Small improvements

Author: scp222thj

src/RPCExploit/MassMedScanPatch.cs renamed to src/RPCExploit/AllMedScanPatch.cs

@@ -3,12 +3,12 @@
 namespace MalumMenu;
 
 [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.LateUpdate))]
-public static class MassMedScan_PlayerPhysics_LateUpdate_Postfix
+public static class AllMedScan_PlayerPhysics_LateUpdate_Postfix
 {
     //Postfix patch of PlayerPhysics.LateUpdate to play the MedBay scan animation for all players
     public static bool isActive;
     public static void Postfix(PlayerPhysics __instance){
-        if (CheatToggles.massMedScan != isActive)
+        if (CheatToggles.allMedScan != isActive)
         {
             var HostData = AmongUsClient.Instance.GetHost();
             if (HostData != null && !HostData.Character.Data.Disconnected){
@@ -17,13 +17,13 @@ public static void Postfix(PlayerPhysics __instance){
                     foreach (var recipient in PlayerControl.AllPlayerControls)
                     {
                         MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(sender.NetId, (byte)RpcCalls.SetScanner, SendOption.None, AmongUsClient.Instance.GetClientIdFromCharacter(recipient));
-                        writer.Write(CheatToggles.massMedScan);
+                        writer.Write(CheatToggles.allMedScan);
                         AmongUsClient.Instance.FinishRpcImmediately(writer);
                     }
                 }
             }
 
-            isActive = CheatToggles.massMedScan;
+            isActive = CheatToggles.allMedScan;
         }
     }
 }

src/RPCExploit/TeleportPatches.cs

@@ -8,16 +8,33 @@ namespace MalumMenu;
 [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.LateUpdate))]
 public static class TeleportCursor_PlayerPhysics_LateUpdate_Postfix
 {
-    // Postfix patch of PlayerPhysics.LateUpdate to teleport to cursor position on right-click
+    private static bool previousTeleportMeCursorState = false;
+    private static bool previousTeleportAllCursorState = false;
+
+    // Postfix patch of PlayerPhysics.LateUpdate to teleport players to cursor position on right-click
     public static void Postfix(PlayerPhysics __instance)
     {
-        if (Input.GetMouseButtonDown(1))
+        //Code to make sure only one of these cheats is enabled at a time
+        if (CheatToggles.teleportMeCursor && !previousTeleportMeCursorState)
+        {
+            CheatToggles.teleportAllCursor = false;
+            previousTeleportMeCursorState = true;
+            previousTeleportAllCursorState = false;
+        }
+        else if (CheatToggles.teleportAllCursor && !previousTeleportAllCursorState)
         {
-            if (CheatToggles.teleportMeCursor)
+            CheatToggles.teleportMeCursor = false;
+            previousTeleportAllCursorState = true;
+            previousTeleportMeCursorState = false;
+        }
+
+        if (Input.GetMouseButtonDown(1)) //Register right-click
+        {
+            if (CheatToggles.teleportMeCursor) //Teleport LocalPlayer to cursor position
             {
                 Utils.TeleportPlayer(PlayerControl.LocalPlayer, Camera.main.ScreenToWorldPoint(Input.mousePosition));
             }
-            else if (CheatToggles.teleportAllCursor)
+            else if (CheatToggles.teleportAllCursor) //Teleport all players to cursor position
             {
                 foreach (var item in PlayerControl.AllPlayerControls)
                 {
@@ -80,7 +97,7 @@ public static void Postfix(PlayerPhysics __instance){
 [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.LateUpdate))]
 public static class TeleportAllPlayer_PlayerPhysics_LateUpdate_Postfix
 {
-    //Postfix patch of PlayerPhysics.LateUpdate to open player pick menu to teleport to player
+    //Postfix patch of PlayerPhysics.LateUpdate to open player pick menu to teleport all players to one player
     public static bool isActive;
     public static void Postfix(PlayerPhysics __instance){
         if (CheatToggles.teleportAllPlayer){
@@ -104,7 +121,9 @@ public static void Postfix(PlayerPhysics __instance){
                 Utils_PlayerPickMenu.openPlayerPickMenu(playerList, (Action) (() =>
                 {
                     foreach (var item in PlayerControl.AllPlayerControls){
-                        Utils.TeleportPlayer(item, Utils_PlayerPickMenu.targetPlayer.transform.position);
+                        if (item.PlayerId != Utils_PlayerPickMenu.targetPlayer.PlayerId){
+                            Utils.TeleportPlayer(item, Utils_PlayerPickMenu.targetPlayer.transform.position);
+                        }
                     }
 
                 }));

src/UI/CheatToggles.cs

@@ -18,7 +18,7 @@ public struct CheatToggles
 
         //RPC Exploit
         public static bool kickPlayer;
-        public static bool massMedScan;
+        public static bool allMedScan;
         public static bool reportBody;
         public static bool murderPlayer;
         public static bool murderAll;

src/UI/MenuUI.cs

@@ -57,7 +57,7 @@ private void Start()
         groups.Add(new GroupInfo("RPC Exploit", false, new List<ToggleInfo>() {
             new ToggleInfo(" KickPlayer", () => CheatToggles.kickPlayer, x => CheatToggles.kickPlayer = x),
             new ToggleInfo(" ReportBody", () => CheatToggles.reportBody, x => CheatToggles.reportBody = x),
-            new ToggleInfo(" MassMedScan", () => CheatToggles.massMedScan, x => CheatToggles.massMedScan = x),
+            new ToggleInfo(" All MedScan", () => CheatToggles.allMedScan, x => CheatToggles.allMedScan = x),
         }, new List<SubmenuInfo> {
             new SubmenuInfo("Teleport", false, new List<ToggleInfo>() {
                 new ToggleInfo(" Me to Cursor", () => CheatToggles.teleportMeCursor, x => CheatToggles.teleportMeCursor = x),
@@ -170,7 +170,7 @@ private void Update(){
         }
 
         if(!CheatChecks.isPlayer){
-            CheatToggles.copyPlayerFC = CheatToggles.massMedScan = CheatToggles.copyPlayerPUID = CheatToggles.spamChat = CheatToggles.chatMimic = CheatToggles.spectate = CheatToggles.freeCam = CheatToggles.kickPlayer = CheatToggles.murderPlayer = CheatToggles.mimicOutfit = CheatToggles.mimicAllOutfits = false;
+            CheatToggles.copyPlayerFC = CheatToggles.allMedScan = CheatToggles.copyPlayerPUID = CheatToggles.spamChat = CheatToggles.chatMimic = CheatToggles.spectate = CheatToggles.freeCam = CheatToggles.kickPlayer = CheatToggles.murderPlayer = CheatToggles.mimicOutfit = CheatToggles.mimicAllOutfits = false;
         }
     }