Transportable class + return object tranported by transportable object

intelligine/synergy/event/transport/TakeableAction.py

@@ -23,8 +23,9 @@ class TakeableAction(Action):
         if obj_transportable.is_carried():
             raise ActionAborted()
         try:
-            obj_transportable.set_carried_by(obj)
-            obj.carry(obj_transportable)
+            obj_carried = obj_transportable.get_carry()
+            obj_carried.set_carried_by(obj)
+            obj.carry(obj_carried)
             context.metas.value.set(CANT_PUT_STILL, obj.get_id(), 5)
         except ValueError: # Une NotCarriableError serais pus approprie
             # TODO: tmp? Si on as pas pu le porter c'est qu'il vient d'etre porte par une autre.

intelligine/synergy/object/BaseBug.py

@@ -1,15 +1,14 @@
-from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
-from intelligine.cst import ALIVE, ATTACKABLE, TRANSPORTABLE, COL_ALIVE
+from intelligine.synergy.object.Transportable import Transportable
+from intelligine.cst import ALIVE, ATTACKABLE, COL_ALIVE
 
 
-class BaseBug(XyzSynergyObject):
+class BaseBug(Transportable):
 
     def __init__(self, collection, context):
         super().__init__(collection, context)
         context.metas.states.add_list(self.get_id(), [ALIVE, ATTACKABLE])
         context.metas.collections.add(self.get_id(), COL_ALIVE)
         self._life_points = 10
-        self._carried_by = None
         self._movements_count = -1
 
     def hurted(self, points):
@@ -18,21 +17,6 @@ class BaseBug(XyzSynergyObject):
     def get_life_points(self):
         return self._life_points
 
-    def set_carried_by(self, obj):
-        if obj is not None:
-            assert self._carried_by is None
-            self._carried_by = obj
-            self._context.metas.states.remove(self.get_id(), TRANSPORTABLE)
-        else:
-            assert self._carried_by is not None
-            self._carried_by = None
-            self._context.metas.states.add(self.get_id(), TRANSPORTABLE)
-
-    def is_carried(self):
-        if self._carried_by:
-            return True
-        return False
-
     def set_position(self, point):
         super().set_position(point)
         self._movements_count += 1

intelligine/synergy/object/Food.py

@@ -1,9 +1,15 @@
-from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
-from intelligine.cst import IMPENETRABLE
+from intelligine.synergy.object.Transportable import Transportable
+from intelligine.cst import IMPENETRABLE, TRANSPORTABLE
 
 
-class Food(XyzSynergyObject):
+class Food(Transportable):
 
     def __init__(self, collection, context):
         super().__init__(collection, context)
-        context.metas.states.add(self.get_id(), IMPENETRABLE)
+        context.metas.states.add(self.get_id(), IMPENETRABLE)
+        context.metas.states.add(self.get_id(), TRANSPORTABLE)
+
+    def get_carry(self):
+        clone = self.__class__(self._collection, self._context)
+        self._collection.add_object(clone)
+        return clone

intelligine/synergy/object/Transportable.py

@@ -0,0 +1,27 @@
+from xyzworld.SynergyObject import SynergyObject as XyzSynergyObject
+from intelligine.cst import TRANSPORTABLE
+
+
+class Transportable(XyzSynergyObject):
+
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
+        self._carried_by = None
+
+    def set_carried_by(self, obj):
+        if obj is not None:
+            assert self._carried_by is None
+            self._carried_by = obj
+            self._context.metas.states.remove(self.get_id(), TRANSPORTABLE)
+        else:
+            assert self._carried_by is not None
+            self._carried_by = None
+            self._context.metas.states.add(self.get_id(), TRANSPORTABLE)
+
+    def is_carried(self):
+        if self._carried_by:
+            return True
+        return False
+
+    def get_carry(self):
+        return self