Put: try multiple position to put

intelligine/synergy/event/transport/PutableAction.py

@@ -1,3 +1,4 @@
+from synergine.synergy.event.exception.ActionAborted import ActionAborted
 from intelligine.synergy.event.move.MoveAction import MoveAction
 from intelligine.synergy.object.Food import Food
 from synergine.synergy.event.Action import Action
@@ -14,20 +15,25 @@ class PutableAction(Action):
         super().__init__(object_id, parameters)
 
     def run(self, obj, context, synergy_manager):
-        position_to_put = self._parameters[PutableEvent.PARAM_PUT_TO]
         obj_transported = obj.get_carried()
 
-        obj_transported.set_carried_by(None)
-        #  TODO: re controle de si posable ? La position a été calculé
-        #  dans le process. Ce qui fait que la situation peut avoir changer.
-        # Soit: Recalculer d'office BrainPut.cant_put_at.. Soit le recalculer que si le hash
-        # de ce qu'il y a la a changer ?
-        obj.put_carry(obj_transported, position_to_put)
-        context.metas.value.set(CANT_CARRY_STILL, obj.get_id(), 5)
+        if not self._parameters[PutableEvent.PARAM_PUT_TO]:
+            raise ActionAborted()
 
-        obj.get_brain().get_part(BRAIN_PART_PUT).done(obj_transported)
+        for position_to_put in self._parameters[PutableEvent.PARAM_PUT_TO]:
 
-        # TODO: DEBUG
-        if isinstance(obj_transported, Food):
-            #obj_transported.set_position((-1, 0, 0))
-            obj_transported.transform_to_stocked()
+            #  TODO: re controle de si posable ? La position a été calculé
+            #  dans le process. Ce qui fait que la situation peut avoir changer.
+            # Soit: Recalculer d'office BrainPut.cant_put_at.. Soit le recalculer que si le hash
+            # de ce qu'il y a la a changer ?
+
+            obj_transported.set_carried_by(None)
+            obj.put_carry(obj_transported, position_to_put)
+            context.metas.value.set(CANT_CARRY_STILL, obj.get_id(), 5)
+
+            obj.get_brain().get_part(BRAIN_PART_PUT).done(obj_transported)
+
+            # TODO: DEV
+            if isinstance(obj_transported, Food):
+                #obj_transported.set_position((-1, 0, 0))
+                obj_transported.transform_to_stocked()

intelligine/synergy/event/transport/PutableEvent.py

@@ -23,24 +23,26 @@ class PutableEvent(NearEvent):
             raise NotConcernedEvent()
 
         try:
-            self.map(context, parameters, stop_at_first=True)
+            self.map(context, parameters, stop_at_first=False)
         except NearNothingFound:
             raise NotConcernedEvent()
 
-        object_near_id = parameters[self._near_name][0]
         brain_part = get_brain_part(context, object_id, BRAIN_PART_PUT)
-
-        if not brain_part.can_put(context, object_id, object_near_id):
-            raise NotConcernedEvent()
-
-        try:
-            put_position = brain_part.get_put_position(context, object_id, object_near_id)
-        except CantFindWhereToPut:
-            raise NotConcernedEvent()
-
-        parameters[self.PARAM_PUT] = parameters[self._near_name][0]
-        parameters[self.PARAM_PUT_TO] = put_position
-        return parameters
+        parameters[self.PARAM_PUT] = []
+        parameters[self.PARAM_PUT_TO] = []
+
+        for object_near_id in parameters[self._near_name]:
+            if brain_part.can_put(context, object_id, object_near_id):
+                try:
+                    put_position = brain_part.get_put_position(context, object_id, object_near_id)
+                    parameters[self.PARAM_PUT].append(object_near_id)
+                    parameters[self.PARAM_PUT_TO].append(put_position)
+                    return parameters  # Si a terme on veut tous les calculer a l'avance, ne pas retourner ici
+                except CantFindWhereToPut:
+                    pass  # On continu la booucle
+
+        # Si a terme on veut tous les calculer a l'avance, raise que si rien trouve
+        raise NotConcernedEvent()
 
     @staticmethod
     def _can_put(object_id, context):