Pheromones: explo AND home

intelligine/display/Pygame.py

@@ -1,7 +1,8 @@
 from xyzworld.display.Pygame import Pygame as XyzPygame
 import pygame
-from intelligine.cst import PHEROMON_INFOS, PHEROMON_DIRECTION, PHEROMON_DIR_HOME, PHEROMON_POSITIONS
-from intelligine.synergy.object.ant.Pheromon import Pheromon
+from intelligine.cst import PHEROMON_INFOS, PHEROMON_DIRECTION, PHEROMON_DIR_HOME, PHEROMON_DIR_EXPLO, PHEROMON_POSITIONS
+from intelligine.synergy.object.ant.PheromonExploration import PheromonExploration
+from intelligine.synergy.object.ant.PheromonHome import PheromonHome
 
 
 class Pygame(XyzPygame):
@@ -27,7 +28,21 @@ class Pygame(XyzPygame):
             for direction in exploration_info:
                 intensity = exploration_info[direction]
                 # TODO: ne pas avoir a creer d'objet, voir comment dans display
-                pheromon = Pheromon(object(), context)
+                pheromon = PheromonHome(object(), context)
+                pheromon.set_direction(direction)
+                self._draw_objects_with_decal(point, [pheromon])
+
+
+            exploration_info = context.pheromones().get_info(point,
+                                                             [PHEROMON_DIRECTION,
+                                                              PHEROMON_DIR_EXPLO],
+                                                             allow_empty=True,
+                                                             empty_value={})
+
+            for direction in exploration_info:
+                intensity = exploration_info[direction]
+                # TODO: ne pas avoir a creer d'objet, voir comment dans display
+                pheromon = PheromonExploration(object(), context)
                 pheromon.set_direction(direction)
                 self._draw_objects_with_decal(point, [pheromon])
 

intelligine/display/pygame/visualisation.py

@@ -32,9 +32,12 @@ eggc5 = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/eg
 eggc7 = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/egg_c7.png')
 
 
-from intelligine.synergy.object.ant.Pheromon import Pheromon
+from intelligine.synergy.object.ant.PheromonExploration import PheromonExploration
+from intelligine.synergy.object.ant.PheromonHome import PheromonHome
 phee = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/phee.png')
-dir_phee = directions_ant = DirectionnedImage(phee)
+pheh = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/pheh.png')
+dir_phee = DirectionnedImage(phee)
+dir_pheh = DirectionnedImage(pheh)
 
 
 directions_ant = DirectionnedImage(ant)
@@ -45,6 +48,9 @@ directions_green_ant = DirectionnedImage(green_ant)
 def phee_direction(phee, context):
     return dir_phee.get_for_direction(phee.get_direction())
 
+def pheh_direction(pheh, context):
+    return dir_pheh.get_for_direction(pheh.get_direction())
+
 def bug_direction(bug, context):
     if bug.get_life_points() <= 0:
         return dead_ant
@@ -133,9 +139,13 @@ visualisation = {
         Food: {
             'default': food
         },
-        Pheromon: {
+        PheromonExploration: {
             'default': phee,
             'callbacks': [phee_direction]
         },
+        PheromonHome: {
+            'default': pheh,
+            'callbacks': [pheh_direction]
+        },
     }
 }

intelligine/synergy/event/pheromone/ApposeDirection.py

@@ -1,7 +1,8 @@
 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_HOME, PHEROMON_POSITIONS, MOVE_MODE_EXPLO
+from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_DIR_HOME, PHEROMON_POSITIONS, MOVE_MODE_EXPLO, \
+    MOVE_MODE_GOHOME, PHEROMON_DIR_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
@@ -59,4 +60,6 @@ class ApposeDirection(Action):
     def _get_pheromone_direction_type(self, obj):
         if obj.get_movement_mode() == MOVE_MODE_EXPLO:
             return PHEROMON_DIR_HOME
+        if obj.get_movement_mode() == MOVE_MODE_GOHOME:
+            return PHEROMON_DIR_EXPLO
         raise NotImplementedError()

intelligine/synergy/object/ant/Ant.py

@@ -1,7 +1,9 @@
 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
+                            COL_FIGHTER, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME, \
+                            PHEROMON_DIR_EXPLO
+from intelligine.synergy.object.Food import Food
 
 
 class Ant(Bug):
@@ -30,6 +32,10 @@ class Ant(Bug):
     def carry(self, obj):
         self._carried.append(obj)
         self._context.metas.states.add(self.get_id(), CARRYING)
+        # TODO: pour le moment hardcode
+        if isinstance(obj, Food):
+            self.set_movement_mode(MOVE_MODE_GOHOME)
+            self.set_last_pheromone_point(PHEROMON_DIR_EXPLO, obj.get_position())
 
     def is_carrying(self):
         if len(self._carried):

intelligine/synergy/object/ant/PheromonExploration.py

@@ -0,0 +1,5 @@
+from intelligine.synergy.object.ant.Pheromon import Pheromon
+
+
+class PheromonExploration(Pheromon):
+    pass

intelligine/synergy/object/ant/PheromonHome.py

@@ -0,0 +1,5 @@
+from intelligine.synergy.object.ant.Pheromon import Pheromon
+
+
+class PheromonHome(Pheromon):
+    pass