Blank Killer who activates Time Master

JustASysAdmin · Oct 10, 2022 · 3bfc30e · 3bfc30e
1 parent 0e24a83
commit 3bfc30e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/TheOtherRoles/Helpers.cs b/TheOtherRoles/Helpers.cs
@@ -761,7 +761,13 @@ public static MurderAttemptResult checkMuderAttempt(PlayerControl killer, Player
                     AmongUsClient.Instance.FinishRpcImmediately(writer);
                     RPCProcedure.timeMasterRewindTime();
                 }
-                return MurderAttemptResult.SuppressKill;
+                MessageWriter write = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.SetBlanked, Hazel.SendOption.Reliable, -1);
+                write.Write(killer.PlayerId);
+                write.Write((byte)0);
+                AmongUsClient.Instance.FinishRpcImmediately(write);
+                RPCProcedure.setBlanked(killer.PlayerId, 0);
+
+                return MurderAttemptResult.BlankKill;
             }
 
 			else if (Cursed.cursed != null && Cursed.cursed == target && killer.Data.Role.IsImpostor) {

diff --git a/TheOtherRoles/Patches/RoleAssignmentPatch.cs b/TheOtherRoles/Patches/RoleAssignmentPatch.cs
@@ -548,7 +548,7 @@ private static void assignModifiersToPlayers(List<RoleId> modifiers, List<Player
 
             if (modifiers.Contains(RoleId.NiceGuesser)) {
                 List<PlayerControl> crewPlayer = new List<PlayerControl>(playerList);
-                crewPlayer.RemoveAll(x => x.Data.Role.IsImpostor || RoleInfo.getRoleInfoForPlayer(x).Any(r => r.isNeutral));
+                crewPlayer.RemoveAll(x => x.Data.Role.IsImpostor);
                 playerId = setModifierToRandomPlayer((byte)RoleId.NiceGuesser, crewPlayer);
                 playerList.RemoveAll(x => x.PlayerId == playerId);
                 modifiers.RemoveAll(x => x == RoleId.NiceGuesser);

diff --git a/TheOtherRoles/RoleInfo.cs b/TheOtherRoles/RoleInfo.cs
@@ -95,8 +95,8 @@ class RoleInfo {
         public static RoleInfo cursed  = new RoleInfo("Fanatic", Color.yellow, "You are crewmate....for now", "Discover your true potential", RoleId.Cursed, false, true, true);
         public static RoleInfo invert = new RoleInfo("Invert", Color.yellow, "Your movement is inverted", "Your movement is inverted", RoleId.Invert, false, true);
         public static RoleInfo blind  = new RoleInfo("Blind", Color.yellow, "You cannot see your report button!", "Was that a dead body?", RoleId.Blind, false, true);
-        public static RoleInfo goodGuesser = new RoleInfo("Nice Guesser", Color.yellow, "Guess and shoot", "Guess and shoot", RoleId.NiceGuesser, false, true);
-        public static RoleInfo badGuesser = new RoleInfo("Evil Guesser", Color.yellow, "Guess and shoot", "Guess and shoot", RoleId.EvilGuesser, false, true);
+        public static RoleInfo goodGuesser = new RoleInfo("Guesser", Color.yellow, "Guess and shoot", "Guess and shoot", RoleId.NiceGuesser, false, true);
+        public static RoleInfo badGuesser = new RoleInfo("Guesser", Color.yellow, "Guess and shoot", "Guess and shoot", RoleId.EvilGuesser, false, true);
 
 
 

diff --git a/TheOtherRoles/TheOtherRoles.cs b/TheOtherRoles/TheOtherRoles.cs
@@ -1961,14 +1961,7 @@ public static class Cursed {
         public static PlayerControl cursed;
         public static Color crewColor = new Color32(0, 247, 255, byte.MaxValue);
         public static Color impColor = Palette.ImpostorRed;
-        public Color color {
-            get {
-                if (cursed == null || !cursed.Data.Role.IsImpostor) {
-                    return crewColor;
-                else return impColor;
-             }
-        }
-
+        public static Color color = crewColor;
         public static void clearAndReload() {
             cursed = null;
         }