Merge pull request #9 from MyDragonBreath/dev

v0.0.5

Author: MyDragonBreath

MCI/MCIPlugin.cs

@@ -1,20 +1,44 @@
 using BepInEx;
 using BepInEx.Unity.IL2CPP;
 using HarmonyLib;
+using System;
+using UnityEngine.SceneManagement;
 
 namespace MCI
 {
     [BepInAutoPlugin("dragonbreath.au.mci", "MCI", VersionString)]
     [BepInProcess("Among Us.exe")]
     public partial class MCIPlugin : BasePlugin
     {
-        public const string VersionString = "0.0.4";
+        public const string VersionString = "0.0.5";
         public static System.Version vVersion = new(VersionString);
         public Harmony Harmony { get; } = new(Id);
         public override void Load()
         {
             Harmony.PatchAll();
             UpdateChecker.checkForUpdate();
+
+            SceneManager.add_sceneLoaded((Action<Scene, LoadSceneMode>)((scene, _) =>
+            {
+                if (scene.name == "MainMenu")
+                {
+                    ModManager.Instance.ShowModStamp();
+                }
+            }));
+        }
+
+
+        public static bool Persistence = true;
+        
+    }
+
+
+    [HarmonyPatch(typeof(GameStartManager), nameof(GameStartManager.Update))]
+    public static class CountdownPatch
+    {
+        public static void Prefix(GameStartManager __instance)
+        {
+            __instance.countDownTimer = 0;
         }
     }
 }

MCI/Patches/AirshipSpawn.cs

@@ -0,0 +1,24 @@
+using HarmonyLib;
+using System;
+
+namespace MCI.Patches
+{
+    [HarmonyPatch]
+
+    public sealed class AirshipSpawn
+    {
+        [HarmonyPatch(typeof(SpawnInMinigame), nameof(SpawnInMinigame.Begin))]
+        [HarmonyPostfix]
+
+        public static void Postfix(SpawnInMinigame __instance)
+        {
+            foreach (var player in PlayerControl.AllPlayerControls)
+            {
+                if (!player.Data.PlayerName.Contains("Robot")) continue;
+                var rand = new Random().Next(0, __instance.Locations.Count);
+                player.gameObject.SetActive(true);
+                player.NetTransform.RpcSnapTo(__instance.Locations[rand].Location);
+            }
+        }
+    }
+}

MCI/Patches/KeyboardJoystick.cs

@@ -31,6 +31,16 @@ public static void Postfix()
                 controllingFigure = Mathf.Clamp(controllingFigure, 0, PlayerControl.AllPlayerControls.Count - 1);
                 InstanceControl.SwitchTo((byte)controllingFigure);
             }
+
+            if (Input.GetKeyDown(KeyCode.F6))
+            {
+                MCIPlugin.Persistence = !MCIPlugin.Persistence;
+            }
+
+            if (Input.GetKeyDown(KeyCode.F11))
+            {
+                Utils.RemoveAllPlayers();
+            }
         }
     }
 }

MCI/Patches/OnLobbyStart.cs

@@ -0,0 +1,26 @@
+using HarmonyLib;
+
+namespace MCI.Patches
+{
+    [HarmonyPatch]
+
+    public sealed class OnLobbyStart
+    {
+        [HarmonyPatch(typeof(LobbyBehaviour), nameof(LobbyBehaviour.Start))]
+        [HarmonyPostfix]
+
+        public static void Postfix()
+        {
+            if (MCIPlugin.Persistence && InstanceControl.clients.Count != 0)
+            {
+                int count = InstanceControl.clients.Count;
+                InstanceControl.clients.Clear();
+                InstanceControl.PlayerIdClientId.Clear();
+                for (int i = 0; i < count; i++)
+                {
+                    Utils.CreatePlayerInstance("Robot");
+                }
+            }
+        }
+    }
+}

MCI/Patches/PingTracker.cs

@@ -15,6 +15,8 @@ public static void Postfix(PingTracker __instance)
             position.AdjustPosition();
             __instance.text.text +=
                 "\n<color=#ff6700FF>MCI v" + MCIPlugin.VersionString + "</color>";
+            __instance.text.text += (MCIPlugin.Persistence) ?
+                " <color=#00ff00FF>[✓]</color>": " <color=#ff0000FF>[X]</color>";
             if (UpdateChecker.needsUpdate) __instance.text.text += " - <color=#ff0000FF>UPDATE AVAILABLE</color>";
             __instance.text.text +=
                 "\n    by MyDragonBreath, whichTwix";

MCI/Utils.cs

@@ -1,4 +1,5 @@
 using InnerNet;
+using System.Linq;
 using UnityEngine;
 
 namespace MCI
@@ -49,6 +50,27 @@ public static PlayerControl PlayerById(byte id)
             }
             return null;
         }
+
+
+
+
+
+
+
+        public static void RemovePlayer(byte id)
+        {
+            int clientId = InstanceControl.clients.FirstOrDefault(x => x.Value.Character.PlayerId == id).Key;
+            ClientData outputData;
+            InstanceControl.clients.Remove(clientId, out outputData);
+            InstanceControl.PlayerIdClientId.Remove(id);
+            AmongUsClient.Instance.RemovePlayer(clientId, DisconnectReasons.ExitGame);
+            AmongUsClient.Instance.allClients.Remove(outputData);
+        }
+
+        public static void RemoveAllPlayers()
+        {
+            foreach (byte playerId in InstanceControl.PlayerIdClientId.Keys) RemovePlayer(playerId);
+        }
     }
 }
 

README.md

@@ -6,7 +6,9 @@ It can also be buggy with different mods differently depending on how they inter
 Think of this as more like a ease-of-access utility then a standlone testing environment.
 
 Whilst in lobby press f5 to add players,
+press f6 to toggle between keeping or losing bots between games,
 and in game press f9 to move up or f10 to move down through the id list.
+You can press f11 to remove all bots.
 
 i've left it openended for any future features but i dont think i can see myself regularly maintaning this beyond bug fixes,
 but your welcome to pr and contribute
@@ -21,13 +23,23 @@ Relies on Bepinex
 
 | Among Us Version | Download |
 |----------|-------------|
+| v2023.2.28 | [v0.0.5](https://github.com/MyDragonBreath/AmongUs.MultiClientInstancing/releases/tag/v0.0.5)
 | v2022.12.14 | [v0.0.4](https://github.com/MyDragonBreath/AmongUs.MultiClientInstancing/releases/tag/v0.0.4)
 | v2022.6.21 & v2022.7.12 | [v0.0.2](https://github.com/MyDragonBreath/AmongUs.MultiClientInstancing/releases/tag/v0.0.2)
 | v2022.6.21 & v2022.7.12 | [v0.0.1](https://github.com/MyDragonBreath/AmongUs.MultiClientInstancing/releases/tag/v0.0.1)
 
 <details>
   <summary> Changelog </summary>
   <details>
+  <summary> v0.0.5 </summary>
+  <ul>
+    <li> Robot presistence </li>
+    <li> Player removal keybind </li>
+    <li> Countdown timer removed </li>
+    <li> Fix Airship Spawning </li>
+  </ul>
+  </details>
+  <details>
   <summary> v0.0.4 </summary>
   <ul>
     <li> Updated to latest version, fixed bugs </li>