Enable bots before disposing

project-fika · May 22, 2024 · c247e14 · c247e14
1 parent cbd4be7
commit c247e14
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/Fika.Core/Coop/Custom/FikaDynamicAI.cs b/Fika.Core/Coop/Custom/FikaDynamicAI.cs
@@ -59,10 +59,16 @@ protected void Awake()
 
         private void Spawner_OnBotRemoved(BotOwner botOwner)
         {
-            if (!bots.Remove((CoopBot)botOwner.GetPlayer))
+            CoopBot bot = (CoopBot)botOwner.GetPlayer;
+            if (!bots.Remove(bot))
             {
                 logger.LogWarning($"Could not remove {botOwner.gameObject.name} from bots list.");
             }
+
+            if (disabledBots.Contains(bot))
+            {
+                disabledBots.Remove(bot);
+            }
         }
 
         private void Spawner_OnBotCreated(BotOwner botOwner)
@@ -184,7 +190,7 @@ private void CheckForPlayers(CoopBot bot)
             }
         }
 
-        public void SettingChanged(bool value)
+        public void EnabledChange(bool value)
         {
             if (!value)
             {
@@ -196,5 +202,16 @@ public void SettingChanged(bool value)
                 disabledBots.Clear();
             }
         }
+
+        internal void RateChanged(FikaPlugin.DynamicAIRates value)
+        {
+            resetCounter = value switch
+            {
+                FikaPlugin.DynamicAIRates.Low => 600,
+                FikaPlugin.DynamicAIRates.Medium => 300,
+                FikaPlugin.DynamicAIRates.High => 120,
+                _ => 300,
+            };
+        }
     }
 }
diff --git a/Fika.Core/Coop/Players/CoopBot.cs b/Fika.Core/Coop/Players/CoopBot.cs
@@ -311,6 +311,8 @@ public override void OnDestroy()
                 CoopGame coopGame = (CoopGame)Singleton<IFikaGame>.Instance;
                 if (coopGame != null && coopGame.Status == GameStatus.Started)
                 {
+                    coopGame.DynamicAI.RemoveBot(this);
+
                     FikaServer server = Singleton<FikaServer>.Instance;
                     GenericPacket packet = new(EPackageType.DisposeBot)
                     {

diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs
@@ -436,6 +436,10 @@ private void OnGenericPacketReceived(GenericPacket packet)
                     {
                         if (CoopHandler.Players.TryGetValue(packet.BotNetId, out CoopPlayer botToDispose))
                         {
+                            if (!botToDispose.gameObject.activeSelf)
+                            {
+                                botToDispose.gameObject.SetActive(true);
+                            }
 
                             if (CoopHandler.Players.Remove(packet.BotNetId))
                             {