refact event who inspect near objects

intelligine/synergy/event/attack/NearAttackableEvent.py

@@ -1,25 +1,22 @@
-from synergine.synergy.event.Event import Event
+from intelligine.synergy.event.src.NearEvent import NearEvent
 from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
 from intelligine.cst import ATTACKABLE, COLONY, COL_FIGHTER
 
 
-class NearAttackableEvent(Event):
+class NearAttackableEvent(NearEvent):
 
     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 _object_match(self, object_id, context, parameters={}):
-        # TODO: nettoyer
         obj_colony_id = context.metas.value.get(COLONY, object_id)
-        for obj_near_id in parameters['objects_ids_near']:
-            if context.metas.states.have(obj_near_id, ATTACKABLE):
-                if obj_colony_id != context.metas.value.get(COLONY, obj_near_id):
-                    if 'objects_ids_attackable' not in parameters:
-                        parameters['objects_ids_attackable'] = []
-                    parameters['objects_ids_attackable'].append(obj_near_id)
-        if 'objects_ids_attackable' not in parameters:
+        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

intelligine/synergy/event/src/NearEvent.py

@@ -0,0 +1,21 @@
+from synergine.synergy.event.Event import Event
+from xyzworld.mechanism.ArroundMechanism import ArroundMechanism
+
+
+class NearEvent(Event):
+
+    _near_name = None
+    _near_map = lambda self, near_object_id, context: False
+
+    def __init__(self, actions):
+        super().__init__(actions)
+        self._mechanism = ArroundMechanism
+
+    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']:
+            if self._near_map(near_object_id, context) and filter(near_object_id, context):
+                if self._near_name not in parameters:
+                    parameters[self._near_name] = []
+                parameters[self._near_name].append(near_object_id)
+                if stop_at_first:
+                    return

intelligine/synergy/event/transport/TakeableEvent.py

@@ -1,11 +1,13 @@
-from synergine.synergy.event.Event import Event
+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
 
 
-class TakeableEvent(Event):
+class TakeableEvent(NearEvent):
 
     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)
@@ -14,12 +16,7 @@ class TakeableEvent(Event):
     def _object_match(self, object_id, context, parameters={}):
         if context.metas.value.get(CANT_CARRY_STILL, object_id, allow_empty=True):
             return False
-        # TODO: Nettoyer (refact possible sur ces objets ont tel states, comme dans concern)
-        for obj_near_id in parameters['objects_ids_near']:
-            if context.metas.states.have(obj_near_id, TRANSPORTABLE):
-                if 'objects_ids_transportable' not in parameters:
-                    parameters['objects_ids_transportable'] = []
-                parameters['objects_ids_transportable'].append(obj_near_id)
-        if 'objects_ids_transportable' not in parameters:
+        self.map(context, parameters, stop_at_first=True)
+        if self._near_name not in parameters:
             return False
         return True