Fix shift

mxyx-club · Apr 25, 2024 · 393a8b1 · 393a8b1
1 parent 2fec1f0
commit 393a8b1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/TheOtherRoles/Helper/Helpers.cs b/TheOtherRoles/Helper/Helpers.cs
@@ -1331,19 +1331,18 @@ public static bool isNeutral(PlayerControl player)
         return false;
     }
 
-    //好人交换师代码target
     public static bool isShiftNeutral(PlayerControl player)
     {
         if (CustomOptionHolder.modifierShiftNeutral.getBool())
         {
             if (player != null)
-                return player == (Jackal.jackal
-                        || Sidekick.sidekick
-                        || Werewolf.werewolf
-                        || Akujo.akujo
-                        || Juggernaut.juggernaut
-                        || Swooper.swooper
-                        || Arsonist.arsonist);
+                return player == Jackal.jackal ||
+                       player == Sidekick.sidekick ||
+                       player == Werewolf.werewolf ||
+                       player == Akujo.akujo ||
+                       player == Juggernaut.juggernaut ||
+                       player == Swooper.swooper ||
+                       player == Arsonist.arsonist;
             return false;
         }
         else

diff --git a/TheOtherRoles/Patches/UpdatePatch.cs b/TheOtherRoles/Patches/UpdatePatch.cs
@@ -95,12 +95,20 @@ private static void setNameColors()
             if (Deputy.deputy != null && Deputy.knowsSheriff) {
                 setPlayerNameColor(Deputy.deputy, Deputy.color);
             }
-        } else
+        } else*/
+
         if (Deputy.deputy != null && Deputy.deputy == localPlayer)
         {
             setPlayerNameColor(Deputy.deputy, Deputy.color);
             if (Sheriff.sheriff != null && Deputy.knowsSheriff) setPlayerNameColor(Sheriff.sheriff, Sheriff.color);
-        }*/
+        }
+
+        //警长可见捕快
+        if (Sheriff.sheriff != null && Sheriff.sheriff == localPlayer)
+        {
+            setPlayerNameColor(Sheriff.sheriff, Sheriff.color);
+            if (Deputy.deputy != null && Deputy.knowsSheriff) setPlayerNameColor(Deputy.deputy, Sheriff.color);
+        }
 
         if (Prophet.prophet != null && Prophet.prophet == localPlayer)
         {
@@ -113,12 +121,6 @@ private static void setNameColors()
                 }
             }
         }
-        //警长可见捕快
-        if (Sheriff.sheriff != null && Sheriff.sheriff == localPlayer)
-        {
-            setPlayerNameColor(Sheriff.sheriff, Sheriff.color);
-            if (Deputy.deputy != null && Deputy.knowsSheriff) setPlayerNameColor(Deputy.deputy, Sheriff.color);
-        }
         /*else if (Portalmaker.portalmaker != null && Portalmaker.portalmaker == localPlayer)
             setPlayerNameColor(Portalmaker.portalmaker, Portalmaker.color);
         else if (Lighter.lighter != null && Lighter.lighter == localPlayer)

diff --git a/TheOtherRoles/TheOtherRoles.csproj b/TheOtherRoles/TheOtherRoles.csproj
@@ -9,6 +9,14 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 		<AmongUsLatest>F:\AmongUs\v2024.3.5</AmongUsLatest>
+		<AnalysisLevel>6.0</AnalysisLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+      <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+      <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/TheOtherRoles/Utilities/GithubUtils.cs b/TheOtherRoles/Utilities/GithubUtils.cs
@@ -18,7 +18,7 @@ public static string GithubUrl(this string url)
                 return url.Replace("https://raw.githubusercontent.com", "https://github.moeyy.xyz/https://raw.githubusercontent.com");
             }
         }
-
+        Info("Rewrite URL" + url);
         return url;
     }
 }