Transformed food from food object

intelligine/display/pygame/config.py

@@ -1,13 +1,15 @@
 from intelligine.synergy.Colony import Colony
 from intelligine.synergy.Environment import Environment
 from intelligine.synergy.Simulation import Simulation
-from intelligine.synergy.object.StockedFood import StockedFood
 from intelligine.synergy.object.Food import Food
 from intelligine.synergy.object.Rock import Rock
 from intelligine.synergy.object.ant.Ant import Ant
 from intelligine.synergy.object.ant.Egg import Egg
 
 
+def stocked_food(food):
+    food.transform_to_stocked()
+
 map_config = {
     'simulation': {
         'base': Simulation
@@ -21,6 +23,9 @@ map_config = {
         'egg': Egg,
         'rock': Rock,
         'food': Food,
-        'stocked_food': StockedFood
+        'stocked_food': Food
+    },
+    'callbacks': {
+        'stocked_food': [stocked_food]
     }
 }

intelligine/sandbox/exploration/map.tmx

@@ -180,30 +180,35 @@
   </tile>
   <tile id="2">
    <properties>
+    <property name="callbacks" value="stocked_food"/>
     <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="3">
    <properties>
     <property name="actions" value="clone(),"/>
+    <property name="callbacks" value="stocked_food"/>
     <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="4">
    <properties>
     <property name="actions" value="clone(2),"/>
+    <property name="callbacks" value="stocked_food"/>
     <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="5">
    <properties>
     <property name="actions" value="clone(3),"/>
+    <property name="callbacks" value="stocked_food"/>
     <property name="object" value="stocked_food"/>
    </properties>
   </tile>
   <tile id="6">
    <properties>
     <property name="actions" value="clone(4),"/>
+    <property name="callbacks" value="stocked_food"/>
     <property name="object" value="stocked_food"/>
    </properties>
   </tile>
@@ -2331,7 +2336,7 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
@@ -2428,10 +2433,10 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
@@ -2528,7 +2533,7 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="0"/>
@@ -2627,9 +2632,9 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="0"/>
    <tile gid="241"/>
@@ -2727,9 +2732,9 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
    <tile gid="244"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="0"/>
    <tile gid="241"/>
@@ -2827,9 +2832,9 @@
    <tile gid="241"/>
    <tile gid="241"/>
    <tile gid="241"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
-   <tile gid="1"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
+   <tile gid="0"/>
    <tile gid="241"/>
    <tile gid="0"/>
    <tile gid="241"/>

intelligine/synergy/event/transport/PutableAction.py

@@ -29,4 +29,5 @@ class PutableAction(Action):
 
         # TODO: DEBUG
         if isinstance(obj_transported, Food):
-            obj_transported.set_position((-1, 0, 0))
+            #obj_transported.set_position((-1, 0, 0))
+            obj_transported.transform_to_stocked()

intelligine/synergy/object/Food.py

@@ -1,5 +1,6 @@
 from intelligine.synergy.object.ressource.Ressource import Resource
-from intelligine.cst import TYPE, TYPE_RESOURCE_EXPLOITABLE
+from intelligine.cst import TYPE, TYPE_RESOURCE_EXPLOITABLE, TYPE_RESOURCE_EATABLE, COL_EATABLE, COL_SMELL, SMELL_FOOD, \
+    TRANSPORTABLE
 
 
 class Food(Resource):
@@ -12,3 +13,10 @@ class Food(Resource):
         clone = self.__class__(self._collection, self._context)
         self._collection.add_object(clone)
         return clone
+
+    def transform_to_stocked(self):
+        self._context.metas.list.remove(TYPE, self.get_id(), TYPE_RESOURCE_EXPLOITABLE)
+        self._context.metas.list.add(TYPE, self.get_id(), TYPE_RESOURCE_EATABLE)
+        self._add_col(COL_EATABLE)
+        self._add_col(COL_SMELL)
+        self._set_smell(SMELL_FOOD)

intelligine/synergy/object/StockedFood.py

@@ -11,3 +11,6 @@ class StockedFood(Food):
         self._add_col(COL_EATABLE)
         self._add_col(COL_SMELL)
         self._set_smell(SMELL_FOOD)
+
+    def __new__(cls, *args, **kwargs):
+        return Food(*args, **kwargs)

intelligine/tests/simulation/mode/TestChangeMode.py

@@ -1,6 +1,5 @@
 from intelligine.synergy.Environment import Environment
 from intelligine.synergy.object.Food import Food
-from intelligine.synergy.object.StockedFood import StockedFood
 from intelligine.tests.simulation.mode.Base import Base
 from intelligine.synergy.Colony import Colony
 from intelligine.synergy.Simulation import Simulation
@@ -65,7 +64,8 @@ class TestChangeMode(Base):
             def get_start_objects(self, collection, context):
                 foods = []
                 food = Food(collection, context)
-                stocked_food = StockedFood(collection, context)
+                stocked_food = Food(collection, context)
+                stocked_food.transform_to_stocked()
                 food.set_position((0, 0, -20))
                 stocked_food.set_position((0, 0, 0))
                 foods.append(stocked_food)