From e6eeedf0076c760c011a6b0189fa36f0e012260b Mon Sep 17 00:00:00 2001
From: Dev <dev@dev.sp-tarkov.com>
Date: Sun, 30 Jul 2023 12:24:36 +0100
Subject: [PATCH] Further chagnes for lighthouse bosses

---
 project/Aki.Custom/Patches/CheckAndAddEnemyPatch.cs | 13 ++++++++-----
 .../Progression/LighthouseProgressionClass.cs       |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/project/Aki.Custom/Patches/CheckAndAddEnemyPatch.cs b/project/Aki.Custom/Patches/CheckAndAddEnemyPatch.cs
index ffe4fea..1dee66c 100644
--- a/project/Aki.Custom/Patches/CheckAndAddEnemyPatch.cs
+++ b/project/Aki.Custom/Patches/CheckAndAddEnemyPatch.cs
@@ -17,6 +17,9 @@ namespace Aki.Custom.Patches
         private static MethodInfo _addEnemy;
         private readonly string _targetMethodName = "CheckAndAddEnemy";
 
+        /// <summary>
+        /// BotGroupClass.CheckAndAddEnemy()
+        /// </summary>
         public CheckAndAddEnemyPatch()
         {
             _targetType = PatchConstants.EftTypes.Single(IsTargetType);
@@ -47,7 +50,7 @@ namespace Aki.Custom.Patches
         /// removes the !player.AIData.IsAI  check
         /// </summary>
         [PatchPrefix]
-        private static bool PatchPrefix(object __instance, ref IAIDetails player, ref bool ignoreAI)
+        private static bool PatchPrefix(BotGroupClass __instance, IAIDetails player, ref bool ignoreAI, Dictionary<IAIDetails, BotSettingsClass> ___Enemies)
         {
             //var side = (EPlayerSide)_sideField.GetValue(__instance);
             //var botType = (WildSpawnType)_spawnTypeField.GetValue(__instance);
@@ -57,15 +60,15 @@ namespace Aki.Custom.Patches
                 return false; // do nothing and skip
             }
 
-            var enemies = (Dictionary<IAIDetails, BotSettingsClass>)_enemiesField.GetValue(__instance);
-            if (enemies.ContainsKey(player))
+            if (!___Enemies.ContainsKey(player))
             {
-                return false;// do nothing and skip
+                __instance.AddEnemy(player);
             }
 
             // Add enemy to list
             //if (!enemies.ContainsKey(player) && (!playerIsAi || ignoreAI))
-            _addEnemy.Invoke(__instance, new IAIDetails[] { player });
+            //_addEnemy.Invoke(__instance, new IAIDetails[] { player });
+            
 
             return false;
         }
diff --git a/project/Aki.SinglePlayer/Models/Progression/LighthouseProgressionClass.cs b/project/Aki.SinglePlayer/Models/Progression/LighthouseProgressionClass.cs
index 3be5a38..094fefc 100644
--- a/project/Aki.SinglePlayer/Models/Progression/LighthouseProgressionClass.cs
+++ b/project/Aki.SinglePlayer/Models/Progression/LighthouseProgressionClass.cs
@@ -15,7 +15,7 @@ namespace Aki.SinglePlayer.Models.Progression
         private bool _playerFlaggedAsEnemyToBosses;
         private List<MineDirectionalColliders> _bridgeMines;
         private RecodableItemClass _transmitter;
-        private List<IAIDetails> _zryachiyAndFollowers = new List<IAIDetails>();
+        private readonly List<IAIDetails> _zryachiyAndFollowers = new List<IAIDetails>();
         private bool _aggressor;
         private bool _isDoorDisabled;
         private readonly string _transmitterId = "62e910aaf957f2915e0a5e36";
@@ -158,7 +158,7 @@ namespace Aki.SinglePlayer.Models.Progression
                         if (player1?.KillerId == _player?.ProfileId)
                         {
                             _aggressor = true;
-                            _player?.Profile.TradersInfo[_lightKeeperTid].SetStanding(-0.01f);
+                            _player?.Profile.TradersInfo[_lightKeeperTid].SetStanding(-0.01);
                         }
                     };