Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Telekinesis update (telepathy + Messenger) #1154

Draft
wants to merge 46 commits into
base: Drakos_TelekinesisRoles
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0c7cf44
wow I already broke the game, how fun.....
Ultradragon005 Aug 11, 2024
956aebc
Merge branch 'DevBuild_2.1.0' into telekinesis-update
Ultradragon005 Aug 11, 2024
aa06b23
fix bugs
Ultradragon005 Aug 12, 2024
ceb415e
now finally time to begin on Messenger
Ultradragon005 Aug 12, 2024
9f06169
.
Ultradragon005 Aug 12, 2024
b149e43
nvm I guess I'm just autistic
Ultradragon005 Aug 12, 2024
131a816
revert
Ultradragon005 Aug 12, 2024
19f85eb
skibidi toilet
Ultradragon005 Aug 12, 2024
696c711
Almsot done, jsut need some fixes left
Ultradragon005 Aug 12, 2024
4054446
finishing touches
Ultradragon005 Aug 12, 2024
c536c28
Updates
Ultradragon005 Aug 12, 2024
467e3c5
done
Ultradragon005 Aug 12, 2024
c7ab50d
update
Ultradragon005 Aug 12, 2024
486278c
bruh
Ultradragon005 Aug 12, 2024
7781c25
bruh 2.0
Ultradragon005 Aug 12, 2024
b70c262
larger delay
Ultradragon005 Aug 12, 2024
bc67cb7
move
Ultradragon005 Aug 12, 2024
23002ff
change id
Ultradragon005 Aug 12, 2024
87801c2
move
Ultradragon005 Aug 12, 2024
a5d2fdc
how the hell did I forget that
Ultradragon005 Aug 12, 2024
789881d
oh also not supposed to be experimental anymore
Ultradragon005 Aug 12, 2024
36dcdd2
eh, this can break too
Ultradragon005 Aug 12, 2024
f6b47fd
cleanup logic
Ultradragon005 Aug 12, 2024
ef501d3
change
Ultradragon005 Aug 12, 2024
ab8b8da
forget revert
Ultradragon005 Aug 12, 2024
b47aafb
more cleanup
Ultradragon005 Aug 12, 2024
3bfe675
nah, it will be funny af 🤣
Ultradragon005 Aug 12, 2024
eef3efd
OH THIS MF
Ultradragon005 Aug 13, 2024
35344cf
fix
Ultradragon005 Aug 13, 2024
fe63d08
I already checked for null
Ultradragon005 Aug 13, 2024
8f7477c
use strinbuilder && 0 => 1
Ultradragon005 Aug 13, 2024
5470ce0
fix
Ultradragon005 Aug 13, 2024
579ac56
fix again..
Ultradragon005 Aug 13, 2024
a844c52
rename
Ultradragon005 Aug 13, 2024
a68a2e2
simplify
Ultradragon005 Aug 16, 2024
ea1cf2f
fix
Ultradragon005 Aug 16, 2024
70d2a6f
fix again...
Ultradragon005 Aug 16, 2024
a185904
change
Ultradragon005 Aug 16, 2024
c7be738
fix again..
Ultradragon005 Aug 16, 2024
35445b1
fix id
Ultradragon005 Aug 17, 2024
57c3b3e
CustomRoles.NotAssigned => CustomRoles.Telepathy
Ultradragon005 Aug 17, 2024
f49691f
I forgot .outofgame exists...
Ultradragon005 Aug 19, 2024
b42dff1
merge latest
Ultradragon005 Aug 19, 2024
d95bb17
.
Ultradragon005 Aug 19, 2024
a21a3c2
merge latest
Ultradragon005 Aug 29, 2024
89ffd8e
fix error
Ultradragon005 Aug 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
Ultradragon005 committed Aug 13, 2024
commit 35344cf88737dfc904be687f22ac340f97cb1bbc
2 changes: 1 addition & 1 deletion Patches/PlayerControlPatch.cs
Original file line number Diff line number Diff line change
@@ -976,7 +976,7 @@ public static void AfterReportTasks(PlayerControl player, NetworkedPlayerInfo ta
if (target?.Object?.GetRealKiller() != null)
{
Main.RememberKillerRole = GetString($"{target.Object.GetRealKiller().GetCustomRole()}");
if (target.Object.GetRealKiller().IsAnySubRole(x => x.IsConverted() && !target.Object.Is(CustomRoles.Madmate)))
if (!target.Object.GetRealKiller().IsAnySubRole(x => x.IsConverted() && !target.Object.Is(CustomRoles.Madmate)))
Main.RememberedFaction = target.Object.GetRealKiller().GetCustomRole().GetCustomRoleTeam();
else
Main.RememberedFaction = Custom_Team.Neutral;