clean directions and imports

intelligine/simulation/object/brain/part/MoveBrainPart.py

@@ -27,12 +27,12 @@ class MoveBrainPart(BrainPart):
 
                 directions_list = directions_slighty[previous_direction]
                 # TODO: TMP tant que 1 niveau (z)
-                directions_list = [direction for direction in directions_list if direction > 9 and direction < 19]
+                directions_list = [direction for direction in directions_list if 9 < direction < 19]
                 direction_name = choice(directions_list)
             except KeyError:
                 pass
 
         if not direction_name:
-            direction_name = randint(directions_same_level[0], directions_same_level[1])
+            direction_name = randint(directions_same_level)
 
         return direction_name

intelligine/simulation/pheromone/DirectionPheromone.py

@@ -1,6 +1,4 @@
-from collections import OrderedDict
-from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_POSITIONS, MOVE_MODE_EXPLO, MOVE_MODE_GOHOME,\
-    PHEROMON_DIR_EXPLO, PHEROMON_DIR_HOME
+from intelligine.cst import PHEROMON_DIRECTION, PHEROMON_POSITIONS
 from intelligine.core.exceptions import NoPheromone
 from random import shuffle
 from xyzworld.geometry import get_degree_from_north

intelligine/synergy/event/move/MoveAction.py

@@ -2,7 +2,7 @@ from synergine.synergy.event.Action import Action
 from intelligine.synergy.event.move.MoveEvent import MoveEvent
 from synergine.synergy.event.exception.ActionAborted import ActionAborted
 from xyzworld.cst import POSITION
-from intelligine.cst import PREVIOUS_DIRECTION, BLOCKED_SINCE, BRAIN_PART_MOVE, BRAIN_SCHEMA
+from intelligine.cst import BLOCKED_SINCE, BRAIN_PART_MOVE, BRAIN_SCHEMA
 from intelligine.synergy.event.move.direction import get_position_with_direction_decal
 
 
@@ -52,7 +52,3 @@ class MoveAction(Action):
 
         obj.set_position(self._move_to_point)
         obj.get_brain().get_part(BRAIN_PART_MOVE).done(obj, context)
-
-        # TODO: Ces metas update dans ant ?
-        context.metas.value.set(PREVIOUS_DIRECTION, self._object_id, self._move_to_direction)
-        context.metas.value.set(BLOCKED_SINCE, self._object_id, 0)

intelligine/synergy/event/move/direction.py

@@ -13,10 +13,10 @@ niv 1:   19 20 21
          25 26 27
 """
 
-directions = (0, 27)
-directions_under_level = (0, 9)
-directions_same_level = (10, 18)
-directions_upper_level = (19, 27)
+directions = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27)
+directions_under_level = (1, 2, 3, 4, 5, 6, 7, 8, 9)
+directions_same_level = (10, 11, 12, 13, 15, 16, 17, 18)
+directions_upper_level = (19, 20, 21, 22, 23, 24, 25, 26, 27)
 directions_modifiers = {
   #  (z, x, y)
   1: (-1, -1, -1),