use refactored code for soldier death

opencombat/simulation/behaviour.py

@@ -120,13 +120,11 @@ class EngageOpponent(AliveSubjectBehaviour):
 
         # Must be check if target is not already dead (killed same cycle)
         if kill and COLLECTION_ALIVE in target_subject.collections:
-            # TODO: refact ? All in same place for dead ?
-            target_subject.collections.remove(COLLECTION_ALIVE)
-            # FIXME: Must be automatic when manipulate subject collections !
-            self.simulation.collections[COLLECTION_ALIVE].remove(target_subject_id)
-            self.simulation.collections[COLLECTION_ALIVE] = self.simulation.collections[COLLECTION_ALIVE]
-            events.append(DieEvent(shooter_subject_id=self.subject.id, shoot_subject_id=target_subject_id))
-            target_subject.intentions.remove_all()
+            DieEvent.apply_subject_death(target_subject)
+            events.append(DieEvent(
+                shooter_subject_id=self.subject.id,
+                shoot_subject_id=target_subject_id,
+            ))
 
         return events
 

opencombat/simulation/event.py

@@ -1,11 +1,13 @@
 # coding: utf-8
-
-
-# TODO: Reprendre les events Move, pour les lister tous ici
 import typing
 
 from synergine2.simulation import Event
 
+from opencombat.const import COLLECTION_ALIVE
+
+if typing.TYPE_CHECKING:
+    from opencombat.simulation.subject import TileSubject
+
 
 class NewVisibleOpponent(Event):
     def __init__(
@@ -38,6 +40,11 @@ class FireEvent(Event):
 
 
 class DieEvent(Event):
+    @classmethod
+    def apply_subject_death(cls, subject: 'TileSubject') -> None:
+        subject.remove_collection(COLLECTION_ALIVE)
+        subject.intentions.remove_all()
+
     def __init__(
         self,
         shooter_subject_id: int,