dapt code to NotConcernedEvent and Event return parameters

intelligine/core/exceptions.py

@@ -35,11 +35,14 @@ class BestPheromoneHere(PheromoneException):
     def get_best_distance(self):
         return self._best_distance
 
+
 class BrainException(Exception):
     pass
 
+
 class BrainPartAlreadyExist(BrainException):
     pass
 
+
 class DirectionException(Exception):
-    pass
+    pass

intelligine/synergy/event/CycleEvent.py

@@ -6,5 +6,5 @@ class CycleEvent(Event):
 
     concern = COL_TRANSPORTER
 
-    def _object_match(self, object_id, context, parameters):
-        return True
+    def _prepare(self, object_id, context, parameters):
+        return parameters

intelligine/synergy/event/attack/NearAttackableEvent.py

@@ -1,3 +1,4 @@
+from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.src.NearEvent import NearEvent
 from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
 from intelligine.cst import ATTACKABLE, COLONY, COL_FIGHTER
@@ -13,10 +14,10 @@ class NearAttackableEvent(NearEvent):
         super().__init__(actions)
         self._mechanism = ArroundMechanism
 
-    def _object_match(self, object_id, context, parameters={}):
+    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)
         self.map(context, parameters, stop_at_first=True, filter=filter)
         if self._near_name not in parameters:
-            return False
-        return True
+            raise NotConcernedEvent()
+        return parameters

intelligine/synergy/event/move/MoveEvent.py

@@ -11,5 +11,5 @@ class MoveEvent(Event):
         super().__init__(actions)
         self._mechanism = Mechanism
 
-    def _object_match(self, object_id, context, parameters={}):
-      return True
+    def _prepare(self, object_id, context, parameters={}):
+        return parameters

intelligine/synergy/event/transport/PutableEvent.py

@@ -1,5 +1,5 @@
+from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.transport.TakeableEvent import TakeableEvent
-from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
 from intelligine.cst import CANT_PUT_STILL, COL_TRANSPORTER_CARRYING
 
 
@@ -7,7 +7,7 @@ class PutableEvent(TakeableEvent):
 
     concern = COL_TRANSPORTER_CARRYING
 
-    def _object_match(self, object_id, context, parameters={}):
+    def _prepare(self, object_id, context, parameters={}):
         if context.metas.value.get(CANT_PUT_STILL, object_id, allow_empty=True):
-            return False
-        return super()._object_match(object_id, context, parameters)
+            raise NotConcernedEvent()
+        return super()._prepare(object_id, context, parameters)

intelligine/synergy/event/transport/TakeableEvent.py

@@ -1,3 +1,4 @@
+from synergine.core.exceptions import NotConcernedEvent
 from intelligine.synergy.event.src.NearEvent import NearEvent
 from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
 from intelligine.cst import TRANSPORTABLE, CANT_CARRY_STILL, COL_TRANSPORTER_NOT_CARRYING
@@ -13,10 +14,10 @@ class TakeableEvent(NearEvent):
         super().__init__(actions)
         self._mechanism = ArroundMechanism
 
-    def _object_match(self, object_id, context, parameters={}):
+    def _prepare(self, object_id, context, parameters={}):
         if context.metas.value.get(CANT_CARRY_STILL, object_id, allow_empty=True):
-            return False
+            raise NotConcernedEvent()
         self.map(context, parameters, stop_at_first=True)
         if self._near_name not in parameters:
-            return False
-        return True
+            raise NotConcernedEvent()
+        return parameters