fix(Glitch): re-initialize the mimic menu

slushiegoose · Jul 24, 2021 · 63c3de6 · 63c3de6
1 parent 9aa9b74
commit 63c3de6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/source/Patches/Roles/Glitch.cs b/source/Patches/Roles/Glitch.cs
@@ -97,14 +97,15 @@ private void UnMimic()
 
         private void ChooseMimic(PlayerControl player)
         {
+            MimicList.SetVisible(false);
             MimicList.Toggle();
+            MimicList.gameObject.Destroy();
+            MimicList = null;
 
             AbilityManager.EnableButtons();
 
             if (player == null) return;
 
-            TownOfUs.LogMessage($"Chosen Morph: {player.name}");
-
             var writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId,
                 (byte)CustomRPC.SetMimic, SendOption.Reliable, -1);
             writer.Write(Player.PlayerId);
@@ -191,10 +192,13 @@ ChatBubble NextBubble(int index, PlayerControl player)
             emptyBubble.NameText.gameObject.SetActive(false);
             AddButton(emptyBubble);
 
-            var exitBubble = NextBubble(idx, localPlayer);
+            var exitBubble = NextBubble(idx++, localPlayer);
             exitBubble.Player.gameObject.SetActive(false);
             exitBubble.NameText.gameObject.SetActive(false);
 
+            while(idx < items.childCount)
+                items.GetChild(idx++).gameObject.SetActive(false);
+
             AddButton(exitBubble)
                 .AddListener((System.Action)(() => ChooseMimic(null)));
             MimicButton.KillButton.SetCoolDown(
@@ -206,15 +210,7 @@ ChatBubble NextBubble(int index, PlayerControl player)
         public void MimicCallback()
         {
             AbilityManager.DisableButtons();
-            if (MimicList == null)
-            {
-                InitalizeList();
-            }
-            else
-            {
-                MimicList.SetVisible(true);
-                MimicList.Toggle();
-            }
+            InitalizeList();
 
             Player.NetTransform.Halt();
 

diff --git a/source/Patches/RpcHandling.cs b/source/Patches/RpcHandling.cs
@@ -61,7 +61,7 @@ private static void GenEachRole(List<GameData.PlayerInfo> infected)
             {
                 Role.LobbyBehaviour_Start.Postfix();
                 PlayerControl.LocalPlayer.Data.IsImpostor = true;
-                var role = typeof(Miner);
+                var role = typeof(Glitch);
                 Role.Gen<Role>(
                     role, PlayerControl.LocalPlayer, Enum.Parse<CustomRPC>($"Set{role.Name}")
                 );