StockedFood & rename const

intelligine/cst.py

@@ -22,7 +22,7 @@ MOVE_MODE_GOHOME = IncrementedNamedInt.get('intelligine.basebug.move.mode.gohome
 MOVE_MODE_NURSE = IncrementedNamedInt.get('intelligine.basebug.move.mode.nurse')
 
 TYPE = IncrementedNamedInt.get('intelligine.object.type')
-TYPE_RESOURCE_TRANSFORMABLE = IncrementedNamedInt.get('intelligine.object.type.resource.transformable')
+TYPE_RESOURCE_EXPLOITABLE = IncrementedNamedInt.get('intelligine.object.type.resource.transformable')
 TYPE_NURSERY = IncrementedNamedInt.get('intelligine.object.type.nursery')
 TYPE_ANT = IncrementedNamedInt.get('intelligine.object.type.ant')
 
@@ -39,6 +39,7 @@ COL_FIGHTER = IncrementedNamedInt.get('intelligine.col.walker')
 COL_TRANSPORTER = IncrementedNamedInt.get('intelligine.col.transporter')
 COL_TRANSPORTER_CARRYING = IncrementedNamedInt.get('intelligine.col.transporter_carrying')
 COL_TRANSPORTER_NOT_CARRYING = IncrementedNamedInt.get('intelligine.col.transporter_not_carrying')
+COL_EATABLE = IncrementedNamedInt.get('intelligine.col.eatable')
 
 BRAIN_SCHEMA = IncrementedNamedInt.get('intelligine.brain_schema')
 BRAIN_PART_MOVE = IncrementedNamedInt.get('intelligine.brain.part.move')

intelligine/display/pygame/visualisation.py

@@ -1,6 +1,7 @@
 import pygame
 from intelligine.synergy.Colony import Colony
 from intelligine.synergy.Rocks import Rocks
+from intelligine.synergy.object.StockedFood import StockedFood
 from synergine.synergy.Simulation import Simulation
 from synergine_xyz.display.PygameImageRotate import PygameImageRotate
 from synergine_xyz.display.PygameVisualisation import PygameVisualisation
@@ -164,7 +165,8 @@ map_config = {
         'ant': Ant,
         'egg': Egg,
         'rock': Rock,
-        'food': Food
+        'food': Food,
+        'stocked_food': StockedFood
     }
 }
 image_rotate = PygameImageRotate()

intelligine/simulation/object/brain/part/transport/AntPutBrainPart.py

@@ -1,5 +1,5 @@
 from intelligine.core.exceptions import CantFindWhereToPut
-from intelligine.cst import MOVE_MODE_EXPLO, TYPE_RESOURCE_TRANSFORMABLE, CARRIED
+from intelligine.cst import MOVE_MODE_EXPLO, TYPE_RESOURCE_EXPLOITABLE, CARRIED
 from intelligine.simulation.object.brain.part.transport.TransportBrainPart import TransportBrainPart
 from intelligine.synergy.object.Food import Food
 from synergine_xyz.cst import POSITION, POSITIONS
@@ -9,7 +9,7 @@ class AntPutBrainPart(TransportBrainPart):
 
     # TODO: methode __nit_ pour la classe ?
     _mode_matches = {
-        MOVE_MODE_EXPLO: [TYPE_RESOURCE_TRANSFORMABLE],
+        MOVE_MODE_EXPLO: [TYPE_RESOURCE_EXPLOITABLE],
     }
 
     @classmethod

intelligine/simulation/object/brain/part/transport/AntTakeBrainPart.py

@@ -1,14 +1,14 @@
 from intelligine.simulation.object.brain.part.transport.TakeBrainPart import TakeBrainPart
 from intelligine.synergy.object.ressource.Ressource import Resource
-from intelligine.cst import MOVE_MODE_EXPLO, MOVE_MODE, TYPE_RESOURCE_TRANSFORMABLE, \
-    TYPE, MOVE_MODE_GOHOME, PHEROMON_DIR_EXPLO, MOVE_MODE_NURSE, TYPE_NURSERY
+from intelligine.cst import MOVE_MODE_EXPLO, TYPE_RESOURCE_EXPLOITABLE, \
+    MOVE_MODE_GOHOME, MOVE_MODE_NURSE, TYPE_NURSERY
 
 
 class AntTakeBrainPart(TakeBrainPart):
 
     # TODO: methode __init_ pour la classe ? Pour surcharger ici.
     _mode_matches = {
-        MOVE_MODE_EXPLO: [TYPE_RESOURCE_TRANSFORMABLE],
+        MOVE_MODE_EXPLO: [TYPE_RESOURCE_EXPLOITABLE],
         MOVE_MODE_NURSE: [TYPE_NURSERY],
         MOVE_MODE_GOHOME: []
     }

intelligine/synergy/object/Food.py

@@ -1,12 +1,12 @@
 from intelligine.synergy.object.ressource.Ressource import Resource
-from intelligine.cst import TRANSPORTABLE, TYPE, TYPE_RESOURCE_TRANSFORMABLE
+from intelligine.cst import TYPE, TYPE_RESOURCE_EXPLOITABLE
 
 
 class Food(Resource):
 
     def __init__(self, collection, context):
         super().__init__(collection, context)
-        context.metas.list.add(TYPE, self.get_id(), TYPE_RESOURCE_TRANSFORMABLE)
+        context.metas.list.add(TYPE, self.get_id(), TYPE_RESOURCE_EXPLOITABLE)
 
     def get_what_carry(self):
         clone = self.__class__(self._collection, self._context)

intelligine/synergy/object/StockedFood.py

@@ -0,0 +1,10 @@
+from intelligine.cst import TYPE, TYPE_RESOURCE_EXPLOITABLE, COL_EATABLE
+from intelligine.synergy.object.Food import Food
+
+
+class StockedFood(Food):
+
+    def __init__(self, collection, context):
+        super().__init__(collection, context)
+        context.metas.list.remove(TYPE, self.get_id(), TYPE_RESOURCE_EXPLOITABLE)
+        self._add_col(COL_EATABLE)