MusicBeat

Assets/Scripts/MainGame/Characters/Automata/Automata.cs

@@ -48,7 +48,7 @@ namespace Cielonos.MainGame.Characters
 
             foreach (KeyValuePair<string, float> timer in timerData.timers)
             {
-                selfTimeSm.coolDownTimers[timer.Key] = new Timer(timer.Value);
+                selfTimeSm.coolDownTimers[timer.Key] = new CooldownTimer(timer.Value);
             }
         }
 
@@ -116,7 +116,7 @@ namespace Cielonos.MainGame.Characters
             eventSm.onDeath.Invoke();
 
             CombatManager.CoordinatorSm.ReleaseAll(this);
-            CombatManager.EnemySm.RemoveEnemy(this);
+          
             float deathProcessTime = 0f;
             var deathFuncAnim = fullBodyFuncAnims.animDataList.Find(data => data.animInfo.animationName == "Death");
             if (deathFuncAnim != null)

Assets/Scripts/MainGame/Characters/Automata/Enemy.cs

@@ -22,6 +22,16 @@ namespace Cielonos.MainGame.Characters
             base.InitializeSubcontrollers();
             reactionSc.InitializeResistances(enemyRank);
         }
+
+        protected override void Start()
+        {
+            base.Start();
+            
+            if (fraction == Fraction.Enemy)
+            {
+                CombatManager.EnemySm.activeEnemiesList.Add(this);
+            }
+        }
     }
 
     public partial class Enemy
@@ -36,6 +46,7 @@ namespace Cielonos.MainGame.Characters
             }
             
             base.Die();
+            CombatManager.EnemySm.RemoveEnemy(this);
         }
     }
 }