col/states manipulation in obj mecthod

intelligine/synergy/Simulation.py

@@ -1,18 +1,9 @@
 from synergine.synergy.Simulation import Simulation as BaseSimulation
 from synergine_xyz.cst import POSITIONS
-from intelligine.synergy.event.transport.PutableAction import PutableAction
-from intelligine.synergy.event.transport.TakeableAction import TakeableAction
-from intelligine.cst import COL_TRANSPORTER_CARRYING, COL_TRANSPORTER_NOT_CARRYING
 
 
 class Simulation(BaseSimulation):
 
-    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))
-
     def end_cycle(self, context):
         if context.get_cycle() % 100 is 0:
             context.metas.list.clean(POSITIONS)

intelligine/synergy/object/BaseBug.py

@@ -1,6 +1,6 @@
 from intelligine.core.exceptions import BodyPartAlreadyExist
 from intelligine.synergy.object.Transportable import Transportable
-from intelligine.cst import ALIVE, ATTACKABLE, COL_ALIVE, COLONY
+from intelligine.cst import ALIVE, ATTACKABLE, COL_ALIVE, COLONY, CARRIED
 from intelligine.simulation.object.brain.Brain import Brain
 
 
@@ -18,6 +18,7 @@ class BaseBug(Transportable):
         self._brain = self._get_brain_instance()
         self._parts = {}
         self._init_parts()
+        self._is_carried = False
 
     def die(self):
         self._remove_state(ALIVE)
@@ -54,3 +55,10 @@ class BaseBug(Transportable):
 
     def get_brain(self):
         return self._brain
+
+    def set_is_carried(self, is_carried, by_obj):
+        self._is_carried = bool(is_carried)
+        if self._is_carried:
+            self._context.metas.value.set(CARRIED, subject=by_obj.get_id(), value=self.get_id())
+        else:
+            self._context.metas.value.unset(CARRIED, subject=by_obj.get_id())

intelligine/synergy/object/ant/Ant.py

@@ -1,8 +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_TRANSPORTER_CARRYING
+    COL_FIGHTER, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, BODY_PART_PHEROMONE_GLAND, TYPE, TYPE_ANT, \
+    COL_TRANSPORTER_CARRYING, MOVE_MODE_NURSE
 from intelligine.synergy.object.Food import Food
 from intelligine.simulation.object.pheromone.MovementPheromoneGland import MovementPheromoneGland
 from intelligine.simulation.object.brain.AntBrain import AntBrain
@@ -44,7 +44,10 @@ class Ant(Bug):
             position = self._get_position()
         self._carried = None
         obj.set_position(position)
+        obj.set_is_carried(False, self)
         self._context.metas.states.remove(self.get_id(), CARRYING)
+        self._add_col(COL_TRANSPORTER_NOT_CARRYING)
+        self._remove_col(COL_TRANSPORTER_CARRYING)
 
     def get_carried(self):
         return self._carried
@@ -52,7 +55,9 @@ class Ant(Bug):
     def carry(self, obj):
         self._carried = obj
         self._context.metas.states.add(self.get_id(), CARRYING)
-        self._context.metas.value.set(CARRIED, self.get_id(), obj.get_id())
+        self._add_col(COL_TRANSPORTER_CARRYING)
+        self._remove_col(COL_TRANSPORTER_NOT_CARRYING)
+        obj.set_is_carried(True, self)
         # TODO: pour le moment hardcode, a gerer dans AntTakeBrainPart (callback en fct de ce qui est depose)
         if isinstance(obj, Food):
             self.get_brain().switch_to_mode(MOVE_MODE_GOHOME)