Further refactoring of CoopGame and CoopBot/ObservedCoopPlayer

project-fika · Jun 14, 2024 · ada9da3 · ada9da3
1 parent 807ee9f
commit ada9da3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs
@@ -9,6 +9,7 @@
 using EFT.Counters;
 using EFT.EnvironmentEffect;
 using EFT.Game.Spawning;
+using EFT.HealthSystem;
 using EFT.Interactive;
 using EFT.InventoryLogic;
 using EFT.UI;
@@ -60,9 +61,8 @@ public sealed class CoopGame : BaseLocalGame<EftGamePlayerOwner>, IBotGame, IFik
         public ExitStatus MyExitStatus { get; set; } = ExitStatus.Survived;
         public string MyExitLocation { get; set; } = null;
         public ISpawnSystem SpawnSystem;
-
         public Dictionary<string, Player> Bots = [];
-        //private GameObject fikaStartButton;
+
         private readonly Dictionary<int, int> botQueue = [];
         private Coroutine extractRoutine;
         private GClass2949 spawnPoints = null;
@@ -463,6 +463,10 @@ private async Task<LocalPlayer> CreateBot(Profile profile, Vector3 position)
 
             CoopBot coopBot = (CoopBot)localPlayer;
             coopBot.NetId = netId;
+            if (FikaPlugin.DisableBotMetabolism.Value)
+            {
+                coopBot.HealthController.DisableMetabolism();
+            }
             coopHandler.Players.Add(coopBot.NetId, coopBot);
 
             return localPlayer;

diff --git a/Fika.Core/Coop/Players/CoopBot.cs b/Fika.Core/Coop/Players/CoopBot.cs
@@ -137,14 +137,6 @@ public override GClass1688 ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartTy
             return hitInfo;
         }
 
-        protected override void Start()
-        {
-            if (FikaPlugin.DisableBotMetabolism.Value)
-            {
-                HealthController.DisableMetabolism();
-            }
-        }
-
         public override void BtrInteraction()
         {
             // Do nothing

diff --git a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs
@@ -895,11 +895,6 @@ private IEnumerator CreateHealthBar()
             yield break;
         }
 
-        protected override void Start()
-        {
-            // Do nothing
-        }
-
         public override void LateUpdate()
         {
             DistanceDirty = true;