refactorise apose pheromone and add movement mode to ant

intelligine/cst.py

@@ -14,6 +14,10 @@ CARRYING = IncrementedNamedInt.get('intelligine.carrying')
 CANT_CARRY_STILL = IncrementedNamedInt.get('intelligine.cantcarry.still')
 CANT_PUT_STILL = IncrementedNamedInt.get('intelligine.cantput.still')
 ACTION_DIE = IncrementedNamedInt.get('intelligine.basebug.action.die')
+
+MOVE_MODE_EXPLO = IncrementedNamedInt.get('intelligine.basebug.move.mode.explo')
+MOVE_MODE_GOHOME = IncrementedNamedInt.get('intelligine.basebug.move.mode.gohome')
+
 PHEROMON_POSITIONS = IncrementedNamedInt.get('intelligine.phero.positions')
 PHEROMON_INFOS = IncrementedNamedInt.get('intelligine.phero.infos')
 PHEROMON_DIRECTION = IncrementedNamedInt.get('intelligine.phero.direction')

intelligine/synergy/event/pheromone/ApposeDirection.py

@@ -1,9 +1,10 @@
 from synergine.synergy.event.Action import Action
 from intelligine.synergy.event.pheromone.PheromoneEvent import PheromoneEvent
 from xyzworld.cst import POSITION
-from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_DIR_EXPLO, PHEROMON_POSITIONS
-from xyzworld.geometry import get_direction_degrees, get_degree_from_north
+from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_DIR_EXPLO, PHEROMON_POSITIONS, MOVE_MODE_EXPLO
+from xyzworld.geometry import get_degree_from_north
 from intelligine.synergy.event.move.direction import get_direction_for_degrees, get_direction_opposite
+from intelligine.core.exceptions import SamePosition
 
 
 class ApposeDirection(Action):
@@ -26,54 +27,35 @@ class ApposeDirection(Action):
         On effectue l'incrementation dans le process principal. Beaucoups plus lourd que de le faie dans les
         process. Mais si on le fait dans les process on va rater des infos ...
         met a jour les pts (incremente)
-        :param obj:
-        :param context:
-        :param synergy_manager:
-        :return:
         """
-        # TODO: Remonter ca dans une objet
-
-        # a = get_direction_degrees((0, 0, 0), (0, -1, -1)) # 315
-        # a = get_direction_degrees((0, 0, 0), (0, 0, -1))  # 0
-        # a = get_direction_degrees((0, 0, 0), (0, 1, -1))  # 45
-        # a = get_direction_degrees((0, 0, 0), (0, -1, 0))  # 270
-        # a = get_direction_degrees((0, 0, 0), (0, 1, 0))   # 90
-        # a = get_direction_degrees((0, 0, 0), (0, -1, 1))  # 225
-        # a = get_direction_degrees((0, 0, 0), (0, 0, 1))   # 180
-        # a = get_direction_degrees((0, 0, 0), (0, 1, 1))   # 135
-
-        # a = get_degree_from_north((0, 0, 0), (0, -1, -1)) # 315
-        # a = get_degree_from_north((0, 0, 0), (0, 0, -1))  # 0
-        # a = get_degree_from_north((0, 0, 0), (0, 1, -1))  # 45
-        # a = get_degree_from_north((0, 0, 0), (0, -1, 0))  # 270
-        # a = get_degree_from_north((0, 0, 0), (0, 1, 0))   # 90
-        # a = get_degree_from_north((0, 0, 0), (0, -1, 1))  # 225
-        # a = get_degree_from_north((0, 0, 0), (0, 0, 1))   # 180
-        # a = get_degree_from_north((0, 0, 0), (0, 1, 1))   # 135
         self._appose_pheromones(obj, context, synergy_manager)
 
     def _appose_pheromones(self, obj, context, synergy_manager):
-        obj_position = obj.get_position()
-        obj_last_pheromon_position = obj.get_last_pheromone_point(PHEROMON_DIRECTION)
         try:
-            direction_degrees = get_degree_from_north(obj_last_pheromon_position, obj_position)
-        except ZeroDivisionError:
+            from_direction = self._get_from_direction(obj)
+        except SamePosition:
             return
-        direction = get_direction_for_degrees(direction_degrees)
-        from_direction = get_direction_opposite(direction)
-        depose_intensity = 1 # TODO: config
 
+        depose_intensity = 1 # TODO: config
+        pheromone_direction_type = self._get_pheromone_direction_type(obj)
         for affected_point in self._parameters['concerned_points']:
-            self._appose_pheromone(context, affected_point, direction, depose_intensity)
+            context.pheromones().increment(affected_point, [PHEROMON_DIRECTION,
+                                                            pheromone_direction_type,
+                                                            from_direction], depose_intensity)
             context.metas.list.add(PHEROMON_POSITIONS, PHEROMON_POSITIONS, affected_point, assert_not_in=False)
 
         obj.set_last_pheromone_point(PHEROMON_DIRECTION, obj.get_position())
 
-    def _appose_pheromone(self, context, affected_point, direction, depose_intensity):
-        context.pheromones().increment(affected_point, [PHEROMON_DIRECTION,
-                                                        PHEROMON_DIR_EXPLO,
-                                                        direction], depose_intensity)
-
-
-
+    def _get_from_direction(self, obj):
+        obj_position = obj.get_position()
+        obj_last_pheromon_position = obj.get_last_pheromone_point(PHEROMON_DIRECTION)
+        try:
+            direction_degrees = get_degree_from_north(obj_last_pheromon_position, obj_position)
+        except ZeroDivisionError:
+            raise SamePosition()
+        direction = get_direction_for_degrees(direction_degrees)
+        return get_direction_opposite(direction)
 
+    def _get_pheromone_direction_type(self, obj):
+        if obj.get_movement_mode() == MOVE_MODE_EXPLO:
+            return PHEROMON_DIR_EXPLO

intelligine/synergy/object/ant/Ant.py

@@ -1,6 +1,7 @@
 from intelligine.synergy.object.Bug import Bug
 from intelligine.cst import CARRYING, TRANSPORTER, ATTACKER, \
-   COL_TRANSPORTER, COL_TRANSPORTER_NOT_CARRYING, COL_FIGHTER
+                            COL_TRANSPORTER, COL_TRANSPORTER_NOT_CARRYING, \
+                            COL_FIGHTER, MOVE_MODE_EXPLO
 
 
 class Ant(Bug):
@@ -13,6 +14,7 @@ class Ant(Bug):
                                                            COL_FIGHTER])
         self._carried = []
         self._last_pheromones_points = {}
+        self._movement_mode = MOVE_MODE_EXPLO
 
     def put_carry(self, obj, position=None):
         if position is None:
@@ -48,3 +50,9 @@ class Ant(Bug):
 
     def set_last_pheromone_point(self, pheromone_name, position):
         self._last_pheromones_points[pheromone_name] = position
+
+    def get_movement_mode(self):
+        return self._movement_mode
+
+    def set_movement_mode(self, movement_mode):
+        self._movement_mode = movement_mode