Fix RandomPosition

mxyx-club · Apr 26, 2024 · da6e9a4 · da6e9a4
1 parent d25b95d
commit da6e9a4
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 41 deletions.
diff --git a/TheOtherRoles/Buttons.cs b/TheOtherRoles/Buttons.cs
@@ -3133,7 +3133,7 @@ public static void createButtonsPostfix(HudManager __instance)
                     writer.Write(Jumper.jumpLocation.y);
                     AmongUsClient.Instance.FinishRpcImmediately(writer);
 
-                    PlayerControl.LocalPlayer.transform.position = Jumper.jumpLocation;
+                    PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(Jumper.jumpLocation);
 
 
                     Jumper.Charges -= 1f;
@@ -3193,7 +3193,7 @@ public static void createButtonsPostfix(HudManager __instance)
                     writer.Write(Escapist.escapeLocation.y);
                     AmongUsClient.Instance.FinishRpcImmediately(writer);
 
-                    PlayerControl.LocalPlayer.transform.position = Escapist.escapeLocation;
+                    PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(Escapist.escapeLocation);
 
 
                     Escapist.Charges -= 1f;

diff --git a/TheOtherRoles/Patches/ExileControllerPatch.cs b/TheOtherRoles/Patches/ExileControllerPatch.cs
@@ -337,21 +337,24 @@ private static void WrapUpPostfix(GameData.PlayerInfo exiled)
 
             if (CustomOptionHolder.randomGameStartToVents.getBool())
             {
-                CachedPlayer.LocalPlayer.PlayerControl.transform.position = MapData.FindVentSpawnPositions().Random();
+                CachedPlayer.LocalPlayer.PlayerControl.NetTransform.RpcSnapTo
+                    (MapData.FindVentSpawnPositions()[rnd.Next(MapData.FindVentSpawnPositions().Count)]);
             }
             else
             {
-                CachedPlayer.LocalPlayer.PlayerControl.transform.position =
+                var SpawnPositions =
                     GameOptionsManager.Instance.currentNormalGameOptions.MapId switch
                     {
-                        0 => MapData.SkeldSpawnPosition.Random(),
-                        1 => MapData.MiraSpawnPosition.Random(),
-                        2 => MapData.PolusSpawnPosition.Random(),
-                        3 => MapData.DleksSpawnPosition.Random(),
-                        4 => MapData.AirshipSpawnPosition.Random(),
-                        5 => MapData.FungleSpawnPosition.Random(),
-                        _ => CachedPlayer.LocalPlayer.PlayerControl.transform.position
+                        0 => MapData.SkeldSpawnPosition,
+                        1 => MapData.MiraSpawnPosition,
+                        2 => MapData.PolusSpawnPosition,
+                        3 => MapData.DleksSpawnPosition,
+                        4 => MapData.AirshipSpawnPosition,
+                        5 => MapData.FungleSpawnPosition,
+                        _ => MapData.FindVentSpawnPositions()
                     };
+                CachedPlayer.LocalPlayer.PlayerControl.NetTransform.RpcSnapTo
+                    (SpawnPositions[rnd.Next(SpawnPositions.Count)]);
             }
         }
 

diff --git a/TheOtherRoles/Patches/IntroPatch.cs b/TheOtherRoles/Patches/IntroPatch.cs
@@ -130,26 +130,27 @@ public static void Prefix(IntroCutscene __instance)
 
         if (CustomOptionHolder.randomGameStartPosition.getBool())
         {
-            //Random spawn on game start
-
-            var airshipSpawn = new System.Collections.Generic.List<Vector3>(); //no spawns since it already has random spawns
+            // Random spawn on game start
             if (CustomOptionHolder.randomGameStartToVents.getBool())
             {
-                CachedPlayer.LocalPlayer.PlayerControl.transform.position = MapData.FindVentSpawnPositions().Random();
+                CachedPlayer.LocalPlayer.PlayerControl.NetTransform.RpcSnapTo
+                    (MapData.FindVentSpawnPositions()[rnd.Next(MapData.FindVentSpawnPositions().Count)]);
             }
             else
             {
-                CachedPlayer.LocalPlayer.PlayerControl.transform.position =
+                var SpawnPositions =
                     GameOptionsManager.Instance.currentNormalGameOptions.MapId switch
                     {
-                        0 => MapData.SkeldSpawnPosition.Random(),
-                        1 => MapData.MiraSpawnPosition.Random(),
-                        2 => MapData.PolusSpawnPosition.Random(),
-                        3 => MapData.DleksSpawnPosition.Random(),
-                        4 => MapData.AirshipSpawnPosition.Random(),
-                        5 => MapData.FungleSpawnPosition.Random(),
-                        _ => CachedPlayer.LocalPlayer.PlayerControl.transform.position
+                        0 => MapData.SkeldSpawnPosition,
+                        1 => MapData.MiraSpawnPosition,
+                        2 => MapData.PolusSpawnPosition,
+                        3 => MapData.DleksSpawnPosition,
+                        4 => MapData.AirshipSpawnPosition,
+                        5 => MapData.FungleSpawnPosition,
+                        _ => MapData.FindVentSpawnPositions()
                     };
+                CachedPlayer.LocalPlayer.PlayerControl.NetTransform.RpcSnapTo
+                    (SpawnPositions[rnd.Next(SpawnPositions.Count)]);
             }
         }
 

diff --git a/TheOtherRoles/Patches/PlayerControlPatch.cs b/TheOtherRoles/Patches/PlayerControlPatch.cs
@@ -2162,7 +2162,7 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] Player
                 else if (RoleInfo.getRoleInfoForPlayer(target, false).FirstOrDefault().isNeutral) color = Color.blue;
             }
 
-            Helpers.showFlash(color, 1.5f);
+            Helpers.showFlash(color, 1.75f);
         }
 
         // HideNSeek

diff --git a/TheOtherRoles/RPC.cs b/TheOtherRoles/RPC.cs
@@ -1849,8 +1849,10 @@ public static void setFutureShifted(byte playerId)
 
     public static void disperse()
     {
+        // AntiTeleport set position
         AntiTeleport.setPosition();
-        Helpers.showFlash(Cleaner.color);
+
+        Helpers.showFlash(Palette.ImpostorRed);
 
         if (AntiTeleport.antiTeleport.FindAll(x => x.PlayerId == CachedPlayer.LocalPlayer.PlayerControl.PlayerId).Count == 0 && !CachedPlayer.LocalPlayer.Data.IsDead)
         {
@@ -1867,21 +1869,24 @@ public static void disperse()
                 };
                 if (Disperser.DispersesToVent)
                 {
-                    CachedPlayer.LocalPlayer.PlayerControl.transform.position = MapData.FindVentSpawnPositions().Random();
+                    CachedPlayer.LocalPlayer.PlayerControl.NetTransform.RpcSnapTo
+                    (MapData.FindVentSpawnPositions()[rnd.Next(MapData.FindVentSpawnPositions().Count)]);
                 }
                 else
                 {
-                    CachedPlayer.LocalPlayer.PlayerControl.transform.position =
+                    var SpawnPositions =
                         GameOptionsManager.Instance.currentNormalGameOptions.MapId switch
                         {
-                            0 => MapData.SkeldSpawnPosition.Random(),
-                            1 => MapData.MiraSpawnPosition.Random(),
-                            2 => MapData.PolusSpawnPosition.Random(),
-                            3 => MapData.DleksSpawnPosition.Random(),
-                            4 => MapData.AirshipSpawnPosition.Random(),
-                            5 => MapData.FungleSpawnPosition.Random(),
-                            _ => CachedPlayer.LocalPlayer.PlayerControl.transform.position
+                            0 => MapData.SkeldSpawnPosition,
+                            1 => MapData.MiraSpawnPosition,
+                            2 => MapData.PolusSpawnPosition,
+                            3 => MapData.DleksSpawnPosition,
+                            4 => MapData.AirshipSpawnPosition,
+                            5 => MapData.FungleSpawnPosition,
+                            _ => MapData.FindVentSpawnPositions()
                         };
+                    CachedPlayer.LocalPlayer.PlayerControl.NetTransform.RpcSnapTo
+                        (SpawnPositions[rnd.Next(SpawnPositions.Count)]);
                 }
             }
             Disperser.remainingDisperses--;

diff --git a/TheOtherRoles/TheOtherRoles.csproj b/TheOtherRoles/TheOtherRoles.csproj
@@ -11,13 +11,6 @@
 		<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>
         <EmbeddedResource Include="Resources\**" />