Adapt code to synergine [master 6d63269] SynergyObject now need collection on innit and collection is not passed to Action::run

intelligine/sandbox/colored/RedColonyConfiguration.py

@@ -15,7 +15,7 @@ class RedColonyConfiguration(ColonyConfiguration):
         for x in range(50):
           for y in range(1, 50):
             if x % 3 == 0 and y % 3 == 0:
-              egg = Egg(context)
+              egg = Egg(collection, context)
               egg.set_position((0, 1+x, 50+y))
               # TODO: Ce COLONY doit devenir un truc automatise au niveau de la collection (qd get_object)
               context.metas.value.set(COLONY, egg.get_id(), collection.get_id())

intelligine/synergy/ColonyConfiguration.py

@@ -11,8 +11,8 @@ class ColonyConfiguration(Configuration):
     def get_start_objects(self, collection, context):
 
       ants = []
-      for i in range(20):
-          ant = self._ant_class(context)
+      for i in range(50):
+          ant = self._ant_class(collection, context)
           context.metas.value.set(COLONY, ant.get_id(), collection.get_id())
           ant.set_position(self._start_position)
           ants.append(ant)

intelligine/synergy/RocksConfiguration.py

@@ -29,7 +29,7 @@ class RocksConfiguration(Configuration):
       rocks_positions.append((0, 100, 100))
 
       for rock_position in rocks_positions:
-          rock = Rock(context)
+          rock = Rock(collection, context)
           rock.set_position(rock_position)
           rocks.append(rock)
 

intelligine/synergy/event/CycleAction.py

@@ -7,7 +7,7 @@ class CycleAction(Action):
 
     _listen = CycleEvent
 
-    def run(self, obj, collection, context, synergy_manager):
+    def run(self, obj, context, synergy_manager):
       # TODO: refact ...
       cant_carry_still = context.metas.value.get(CANT_CARRY_STILL, obj.get_id(), allow_empty=True, empty_value=0)
       if cant_carry_still > 0:

intelligine/synergy/event/attack/NearAttackableAction.py

@@ -15,7 +15,7 @@ class NearAttackableAction(Action):
     def prepare(self, context):
         pass
 
-    def run(self, obj, collection, context, synergy_manager):
+    def run(self, obj, context, synergy_manager):
         # TODO: reprendre ?
         for obj_id_attackable in self._parameters['objects_ids_attackable']:
             obj_attackable = synergy_manager.get_map().get_object(obj_id_attackable)

intelligine/synergy/event/move/MoveAction.py

@@ -53,7 +53,7 @@ class MoveAction(Action):
     def _direction_point_is_possible(self, context, direction_point):
         return context.position_is_penetrable(direction_point)
 
-    def run(self, obj, collection, context, synergy_manager):
+    def run(self, obj, context, synergy_manager):
         if self._move_to_point is not None:
             obj.set_position(self._move_to_point)
             context.metas.value.set(PREVIOUS_DIRECTION, self._object_id, self._move_to_direction)

intelligine/synergy/event/transport/PutableAction.py

@@ -15,7 +15,7 @@ class PutableAction(Action):
     def prepare(self, context):
         pass
 
-    def run(self, obj, collection, context, synergy_manager):
+    def run(self, obj, context, synergy_manager):
         # TODO: DEV
         obj_id_transportable = self._parameters['objects_ids_transportable'][0]
         obj_transportable = synergy_manager.get_map().get_object(obj_id_transportable)

intelligine/synergy/event/transport/TakeableAction.py

@@ -14,7 +14,7 @@ class TakeableAction(Action):
     def prepare(self, context):
         pass
 
-    def run(self, obj, collection, context, synergy_manager):
+    def run(self, obj, context, synergy_manager):
         # TODO: TEST
         # TODO: Enlever le state de transportable a ce qui est transporte
         # ?! Comment gerer lorsque deux obj vont vouloir transporter le meme objet ? process !

intelligine/synergy/object/BaseBug.py

@@ -4,8 +4,8 @@ from intelligine.cst import ALIVE, ATTACKABLE, TRANSPORTABLE, COL_ALIVE
 
 class BaseBug(XyzSynergyObject):
 
-    def __init__(self, context):
-        super().__init__(context)
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
         context.metas.states.add_list(self.get_id(), [ALIVE, ATTACKABLE])
         context.metas.collections.add(self.get_id(), COL_ALIVE)
         self._life_points = 10

intelligine/synergy/object/Bug.py

@@ -4,7 +4,7 @@ from intelligine.cst import WALKER, COL_WALKER
 
 class Bug(BaseBug):
 
-    def __init__(self, context):
-        super().__init__(context)
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
         context.metas.states.add(self.get_id(), WALKER)
         context.metas.collections.add(self.get_id(), COL_WALKER)

intelligine/synergy/object/Egg.py

@@ -4,7 +4,7 @@ from intelligine.cst import TRANSPORTABLE
 
 class Egg(BaseBug):
 
-    def __init__(self, context):
-        super().__init__(context)
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
         context.metas.states.add(self.get_id(), TRANSPORTABLE)
         self._life_points = 1

intelligine/synergy/object/Rock.py

@@ -4,6 +4,6 @@ from intelligine.cst import IMPENETRABLE
 
 class Rock(XyzSynergyObject):
 
-    def __init__(self, context):
-        super().__init__(context)
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
         context.metas.states.add(self.get_id(), IMPENETRABLE)

intelligine/synergy/object/ant/Ant.py

@@ -5,8 +5,8 @@ from intelligine.cst import CARRYING, TRANSPORTER, ATTACKER, \
 
 class Ant(Bug):
 
-    def __init__(self, context):
-        super().__init__(context)
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
         context.metas.states.add_list(self.get_id(), [TRANSPORTER, ATTACKER])
         context.metas.collections.add_list(self.get_id(), [COL_TRANSPORTER_NOT_CARRYING, COL_FIGHTER])
         self._carried = []