Update v4.2.1 (with fixed merge issues)

diff --git a/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs b/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs
index 3b8c9a08558966331d4e33211c954dfd04d32ddf..4087ff86f316d691ac64cf49c246012b5ebe226d 100644 (file)
--- a/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs
+++ b/TheOtherRoles/Patches/CreateOptionsPickerPatch.cs
@@ -29,15 +29,7 @@ namespace TheOtherRoles.Patches {
             }
             return false;
         }
-            else {
-                //
-            }
-        }
 
-        private static void addGamemodeButton(CreateOptionsPicker __instance, string name, string spritePath, CustomGamemodes gamemode) {
-            Vector3 position1 = __instance.MapButtons[3].transform.position;
-            Vector3 position2 = __instance.transform.Find("Max Players").position;
-            float p = -5.8f + (renderers.Count * 1.4f);
 
         [HarmonyPatch(typeof(CreateOptionsPicker), nameof(CreateOptionsPicker.Refresh))]
         public static void Postfix(CreateOptionsPicker __instance) {

diff --git a/TheOtherRoles/Patches/EndGamePatch.cs b/TheOtherRoles/Patches/EndGamePatch.cs
index 24518f944f8661cbd8100b2ece28974ec1ca217e..7aa2ffc459973792c9024bcce10c7d4b798a48bf 100644 (file)
--- a/TheOtherRoles/Patches/EndGamePatch.cs
+++ b/TheOtherRoles/Patches/EndGamePatch.cs
@@ -465,15 +465,6 @@ namespace TheOtherRoles.Patches {
             return false;
         }
 
-        private static bool CheckAndEndGameForProsecutorWin(ShipStatus __instance) {
-            if (Lawyer.triggerProsecutorWin) {
-                __instance.enabled = false;
-                ShipStatus.RpcEndGame((GameOverReason)CustomGameOverReason.ProsecutorWin, false);
-                return true;
-            }
-            return false;
-        }
-
         private static bool CheckAndEndGameForLoverWin(ShipStatus __instance, PlayerStatistics statistics) {
             if (statistics.TeamLoversAlive == 2 && statistics.TotalAlive <= 3) {
                 //__instance.enabled = false;

diff --git a/TheOtherRoles/Patches/UpdatePatch.cs b/TheOtherRoles/Patches/UpdatePatch.cs
index 86bde52a31fa193a8f53324127e38c1c544dedf6..d606cc088c00bfebd15997dc65c23d8b60d0b2e2 100644 (file)
--- a/TheOtherRoles/Patches/UpdatePatch.cs
+++ b/TheOtherRoles/Patches/UpdatePatch.cs
@@ -319,11 +319,6 @@ namespace TheOtherRoles.Patches {
             __instance.MapButton.HeldButtonSprite.color = Trapper.playersOnMap.Any() ? Trapper.color : Color.white;
         }
 
-        static void updateMapButton(HudManager __instance) {
-            if (Trapper.trapper == null || !(CachedPlayer.LocalPlayer.PlayerId == Trapper.trapper.PlayerId) || __instance == null || __instance.MapButton == null) return;
-            __instance.MapButton.color = Trapper.playersOnMap.Any() ? Trapper.color : Color.white;
-        }
-
         static void Postfix(HudManager __instance)
         {
             if (AmongUsClient.Instance.GameState != InnerNet.InnerNetClient.GameStates.Started) return;