eh

Modules/CustomRolesHelper.cs

@@ -1076,7 +1076,7 @@ internal static class CustomRolesHelper
 
         public bool IsNoAnimationShifter()
         {
-            return (role == CustomRoles.Disguiser && !Disguiser.ShapeshiftAnimation.GetBool()) || role is
+            return role is
                 CustomRoles.Glitch or
                 CustomRoles.Generator or
                 CustomRoles.Echo;

Modules/ExtendedPlayerControl.cs

@@ -1838,6 +1838,9 @@ internal static class ExtendedPlayerControl
                 _ => Main.AllPlayerKillCooldown[player.PlayerId]
             };
 
+            if (Options.CurrentGameMode == CustomGameMode.HideAndSeek)
+                Main.AllPlayerKillCooldown[player.PlayerId] = Seeker.KillCooldown.GetFloat();
+
             if (player.PlayerId == LastImpostor.CurrentId) LastImpostor.SetKillCooldown();
 
             if (player.Is(CustomRoles.Mare))

Resources/Lang/en_US.json

@@ -4552,7 +4552,6 @@
   "DisguiserResetKillCooldownTo": "Reset Kill Cooldown To",
   "DisguiserShapeshiftCooldown": "Disguiser Shapeshift Cooldown",
   "DisguiserShapeshiftDuration": "Disguiser Shapeshift Duration",
-  "DisguiserShapeshiftAnimation": "Disguiser Shapeshift Animation",
   "HotPotato": "HOT POTATO",
   "ModeHotPotato": "Gamemode: Hot Potato",
   "ModeDescribe.HotPotato": "In the Hot Potato gamemode, one player always has the hot potato, and they can pass it to anyone by going near someone. Each X seconds (X is set by the host), the player who holds the hot potato dies. The last player alive wins!\\n\\nNote: You cannot pass the hot potato to the player that just gave it to you (their name is colored in cyan, it means they cannot get the hot potato) unless there are only 2 players left.",

Roles/HideAndSeek/Disguiser.cs

@@ -12,7 +12,6 @@ public class Disguiser : RoleBase, IHideAndSeekRole
     public static OptionItem ResetKillCooldownTo;
     public static OptionItem ShapeshiftCooldown;
     public static OptionItem ShapeshiftDuration;
-    public static OptionItem ShapeshiftAnimation;
     public static OptionItem Vision;
     public static OptionItem Speed;
 
@@ -78,11 +77,6 @@ public class Disguiser : RoleBase, IHideAndSeekRole
             .SetValueFormat(OptionFormat.Seconds)
             .SetColor(new(179, 70, 70, byte.MaxValue))
             .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Disguiser]);
-
-        ShapeshiftAnimation = new BooleanOptionItem(69_213_1111, "DisguiserShapeshiftAnimation", true, TabGroup.ImpostorRoles)
-            .SetGameMode(CustomGameMode.HideAndSeek)
-            .SetColor(new(179, 70, 70, byte.MaxValue))
-            .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Disguiser]);
     }
 
     public override void Add(byte playerId)
@@ -104,11 +98,6 @@ public class Disguiser : RoleBase, IHideAndSeekRole
         AURoleOptions.ShapeshifterDuration = ShapeshiftDuration.GetInt();
     }
 
-    public override bool OnShapeshift(PlayerControl shapeshifter, PlayerControl target, bool shapeshifting)
-    {
-        return ShapeshiftAnimation.GetBool();
-    }
-
     public static bool CheckMurder(PlayerControl killer, PlayerControl target)
     {
         if (CanOnlyKillShapeshiftTarget.GetBool() && killer.shapeshiftTargetPlayerId != target.PlayerId)