From 5f29175235d6272de15d953f1e1b638fa7c90e55 Mon Sep 17 00:00:00 2001
From: XtraCube <uiqbal544@gmail.com>
Date: Tue, 14 May 2024 17:43:43 -0400
Subject: [PATCH] up to date with lp-player-refactor

---
 MiraAPI/Hud/CustomActionButton.cs           | 22 +++++++--------------
 MiraAPI/Patches/Options/ToHudStringPatch.cs |  2 +-
 MiraAPI/Patches/Roles/GameStartupPatch.cs   |  6 ++++--
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/MiraAPI/Hud/CustomActionButton.cs b/MiraAPI/Hud/CustomActionButton.cs
index 39ecd00..f2f5d26 100644
--- a/MiraAPI/Hud/CustomActionButton.cs
+++ b/MiraAPI/Hud/CustomActionButton.cs
@@ -28,8 +28,6 @@ public abstract class CustomActionButton
 
     protected ActionButton Button;
 
-    protected DeadBody DeadBodyTarget;
-
     public void CreateButton(Transform parent)
     {
         if (Button)
@@ -65,10 +63,10 @@ public abstract class CustomActionButton
         {
             OnEffectEnd();
         }
-
+        
         EffectActive = false;
     }
-
+    
     public void OverrideSprite(Sprite sprite)
     {
         Button.graphic.sprite = sprite;
@@ -87,14 +85,9 @@ public abstract class CustomActionButton
 
     public virtual void OnEffectEnd() { }
 
-    private bool CanUseHandler()
-    {
-        return Timer <= 0 && !EffectActive && (!LimitedUses || UsesLeft > 0) && CanUse();
-    }
-
     public virtual bool CanUse()
     {
-        return true;
+        return Timer <= 0 && !EffectActive && (!LimitedUses || UsesLeft > 0);
     }
 
     public virtual void SetActive(bool visible, RoleBehaviour role)
@@ -102,9 +95,9 @@ public abstract class CustomActionButton
         Button.ToggleVisible(visible && Enabled(role));
     }
 
-    private void ClickHandler()
+    public virtual void ClickHandler()
     {
-        if (!CanUseHandler())
+        if (!CanUse())
         {
             return;
         }
@@ -142,7 +135,7 @@ public abstract class CustomActionButton
             }
         }
 
-        if (CanUseHandler())
+        if (CanUse())
         {
             Button.SetEnabled();
         }
@@ -152,10 +145,9 @@ public abstract class CustomActionButton
         }
         Button.SetCoolDown(Timer, EffectActive ? EffectDuration : Cooldown);
 
-        playerControl.UpdateBodies(playerControl.Data.Role.TeamColor, ref DeadBodyTarget);
         FixedUpdate(playerControl);
     }
-
+    
     private void EffectEndHandler()
     {
         EffectActive = false;
diff --git a/MiraAPI/Patches/Options/ToHudStringPatch.cs b/MiraAPI/Patches/Options/ToHudStringPatch.cs
index c245d2d..bd70182 100644
--- a/MiraAPI/Patches/Options/ToHudStringPatch.cs
+++ b/MiraAPI/Patches/Options/ToHudStringPatch.cs
@@ -98,7 +98,7 @@ public static class ToHudStringPatch
             var groupsWithoutRoles = CustomOptionsManager.CustomGroups.Where(group => group.AdvancedRole == null);
 
             var suffix = CustomGameModeManager.ActiveMode.CanAccessSettingsTab() ? "\nPress <b>Tab</b> to view Normal Options" :
-                $"\n<b>You can not access Normal Options on {Cus    tomGameModeManager.ActiveMode.Name} mode.</b>";
+                $"\n<b>You can not access Normal Options on {CustomGameModeManager.ActiveMode.Name} mode.</b>";
 
             AddOptions(sb,
                 CustomOptionsManager.CustomNumberOptions.Where(option => option.Group == null && !option.Hidden()),
diff --git a/MiraAPI/Patches/Roles/GameStartupPatch.cs b/MiraAPI/Patches/Roles/GameStartupPatch.cs
index 6adc10d..c7a38cc 100644
--- a/MiraAPI/Patches/Roles/GameStartupPatch.cs
+++ b/MiraAPI/Patches/Roles/GameStartupPatch.cs
@@ -1,4 +1,5 @@
 using HarmonyLib;
+using MiraAPI.Roles;
 
 namespace MiraAPI.Patches.Roles;
 
@@ -8,9 +9,10 @@ public static class GameStartupPatch
     private static bool _runOnce;
 
     /// <summary>
-    /// This is used for registering roles when the game opens, might be a janky solution but it works
+    /// This is used for registering roles when the game opens, might be a janky solution, but it works
     /// </summary>
-    [HarmonyPostfix, HarmonyPatch("Start")]
+    [HarmonyPostfix]
+    [HarmonyPatch("Start")]
     public static void StartPostfix()
     {
         if (_runOnce)