position instead trace

socialintengine/synergy/ColonyConfiguration.py

@@ -10,9 +10,9 @@ class ColonyConfiguration(Configuration):
     def get_start_objects(self):
 
       ants = []
-      for i in range(20):
+      for i in range(10):
           ant = Ant()
-          ant.add_trace((0, 20, 20))
+          ant.set_position((0, 20, 20))
           metas.list.add(Simulation.STATE, ant.get_id(), ALIVE)
           ants.append(ant)
 

socialintengine/synergy/RocksConfiguration.py

@@ -11,16 +11,33 @@ class RocksConfiguration(Configuration):
 
       rocks = []
 
-      for i in range(20):
+      for i in range(50):
           rock = Rock()
           metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
-          rock.add_trace((0, 10+i, 15))
+          rock.set_position((0, 0+i, 0))
           rocks.append(rock)
 
-      for i in range(20):
+      for i in range(50):
           rock = Rock()
-          rock.add_trace((0, 10+i, 25))
           metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
+          rock.set_position((0, 0+i, 50))
           rocks.append(rock)
 
+      for i in range(50):
+          rock = Rock()
+          rock.set_position((0, 0, 0+i))
+          metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
+          rocks.append(rock)
+
+      for i in range(50):
+          rock = Rock()
+          rock.set_position((0, 50, 0+i))
+          metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
+          rocks.append(rock)
+
+      rock = Rock()
+      rock.set_position((0, 50, 50))
+      metas.list.add(Simulation.STATE, rock.get_id(), IMPENETRABLE)
+      rocks.append(rock)
+
       return rocks

socialintengine/synergy/event/move/MoveAction.py

@@ -40,6 +40,8 @@ class MoveAction(Action):
             try:
                 previous_direction = context.metas.value.get(PREVIOUS_DIRECTION, self._object_id)
                 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]
                 direction_name = choice(directions_list)
             except KeyError:
                 pass
@@ -58,7 +60,7 @@ class MoveAction(Action):
 
     def run(self, obj, collection, context):
         if self._move_to_point is not None:
-            obj.add_trace(self._move_to_point)
+            obj.set_position(self._move_to_point)
             context.metas.value.set(PREVIOUS_DIRECTION, self._object_id, self._move_to_direction)
             context.metas.value.set(BLOCKED_SINCE, self._object_id, 0)
         else: