upgrade

intelligine/synergy/event/CycleEvent.py

@@ -4,7 +4,7 @@ from intelligine.cst import COL_TRANSPORTER
 
 class CycleEvent(Event):
 
-    concern = COL_TRANSPORTER
+    _concern = COL_TRANSPORTER
 
     def _prepare(self, object_id, context, parameters):
         return parameters

intelligine/synergy/event/attack/NearAttackableEvent.py

@@ -1,20 +1,17 @@
 from intelligine.core.exceptions import NearNothingFound
 from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.src.NearEvent import NearEvent
-from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
+from xyzworld.mechanism.AroundMechanism import AroundMechanism
 from intelligine.cst import ATTACKABLE, COLONY, COL_FIGHTER, BRAIN_PART_ATTACK
 
 
 class NearAttackableEvent(NearEvent):
 
-    concern = COL_FIGHTER
+    _mechanism = AroundMechanism
+    _concern = COL_FIGHTER
     _near_name = 'objects_ids_attackable'
     _near_map = lambda self, near_object_id, context: context.metas.states.have(near_object_id, ATTACKABLE)
 
-    def __init__(self, actions):
-        super().__init__(actions)
-        self._mechanism = ArroundMechanism
-
     def _prepare(self, object_id, context, parameters={}):
         obj_colony_id = context.metas.value.get(COLONY, object_id)
         filter = lambda near_object_id, context: obj_colony_id != context.metas.value.get(COLONY, near_object_id)

intelligine/synergy/event/move/MoveEvent.py

@@ -12,11 +12,8 @@ class MoveEvent(Event):
     PARAM_POSITION = 'pos'
     PARAM_DIRECTION = 'dir'
 
-    concern = COL_WALKER
-
-    def __init__(self, actions):
-        super().__init__(actions)
-        self._mechanism = Mechanism
+    _mechanism = Mechanism
+    _concern = COL_WALKER
 
     def _prepare(self, object_id, context, parameters={}):
         try:

intelligine/synergy/event/src/NearEvent.py

@@ -1,17 +1,14 @@
 from intelligine.core.exceptions import NearNothingFound
 from intelligine.synergy.event.Event import Event
-from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
+from xyzworld.mechanism.AroundMechanism import AroundMechanism
 
 
 class NearEvent(Event):
 
+    _mechanism = AroundMechanism
     _near_name = None
     _near_map = lambda self, near_object_id, context: False
 
-    def __init__(self, actions):
-        super().__init__(actions)
-        self._mechanism = ArroundMechanism
-
     # TODO: parameters en entre/sortie c pas bon ca
     def map(self, context, parameters, stop_at_first=False, filter=lambda near_object_id, context: True):
         for near_object_id in parameters['objects_ids_near']:

intelligine/synergy/event/transport/PutableEvent.py

@@ -2,7 +2,7 @@ from intelligine.core.exceptions import NearNothingFound, CantFindWhereToPut
 from intelligine.synergy.event.src.NearEvent import NearEvent
 from synergine.core.exceptions import NotConcernedEvent
 from intelligine.cst import CANT_PUT_STILL, COL_TRANSPORTER_CARRYING, TRANSPORTABLE, BRAIN_SCHEMA, BRAIN_PART_PUT
-from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
+from xyzworld.mechanism.AroundMechanism import AroundMechanism
 
 
 class PutableEvent(NearEvent):
@@ -12,14 +12,11 @@ class PutableEvent(NearEvent):
 
     PARAM_PUT = 'put'
     PARAM_PUT_TO = 'put_to'
-    concern = COL_TRANSPORTER_CARRYING
+    _mechanism = AroundMechanism
+    _concern = COL_TRANSPORTER_CARRYING
     _near_name = 'objects_ids_putable'
     _near_map = lambda self, near_object_id, context: context.metas.states.have(near_object_id, TRANSPORTABLE)
 
-    def __init__(self, actions):
-        super().__init__(actions)
-        self._mechanism = ArroundMechanism
-
     def _prepare(self, object_id, context, parameters={}):
         if not self._can_put(object_id, context):
             raise NotConcernedEvent()

intelligine/synergy/event/transport/TakeableEvent.py

@@ -1,21 +1,18 @@
 from intelligine.core.exceptions import NearNothingFound
 from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.src.NearEvent import NearEvent
-from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
+from xyzworld.mechanism.AroundMechanism import AroundMechanism
 from intelligine.cst import TRANSPORTABLE, CANT_CARRY_STILL, COL_TRANSPORTER_NOT_CARRYING, BRAIN_SCHEMA, BRAIN_PART_TAKE
 
 
 class TakeableEvent(NearEvent):
 
+    _mechanism = AroundMechanism
     PARAM_TAKE = 'take'
-    concern = COL_TRANSPORTER_NOT_CARRYING
+    _concern = COL_TRANSPORTER_NOT_CARRYING
     _near_name = 'objects_ids_transportable'
     _near_map = lambda self, near_object_id, context: context.metas.states.have(near_object_id, TRANSPORTABLE)
 
-    def __init__(self, actions):
-        super().__init__(actions)
-        self._mechanism = ArroundMechanism
-
     def _prepare(self, object_id, context, parameters={}):
         if not self._can_carry(object_id, context):
             raise NotConcernedEvent()