new states shorcuts bis

intelligine/synergy/event/CycleEvent.py

@@ -5,7 +5,7 @@ from intelligine.cst import CANT_CARRY_STILL, TRANSPORTER, ALIVE
 class CycleEvent(Event):
 
     def concern(self, object_id, context):
-        return context.metas.states.have(object_id, [TRANSPORTER, ALIVE])
+        return context.metas.states.have_list(object_id, [TRANSPORTER, ALIVE])
 
     def _object_match(self, object_id, context, parameters):
         return True

intelligine/synergy/event/attack/NearAttackableEvent.py

@@ -6,7 +6,7 @@ from intelligine.cst import ATTACKER, ATTACKABLE, COLONY, ALIVE
 class NearAttackableEvent(Event):
 
     def concern(self, object_id, context):
-        return context.metas.states.have(object_id, [ATTACKER, ALIVE])
+        return context.metas.states.have_list(object_id, [ATTACKER, ALIVE])
 
     def __init__(self, actions):
         super().__init__(actions)
@@ -16,7 +16,7 @@ class NearAttackableEvent(Event):
         # 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 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'] = []

intelligine/synergy/event/move/MoveAction.py

@@ -53,7 +53,7 @@ class MoveAction(Action):
     def _direction_point_is_possible(self, context, direction_point):
         objects_ids_on_this_point = context.metas.list.get(POSITIONS, direction_point, allow_empty=True)
         for object_id_on_this_point in objects_ids_on_this_point:
-          if context.metas.states.have(object_id_on_this_point, [IMPENETRABLE]):
+          if context.metas.states.have(object_id_on_this_point, IMPENETRABLE):
             return False
         return True
 

intelligine/synergy/event/move/MoveEvent.py

@@ -6,7 +6,7 @@ from intelligine.cst import ALIVE, WALKER
 class MoveEvent(Event):
 
     def concern(self, object_id, context):
-        return context.metas.states.have(object_id, [ALIVE, WALKER])
+        return context.metas.states.have_list(object_id, [ALIVE, WALKER])
 
     def __init__(self, actions):
         super().__init__(actions)

intelligine/synergy/event/transport/PutableEvent.py

@@ -6,5 +6,5 @@ from intelligine.cst import TRANSPORTER, ALIVE, CARRYING, CANT_PUT_STILL
 class PutableEvent(TakeableEvent):
 
     def concern(self, object_id, context):
-        return context.metas.states.have(object_id, [TRANSPORTER, ALIVE, CARRYING]) \
+        return context.metas.states.have_list(object_id, [TRANSPORTER, ALIVE, CARRYING]) \
                and not context.metas.value.get(CANT_PUT_STILL, object_id, allow_empty=True)

intelligine/synergy/event/transport/TakeableEvent.py

@@ -6,8 +6,8 @@ from intelligine.cst import TRANSPORTABLE, TRANSPORTER, ALIVE, CARRYING, CANT_CA
 class TakeableEvent(Event):
 
     def concern(self, object_id, context):
-        return context.metas.states.have(object_id, [TRANSPORTER, ALIVE]) and \
-               context.metas.states.dont_have(object_id, [CARRYING]) and not \
+        return context.metas.states.have_list(object_id, [TRANSPORTER, ALIVE]) and \
+               context.metas.states.dont_have(object_id, CARRYING) and not \
                context.metas.value.get(CANT_CARRY_STILL, object_id, allow_empty=True)
 
     def __init__(self, actions):
@@ -17,7 +17,7 @@ class TakeableEvent(Event):
     def _object_match(self, object_id, context, parameters={}):
         # 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 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)