die states and col removes

intelligine/synergy/Simulation.py

@@ -1,33 +1,17 @@
 from synergine.synergy.Simulation import Simulation as BaseSimulation
-from synergine_xyz.cst import POSITION, POSITIONS
-#from intelligine.synergy.event.attack.NearAttackableAction import NearAttackableAction
+from synergine_xyz.cst import POSITIONS
 from intelligine.synergy.event.transport.PutableAction import PutableAction
 from intelligine.synergy.event.transport.TakeableAction import TakeableAction
-from intelligine.synergy.event.move.MoveAction import MoveAction
-from intelligine.synergy.event.CycleAction import CycleAction
-from intelligine.cst import COL_TRANSPORTER_CARRYING, COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER, \
-    COL_WALKER, ACTION_DIE, COL_ALIVE, ALIVE, ATTACKABLE
+from intelligine.cst import COL_TRANSPORTER_CARRYING, COL_TRANSPORTER_NOT_CARRYING
 
 
 class Simulation(BaseSimulation):
 
-    @staticmethod
-    def event_bug_die(bug, context):
-        context.metas.collections.remove_list(bug.get_id(),
-                                              [COL_TRANSPORTER, \
-                                               COL_TRANSPORTER_CARRYING, \
-                                               COL_TRANSPORTER_NOT_CARRYING, \
-                                               COL_WALKER, \
-                                               COL_ALIVE],
-                                              allow_not_in=True)
-        context.metas.states.remove_list(bug.get_id(), [ALIVE, ATTACKABLE], allow_not_in=True)
-
     def connect_actions_signals(self, Signals):
         Signals.signal(PutableAction).connect(lambda obj, context: \
             context.metas.collections.add_remove(obj.get_id(), COL_TRANSPORTER_NOT_CARRYING, COL_TRANSPORTER_CARRYING))
         Signals.signal(TakeableAction).connect(lambda obj, context: \
             context.metas.collections.add_remove(obj.get_id(), COL_TRANSPORTER_CARRYING, COL_TRANSPORTER_NOT_CARRYING))
-        Signals.signal(ACTION_DIE).connect(lambda obj, context: self.event_bug_die(obj, context))
 
     def end_cycle(self, context):
         if context.get_cycle() % 100 is 0:

intelligine/synergy/object/BaseBug.py

@@ -19,6 +19,11 @@ class BaseBug(Transportable):
         self._parts = {}
         self._init_parts()
 
+    def die(self):
+        self._remove_state(ALIVE)
+        self._remove_state(ATTACKABLE)
+        self._remove_col(COL_ALIVE)
+
     def _init_parts(self):
         for body_part_name in self._body_parts:
             self._set_body_part(body_part_name, self._body_parts[body_part_name](self, self._context))
@@ -49,9 +54,3 @@ class BaseBug(Transportable):
 
     def get_brain(self):
         return self._brain
-
-    def die(self):
-        # TODO: Ca peut buger si pas , allow_not_in=True, pk ?
-        self._remove_state(ALIVE, allow_not_in=True)
-        self._remove_state(ATTACKABLE, allow_not_in=True)
-        self._remove_col(COL_ALIVE, allow_not_in=True)

intelligine/synergy/object/Bug.py

@@ -11,6 +11,5 @@ class Bug(BaseBug):
 
     def die(self):
         super().die()
-        # TODO: Ca peut buger si pas , allow_not_in=True, pk ?
-        self._remove_state(WALKER, allow_not_in=True)
-        self._remove_col(COL_WALKER, allow_not_in=True)
+        self._remove_state(WALKER)
+        self._remove_col(COL_WALKER)

intelligine/synergy/object/ant/Ant.py

@@ -1,7 +1,8 @@
 from intelligine.core.exceptions import PheromoneException
 from intelligine.synergy.object.Bug import Bug
 from intelligine.cst import CARRYING, TRANSPORTER, ATTACKER, COL_TRANSPORTER, COL_TRANSPORTER_NOT_CARRYING, \
-    COL_FIGHTER, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, CARRIED, BODY_PART_PHEROMONE_GLAND, TYPE, TYPE_ANT
+    COL_FIGHTER, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, CARRIED, BODY_PART_PHEROMONE_GLAND, TYPE, TYPE_ANT, \
+    COL_TRANSPORTER_CARRYING
 from intelligine.synergy.object.Food import Food
 from intelligine.simulation.object.pheromone.MovementPheromoneGland import MovementPheromoneGland
 from intelligine.simulation.object.brain.AntBrain import AntBrain
@@ -29,6 +30,7 @@ class Ant(Bug):
         self._remove_state(ATTACKER)
         self._remove_col(COL_TRANSPORTER)
         self._remove_col(COL_TRANSPORTER_NOT_CARRYING)
+        self._remove_col(COL_TRANSPORTER_CARRYING, allow_not_in=True)
         self._remove_col(COL_FIGHTER)
 
     def _get_brain_instance(self):