mettagrid 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

build/mettagrid/actions/actions.cpp

@@ -10,12 +10,12 @@
             ]
         ],
         "depends": [
-            "/Users/daveey/miniforge3/envs/metta-new/lib/python3.11/site-packages/puffergrid/event.hpp",
-            "/Users/daveey/miniforge3/envs/metta-new/lib/python3.11/site-packages/puffergrid/grid.hpp",
-            "/Users/daveey/miniforge3/envs/metta-new/lib/python3.11/site-packages/puffergrid/grid_object.hpp"
+            "/Users/daveey/code/metta/deps/puffergrid/puffergrid/event.hpp",
+            "/Users/daveey/code/metta/deps/puffergrid/puffergrid/grid.hpp",
+            "/Users/daveey/code/metta/deps/puffergrid/puffergrid/grid_object.hpp"
         ],
         "include_dirs": [
-            "/Users/daveey/miniforge3/envs/metta-new/lib/python3.11/site-packages/puffergrid"
+            "/Users/daveey/code/metta/deps/puffergrid/puffergrid"
         ],
         "language": "c++",
         "name": "mettagrid.actions.actions",
@@ -1718,7 +1718,7 @@ typedef struct {
 
 /* #### Code section: numeric_typedefs ### */
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":731
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":731
  * # in Cython to enable them only on the right systems.
  * 
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1727,7 +1727,7 @@ typedef struct {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":732
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":732
  * 
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1736,7 +1736,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":733
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":733
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1745,7 +1745,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":734
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":734
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1754,7 +1754,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":738
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":738
  * #ctypedef npy_int128     int128_t
  * 
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1763,7 +1763,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":739
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":739
  * 
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1772,7 +1772,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":740
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":740
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1781,7 +1781,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":741
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":741
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1790,7 +1790,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":745
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":745
  * #ctypedef npy_uint128    uint128_t
  * 
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1799,7 +1799,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":746
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":746
  * 
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1808,7 +1808,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":755
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":755
  * # The int types are mapped a bit surprising --
  * # numpy.int corresponds to 'l' and numpy.long to 'q'
  * ctypedef npy_long       int_t             # <<<<<<<<<<<<<<
@@ -1817,7 +1817,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_long __pyx_t_5numpy_int_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":756
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":756
  * # numpy.int corresponds to 'l' and numpy.long to 'q'
  * ctypedef npy_long       int_t
  * ctypedef npy_longlong   long_t             # <<<<<<<<<<<<<<
@@ -1826,7 +1826,7 @@ typedef npy_long __pyx_t_5numpy_int_t;
  */
 typedef npy_longlong __pyx_t_5numpy_long_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":757
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":757
  * ctypedef npy_long       int_t
  * ctypedef npy_longlong   long_t
  * ctypedef npy_longlong   longlong_t             # <<<<<<<<<<<<<<
@@ -1835,7 +1835,7 @@ typedef npy_longlong __pyx_t_5numpy_long_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":759
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":759
  * ctypedef npy_longlong   longlong_t
  * 
  * ctypedef npy_ulong      uint_t             # <<<<<<<<<<<<<<
@@ -1844,7 +1844,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulong __pyx_t_5numpy_uint_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":760
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":760
  * 
  * ctypedef npy_ulong      uint_t
  * ctypedef npy_ulonglong  ulong_t             # <<<<<<<<<<<<<<
@@ -1853,7 +1853,7 @@ typedef npy_ulong __pyx_t_5numpy_uint_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulong_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":761
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":761
  * ctypedef npy_ulong      uint_t
  * ctypedef npy_ulonglong  ulong_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1862,7 +1862,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulong_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":763
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":763
  * ctypedef npy_ulonglong  ulonglong_t
  * 
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1871,7 +1871,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":764
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":764
  * 
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1880,7 +1880,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":766
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":766
  * ctypedef npy_uintp      uintp_t
  * 
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1889,7 +1889,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":767
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":767
  * 
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1898,7 +1898,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":768
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":768
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1975,7 +1975,7 @@ struct __pyx_MemviewEnum_obj;
 struct __pyx_memoryview_obj;
 struct __pyx_memoryviewslice_obj;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":770
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":770
  * ctypedef npy_longdouble longdouble_t
  * 
  * ctypedef npy_cfloat      cfloat_t             # <<<<<<<<<<<<<<
@@ -1984,7 +1984,7 @@ struct __pyx_memoryviewslice_obj;
  */
 typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":771
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":771
  * 
  * ctypedef npy_cfloat      cfloat_t
  * ctypedef npy_cdouble     cdouble_t             # <<<<<<<<<<<<<<
@@ -1993,7 +1993,7 @@ typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
  */
 typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":772
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":772
  * ctypedef npy_cfloat      cfloat_t
  * ctypedef npy_cdouble     cdouble_t
  * ctypedef npy_clongdouble clongdouble_t             # <<<<<<<<<<<<<<
@@ -2002,7 +2002,7 @@ typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
  */
 typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t;
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":774
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":774
  * ctypedef npy_clongdouble clongdouble_t
  * 
  * ctypedef npy_cdouble     complex_t             # <<<<<<<<<<<<<<
@@ -2018,7 +2018,7 @@ struct __pyx_t_9mettagrid_7objects_Generator;
 struct __pyx_t_9mettagrid_7objects_Converter;
 struct __pyx_t_9mettagrid_7objects_Altar;
 
-/* "mettagrid/objects.pxd":15
+/* "mettagrid/objects.pxd":16
  * from puffergrid.event cimport EventHandler, EventArg
  * 
  * cdef enum GridLayer:             # <<<<<<<<<<<<<<
@@ -2030,7 +2030,7 @@ enum __pyx_t_9mettagrid_7objects_GridLayer {
   __pyx_e_9mettagrid_7objects_Object_Layer = 1
 };
 
-/* "mettagrid/objects.pxd":46
+/* "mettagrid/objects.pxd":44
  *         return this.ready and this.use_cost <= actor.energy
  * 
  * cdef enum ObjectType:             # <<<<<<<<<<<<<<
@@ -2046,7 +2046,7 @@ enum __pyx_t_9mettagrid_7objects_ObjectType {
   __pyx_e_9mettagrid_7objects_Count = 5
 };
 
-/* "mettagrid/objects.pxd":56
+/* "mettagrid/objects.pxd":54
  * cdef vector[string] ObjectTypeNames # defined in objects.pyx
  * 
  * cdef enum InventoryItem:             # <<<<<<<<<<<<<<
@@ -2060,7 +2060,7 @@ enum __pyx_t_9mettagrid_7objects_InventoryItem {
   __pyx_e_9mettagrid_7objects_InventoryCount = 3
 };
 
-/* "mettagrid/objects.pxd":191
+/* "mettagrid/objects.pxd":202
  *         self.env._stats.game_incr("resets." + ObjectTypeNames[usable._type_id])
  * 
  * cdef enum Events:             # <<<<<<<<<<<<<<
@@ -2071,7 +2071,7 @@ enum __pyx_t_9mettagrid_7objects_Events {
   __pyx_e_9mettagrid_7objects_Reset = 0
 };
 
-/* "mettagrid/objects.pxd":19
+/* "mettagrid/objects.pxd":20
  *     Object_Layer = 1
  * 
  * ctypedef map[string, int] ObjectConfig             # <<<<<<<<<<<<<<
@@ -2081,7 +2081,7 @@ enum __pyx_t_9mettagrid_7objects_Events {
 typedef std::map<std::string,int>  __pyx_t_9mettagrid_7objects_ObjectConfig;
 struct __pyx_t_9mettagrid_7objects_MettaObject : public GridObject {
 
-  /* "mettagrid/objects.pxd":21
+  /* "mettagrid/objects.pxd":22
  * ctypedef map[string, int] ObjectConfig
  * 
  * cdef cppclass MettaObject(GridObject):             # <<<<<<<<<<<<<<
@@ -2090,14 +2090,13 @@ struct __pyx_t_9mettagrid_7objects_MettaObject : public GridObject {
  */
   unsigned int hp;
   virtual void init_mo(__pyx_t_9mettagrid_7objects_ObjectConfig);
-  virtual char usable(__pyx_t_9mettagrid_7objects_Agent const *);
-  virtual char attackable(void);
+  virtual int usable(__pyx_t_9mettagrid_7objects_Agent const *);
   virtual ~__pyx_t_9mettagrid_7objects_MettaObject() {
   }
 };
 struct __pyx_t_9mettagrid_7objects_Usable : public __pyx_t_9mettagrid_7objects_MettaObject {
 
-  /* "mettagrid/objects.pxd":33
+  /* "mettagrid/objects.pxd":31
  *         return False
  * 
  * cdef cppclass Usable(MettaObject):             # <<<<<<<<<<<<<<
@@ -2108,24 +2107,28 @@ struct __pyx_t_9mettagrid_7objects_Usable : public __pyx_t_9mettagrid_7objects_M
   unsigned int cooldown;
   unsigned char ready;
   virtual void init_usable(__pyx_t_9mettagrid_7objects_ObjectConfig);
-  virtual char usable(__pyx_t_9mettagrid_7objects_Agent const *);
+  virtual int usable(__pyx_t_9mettagrid_7objects_Agent const *);
   virtual ~__pyx_t_9mettagrid_7objects_Usable() {
   }
 };
 struct __pyx_t_9mettagrid_7objects_Agent : public __pyx_t_9mettagrid_7objects_MettaObject {
 
-  /* "mettagrid/objects.pxd":65
+  /* "mettagrid/objects.pxd":63
  * 
  * 
  * cdef cppclass Agent(MettaObject):             # <<<<<<<<<<<<<<
- *     char frozen
- *     unsigned int energy
+ *     unsigned int frozen
+ *     unsigned int freeze_duration
  */
-  char frozen;
-  unsigned int energy;
+  unsigned int frozen;
+  unsigned int freeze_duration;
+  unsigned char energy;
   unsigned int orientation;
-  char shield;
-  std::vector<unsigned short>  inventory;
+  unsigned char shield;
+  unsigned char shield_upkeep;
+  std::vector<unsigned char>  inventory;
+  unsigned char max_items;
+  unsigned char max_energy;
   void __pyx_f___init__Agent(GridCoord, GridCoord, __pyx_t_9mettagrid_7objects_ObjectConfig &);
   virtual void update_inventory(enum __pyx_t_9mettagrid_7objects_InventoryItem, short);
   virtual void obs(__Pyx_memviewslice);
@@ -2138,7 +2141,7 @@ struct __pyx_t_9mettagrid_7objects_Agent : public __pyx_t_9mettagrid_7objects_Me
 };
 struct __pyx_t_9mettagrid_7objects_Wall : public __pyx_t_9mettagrid_7objects_MettaObject {
 
-  /* "mettagrid/objects.pxd":104
+  /* "mettagrid/objects.pxd":112
  *             "agent:inv:" + n for n in InventoryItemNames]
  * 
  * cdef cppclass Wall(MettaObject):             # <<<<<<<<<<<<<<
@@ -2156,7 +2159,7 @@ struct __pyx_t_9mettagrid_7objects_Wall : public __pyx_t_9mettagrid_7objects_Met
 };
 struct __pyx_t_9mettagrid_7objects_Generator : public __pyx_t_9mettagrid_7objects_Usable {
 
-  /* "mettagrid/objects.pxd":117
+  /* "mettagrid/objects.pxd":125
  *         return ["wall", "wall:hp"]
  * 
  * cdef cppclass Generator(Usable):             # <<<<<<<<<<<<<<
@@ -2165,7 +2168,7 @@ struct __pyx_t_9mettagrid_7objects_Generator : public __pyx_t_9mettagrid_7object
  */
   unsigned int r1;
   void __pyx_f___init__Generator(GridCoord, GridCoord, __pyx_t_9mettagrid_7objects_ObjectConfig &);
-  virtual char usable(__pyx_t_9mettagrid_7objects_Agent const *);
+  virtual int usable(__pyx_t_9mettagrid_7objects_Agent const *);
   virtual void obs(__Pyx_memviewslice);
   static std::vector<std::string>  feature_names(void);
   __pyx_t_9mettagrid_7objects_Generator(GridCoord __pyx_v_r, GridCoord __pyx_v_c, __pyx_t_9mettagrid_7objects_ObjectConfig __pyx_v_cfg) {
@@ -2176,7 +2179,7 @@ struct __pyx_t_9mettagrid_7objects_Generator : public __pyx_t_9mettagrid_7object
 };
 struct __pyx_t_9mettagrid_7objects_Converter : public __pyx_t_9mettagrid_7objects_Usable {
 
-  /* "mettagrid/objects.pxd":140
+  /* "mettagrid/objects.pxd":148
  *         return ["generator", "generator:hp", "generator:r1", "generator:ready"]
  * 
  * cdef cppclass Converter(Usable):             # <<<<<<<<<<<<<<
@@ -2187,7 +2190,7 @@ struct __pyx_t_9mettagrid_7objects_Converter : public __pyx_t_9mettagrid_7object
   enum __pyx_t_9mettagrid_7objects_InventoryItem output_resource;
   short output_energy;
   void __pyx_f___init__Converter(GridCoord, GridCoord, __pyx_t_9mettagrid_7objects_ObjectConfig &);
-  virtual char usable(__pyx_t_9mettagrid_7objects_Agent const *);
+  virtual int usable(__pyx_t_9mettagrid_7objects_Agent const *);
   virtual PyObject *obs(__Pyx_memviewslice);
   static std::vector<std::string>  feature_names(void);
   __pyx_t_9mettagrid_7objects_Converter(GridCoord __pyx_v_r, GridCoord __pyx_v_c, __pyx_t_9mettagrid_7objects_ObjectConfig __pyx_v_cfg) {
@@ -2198,7 +2201,7 @@ struct __pyx_t_9mettagrid_7objects_Converter : public __pyx_t_9mettagrid_7object
 };
 struct __pyx_t_9mettagrid_7objects_Altar : public __pyx_t_9mettagrid_7objects_Usable {
 
-  /* "mettagrid/objects.pxd":168
+  /* "mettagrid/objects.pxd":176
  *         return ["converter", "converter:hp", "converter:input_resource", "converter:output_resource", "converter:output_energy", "converter:ready"]
  * 
  * cdef cppclass Altar(Usable):             # <<<<<<<<<<<<<<
@@ -2305,6 +2308,8 @@ struct __pyx_obj_10puffergrid_8grid_env_GridEnv {
   unsigned int _current_timestep;
   unsigned int _max_timestep;
   PyObject *_action_handlers;
+  std::vector<unsigned char>  _max_action_args;
+  unsigned char _max_action_arg;
   struct __pyx_obj_10puffergrid_19observation_encoder_ObservationEncoder *_obs_encoder;
   unsigned short _obs_width;
   unsigned short _obs_height;
@@ -2338,7 +2343,7 @@ struct __pyx_obj_10puffergrid_6action_ActionHandler {
 };
 
 
-/* "mettagrid/objects.pxd":185
+/* "mettagrid/objects.pxd":193
  * cdef map[TypeId, GridLayer] ObjectLayers
  * 
  * cdef class ResetHandler(EventHandler):             # <<<<<<<<<<<<<<
@@ -2350,17 +2355,18 @@ struct __pyx_obj_9mettagrid_7objects_ResetHandler {
 };
 
 
-/* "mettagrid/objects.pxd":194
+/* "mettagrid/objects.pxd":205
  *     Reset = 0
  * 
  * cdef class MettaObservationEncoder(ObservationEncoder):             # <<<<<<<<<<<<<<
+ *     cdef _encode(self, GridObject *obj, ObsType[:] obs, unsigned int offset)
  *     cdef vector[short] _offsets
- *     cdef vector[string] _feature_names
  */
 struct __pyx_obj_9mettagrid_7objects_MettaObservationEncoder {
   struct __pyx_obj_10puffergrid_19observation_encoder_ObservationEncoder __pyx_base;
   std::vector<short>  _offsets;
   std::vector<std::string>  _feature_names;
+  std::vector<std::vector<std::string> >  _type_feature_names;
 };
 
 
@@ -2550,7 +2556,7 @@ struct __pyx_vtabstruct_10puffergrid_8grid_env_GridEnv {
   PyObject *(*get_episode_rewards)(struct __pyx_obj_10puffergrid_8grid_env_GridEnv *, int __pyx_skip_dispatch);
   PyObject *(*get_buffers)(struct __pyx_obj_10puffergrid_8grid_env_GridEnv *, int __pyx_skip_dispatch);
   PyArrayObject *(*render_ascii)(struct __pyx_obj_10puffergrid_8grid_env_GridEnv *, PyObject *, int __pyx_skip_dispatch);
-  PyArrayObject *(*grid_objects)(struct __pyx_obj_10puffergrid_8grid_env_GridEnv *, int __pyx_skip_dispatch);
+  PyArrayObject *(*grid_objects_types)(struct __pyx_obj_10puffergrid_8grid_env_GridEnv *, int __pyx_skip_dispatch);
 };
 static struct __pyx_vtabstruct_10puffergrid_8grid_env_GridEnv *__pyx_vtabptr_10puffergrid_8grid_env_GridEnv;
 
@@ -2565,12 +2571,13 @@ static struct __pyx_vtabstruct_10puffergrid_8grid_env_GridEnv *__pyx_vtabptr_10p
 
 struct __pyx_vtabstruct_10puffergrid_6action_ActionHandler {
   void (*init)(struct __pyx_obj_10puffergrid_6action_ActionHandler *, struct __pyx_obj_10puffergrid_8grid_env_GridEnv *);
-  char (*handle_action)(struct __pyx_obj_10puffergrid_6action_ActionHandler *, unsigned int, GridObjectId, __pyx_t_10puffergrid_6action_ActionArg);
+  int (*handle_action)(struct __pyx_obj_10puffergrid_6action_ActionHandler *, unsigned int, GridObjectId, __pyx_t_10puffergrid_6action_ActionArg);
+  unsigned char (*max_arg)(struct __pyx_obj_10puffergrid_6action_ActionHandler *);
 };
 static struct __pyx_vtabstruct_10puffergrid_6action_ActionHandler *__pyx_vtabptr_10puffergrid_6action_ActionHandler;
 
 
-/* "mettagrid/objects.pxd":185
+/* "mettagrid/objects.pxd":193
  * cdef map[TypeId, GridLayer] ObjectLayers
  * 
  * cdef class ResetHandler(EventHandler):             # <<<<<<<<<<<<<<
@@ -2584,16 +2591,17 @@ struct __pyx_vtabstruct_9mettagrid_7objects_ResetHandler {
 static struct __pyx_vtabstruct_9mettagrid_7objects_ResetHandler *__pyx_vtabptr_9mettagrid_7objects_ResetHandler;
 
 
-/* "mettagrid/objects.pxd":194
+/* "mettagrid/objects.pxd":205
  *     Reset = 0
  * 
  * cdef class MettaObservationEncoder(ObservationEncoder):             # <<<<<<<<<<<<<<
+ *     cdef _encode(self, GridObject *obj, ObsType[:] obs, unsigned int offset)
  *     cdef vector[short] _offsets
- *     cdef vector[string] _feature_names
  */
 
 struct __pyx_vtabstruct_9mettagrid_7objects_MettaObservationEncoder {
   struct __pyx_vtabstruct_10puffergrid_19observation_encoder_ObservationEncoder __pyx_base;
+  PyObject *(*_encode)(struct __pyx_obj_9mettagrid_7objects_MettaObservationEncoder *, GridObject *, __Pyx_memviewslice, unsigned int);
 };
 static struct __pyx_vtabstruct_9mettagrid_7objects_MettaObservationEncoder *__pyx_vtabptr_9mettagrid_7objects_MettaObservationEncoder;
 
@@ -2602,13 +2610,13 @@ static struct __pyx_vtabstruct_9mettagrid_7objects_MettaObservationEncoder *__py
  *     string to_string(int val)
  * 
  * cdef class MettaActionHandler(ActionHandler):             # <<<<<<<<<<<<<<
- *     def __init__(self, cfg: OmegaConf, action_name, action_cost=0):
+ *     def __init__(self, cfg: OmegaConf, action_name):
  *         self.action_name = action_name
  */
 
 struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler {
   struct __pyx_vtabstruct_10puffergrid_6action_ActionHandler __pyx_base;
-  char (*_handle_action)(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *, unsigned int, __pyx_t_9mettagrid_7objects_Agent *, __pyx_t_10puffergrid_6action_ActionArg);
+  int (*_handle_action)(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *, unsigned int, __pyx_t_9mettagrid_7objects_Agent *, __pyx_t_10puffergrid_6action_ActionArg);
 };
 static struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler;
 
@@ -3732,9 +3740,6 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum____pyx_t_9mettagrid_7object
 /* CIntFromPy.proto */
 static CYTHON_INLINE unsigned short __Pyx_PyInt_As_unsigned_short(PyObject *);
 
-/* CIntToPy.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_char(char value);
-
 /* MemviewSliceInit.proto */
 #define __Pyx_BUF_MAX_NDIMS %(BUF_MAX_NDIMS)d
 #define __Pyx_MEMVIEW_DIRECT   1
@@ -3816,8 +3821,8 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self); /* proto*/
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self); /* proto*/
 static void __pyx_f_9mettagrid_7objects_12ResetHandler_handle_event(struct __pyx_obj_9mettagrid_7objects_ResetHandler *__pyx_v_self, GridObjectId __pyx_v_obj_id, CYTHON_UNUSED EventArg __pyx_v_arg); /* proto*/
-static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_action(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, unsigned int __pyx_v_actor_id, GridObjectId __pyx_v_actor_object_id, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg); /* proto*/
-static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_action(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, CYTHON_UNUSED __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, CYTHON_UNUSED __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg); /* proto*/
+static int __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_action(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, unsigned int __pyx_v_actor_id, GridObjectId __pyx_v_actor_object_id, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg); /* proto*/
+static int __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_action(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, CYTHON_UNUSED __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, CYTHON_UNUSED __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg); /* proto*/
 
 /* Module declarations from "libc.string" */
 
@@ -4030,12 +4035,12 @@ static const char __pyx_k_pyx_state[] = "__pyx_state";
 static const char __pyx_k_reduce_ex[] = "__reduce_ex__";
 static const char __pyx_k_IndexError[] = "IndexError";
 static const char __pyx_k_ValueError[] = "ValueError";
+static const char __pyx_k_max_energy[] = "max_energy";
 static const char __pyx_k_pyx_result[] = "__pyx_result";
 static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__";
 static const char __pyx_k_ImportError[] = "ImportError";
 static const char __pyx_k_MemoryError[] = "MemoryError";
 static const char __pyx_k_PickleError[] = "PickleError";
-static const char __pyx_k_action_cost[] = "action_cost";
 static const char __pyx_k_action_name[] = "action_name";
 static const char __pyx_k_altar_ready[] = "altar:ready";
 static const char __pyx_k_collections[] = "collections";
@@ -4051,7 +4056,9 @@ static const char __pyx_k_pyx_checksum[] = "__pyx_checksum";
 static const char __pyx_k_stringsource[] = "<stringsource>";
 static const char __pyx_k_version_info[] = "version_info";
 static const char __pyx_k_class_getitem[] = "__class_getitem__";
+static const char __pyx_k_max_inventory[] = "max_inventory";
 static const char __pyx_k_reduce_cython[] = "__reduce_cython__";
+static const char __pyx_k_upkeep_shield[] = "upkeep.shield";
 static const char __pyx_k_AssertionError[] = "AssertionError";
 static const char __pyx_k_initial_energy[] = "initial_energy";
 static const char __pyx_k_View_MemoryView[] = "View.MemoryView";
@@ -4059,6 +4066,7 @@ static const char __pyx_k_allocate_buffer[] = "allocate_buffer";
 static const char __pyx_k_collections_abc[] = "collections.abc";
 static const char __pyx_k_converter_ready[] = "converter:ready";
 static const char __pyx_k_dtype_is_object[] = "dtype_is_object";
+static const char __pyx_k_freeze_duration[] = "freeze_duration";
 static const char __pyx_k_generator_ready[] = "generator:ready";
 static const char __pyx_k_pyx_PickleError[] = "__pyx_PickleError";
 static const char __pyx_k_setstate_cython[] = "__setstate_cython__";
@@ -4149,7 +4157,7 @@ static void __pyx_memoryviewslice___pyx_pf_15View_dot_MemoryView_16_memoryviewsl
 static PyObject *__pyx_pf___pyx_memoryviewslice___reduce_cython__(CYTHON_UNUSED struct __pyx_memoryviewslice_obj *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf___pyx_memoryviewslice_2__setstate_cython__(CYTHON_UNUSED struct __pyx_memoryviewslice_obj *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */
 static PyObject *__pyx_pf_15View_dot_MemoryView___pyx_unpickle_Enum(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state); /* proto */
-static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, PyObject *__pyx_v_cfg, PyObject *__pyx_v_action_name, CYTHON_UNUSED PyObject *__pyx_v_action_cost); /* proto */
+static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, PyObject *__pyx_v_cfg, PyObject *__pyx_v_action_name); /* proto */
 static PyObject *__pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */
 static PyObject *__pyx_tp_new_9mettagrid_7actions_7actions_MettaActionHandler(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
@@ -4314,7 +4322,6 @@ typedef struct {
   PyObject *__pyx_kp_u__7;
   PyObject *__pyx_n_s_abc;
   PyObject *__pyx_kp_u_action;
-  PyObject *__pyx_n_s_action_cost;
   PyObject *__pyx_n_s_action_name;
   PyObject *__pyx_n_u_agent;
   PyObject *__pyx_kp_u_agent_energy;
@@ -4574,7 +4581,6 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_kp_u__7);
   Py_CLEAR(clear_module_state->__pyx_n_s_abc);
   Py_CLEAR(clear_module_state->__pyx_kp_u_action);
-  Py_CLEAR(clear_module_state->__pyx_n_s_action_cost);
   Py_CLEAR(clear_module_state->__pyx_n_s_action_name);
   Py_CLEAR(clear_module_state->__pyx_n_u_agent);
   Py_CLEAR(clear_module_state->__pyx_kp_u_agent_energy);
@@ -4812,7 +4818,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_kp_u__7);
   Py_VISIT(traverse_module_state->__pyx_n_s_abc);
   Py_VISIT(traverse_module_state->__pyx_kp_u_action);
-  Py_VISIT(traverse_module_state->__pyx_n_s_action_cost);
   Py_VISIT(traverse_module_state->__pyx_n_s_action_name);
   Py_VISIT(traverse_module_state->__pyx_n_u_agent);
   Py_VISIT(traverse_module_state->__pyx_kp_u_agent_energy);
@@ -5110,7 +5115,6 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_kp_u__7 __pyx_mstate_global->__pyx_kp_u__7
 #define __pyx_n_s_abc __pyx_mstate_global->__pyx_n_s_abc
 #define __pyx_kp_u_action __pyx_mstate_global->__pyx_kp_u_action
-#define __pyx_n_s_action_cost __pyx_mstate_global->__pyx_n_s_action_cost
 #define __pyx_n_s_action_name __pyx_mstate_global->__pyx_n_s_action_name
 #define __pyx_n_u_agent __pyx_mstate_global->__pyx_n_u_agent
 #define __pyx_kp_u_agent_energy __pyx_mstate_global->__pyx_kp_u_agent_energy
@@ -19487,7 +19491,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
  * 
  *         @property
  *         cdef inline PyObject* base(self) nogil:             # <<<<<<<<<<<<<<
@@ -19498,7 +19502,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__
 static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
   PyObject *__pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":248
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":248
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -19508,7 +19512,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
  * 
  *         @property
  *         cdef inline PyObject* base(self) nogil:             # <<<<<<<<<<<<<<
@@ -19521,7 +19525,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -19535,7 +19539,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":254
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":254
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -19548,7 +19552,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -19563,7 +19567,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
  * 
  *         @property
  *         cdef inline int ndim(self) nogil:             # <<<<<<<<<<<<<<
@@ -19574,7 +19578,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
 static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":260
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":260
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -19584,7 +19588,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
  * 
  *         @property
  *         cdef inline int ndim(self) nogil:             # <<<<<<<<<<<<<<
@@ -19597,7 +19601,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) nogil:             # <<<<<<<<<<<<<<
@@ -19608,7 +19612,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":268
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":268
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -19618,7 +19622,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) nogil:             # <<<<<<<<<<<<<<
@@ -19631,7 +19635,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) nogil:             # <<<<<<<<<<<<<<
@@ -19642,7 +19646,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":275
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":275
  *             The number of elements matches the number of dimensions of the array (ndim).
  *             """
  *             return PyArray_STRIDES(self)             # <<<<<<<<<<<<<<
@@ -19652,7 +19656,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) nogil:             # <<<<<<<<<<<<<<
@@ -19665,7 +19669,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
  * 
  *         @property
  *         cdef inline npy_intp size(self) nogil:             # <<<<<<<<<<<<<<
@@ -19676,7 +19680,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":281
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":281
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -19686,7 +19690,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
  * 
  *         @property
  *         cdef inline npy_intp size(self) nogil:             # <<<<<<<<<<<<<<
@@ -19699,7 +19703,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
  * 
  *         @property
  *         cdef inline char* data(self) nogil:             # <<<<<<<<<<<<<<
@@ -19710,7 +19714,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
   char *__pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":290
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -19720,7 +19724,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
  * 
  *         @property
  *         cdef inline char* data(self) nogil:             # <<<<<<<<<<<<<<
@@ -19733,7 +19737,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
  * ctypedef npy_cdouble     complex_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -19750,7 +19754,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":777
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":777
  * 
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -19764,7 +19768,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
  * ctypedef npy_cdouble     complex_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -19783,7 +19787,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -19800,7 +19804,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":780
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":780
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -19814,7 +19818,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -19833,7 +19837,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -19850,7 +19854,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":783
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":783
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)             # <<<<<<<<<<<<<<
@@ -19864,7 +19868,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -19883,7 +19887,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -19900,7 +19904,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":786
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":786
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)             # <<<<<<<<<<<<<<
@@ -19914,7 +19918,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -19933,7 +19937,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -19950,7 +19954,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)             # <<<<<<<<<<<<<<
@@ -19964,7 +19968,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -19983,7 +19987,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":791
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":791
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -19997,7 +20001,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -20007,7 +20011,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":793
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":793
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -20019,7 +20023,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape);
     goto __pyx_L0;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -20028,7 +20032,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":795
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":795
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -20042,7 +20046,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":791
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":791
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -20057,7 +20061,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":970
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":970
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base):             # <<<<<<<<<<<<<<
@@ -20067,7 +20071,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
 
 static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_arr, PyObject *__pyx_v_base) {
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
  * 
  * cdef inline void set_array_base(ndarray arr, object base):
  *     Py_INCREF(base) # important to do this before stealing the reference below!             # <<<<<<<<<<<<<<
@@ -20076,7 +20080,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
  * cdef inline void set_array_base(ndarray arr, object base):
  *     Py_INCREF(base) # important to do this before stealing the reference below!
  *     PyArray_SetBaseObject(arr, base)             # <<<<<<<<<<<<<<
@@ -20085,7 +20089,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   (void)(PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base));
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":970
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":970
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base):             # <<<<<<<<<<<<<<
@@ -20096,7 +20100,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   /* function exit code */
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -20111,7 +20115,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
  * 
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -20120,7 +20124,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":976
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":976
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -20130,7 +20134,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":977
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":977
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -20141,7 +20145,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":976
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":976
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -20150,7 +20154,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":978
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":978
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -20162,7 +20166,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -20177,7 +20181,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -20201,7 +20205,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20217,7 +20221,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":984
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":984
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -20226,7 +20230,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
  */
       __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 984, __pyx_L3_error)
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20240,7 +20244,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -20255,7 +20259,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy.core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -20270,7 +20274,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20286,7 +20290,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -20309,7 +20313,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
  *         raise ImportError("numpy.core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -20333,7 +20337,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20349,7 +20353,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":990
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":990
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -20358,7 +20362,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 990, __pyx_L3_error)
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20372,7 +20376,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -20387,7 +20391,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -20402,7 +20406,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20418,7 +20422,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
  *         raise ImportError("numpy.core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -20441,7 +20445,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
  *         raise ImportError("numpy.core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -20465,7 +20469,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20481,7 +20485,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":996
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":996
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -20490,7 +20494,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 996, __pyx_L3_error)
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20504,7 +20508,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":997
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":997
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -20519,7 +20523,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
+      /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -20534,7 +20538,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
+    /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -20550,7 +20554,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
  *         raise ImportError("numpy.core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -20573,7 +20577,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1001
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1001
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj):             # <<<<<<<<<<<<<<
@@ -20584,7 +20588,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
 static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -20594,7 +20598,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1001
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1001
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj):             # <<<<<<<<<<<<<<
@@ -20607,7 +20611,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1016
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1016
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj):             # <<<<<<<<<<<<<<
@@ -20618,7 +20622,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
 static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -20628,7 +20632,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1016
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1016
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj):             # <<<<<<<<<<<<<<
@@ -20641,7 +20645,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1031
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1031
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -20652,7 +20656,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
 static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
   npy_datetime __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -20662,7 +20666,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1031
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1031
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -20675,7 +20679,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1041
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -20686,7 +20690,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
 static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
   npy_timedelta __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -20696,7 +20700,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1041
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1041
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -20709,7 +20713,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
 
-/* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1048
+/* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1048
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -20720,7 +20724,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
 static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
   NPY_DATETIMEUNIT __pyx_r;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1052
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1052
  *     returns the unit part of the dtype for a numpy datetime64 object.
  *     """
  *     return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base             # <<<<<<<<<<<<<<
@@ -20728,7 +20732,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
   goto __pyx_L0;
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1048
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1048
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -20741,7 +20745,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":24
+/* "mettagrid/objects.pxd":25
  *     unsigned int hp
  * 
  *     inline void init_mo(ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -20751,16 +20755,16 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
 
 void __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_t_9mettagrid_7objects_ObjectConfig __pyx_v_cfg) {
 
-  /* "mettagrid/objects.pxd":25
+  /* "mettagrid/objects.pxd":26
  * 
  *     inline void init_mo(ObjectConfig cfg):
  *         this.hp = cfg[b"hp"]             # <<<<<<<<<<<<<<
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  */
   this->hp = (__pyx_v_cfg[__pyx_k_hp]);
 
-  /* "mettagrid/objects.pxd":24
+  /* "mettagrid/objects.pxd":25
  *     unsigned int hp
  * 
  *     inline void init_mo(ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -20771,54 +20775,20 @@ void __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_t_9mettagrid_7object
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":27
+/* "mettagrid/objects.pxd":28
  *         this.hp = cfg[b"hp"]
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return False
  * 
  */
 
-char __pyx_t_9mettagrid_7objects_MettaObject::usable(CYTHON_UNUSED __pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
-  char __pyx_r;
-
-  /* "mettagrid/objects.pxd":28
- * 
- *     inline char usable(const Agent *actor):
- *         return False             # <<<<<<<<<<<<<<
- * 
- *     inline char attackable():
- */
-  __pyx_r = 0;
-  goto __pyx_L0;
-
-  /* "mettagrid/objects.pxd":27
- *         this.hp = cfg[b"hp"]
- * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
- *         return False
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  return __pyx_r;
-}
-
-/* "mettagrid/objects.pxd":30
- *         return False
- * 
- *     inline char attackable():             # <<<<<<<<<<<<<<
- *         return False
- * 
- */
-
-char __pyx_t_9mettagrid_7objects_MettaObject::attackable(void) {
-  char __pyx_r;
+int __pyx_t_9mettagrid_7objects_MettaObject::usable(CYTHON_UNUSED __pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
+  int __pyx_r;
 
-  /* "mettagrid/objects.pxd":31
+  /* "mettagrid/objects.pxd":29
  * 
- *     inline char attackable():
+ *     inline bint usable(const Agent *actor):
  *         return False             # <<<<<<<<<<<<<<
  * 
  * cdef cppclass Usable(MettaObject):
@@ -20826,10 +20796,10 @@ char __pyx_t_9mettagrid_7objects_MettaObject::attackable(void) {
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":30
- *         return False
+  /* "mettagrid/objects.pxd":28
+ *         this.hp = cfg[b"hp"]
  * 
- *     inline char attackable():             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return False
  * 
  */
@@ -20839,7 +20809,7 @@ char __pyx_t_9mettagrid_7objects_MettaObject::attackable(void) {
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":38
+/* "mettagrid/objects.pxd":36
  *     unsigned char ready
  * 
  *     inline void init_usable(ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -20849,7 +20819,7 @@ char __pyx_t_9mettagrid_7objects_MettaObject::attackable(void) {
 
 void __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_t_9mettagrid_7objects_ObjectConfig __pyx_v_cfg) {
 
-  /* "mettagrid/objects.pxd":39
+  /* "mettagrid/objects.pxd":37
  * 
  *     inline void init_usable(ObjectConfig cfg):
  *         this.use_cost = cfg[b"use_cost"]             # <<<<<<<<<<<<<<
@@ -20858,7 +20828,7 @@ void __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_t_9mettagrid_7objects
  */
   this->use_cost = (__pyx_v_cfg[__pyx_k_use_cost]);
 
-  /* "mettagrid/objects.pxd":40
+  /* "mettagrid/objects.pxd":38
  *     inline void init_usable(ObjectConfig cfg):
  *         this.use_cost = cfg[b"use_cost"]
  *         this.cooldown = cfg[b"cooldown"]             # <<<<<<<<<<<<<<
@@ -20867,16 +20837,16 @@ void __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_t_9mettagrid_7objects
  */
   this->cooldown = (__pyx_v_cfg[__pyx_k_cooldown]);
 
-  /* "mettagrid/objects.pxd":41
+  /* "mettagrid/objects.pxd":39
  *         this.use_cost = cfg[b"use_cost"]
  *         this.cooldown = cfg[b"cooldown"]
  *         this.ready = 1             # <<<<<<<<<<<<<<
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  */
   this->ready = 1;
 
-  /* "mettagrid/objects.pxd":38
+  /* "mettagrid/objects.pxd":36
  *     unsigned char ready
  * 
  *     inline void init_usable(ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -20887,29 +20857,30 @@ void __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_t_9mettagrid_7objects
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":43
+/* "mettagrid/objects.pxd":41
  *         this.ready = 1
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return this.ready and this.use_cost <= actor.energy
  * 
  */
 
-char __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
-  char __pyx_r;
-  char __pyx_t_1;
+int __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
+  int __pyx_r;
+  int __pyx_t_1;
   int __pyx_t_2;
 
-  /* "mettagrid/objects.pxd":44
+  /* "mettagrid/objects.pxd":42
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  *         return this.ready and this.use_cost <= actor.energy             # <<<<<<<<<<<<<<
  * 
  * cdef enum ObjectType:
  */
-  if (this->ready) {
+  __pyx_t_2 = (this->ready != 0);
+  if (__pyx_t_2) {
   } else {
-    __pyx_t_1 = this->ready;
+    __pyx_t_1 = __pyx_t_2;
     goto __pyx_L3_bool_binop_done;
   }
   __pyx_t_2 = (this->use_cost <= __pyx_v_actor->energy);
@@ -20918,10 +20889,10 @@ char __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_t_9mettagrid_7objects_Agen
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":43
+  /* "mettagrid/objects.pxd":41
  *         this.ready = 1
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return this.ready and this.use_cost <= actor.energy
  * 
  */
@@ -20931,8 +20902,8 @@ char __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_t_9mettagrid_7objects_Agen
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":72
- *     vector[unsigned short] inventory
+/* "mettagrid/objects.pxd":74
+ *     unsigned char max_energy
  * 
  *     inline Agent(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
  *         GridObject.init(ObjectType.AgentT, GridLocation(r, c, GridLayer.Agent_Layer))
@@ -20944,67 +20915,103 @@ void __pyx_t_9mettagrid_7objects_Agent::__pyx_f___init__Agent(GridCoord __pyx_v_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":73
+  /* "mettagrid/objects.pxd":75
  * 
  *     inline Agent(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.AgentT, GridLocation(r, c, GridLayer.Agent_Layer))             # <<<<<<<<<<<<<<
  *         MettaObject.init_mo(cfg)
- *         this.frozen = False
+ *         this.frozen = 0
  */
   GridObject::init(__pyx_e_9mettagrid_7objects_AgentT, GridLocation(__pyx_v_r, __pyx_v_c, __pyx_e_9mettagrid_7objects_Agent_Layer));
 
-  /* "mettagrid/objects.pxd":74
+  /* "mettagrid/objects.pxd":76
  *     inline Agent(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.AgentT, GridLocation(r, c, GridLayer.Agent_Layer))
  *         MettaObject.init_mo(cfg)             # <<<<<<<<<<<<<<
- *         this.frozen = False
- *         this.energy = cfg[b"initial_energy"]
+ *         this.frozen = 0
+ *         this.freeze_duration = cfg[b"freeze_duration"]
  */
-  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 74, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 76, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":75
+  /* "mettagrid/objects.pxd":77
  *         GridObject.init(ObjectType.AgentT, GridLocation(r, c, GridLayer.Agent_Layer))
  *         MettaObject.init_mo(cfg)
- *         this.frozen = False             # <<<<<<<<<<<<<<
+ *         this.frozen = 0             # <<<<<<<<<<<<<<
+ *         this.freeze_duration = cfg[b"freeze_duration"]
  *         this.energy = cfg[b"initial_energy"]
- *         this.orientation = 0
  */
   this->frozen = 0;
 
-  /* "mettagrid/objects.pxd":76
+  /* "mettagrid/objects.pxd":78
  *         MettaObject.init_mo(cfg)
- *         this.frozen = False
+ *         this.frozen = 0
+ *         this.freeze_duration = cfg[b"freeze_duration"]             # <<<<<<<<<<<<<<
+ *         this.energy = cfg[b"initial_energy"]
+ *         this.max_energy = cfg[b"max_energy"]
+ */
+  this->freeze_duration = (__pyx_v_cfg[__pyx_k_freeze_duration]);
+
+  /* "mettagrid/objects.pxd":79
+ *         this.frozen = 0
+ *         this.freeze_duration = cfg[b"freeze_duration"]
  *         this.energy = cfg[b"initial_energy"]             # <<<<<<<<<<<<<<
- *         this.orientation = 0
- *         this.inventory.resize(InventoryItem.InventoryCount)
+ *         this.max_energy = cfg[b"max_energy"]
+ *         this.shield_upkeep = cfg[b"upkeep.shield"]
  */
   this->energy = (__pyx_v_cfg[__pyx_k_initial_energy]);
 
-  /* "mettagrid/objects.pxd":77
- *         this.frozen = False
+  /* "mettagrid/objects.pxd":80
+ *         this.freeze_duration = cfg[b"freeze_duration"]
  *         this.energy = cfg[b"initial_energy"]
+ *         this.max_energy = cfg[b"max_energy"]             # <<<<<<<<<<<<<<
+ *         this.shield_upkeep = cfg[b"upkeep.shield"]
+ *         this.orientation = 0
+ */
+  this->max_energy = (__pyx_v_cfg[__pyx_k_max_energy]);
+
+  /* "mettagrid/objects.pxd":81
+ *         this.energy = cfg[b"initial_energy"]
+ *         this.max_energy = cfg[b"max_energy"]
+ *         this.shield_upkeep = cfg[b"upkeep.shield"]             # <<<<<<<<<<<<<<
+ *         this.orientation = 0
+ *         this.inventory.resize(InventoryItem.InventoryCount)
+ */
+  this->shield_upkeep = (__pyx_v_cfg[__pyx_k_upkeep_shield]);
+
+  /* "mettagrid/objects.pxd":82
+ *         this.max_energy = cfg[b"max_energy"]
+ *         this.shield_upkeep = cfg[b"upkeep.shield"]
  *         this.orientation = 0             # <<<<<<<<<<<<<<
  *         this.inventory.resize(InventoryItem.InventoryCount)
- * 
+ *         this.max_items = cfg[b"max_inventory"]
  */
   this->orientation = 0;
 
-  /* "mettagrid/objects.pxd":78
- *         this.energy = cfg[b"initial_energy"]
+  /* "mettagrid/objects.pxd":83
+ *         this.shield_upkeep = cfg[b"upkeep.shield"]
  *         this.orientation = 0
  *         this.inventory.resize(InventoryItem.InventoryCount)             # <<<<<<<<<<<<<<
+ *         this.max_items = cfg[b"max_inventory"]
  * 
- *     inline void update_inventory(InventoryItem item, short amount):
  */
   try {
     this->inventory.resize(__pyx_e_9mettagrid_7objects_InventoryCount);
   } catch(...) {
     __Pyx_CppExn2PyErr();
-    __PYX_ERR(3, 78, __pyx_L1_error)
+    __PYX_ERR(3, 83, __pyx_L1_error)
   }
 
-  /* "mettagrid/objects.pxd":72
- *     vector[unsigned short] inventory
+  /* "mettagrid/objects.pxd":84
+ *         this.orientation = 0
+ *         this.inventory.resize(InventoryItem.InventoryCount)
+ *         this.max_items = cfg[b"max_inventory"]             # <<<<<<<<<<<<<<
+ * 
+ *     inline void update_inventory(InventoryItem item, short amount):
+ */
+  this->max_items = (__pyx_v_cfg[__pyx_k_max_inventory]);
+
+  /* "mettagrid/objects.pxd":74
+ *     unsigned char max_energy
  * 
  *     inline Agent(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
  *         GridObject.init(ObjectType.AgentT, GridLocation(r, c, GridLayer.Agent_Layer))
@@ -21018,40 +21025,71 @@ void __pyx_t_9mettagrid_7objects_Agent::__pyx_f___init__Agent(GridCoord __pyx_v_
   __pyx_L0:;
 }
 
-/* "mettagrid/objects.pxd":80
- *         this.inventory.resize(InventoryItem.InventoryCount)
+/* "mettagrid/objects.pxd":86
+ *         this.max_items = cfg[b"max_inventory"]
  * 
  *     inline void update_inventory(InventoryItem item, short amount):             # <<<<<<<<<<<<<<
  *         this.inventory[<InventoryItem>item] += amount
- * 
+ *         if this.inventory[<InventoryItem>item] > this.max_items:
  */
 
 void __pyx_t_9mettagrid_7objects_Agent::update_inventory(enum __pyx_t_9mettagrid_7objects_InventoryItem __pyx_v_item, short __pyx_v_amount) {
   enum __pyx_t_9mettagrid_7objects_InventoryItem __pyx_t_1;
+  int __pyx_t_2;
+  unsigned char __pyx_t_3;
 
-  /* "mettagrid/objects.pxd":81
+  /* "mettagrid/objects.pxd":87
  * 
  *     inline void update_inventory(InventoryItem item, short amount):
  *         this.inventory[<InventoryItem>item] += amount             # <<<<<<<<<<<<<<
- * 
- *     inline void obs(ObsType[:] obs):
+ *         if this.inventory[<InventoryItem>item] > this.max_items:
+ *             this.inventory[<InventoryItem>item] = this.max_items
  */
   __pyx_t_1 = ((enum __pyx_t_9mettagrid_7objects_InventoryItem)__pyx_v_item);
   (this->inventory[__pyx_t_1]) = ((this->inventory[__pyx_t_1]) + __pyx_v_amount);
 
-  /* "mettagrid/objects.pxd":80
- *         this.inventory.resize(InventoryItem.InventoryCount)
+  /* "mettagrid/objects.pxd":88
+ *     inline void update_inventory(InventoryItem item, short amount):
+ *         this.inventory[<InventoryItem>item] += amount
+ *         if this.inventory[<InventoryItem>item] > this.max_items:             # <<<<<<<<<<<<<<
+ *             this.inventory[<InventoryItem>item] = this.max_items
  * 
- *     inline void update_inventory(InventoryItem item, short amount):             # <<<<<<<<<<<<<<
+ */
+  __pyx_t_2 = ((this->inventory[((enum __pyx_t_9mettagrid_7objects_InventoryItem)__pyx_v_item)]) > this->max_items);
+  if (__pyx_t_2) {
+
+    /* "mettagrid/objects.pxd":89
+ *         this.inventory[<InventoryItem>item] += amount
+ *         if this.inventory[<InventoryItem>item] > this.max_items:
+ *             this.inventory[<InventoryItem>item] = this.max_items             # <<<<<<<<<<<<<<
+ * 
+ *     inline void obs(ObsType[:] obs):
+ */
+    __pyx_t_3 = this->max_items;
+    (this->inventory[((enum __pyx_t_9mettagrid_7objects_InventoryItem)__pyx_v_item)]) = __pyx_t_3;
+
+    /* "mettagrid/objects.pxd":88
+ *     inline void update_inventory(InventoryItem item, short amount):
  *         this.inventory[<InventoryItem>item] += amount
+ *         if this.inventory[<InventoryItem>item] > this.max_items:             # <<<<<<<<<<<<<<
+ *             this.inventory[<InventoryItem>item] = this.max_items
  * 
+ */
+  }
+
+  /* "mettagrid/objects.pxd":86
+ *         this.max_items = cfg[b"max_inventory"]
+ * 
+ *     inline void update_inventory(InventoryItem item, short amount):             # <<<<<<<<<<<<<<
+ *         this.inventory[<InventoryItem>item] += amount
+ *         if this.inventory[<InventoryItem>item] > this.max_items:
  */
 
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":83
- *         this.inventory[<InventoryItem>item] += amount
+/* "mettagrid/objects.pxd":91
+ *             this.inventory[<InventoryItem>item] = this.max_items
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
  *         obs[0] = 1
@@ -21063,12 +21101,12 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   unsigned short __pyx_v_i;
   Py_ssize_t __pyx_t_1;
   unsigned int __pyx_t_2;
-  char __pyx_t_3;
+  unsigned char __pyx_t_3;
   enum __pyx_t_9mettagrid_7objects_InventoryItem __pyx_t_4;
   enum __pyx_t_9mettagrid_7objects_InventoryItem __pyx_t_5;
   unsigned short __pyx_t_6;
 
-  /* "mettagrid/objects.pxd":84
+  /* "mettagrid/objects.pxd":92
  * 
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1             # <<<<<<<<<<<<<<
@@ -21078,7 +21116,7 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 0;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = 1;
 
-  /* "mettagrid/objects.pxd":85
+  /* "mettagrid/objects.pxd":93
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1
  *         obs[1] = this.hp             # <<<<<<<<<<<<<<
@@ -21089,29 +21127,29 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 1;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_2;
 
-  /* "mettagrid/objects.pxd":86
+  /* "mettagrid/objects.pxd":94
  *         obs[0] = 1
  *         obs[1] = this.hp
  *         obs[2] = this.frozen             # <<<<<<<<<<<<<<
  *         obs[3] = this.energy
  *         obs[4] = this.orientation
  */
-  __pyx_t_3 = this->frozen;
+  __pyx_t_2 = this->frozen;
   __pyx_t_1 = 2;
-  *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_3;
+  *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_2;
 
-  /* "mettagrid/objects.pxd":87
+  /* "mettagrid/objects.pxd":95
  *         obs[1] = this.hp
  *         obs[2] = this.frozen
  *         obs[3] = this.energy             # <<<<<<<<<<<<<<
  *         obs[4] = this.orientation
  *         obs[5] = this.shield
  */
-  __pyx_t_2 = this->energy;
+  __pyx_t_3 = this->energy;
   __pyx_t_1 = 3;
-  *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_2;
+  *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_3;
 
-  /* "mettagrid/objects.pxd":88
+  /* "mettagrid/objects.pxd":96
  *         obs[2] = this.frozen
  *         obs[3] = this.energy
  *         obs[4] = this.orientation             # <<<<<<<<<<<<<<
@@ -21122,7 +21160,7 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 4;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_2;
 
-  /* "mettagrid/objects.pxd":89
+  /* "mettagrid/objects.pxd":97
  *         obs[3] = this.energy
  *         obs[4] = this.orientation
  *         obs[5] = this.shield             # <<<<<<<<<<<<<<
@@ -21133,7 +21171,7 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 5;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_3;
 
-  /* "mettagrid/objects.pxd":91
+  /* "mettagrid/objects.pxd":99
  *         obs[5] = this.shield
  * 
  *         cdef unsigned short idx = 6             # <<<<<<<<<<<<<<
@@ -21142,7 +21180,7 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
  */
   __pyx_v_idx = 6;
 
-  /* "mettagrid/objects.pxd":93
+  /* "mettagrid/objects.pxd":101
  *         cdef unsigned short idx = 6
  *         cdef unsigned short i
  *         for i in range(InventoryItem.InventoryCount):             # <<<<<<<<<<<<<<
@@ -21154,7 +21192,7 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {
     __pyx_v_i = __pyx_t_6;
 
-    /* "mettagrid/objects.pxd":94
+    /* "mettagrid/objects.pxd":102
  *         cdef unsigned short i
  *         for i in range(InventoryItem.InventoryCount):
  *             obs[idx + i] = this.inventory[i]             # <<<<<<<<<<<<<<
@@ -21165,8 +21203,8 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
     *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = (this->inventory[__pyx_v_i]);
   }
 
-  /* "mettagrid/objects.pxd":83
- *         this.inventory[<InventoryItem>item] += amount
+  /* "mettagrid/objects.pxd":91
+ *             this.inventory[<InventoryItem>item] = this.max_items
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
  *         obs[0] = 1
@@ -21176,7 +21214,7 @@ void __pyx_t_9mettagrid_7objects_Agent::obs(__Pyx_memviewslice __pyx_v_obs) {
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":97
+/* "mettagrid/objects.pxd":105
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21200,46 +21238,46 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Agent::feature_names(void)
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("feature_names", 1);
 
-  /* "mettagrid/objects.pxd":98
+  /* "mettagrid/objects.pxd":106
  *     @staticmethod
  *     inline vector[string] feature_names():
  *         return [             # <<<<<<<<<<<<<<
  *             "agent", "agent:hp", "agent:frozen", "agent:energy", "agent:orientation",
  *             "agent:shield"
  */
-  __pyx_t_1 = PyList_New(6); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 98, __pyx_L1_error)
+  __pyx_t_1 = PyList_New(6); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 106, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_n_u_agent);
   __Pyx_GIVEREF(__pyx_n_u_agent);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_agent)) __PYX_ERR(3, 98, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_agent)) __PYX_ERR(3, 106, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_agent_hp);
   __Pyx_GIVEREF(__pyx_kp_u_agent_hp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_agent_hp)) __PYX_ERR(3, 98, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_agent_hp)) __PYX_ERR(3, 106, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_agent_frozen);
   __Pyx_GIVEREF(__pyx_kp_u_agent_frozen);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_agent_frozen)) __PYX_ERR(3, 98, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_agent_frozen)) __PYX_ERR(3, 106, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_agent_energy);
   __Pyx_GIVEREF(__pyx_kp_u_agent_energy);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 3, __pyx_kp_u_agent_energy)) __PYX_ERR(3, 98, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 3, __pyx_kp_u_agent_energy)) __PYX_ERR(3, 106, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_agent_orientation);
   __Pyx_GIVEREF(__pyx_kp_u_agent_orientation);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 4, __pyx_kp_u_agent_orientation)) __PYX_ERR(3, 98, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 4, __pyx_kp_u_agent_orientation)) __PYX_ERR(3, 106, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_agent_shield);
   __Pyx_GIVEREF(__pyx_kp_u_agent_shield);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 5, __pyx_kp_u_agent_shield)) __PYX_ERR(3, 98, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 5, __pyx_kp_u_agent_shield)) __PYX_ERR(3, 106, __pyx_L1_error);
   { /* enter inner scope */
 
-    /* "mettagrid/objects.pxd":101
+    /* "mettagrid/objects.pxd":109
  *             "agent", "agent:hp", "agent:frozen", "agent:energy", "agent:orientation",
  *             "agent:shield"
  *         ] + [             # <<<<<<<<<<<<<<
  *             "agent:inv:" + n for n in InventoryItemNames]
  * 
  */
-    __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 101, __pyx_L1_error)
+    __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 109, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
 
-    /* "mettagrid/objects.pxd":102
+    /* "mettagrid/objects.pxd":110
  *             "agent:shield"
  *         ] + [
  *             "agent:inv:" + n for n in InventoryItemNames]             # <<<<<<<<<<<<<<
@@ -21252,33 +21290,33 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Agent::feature_names(void)
       __pyx_t_4 = *__pyx_t_3;
       ++__pyx_t_3;
       __pyx_7genexpr__pyx_v_n = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_4);
-      __pyx_t_5 = __pyx_convert_PyStr_string_to_py_6libcpp_6string_std__in_string(__pyx_7genexpr__pyx_v_n); if (unlikely(!__pyx_t_5)) __PYX_ERR(3, 102, __pyx_L1_error)
+      __pyx_t_5 = __pyx_convert_PyStr_string_to_py_6libcpp_6string_std__in_string(__pyx_7genexpr__pyx_v_n); if (unlikely(!__pyx_t_5)) __PYX_ERR(3, 110, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_5);
-      __pyx_t_6 = __Pyx_PyUnicode_Concat(__pyx_kp_u_agent_inv, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(3, 102, __pyx_L1_error)
+      __pyx_t_6 = __Pyx_PyUnicode_Concat(__pyx_kp_u_agent_inv, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(3, 110, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-      if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_6))) __PYX_ERR(3, 101, __pyx_L1_error)
+      if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_6))) __PYX_ERR(3, 109, __pyx_L1_error)
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     }
   } /* exit inner scope */
 
-  /* "mettagrid/objects.pxd":101
+  /* "mettagrid/objects.pxd":109
  *             "agent", "agent:hp", "agent:frozen", "agent:energy", "agent:orientation",
  *             "agent:shield"
  *         ] + [             # <<<<<<<<<<<<<<
  *             "agent:inv:" + n for n in InventoryItemNames]
  * 
  */
-  __pyx_t_6 = PyNumber_Add(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(3, 101, __pyx_L1_error)
+  __pyx_t_6 = PyNumber_Add(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(3, 109, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_7 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_6); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 101, __pyx_L1_error)
+  __pyx_t_7 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_6); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 109, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __pyx_r = __pyx_t_7;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":97
+  /* "mettagrid/objects.pxd":105
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21299,7 +21337,7 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Agent::feature_names(void)
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":105
+/* "mettagrid/objects.pxd":113
  * 
  * cdef cppclass Wall(MettaObject):
  *     inline Wall(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21312,7 +21350,7 @@ void __pyx_t_9mettagrid_7objects_Wall::__pyx_f___init__Wall(GridCoord __pyx_v_r,
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":106
+  /* "mettagrid/objects.pxd":114
  * cdef cppclass Wall(MettaObject):
  *     inline Wall(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.WallT, GridLocation(r, c, GridLayer.Object_Layer))             # <<<<<<<<<<<<<<
@@ -21321,16 +21359,16 @@ void __pyx_t_9mettagrid_7objects_Wall::__pyx_f___init__Wall(GridCoord __pyx_v_r,
  */
   GridObject::init(__pyx_e_9mettagrid_7objects_WallT, GridLocation(__pyx_v_r, __pyx_v_c, __pyx_e_9mettagrid_7objects_Object_Layer));
 
-  /* "mettagrid/objects.pxd":107
+  /* "mettagrid/objects.pxd":115
  *     inline Wall(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.WallT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)             # <<<<<<<<<<<<<<
  * 
  *     inline void obs(ObsType[:] obs):
  */
-  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 107, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 115, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":105
+  /* "mettagrid/objects.pxd":113
  * 
  * cdef cppclass Wall(MettaObject):
  *     inline Wall(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21345,7 +21383,7 @@ void __pyx_t_9mettagrid_7objects_Wall::__pyx_f___init__Wall(GridCoord __pyx_v_r,
   __pyx_L0:;
 }
 
-/* "mettagrid/objects.pxd":109
+/* "mettagrid/objects.pxd":117
  *         MettaObject.init_mo(cfg)
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -21356,7 +21394,7 @@ void __pyx_t_9mettagrid_7objects_Wall::__pyx_f___init__Wall(GridCoord __pyx_v_r,
 void __pyx_t_9mettagrid_7objects_Wall::obs(__Pyx_memviewslice __pyx_v_obs) {
   Py_ssize_t __pyx_t_1;
 
-  /* "mettagrid/objects.pxd":110
+  /* "mettagrid/objects.pxd":118
  * 
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1             # <<<<<<<<<<<<<<
@@ -21366,7 +21404,7 @@ void __pyx_t_9mettagrid_7objects_Wall::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 0;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = 1;
 
-  /* "mettagrid/objects.pxd":111
+  /* "mettagrid/objects.pxd":119
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1
  *         obs[1] = hp             # <<<<<<<<<<<<<<
@@ -21376,7 +21414,7 @@ void __pyx_t_9mettagrid_7objects_Wall::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 1;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = hp;
 
-  /* "mettagrid/objects.pxd":109
+  /* "mettagrid/objects.pxd":117
  *         MettaObject.init_mo(cfg)
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -21387,7 +21425,7 @@ void __pyx_t_9mettagrid_7objects_Wall::obs(__Pyx_memviewslice __pyx_v_obs) {
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":114
+/* "mettagrid/objects.pxd":122
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21405,27 +21443,27 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Wall::feature_names(void)
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("feature_names", 1);
 
-  /* "mettagrid/objects.pxd":115
+  /* "mettagrid/objects.pxd":123
  *     @staticmethod
  *     inline vector[string] feature_names():
  *         return ["wall", "wall:hp"]             # <<<<<<<<<<<<<<
  * 
  * cdef cppclass Generator(Usable):
  */
-  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 115, __pyx_L1_error)
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 123, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_n_u_wall);
   __Pyx_GIVEREF(__pyx_n_u_wall);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_wall)) __PYX_ERR(3, 115, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_wall)) __PYX_ERR(3, 123, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_wall_hp);
   __Pyx_GIVEREF(__pyx_kp_u_wall_hp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_wall_hp)) __PYX_ERR(3, 115, __pyx_L1_error);
-  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 115, __pyx_L1_error)
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_wall_hp)) __PYX_ERR(3, 123, __pyx_L1_error);
+  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 123, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":114
+  /* "mettagrid/objects.pxd":122
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21443,7 +21481,7 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Wall::feature_names(void)
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":120
+/* "mettagrid/objects.pxd":128
  *     unsigned int r1
  * 
  *     inline Generator(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21456,7 +21494,7 @@ void __pyx_t_9mettagrid_7objects_Generator::__pyx_f___init__Generator(GridCoord
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":121
+  /* "mettagrid/objects.pxd":129
  * 
  *     inline Generator(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.GeneratorT, GridLocation(r, c, GridLayer.Object_Layer))             # <<<<<<<<<<<<<<
@@ -21465,34 +21503,34 @@ void __pyx_t_9mettagrid_7objects_Generator::__pyx_f___init__Generator(GridCoord
  */
   GridObject::init(__pyx_e_9mettagrid_7objects_GeneratorT, GridLocation(__pyx_v_r, __pyx_v_c, __pyx_e_9mettagrid_7objects_Object_Layer));
 
-  /* "mettagrid/objects.pxd":122
+  /* "mettagrid/objects.pxd":130
  *     inline Generator(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.GeneratorT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)             # <<<<<<<<<<<<<<
  *         Usable.init_usable(cfg)
  *         this.r1 = cfg[b"initial_resources"]
  */
-  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 122, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 130, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":123
+  /* "mettagrid/objects.pxd":131
  *         GridObject.init(ObjectType.GeneratorT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)
  *         Usable.init_usable(cfg)             # <<<<<<<<<<<<<<
  *         this.r1 = cfg[b"initial_resources"]
  * 
  */
-  __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 123, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 131, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":124
+  /* "mettagrid/objects.pxd":132
  *         MettaObject.init_mo(cfg)
  *         Usable.init_usable(cfg)
  *         this.r1 = cfg[b"initial_resources"]             # <<<<<<<<<<<<<<
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  */
   this->r1 = (__pyx_v_cfg[__pyx_k_initial_resources]);
 
-  /* "mettagrid/objects.pxd":120
+  /* "mettagrid/objects.pxd":128
  *     unsigned int r1
  * 
  *     inline Generator(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21507,46 +21545,45 @@ void __pyx_t_9mettagrid_7objects_Generator::__pyx_f___init__Generator(GridCoord
   __pyx_L0:;
 }
 
-/* "mettagrid/objects.pxd":126
+/* "mettagrid/objects.pxd":134
  *         this.r1 = cfg[b"initial_resources"]
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return Usable.usable(actor) and this.r1 > 0
  * 
  */
 
-char __pyx_t_9mettagrid_7objects_Generator::usable(__pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
-  char __pyx_r;
-  char __pyx_t_1;
-  char __pyx_t_2;
-  int __pyx_t_3;
+int __pyx_t_9mettagrid_7objects_Generator::usable(__pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
+  int __pyx_r;
+  int __pyx_t_1;
+  int __pyx_t_2;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":127
+  /* "mettagrid/objects.pxd":135
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  *         return Usable.usable(actor) and this.r1 > 0             # <<<<<<<<<<<<<<
  * 
  *     inline void obs(ObsType[:] obs):
  */
-  __pyx_t_2 = __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_v_actor); if (unlikely(__pyx_t_2 == ((char)-1) && PyErr_Occurred())) __PYX_ERR(3, 127, __pyx_L1_error)
+  __pyx_t_2 = __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_v_actor); if (unlikely(__pyx_t_2 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(3, 135, __pyx_L1_error)
   if (__pyx_t_2) {
   } else {
     __pyx_t_1 = __pyx_t_2;
     goto __pyx_L3_bool_binop_done;
   }
-  __pyx_t_3 = (this->r1 > 0);
-  __pyx_t_1 = __pyx_t_3;
+  __pyx_t_2 = (this->r1 > 0);
+  __pyx_t_1 = __pyx_t_2;
   __pyx_L3_bool_binop_done:;
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":126
+  /* "mettagrid/objects.pxd":134
  *         this.r1 = cfg[b"initial_resources"]
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return Usable.usable(actor) and this.r1 > 0
  * 
  */
@@ -21559,7 +21596,7 @@ char __pyx_t_9mettagrid_7objects_Generator::usable(__pyx_t_9mettagrid_7objects_A
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":129
+/* "mettagrid/objects.pxd":137
  *         return Usable.usable(actor) and this.r1 > 0
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -21572,7 +21609,7 @@ void __pyx_t_9mettagrid_7objects_Generator::obs(__Pyx_memviewslice __pyx_v_obs)
   unsigned int __pyx_t_2;
   unsigned char __pyx_t_3;
 
-  /* "mettagrid/objects.pxd":130
+  /* "mettagrid/objects.pxd":138
  * 
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1             # <<<<<<<<<<<<<<
@@ -21582,7 +21619,7 @@ void __pyx_t_9mettagrid_7objects_Generator::obs(__Pyx_memviewslice __pyx_v_obs)
   __pyx_t_1 = 0;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = 1;
 
-  /* "mettagrid/objects.pxd":131
+  /* "mettagrid/objects.pxd":139
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1
  *         obs[1] = this.hp             # <<<<<<<<<<<<<<
@@ -21593,7 +21630,7 @@ void __pyx_t_9mettagrid_7objects_Generator::obs(__Pyx_memviewslice __pyx_v_obs)
   __pyx_t_1 = 1;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_2;
 
-  /* "mettagrid/objects.pxd":132
+  /* "mettagrid/objects.pxd":140
  *         obs[0] = 1
  *         obs[1] = this.hp
  *         obs[2] = this.r1             # <<<<<<<<<<<<<<
@@ -21604,7 +21641,7 @@ void __pyx_t_9mettagrid_7objects_Generator::obs(__Pyx_memviewslice __pyx_v_obs)
   __pyx_t_1 = 2;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_2;
 
-  /* "mettagrid/objects.pxd":133
+  /* "mettagrid/objects.pxd":141
  *         obs[1] = this.hp
  *         obs[2] = this.r1
  *         obs[3] = this.ready             # <<<<<<<<<<<<<<
@@ -21615,7 +21652,7 @@ void __pyx_t_9mettagrid_7objects_Generator::obs(__Pyx_memviewslice __pyx_v_obs)
   __pyx_t_1 = 3;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = __pyx_t_3;
 
-  /* "mettagrid/objects.pxd":129
+  /* "mettagrid/objects.pxd":137
  *         return Usable.usable(actor) and this.r1 > 0
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -21626,7 +21663,7 @@ void __pyx_t_9mettagrid_7objects_Generator::obs(__Pyx_memviewslice __pyx_v_obs)
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":137
+/* "mettagrid/objects.pxd":145
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21644,33 +21681,33 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Generator::feature_names(v
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("feature_names", 1);
 
-  /* "mettagrid/objects.pxd":138
+  /* "mettagrid/objects.pxd":146
  *     @staticmethod
  *     inline vector[string] feature_names():
  *         return ["generator", "generator:hp", "generator:r1", "generator:ready"]             # <<<<<<<<<<<<<<
  * 
  * cdef cppclass Converter(Usable):
  */
-  __pyx_t_1 = PyList_New(4); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 138, __pyx_L1_error)
+  __pyx_t_1 = PyList_New(4); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 146, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_n_u_generator);
   __Pyx_GIVEREF(__pyx_n_u_generator);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_generator)) __PYX_ERR(3, 138, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_generator)) __PYX_ERR(3, 146, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_generator_hp);
   __Pyx_GIVEREF(__pyx_kp_u_generator_hp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_generator_hp)) __PYX_ERR(3, 138, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_generator_hp)) __PYX_ERR(3, 146, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_generator_r1);
   __Pyx_GIVEREF(__pyx_kp_u_generator_r1);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_generator_r1)) __PYX_ERR(3, 138, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_generator_r1)) __PYX_ERR(3, 146, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_generator_ready);
   __Pyx_GIVEREF(__pyx_kp_u_generator_ready);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 3, __pyx_kp_u_generator_ready)) __PYX_ERR(3, 138, __pyx_L1_error);
-  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 138, __pyx_L1_error)
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 3, __pyx_kp_u_generator_ready)) __PYX_ERR(3, 146, __pyx_L1_error);
+  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 146, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":137
+  /* "mettagrid/objects.pxd":145
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21688,7 +21725,7 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Generator::feature_names(v
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":145
+/* "mettagrid/objects.pxd":153
  *     short output_energy
  * 
  *     inline Converter(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21701,7 +21738,7 @@ void __pyx_t_9mettagrid_7objects_Converter::__pyx_f___init__Converter(GridCoord
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":146
+  /* "mettagrid/objects.pxd":154
  * 
  *     inline Converter(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.ConverterT, GridLocation(r, c, GridLayer.Object_Layer))             # <<<<<<<<<<<<<<
@@ -21710,25 +21747,25 @@ void __pyx_t_9mettagrid_7objects_Converter::__pyx_f___init__Converter(GridCoord
  */
   GridObject::init(__pyx_e_9mettagrid_7objects_ConverterT, GridLocation(__pyx_v_r, __pyx_v_c, __pyx_e_9mettagrid_7objects_Object_Layer));
 
-  /* "mettagrid/objects.pxd":147
+  /* "mettagrid/objects.pxd":155
  *     inline Converter(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.ConverterT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)             # <<<<<<<<<<<<<<
  *         Usable.init_usable(cfg)
  *         this.input_resource = InventoryItem.r1
  */
-  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 147, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 155, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":148
+  /* "mettagrid/objects.pxd":156
  *         GridObject.init(ObjectType.ConverterT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)
  *         Usable.init_usable(cfg)             # <<<<<<<<<<<<<<
  *         this.input_resource = InventoryItem.r1
  *         this.output_resource = InventoryItem.r2
  */
-  __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 148, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 156, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":149
+  /* "mettagrid/objects.pxd":157
  *         MettaObject.init_mo(cfg)
  *         Usable.init_usable(cfg)
  *         this.input_resource = InventoryItem.r1             # <<<<<<<<<<<<<<
@@ -21737,7 +21774,7 @@ void __pyx_t_9mettagrid_7objects_Converter::__pyx_f___init__Converter(GridCoord
  */
   this->input_resource = __pyx_e_9mettagrid_7objects_r1;
 
-  /* "mettagrid/objects.pxd":150
+  /* "mettagrid/objects.pxd":158
  *         Usable.init_usable(cfg)
  *         this.input_resource = InventoryItem.r1
  *         this.output_resource = InventoryItem.r2             # <<<<<<<<<<<<<<
@@ -21746,16 +21783,16 @@ void __pyx_t_9mettagrid_7objects_Converter::__pyx_f___init__Converter(GridCoord
  */
   this->output_resource = __pyx_e_9mettagrid_7objects_r2;
 
-  /* "mettagrid/objects.pxd":151
+  /* "mettagrid/objects.pxd":159
  *         this.input_resource = InventoryItem.r1
  *         this.output_resource = InventoryItem.r2
  *         this.output_energy = cfg[b"energy_output.r1"]             # <<<<<<<<<<<<<<
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  */
   this->output_energy = (__pyx_v_cfg[__pyx_k_energy_output_r1]);
 
-  /* "mettagrid/objects.pxd":145
+  /* "mettagrid/objects.pxd":153
  *     short output_energy
  * 
  *     inline Converter(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21770,46 +21807,45 @@ void __pyx_t_9mettagrid_7objects_Converter::__pyx_f___init__Converter(GridCoord
   __pyx_L0:;
 }
 
-/* "mettagrid/objects.pxd":153
+/* "mettagrid/objects.pxd":161
  *         this.output_energy = cfg[b"energy_output.r1"]
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return Usable.usable(actor) and actor.inventory[this.input_resource] > 0
  * 
  */
 
-char __pyx_t_9mettagrid_7objects_Converter::usable(__pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
-  char __pyx_r;
-  char __pyx_t_1;
-  char __pyx_t_2;
-  int __pyx_t_3;
+int __pyx_t_9mettagrid_7objects_Converter::usable(__pyx_t_9mettagrid_7objects_Agent const *__pyx_v_actor) {
+  int __pyx_r;
+  int __pyx_t_1;
+  int __pyx_t_2;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":154
+  /* "mettagrid/objects.pxd":162
  * 
- *     inline char usable(const Agent *actor):
+ *     inline bint usable(const Agent *actor):
  *         return Usable.usable(actor) and actor.inventory[this.input_resource] > 0             # <<<<<<<<<<<<<<
  * 
  *     inline obs(ObsType[:] obs):
  */
-  __pyx_t_2 = __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_v_actor); if (unlikely(__pyx_t_2 == ((char)-1) && PyErr_Occurred())) __PYX_ERR(3, 154, __pyx_L1_error)
+  __pyx_t_2 = __pyx_t_9mettagrid_7objects_Usable::usable(__pyx_v_actor); if (unlikely(__pyx_t_2 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(3, 162, __pyx_L1_error)
   if (__pyx_t_2) {
   } else {
     __pyx_t_1 = __pyx_t_2;
     goto __pyx_L3_bool_binop_done;
   }
-  __pyx_t_3 = ((__pyx_v_actor->inventory[this->input_resource]) > 0);
-  __pyx_t_1 = __pyx_t_3;
+  __pyx_t_2 = ((__pyx_v_actor->inventory[this->input_resource]) > 0);
+  __pyx_t_1 = __pyx_t_2;
   __pyx_L3_bool_binop_done:;
   __pyx_r = __pyx_t_1;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":153
+  /* "mettagrid/objects.pxd":161
  *         this.output_energy = cfg[b"energy_output.r1"]
  * 
- *     inline char usable(const Agent *actor):             # <<<<<<<<<<<<<<
+ *     inline bint usable(const Agent *actor):             # <<<<<<<<<<<<<<
  *         return Usable.usable(actor) and actor.inventory[this.input_resource] > 0
  * 
  */
@@ -21822,7 +21858,7 @@ char __pyx_t_9mettagrid_7objects_Converter::usable(__pyx_t_9mettagrid_7objects_A
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":156
+/* "mettagrid/objects.pxd":164
  *         return Usable.usable(actor) and actor.inventory[this.input_resource] > 0
  * 
  *     inline obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -21836,7 +21872,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   Py_ssize_t __pyx_t_1;
   __Pyx_RefNannySetupContext("obs", 1);
 
-  /* "mettagrid/objects.pxd":157
+  /* "mettagrid/objects.pxd":165
  * 
  *     inline obs(ObsType[:] obs):
  *         obs[0] = 1             # <<<<<<<<<<<<<<
@@ -21846,7 +21882,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   __pyx_t_1 = 0;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = 1;
 
-  /* "mettagrid/objects.pxd":158
+  /* "mettagrid/objects.pxd":166
  *     inline obs(ObsType[:] obs):
  *         obs[0] = 1
  *         obs[1] = hp             # <<<<<<<<<<<<<<
@@ -21856,7 +21892,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   __pyx_t_1 = 1;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = hp;
 
-  /* "mettagrid/objects.pxd":159
+  /* "mettagrid/objects.pxd":167
  *         obs[0] = 1
  *         obs[1] = hp
  *         obs[2] = input_resource             # <<<<<<<<<<<<<<
@@ -21866,7 +21902,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   __pyx_t_1 = 2;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = input_resource;
 
-  /* "mettagrid/objects.pxd":160
+  /* "mettagrid/objects.pxd":168
  *         obs[1] = hp
  *         obs[2] = input_resource
  *         obs[3] = output_resource             # <<<<<<<<<<<<<<
@@ -21876,7 +21912,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   __pyx_t_1 = 3;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = output_resource;
 
-  /* "mettagrid/objects.pxd":161
+  /* "mettagrid/objects.pxd":169
  *         obs[2] = input_resource
  *         obs[3] = output_resource
  *         obs[4] = output_energy             # <<<<<<<<<<<<<<
@@ -21886,7 +21922,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   __pyx_t_1 = 4;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = output_energy;
 
-  /* "mettagrid/objects.pxd":162
+  /* "mettagrid/objects.pxd":170
  *         obs[3] = output_resource
  *         obs[4] = output_energy
  *         obs[5] = ready             # <<<<<<<<<<<<<<
@@ -21896,7 +21932,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   __pyx_t_1 = 5;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = ready;
 
-  /* "mettagrid/objects.pxd":156
+  /* "mettagrid/objects.pxd":164
  *         return Usable.usable(actor) and actor.inventory[this.input_resource] > 0
  * 
  *     inline obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -21911,7 +21947,7 @@ PyObject *__pyx_t_9mettagrid_7objects_Converter::obs(__Pyx_memviewslice __pyx_v_
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":165
+/* "mettagrid/objects.pxd":173
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21929,39 +21965,39 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Converter::feature_names(v
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("feature_names", 1);
 
-  /* "mettagrid/objects.pxd":166
+  /* "mettagrid/objects.pxd":174
  *     @staticmethod
  *     inline vector[string] feature_names():
  *         return ["converter", "converter:hp", "converter:input_resource", "converter:output_resource", "converter:output_energy", "converter:ready"]             # <<<<<<<<<<<<<<
  * 
  * cdef cppclass Altar(Usable):
  */
-  __pyx_t_1 = PyList_New(6); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 166, __pyx_L1_error)
+  __pyx_t_1 = PyList_New(6); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 174, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_n_u_converter);
   __Pyx_GIVEREF(__pyx_n_u_converter);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_converter)) __PYX_ERR(3, 166, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_converter)) __PYX_ERR(3, 174, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_converter_hp);
   __Pyx_GIVEREF(__pyx_kp_u_converter_hp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_converter_hp)) __PYX_ERR(3, 166, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_converter_hp)) __PYX_ERR(3, 174, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_converter_input_resource);
   __Pyx_GIVEREF(__pyx_kp_u_converter_input_resource);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_converter_input_resource)) __PYX_ERR(3, 166, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_converter_input_resource)) __PYX_ERR(3, 174, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_converter_output_resource);
   __Pyx_GIVEREF(__pyx_kp_u_converter_output_resource);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 3, __pyx_kp_u_converter_output_resource)) __PYX_ERR(3, 166, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 3, __pyx_kp_u_converter_output_resource)) __PYX_ERR(3, 174, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_converter_output_energy);
   __Pyx_GIVEREF(__pyx_kp_u_converter_output_energy);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 4, __pyx_kp_u_converter_output_energy)) __PYX_ERR(3, 166, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 4, __pyx_kp_u_converter_output_energy)) __PYX_ERR(3, 174, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_converter_ready);
   __Pyx_GIVEREF(__pyx_kp_u_converter_ready);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 5, __pyx_kp_u_converter_ready)) __PYX_ERR(3, 166, __pyx_L1_error);
-  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 166, __pyx_L1_error)
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 5, __pyx_kp_u_converter_ready)) __PYX_ERR(3, 174, __pyx_L1_error);
+  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 174, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":165
+  /* "mettagrid/objects.pxd":173
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -21979,7 +22015,7 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Converter::feature_names(v
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":169
+/* "mettagrid/objects.pxd":177
  * 
  * cdef cppclass Altar(Usable):
  *     inline Altar(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -21992,7 +22028,7 @@ void __pyx_t_9mettagrid_7objects_Altar::__pyx_f___init__Altar(GridCoord __pyx_v_
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "mettagrid/objects.pxd":170
+  /* "mettagrid/objects.pxd":178
  * cdef cppclass Altar(Usable):
  *     inline Altar(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.AltarT, GridLocation(r, c, GridLayer.Object_Layer))             # <<<<<<<<<<<<<<
@@ -22001,25 +22037,25 @@ void __pyx_t_9mettagrid_7objects_Altar::__pyx_f___init__Altar(GridCoord __pyx_v_
  */
   GridObject::init(__pyx_e_9mettagrid_7objects_AltarT, GridLocation(__pyx_v_r, __pyx_v_c, __pyx_e_9mettagrid_7objects_Object_Layer));
 
-  /* "mettagrid/objects.pxd":171
+  /* "mettagrid/objects.pxd":179
  *     inline Altar(GridCoord r, GridCoord c, ObjectConfig cfg):
  *         GridObject.init(ObjectType.AltarT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)             # <<<<<<<<<<<<<<
  *         Usable.init_usable(cfg)
  * 
  */
-  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 171, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_MettaObject::init_mo(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 179, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":172
+  /* "mettagrid/objects.pxd":180
  *         GridObject.init(ObjectType.AltarT, GridLocation(r, c, GridLayer.Object_Layer))
  *         MettaObject.init_mo(cfg)
  *         Usable.init_usable(cfg)             # <<<<<<<<<<<<<<
  * 
  *     inline void obs(ObsType[:] obs):
  */
-  __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 172, __pyx_L1_error)
+  __pyx_t_9mettagrid_7objects_Usable::init_usable(__pyx_v_cfg); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 180, __pyx_L1_error)
 
-  /* "mettagrid/objects.pxd":169
+  /* "mettagrid/objects.pxd":177
  * 
  * cdef cppclass Altar(Usable):
  *     inline Altar(GridCoord r, GridCoord c, ObjectConfig cfg):             # <<<<<<<<<<<<<<
@@ -22034,7 +22070,7 @@ void __pyx_t_9mettagrid_7objects_Altar::__pyx_f___init__Altar(GridCoord __pyx_v_
   __pyx_L0:;
 }
 
-/* "mettagrid/objects.pxd":174
+/* "mettagrid/objects.pxd":182
  *         Usable.init_usable(cfg)
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -22045,7 +22081,7 @@ void __pyx_t_9mettagrid_7objects_Altar::__pyx_f___init__Altar(GridCoord __pyx_v_
 void __pyx_t_9mettagrid_7objects_Altar::obs(__Pyx_memviewslice __pyx_v_obs) {
   Py_ssize_t __pyx_t_1;
 
-  /* "mettagrid/objects.pxd":175
+  /* "mettagrid/objects.pxd":183
  * 
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1             # <<<<<<<<<<<<<<
@@ -22055,7 +22091,7 @@ void __pyx_t_9mettagrid_7objects_Altar::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 0;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = 1;
 
-  /* "mettagrid/objects.pxd":176
+  /* "mettagrid/objects.pxd":184
  *     inline void obs(ObsType[:] obs):
  *         obs[0] = 1
  *         obs[1] = hp             # <<<<<<<<<<<<<<
@@ -22065,7 +22101,7 @@ void __pyx_t_9mettagrid_7objects_Altar::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 1;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = hp;
 
-  /* "mettagrid/objects.pxd":177
+  /* "mettagrid/objects.pxd":185
  *         obs[0] = 1
  *         obs[1] = hp
  *         obs[2] = ready             # <<<<<<<<<<<<<<
@@ -22075,7 +22111,7 @@ void __pyx_t_9mettagrid_7objects_Altar::obs(__Pyx_memviewslice __pyx_v_obs) {
   __pyx_t_1 = 2;
   *((__pyx_t_10puffergrid_19observation_encoder_ObsType *) ( /* dim=0 */ (__pyx_v_obs.data + __pyx_t_1 * __pyx_v_obs.strides[0]) )) = ready;
 
-  /* "mettagrid/objects.pxd":174
+  /* "mettagrid/objects.pxd":182
  *         Usable.init_usable(cfg)
  * 
  *     inline void obs(ObsType[:] obs):             # <<<<<<<<<<<<<<
@@ -22086,7 +22122,7 @@ void __pyx_t_9mettagrid_7objects_Altar::obs(__Pyx_memviewslice __pyx_v_obs) {
   /* function exit code */
 }
 
-/* "mettagrid/objects.pxd":180
+/* "mettagrid/objects.pxd":188
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -22104,30 +22140,30 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Altar::feature_names(void)
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("feature_names", 1);
 
-  /* "mettagrid/objects.pxd":181
+  /* "mettagrid/objects.pxd":189
  *     @staticmethod
  *     inline vector[string] feature_names():
  *         return ["altar", "altar:hp", "altar:ready"]             # <<<<<<<<<<<<<<
  * 
  * cdef map[TypeId, GridLayer] ObjectLayers
  */
-  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 181, __pyx_L1_error)
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 189, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_n_u_altar);
   __Pyx_GIVEREF(__pyx_n_u_altar);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_altar)) __PYX_ERR(3, 181, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_u_altar)) __PYX_ERR(3, 189, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_altar_hp);
   __Pyx_GIVEREF(__pyx_kp_u_altar_hp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_altar_hp)) __PYX_ERR(3, 181, __pyx_L1_error);
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 1, __pyx_kp_u_altar_hp)) __PYX_ERR(3, 189, __pyx_L1_error);
   __Pyx_INCREF(__pyx_kp_u_altar_ready);
   __Pyx_GIVEREF(__pyx_kp_u_altar_ready);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_altar_ready)) __PYX_ERR(3, 181, __pyx_L1_error);
-  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 181, __pyx_L1_error)
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_1, 2, __pyx_kp_u_altar_ready)) __PYX_ERR(3, 189, __pyx_L1_error);
+  __pyx_t_2 = __pyx_convert_vector_from_py_std_3a__3a_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 189, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   goto __pyx_L0;
 
-  /* "mettagrid/objects.pxd":180
+  /* "mettagrid/objects.pxd":188
  * 
  *     @staticmethod
  *     inline vector[string] feature_names():             # <<<<<<<<<<<<<<
@@ -22145,72 +22181,101 @@ std::vector<std::string>  __pyx_t_9mettagrid_7objects_Altar::feature_names(void)
   return __pyx_r;
 }
 
-/* "mettagrid/objects.pxd":186
+/* "mettagrid/objects.pxd":194
  * 
  * cdef class ResetHandler(EventHandler):
  *     cdef inline void handle_event(self, GridObjectId obj_id, EventArg arg):             # <<<<<<<<<<<<<<
  *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)
- *         usable.ready = True
+ *         if usable is NULL:
  */
 
 static void __pyx_f_9mettagrid_7objects_12ResetHandler_handle_event(struct __pyx_obj_9mettagrid_7objects_ResetHandler *__pyx_v_self, GridObjectId __pyx_v_obj_id, CYTHON_UNUSED EventArg __pyx_v_arg) {
   __pyx_t_9mettagrid_7objects_Usable *__pyx_v_usable;
   __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
+  int __pyx_t_1;
   PyObject *__pyx_t_2 = NULL;
-  char const *__pyx_t_3;
+  PyObject *__pyx_t_3 = NULL;
+  char const *__pyx_t_4;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("handle_event", 1);
 
-  /* "mettagrid/objects.pxd":187
+  /* "mettagrid/objects.pxd":195
  * cdef class ResetHandler(EventHandler):
  *     cdef inline void handle_event(self, GridObjectId obj_id, EventArg arg):
  *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)             # <<<<<<<<<<<<<<
- *         usable.ready = True
- *         self.env._stats.game_incr("resets." + ObjectTypeNames[usable._type_id])
+ *         if usable is NULL:
+ *             return
  */
   __pyx_v_usable = ((__pyx_t_9mettagrid_7objects_Usable *)__pyx_v_self->__pyx_base.env->_grid->object(__pyx_v_obj_id));
 
-  /* "mettagrid/objects.pxd":188
+  /* "mettagrid/objects.pxd":196
+ *     cdef inline void handle_event(self, GridObjectId obj_id, EventArg arg):
+ *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)
+ *         if usable is NULL:             # <<<<<<<<<<<<<<
+ *             return
+ * 
+ */
+  __pyx_t_1 = (__pyx_v_usable == NULL);
+  if (__pyx_t_1) {
+
+    /* "mettagrid/objects.pxd":197
+ *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)
+ *         if usable is NULL:
+ *             return             # <<<<<<<<<<<<<<
+ * 
+ *         usable.ready = True
+ */
+    goto __pyx_L0;
+
+    /* "mettagrid/objects.pxd":196
  *     cdef inline void handle_event(self, GridObjectId obj_id, EventArg arg):
  *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)
+ *         if usable is NULL:             # <<<<<<<<<<<<<<
+ *             return
+ * 
+ */
+  }
+
+  /* "mettagrid/objects.pxd":199
+ *             return
+ * 
  *         usable.ready = True             # <<<<<<<<<<<<<<
  *         self.env._stats.game_incr("resets." + ObjectTypeNames[usable._type_id])
  * 
  */
   __pyx_v_usable->ready = 1;
 
-  /* "mettagrid/objects.pxd":189
- *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)
+  /* "mettagrid/objects.pxd":200
+ * 
  *         usable.ready = True
  *         self.env._stats.game_incr("resets." + ObjectTypeNames[usable._type_id])             # <<<<<<<<<<<<<<
  * 
  * cdef enum Events:
  */
-  __pyx_t_1 = __pyx_convert_PyStr_string_to_py_6libcpp_6string_std__in_string((__pyx_v_9mettagrid_7objects_ObjectTypeNames[__pyx_v_usable->_type_id])); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 189, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyUnicode_Concat(__pyx_kp_u_resets, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 189, __pyx_L1_error)
+  __pyx_t_2 = __pyx_convert_PyStr_string_to_py_6libcpp_6string_std__in_string((__pyx_v_9mettagrid_7objects_ObjectTypeNames[__pyx_v_usable->_type_id])); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 200, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_3 = __Pyx_PyObject_AsString(__pyx_t_2); if (unlikely((!__pyx_t_3) && PyErr_Occurred())) __PYX_ERR(3, 189, __pyx_L1_error)
-  ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->game_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_t_3); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 189, __pyx_L1_error)
+  __pyx_t_3 = __Pyx_PyUnicode_Concat(__pyx_kp_u_resets, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(3, 200, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyObject_AsString(__pyx_t_3); if (unlikely((!__pyx_t_4) && PyErr_Occurred())) __PYX_ERR(3, 200, __pyx_L1_error)
+  ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->game_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_t_4); if (unlikely(PyErr_Occurred())) __PYX_ERR(3, 200, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "mettagrid/objects.pxd":186
+  /* "mettagrid/objects.pxd":194
  * 
  * cdef class ResetHandler(EventHandler):
  *     cdef inline void handle_event(self, GridObjectId obj_id, EventArg arg):             # <<<<<<<<<<<<<<
  *         cdef Usable *usable = <Usable*>self.env._grid.object(obj_id)
- *         usable.ready = True
+ *         if usable is NULL:
  */
 
   /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("mettagrid.objects.ResetHandler.handle_event", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
@@ -22219,7 +22284,7 @@ static void __pyx_f_9mettagrid_7objects_12ResetHandler_handle_event(struct __pyx
 /* "mettagrid/actions/actions.pyx":14
  * 
  * cdef class MettaActionHandler(ActionHandler):
- *     def __init__(self, cfg: OmegaConf, action_name, action_cost=0):             # <<<<<<<<<<<<<<
+ *     def __init__(self, cfg: OmegaConf, action_name):             # <<<<<<<<<<<<<<
  *         self.action_name = action_name
  * 
  */
@@ -22229,10 +22294,9 @@ static int __pyx_pw_9mettagrid_7actions_7actions_18MettaActionHandler_1__init__(
 static int __pyx_pw_9mettagrid_7actions_7actions_18MettaActionHandler_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
   PyObject *__pyx_v_cfg = 0;
   PyObject *__pyx_v_action_name = 0;
-  CYTHON_UNUSED PyObject *__pyx_v_action_cost = 0;
   CYTHON_UNUSED Py_ssize_t __pyx_nargs;
   CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[3] = {0,0,0};
+  PyObject* values[2] = {0,0};
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -22246,13 +22310,10 @@ static int __pyx_pw_9mettagrid_7actions_7actions_18MettaActionHandler_1__init__(
   #endif
   __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
   {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_cfg,&__pyx_n_s_action_name,&__pyx_n_s_action_cost,0};
-    values[2] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)__pyx_int_0));
+    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_cfg,&__pyx_n_s_action_name,0};
     if (__pyx_kwds) {
       Py_ssize_t kw_args;
       switch (__pyx_nargs) {
-        case  3: values[2] = __Pyx_Arg_VARARGS(__pyx_args, 2);
-        CYTHON_FALLTHROUGH;
         case  2: values[1] = __Pyx_Arg_VARARGS(__pyx_args, 1);
         CYTHON_FALLTHROUGH;
         case  1: values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
@@ -22277,37 +22338,25 @@ static int __pyx_pw_9mettagrid_7actions_7actions_18MettaActionHandler_1__init__(
         }
         else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 14, __pyx_L3_error)
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 0, 2, 3, 1); __PYX_ERR(0, 14, __pyx_L3_error)
-        }
-        CYTHON_FALLTHROUGH;
-        case  2:
-        if (kw_args > 0) {
-          PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_action_cost);
-          if (value) { values[2] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 14, __pyx_L3_error)
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 2, 2, 1); __PYX_ERR(0, 14, __pyx_L3_error)
         }
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
         if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 14, __pyx_L3_error)
       }
+    } else if (unlikely(__pyx_nargs != 2)) {
+      goto __pyx_L5_argtuple_error;
     } else {
-      switch (__pyx_nargs) {
-        case  3: values[2] = __Pyx_Arg_VARARGS(__pyx_args, 2);
-        CYTHON_FALLTHROUGH;
-        case  2: values[1] = __Pyx_Arg_VARARGS(__pyx_args, 1);
-        values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
-        break;
-        default: goto __pyx_L5_argtuple_error;
-      }
+      values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
+      values[1] = __Pyx_Arg_VARARGS(__pyx_args, 1);
     }
     __pyx_v_cfg = values[0];
     __pyx_v_action_name = values[1];
-    __pyx_v_action_cost = values[2];
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 14, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 14, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -22321,7 +22370,7 @@ static int __pyx_pw_9mettagrid_7actions_7actions_18MettaActionHandler_1__init__(
   __Pyx_RefNannyFinishContext();
   return -1;
   __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(((struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *)__pyx_v_self), __pyx_v_cfg, __pyx_v_action_name, __pyx_v_action_cost);
+  __pyx_r = __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(((struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *)__pyx_v_self), __pyx_v_cfg, __pyx_v_action_name);
 
   /* function exit code */
   {
@@ -22334,7 +22383,7 @@ static int __pyx_pw_9mettagrid_7actions_7actions_18MettaActionHandler_1__init__(
   return __pyx_r;
 }
 
-static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, PyObject *__pyx_v_cfg, PyObject *__pyx_v_action_name, CYTHON_UNUSED PyObject *__pyx_v_action_cost) {
+static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, PyObject *__pyx_v_cfg, PyObject *__pyx_v_action_name) {
   PyObject *__pyx_v_t = NULL;
   PyObject *__pyx_v_n = NULL;
   int __pyx_r;
@@ -22355,7 +22404,7 @@ static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(s
 
   /* "mettagrid/actions/actions.pyx":15
  * cdef class MettaActionHandler(ActionHandler):
- *     def __init__(self, cfg: OmegaConf, action_name, action_cost=0):
+ *     def __init__(self, cfg: OmegaConf, action_name):
  *         self.action_name = action_name             # <<<<<<<<<<<<<<
  * 
  *         self._stats.action = "action." + action_name
@@ -22522,7 +22571,7 @@ static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(s
  * 
  *         self.action_cost = cfg.cost             # <<<<<<<<<<<<<<
  * 
- *     cdef char handle_action(
+ *     cdef bint handle_action(
  */
   __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_cfg, __pyx_n_s_cost); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 24, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -22533,7 +22582,7 @@ static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(s
   /* "mettagrid/actions/actions.pyx":14
  * 
  * cdef class MettaActionHandler(ActionHandler):
- *     def __init__(self, cfg: OmegaConf, action_name, action_cost=0):             # <<<<<<<<<<<<<<
+ *     def __init__(self, cfg: OmegaConf, action_name):             # <<<<<<<<<<<<<<
  *         self.action_name = action_name
  * 
  */
@@ -22558,17 +22607,16 @@ static int __pyx_pf_9mettagrid_7actions_7actions_18MettaActionHandler___init__(s
 /* "mettagrid/actions/actions.pyx":26
  *         self.action_cost = cfg.cost
  * 
- *     cdef char handle_action(             # <<<<<<<<<<<<<<
+ *     cdef bint handle_action(             # <<<<<<<<<<<<<<
  *         self,
  *         unsigned int actor_id,
  */
 
-static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_action(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, unsigned int __pyx_v_actor_id, GridObjectId __pyx_v_actor_object_id, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg) {
+static int __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_action(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, unsigned int __pyx_v_actor_id, GridObjectId __pyx_v_actor_object_id, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg) {
   __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor;
-  char __pyx_v_result;
-  char __pyx_r;
+  int __pyx_v_result;
+  int __pyx_r;
   int __pyx_t_1;
-  char __pyx_t_2;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -22578,40 +22626,141 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
  * 
  *         cdef Agent *actor = <Agent*>self.env._grid.object(actor_object_id)             # <<<<<<<<<<<<<<
  * 
- *         if actor.frozen:
+ *         if actor.shield:
  */
   __pyx_v_actor = ((__pyx_t_9mettagrid_7objects_Agent *)__pyx_v_self->__pyx_base.env->_grid->object(__pyx_v_actor_object_id));
 
   /* "mettagrid/actions/actions.pyx":34
  *         cdef Agent *actor = <Agent*>self.env._grid.object(actor_object_id)
  * 
- *         if actor.frozen:             # <<<<<<<<<<<<<<
- *             return False
- * 
+ *         if actor.shield:             # <<<<<<<<<<<<<<
+ *             actor.energy -= actor.shield_upkeep
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)
  */
-  __pyx_t_1 = (__pyx_v_actor->frozen != 0);
+  __pyx_t_1 = (__pyx_v_actor->shield != 0);
   if (__pyx_t_1) {
 
     /* "mettagrid/actions/actions.pyx":35
  * 
- *         if actor.frozen:
- *             return False             # <<<<<<<<<<<<<<
+ *         if actor.shield:
+ *             actor.energy -= actor.shield_upkeep             # <<<<<<<<<<<<<<
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)
+ *             self.env._stats.agent_incr(actor_id, "status.shield.ticks")
+ */
+    __pyx_v_actor->energy = (__pyx_v_actor->energy - __pyx_v_actor->shield_upkeep);
+
+    /* "mettagrid/actions/actions.pyx":36
+ *         if actor.shield:
+ *             actor.energy -= actor.shield_upkeep
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)             # <<<<<<<<<<<<<<
+ *             self.env._stats.agent_incr(actor_id, "status.shield.ticks")
+ *             if actor.energy <= 0:
+ */
+    ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_add(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, ((char const *)"shield_upkeep"), __pyx_v_actor->shield_upkeep); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 36, __pyx_L1_error)
+
+    /* "mettagrid/actions/actions.pyx":37
+ *             actor.energy -= actor.shield_upkeep
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)
+ *             self.env._stats.agent_incr(actor_id, "status.shield.ticks")             # <<<<<<<<<<<<<<
+ *             if actor.energy <= 0:
+ *                 actor.shield = False
+ */
+    ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, ((char const *)"status.shield.ticks")); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 37, __pyx_L1_error)
+
+    /* "mettagrid/actions/actions.pyx":38
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)
+ *             self.env._stats.agent_incr(actor_id, "status.shield.ticks")
+ *             if actor.energy <= 0:             # <<<<<<<<<<<<<<
+ *                 actor.shield = False
+ *                 actor.energy = 0
+ */
+    __pyx_t_1 = (__pyx_v_actor->energy <= 0);
+    if (__pyx_t_1) {
+
+      /* "mettagrid/actions/actions.pyx":39
+ *             self.env._stats.agent_incr(actor_id, "status.shield.ticks")
+ *             if actor.energy <= 0:
+ *                 actor.shield = False             # <<<<<<<<<<<<<<
+ *                 actor.energy = 0
  * 
- *         if actor.energy < self.action_cost:
  */
-    __pyx_r = 0;
-    goto __pyx_L0;
+      __pyx_v_actor->shield = 0;
+
+      /* "mettagrid/actions/actions.pyx":40
+ *             if actor.energy <= 0:
+ *                 actor.shield = False
+ *                 actor.energy = 0             # <<<<<<<<<<<<<<
+ * 
+ *         if actor.frozen > 0:
+ */
+      __pyx_v_actor->energy = 0;
+
+      /* "mettagrid/actions/actions.pyx":38
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)
+ *             self.env._stats.agent_incr(actor_id, "status.shield.ticks")
+ *             if actor.energy <= 0:             # <<<<<<<<<<<<<<
+ *                 actor.shield = False
+ *                 actor.energy = 0
+ */
+    }
 
     /* "mettagrid/actions/actions.pyx":34
  *         cdef Agent *actor = <Agent*>self.env._grid.object(actor_object_id)
  * 
- *         if actor.frozen:             # <<<<<<<<<<<<<<
+ *         if actor.shield:             # <<<<<<<<<<<<<<
+ *             actor.energy -= actor.shield_upkeep
+ *             self.env._stats.agent_add(actor_id, "shield_upkeep", actor.shield_upkeep)
+ */
+  }
+
+  /* "mettagrid/actions/actions.pyx":42
+ *                 actor.energy = 0
+ * 
+ *         if actor.frozen > 0:             # <<<<<<<<<<<<<<
+ *             self.env._stats.agent_incr(actor_id, "status.frozen.ticks")
+ *             actor.frozen -= 1
+ */
+  __pyx_t_1 = (__pyx_v_actor->frozen > 0);
+  if (__pyx_t_1) {
+
+    /* "mettagrid/actions/actions.pyx":43
+ * 
+ *         if actor.frozen > 0:
+ *             self.env._stats.agent_incr(actor_id, "status.frozen.ticks")             # <<<<<<<<<<<<<<
+ *             actor.frozen -= 1
+ *             return False
+ */
+    ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, ((char const *)"status.frozen.ticks")); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 43, __pyx_L1_error)
+
+    /* "mettagrid/actions/actions.pyx":44
+ *         if actor.frozen > 0:
+ *             self.env._stats.agent_incr(actor_id, "status.frozen.ticks")
+ *             actor.frozen -= 1             # <<<<<<<<<<<<<<
  *             return False
  * 
+ */
+    __pyx_v_actor->frozen = (__pyx_v_actor->frozen - 1);
+
+    /* "mettagrid/actions/actions.pyx":45
+ *             self.env._stats.agent_incr(actor_id, "status.frozen.ticks")
+ *             actor.frozen -= 1
+ *             return False             # <<<<<<<<<<<<<<
+ * 
+ *         if actor.energy < self.action_cost:
+ */
+    __pyx_r = 0;
+    goto __pyx_L0;
+
+    /* "mettagrid/actions/actions.pyx":42
+ *                 actor.energy = 0
+ * 
+ *         if actor.frozen > 0:             # <<<<<<<<<<<<<<
+ *             self.env._stats.agent_incr(actor_id, "status.frozen.ticks")
+ *             actor.frozen -= 1
  */
   }
 
-  /* "mettagrid/actions/actions.pyx":37
+  /* "mettagrid/actions/actions.pyx":47
  *             return False
  * 
  *         if actor.energy < self.action_cost:             # <<<<<<<<<<<<<<
@@ -22621,7 +22770,7 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
   __pyx_t_1 = (__pyx_v_actor->energy < __pyx_v_self->action_cost);
   if (__pyx_t_1) {
 
-    /* "mettagrid/actions/actions.pyx":38
+    /* "mettagrid/actions/actions.pyx":48
  * 
  *         if actor.energy < self.action_cost:
  *             return False             # <<<<<<<<<<<<<<
@@ -22631,7 +22780,7 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "mettagrid/actions/actions.pyx":37
+    /* "mettagrid/actions/actions.pyx":47
  *             return False
  * 
  *         if actor.energy < self.action_cost:             # <<<<<<<<<<<<<<
@@ -22640,7 +22789,7 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
  */
   }
 
-  /* "mettagrid/actions/actions.pyx":40
+  /* "mettagrid/actions/actions.pyx":50
  *             return False
  * 
  *         actor.energy -= self.action_cost             # <<<<<<<<<<<<<<
@@ -22649,46 +22798,45 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
  */
   __pyx_v_actor->energy = (__pyx_v_actor->energy - __pyx_v_self->action_cost);
 
-  /* "mettagrid/actions/actions.pyx":41
+  /* "mettagrid/actions/actions.pyx":51
  * 
  *         actor.energy -= self.action_cost
  *         self.env._stats.agent_add(actor_id, self._stats.action_energy.c_str(), self.action_cost)             # <<<<<<<<<<<<<<
  * 
- *         cdef char result = self._handle_action(actor_id, actor, arg)
+ *         cdef bint result = self._handle_action(actor_id, actor, arg)
  */
-  ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_add(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, __pyx_v_self->_stats.action_energy.c_str(), __pyx_v_self->action_cost); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L1_error)
+  ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_add(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, __pyx_v_self->_stats.action_energy.c_str(), __pyx_v_self->action_cost); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 51, __pyx_L1_error)
 
-  /* "mettagrid/actions/actions.pyx":43
+  /* "mettagrid/actions/actions.pyx":53
  *         self.env._stats.agent_add(actor_id, self._stats.action_energy.c_str(), self.action_cost)
  * 
- *         cdef char result = self._handle_action(actor_id, actor, arg)             # <<<<<<<<<<<<<<
+ *         cdef bint result = self._handle_action(actor_id, actor, arg)             # <<<<<<<<<<<<<<
  * 
  *         if result:
  */
-  __pyx_t_2 = ((struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler *)__pyx_v_self->__pyx_base.__pyx_vtab)->_handle_action(__pyx_v_self, __pyx_v_actor_id, __pyx_v_actor, __pyx_v_arg); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 43, __pyx_L1_error)
-  __pyx_v_result = __pyx_t_2;
+  __pyx_t_1 = ((struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler *)__pyx_v_self->__pyx_base.__pyx_vtab)->_handle_action(__pyx_v_self, __pyx_v_actor_id, __pyx_v_actor, __pyx_v_arg); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 53, __pyx_L1_error)
+  __pyx_v_result = __pyx_t_1;
 
-  /* "mettagrid/actions/actions.pyx":45
- *         cdef char result = self._handle_action(actor_id, actor, arg)
+  /* "mettagrid/actions/actions.pyx":55
+ *         cdef bint result = self._handle_action(actor_id, actor, arg)
  * 
  *         if result:             # <<<<<<<<<<<<<<
  *             self.env._stats.agent_incr(actor_id, self._stats.action.c_str())
  * 
  */
-  __pyx_t_1 = (__pyx_v_result != 0);
-  if (__pyx_t_1) {
+  if (__pyx_v_result) {
 
-    /* "mettagrid/actions/actions.pyx":46
+    /* "mettagrid/actions/actions.pyx":56
  * 
  *         if result:
  *             self.env._stats.agent_incr(actor_id, self._stats.action.c_str())             # <<<<<<<<<<<<<<
  * 
- *         return result
+ *         if actor.energy < 0:
  */
-    ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, __pyx_v_self->_stats.action.c_str()); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 46, __pyx_L1_error)
+    ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, __pyx_v_self->_stats.action.c_str()); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 56, __pyx_L1_error)
 
-    /* "mettagrid/actions/actions.pyx":45
- *         cdef char result = self._handle_action(actor_id, actor, arg)
+    /* "mettagrid/actions/actions.pyx":55
+ *         cdef bint result = self._handle_action(actor_id, actor, arg)
  * 
  *         if result:             # <<<<<<<<<<<<<<
  *             self.env._stats.agent_incr(actor_id, self._stats.action.c_str())
@@ -22696,12 +22844,49 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
  */
   }
 
-  /* "mettagrid/actions/actions.pyx":48
+  /* "mettagrid/actions/actions.pyx":58
  *             self.env._stats.agent_incr(actor_id, self._stats.action.c_str())
  * 
+ *         if actor.energy < 0:             # <<<<<<<<<<<<<<
+ *             actor.energy = 0
+ *             self.env._stats.agent_incr(actor_id, "error.negative_energy")
+ */
+  __pyx_t_1 = (__pyx_v_actor->energy < 0);
+  if (__pyx_t_1) {
+
+    /* "mettagrid/actions/actions.pyx":59
+ * 
+ *         if actor.energy < 0:
+ *             actor.energy = 0             # <<<<<<<<<<<<<<
+ *             self.env._stats.agent_incr(actor_id, "error.negative_energy")
+ * 
+ */
+    __pyx_v_actor->energy = 0;
+
+    /* "mettagrid/actions/actions.pyx":60
+ *         if actor.energy < 0:
+ *             actor.energy = 0
+ *             self.env._stats.agent_incr(actor_id, "error.negative_energy")             # <<<<<<<<<<<<<<
+ * 
+ *         return result
+ */
+    ((struct __pyx_vtabstruct_10puffergrid_13stats_tracker_StatsTracker *)__pyx_v_self->__pyx_base.env->_stats->__pyx_vtab)->agent_incr(__pyx_v_self->__pyx_base.env->_stats, __pyx_v_actor_id, ((char const *)"error.negative_energy")); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 60, __pyx_L1_error)
+
+    /* "mettagrid/actions/actions.pyx":58
+ *             self.env._stats.agent_incr(actor_id, self._stats.action.c_str())
+ * 
+ *         if actor.energy < 0:             # <<<<<<<<<<<<<<
+ *             actor.energy = 0
+ *             self.env._stats.agent_incr(actor_id, "error.negative_energy")
+ */
+  }
+
+  /* "mettagrid/actions/actions.pyx":62
+ *             self.env._stats.agent_incr(actor_id, "error.negative_energy")
+ * 
  *         return result             # <<<<<<<<<<<<<<
  * 
- *     cdef char _handle_action(
+ *     cdef bint _handle_action(
  */
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
@@ -22709,7 +22894,7 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
   /* "mettagrid/actions/actions.pyx":26
  *         self.action_cost = cfg.cost
  * 
- *     cdef char handle_action(             # <<<<<<<<<<<<<<
+ *     cdef bint handle_action(             # <<<<<<<<<<<<<<
  *         self,
  *         unsigned int actor_id,
  */
@@ -22722,18 +22907,18 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_act
   return __pyx_r;
 }
 
-/* "mettagrid/actions/actions.pyx":50
+/* "mettagrid/actions/actions.pyx":64
  *         return result
  * 
- *     cdef char _handle_action(             # <<<<<<<<<<<<<<
+ *     cdef bint _handle_action(             # <<<<<<<<<<<<<<
  *         self,
  *         unsigned int actor_id,
  */
 
-static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_action(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, CYTHON_UNUSED __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, CYTHON_UNUSED __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg) {
-  char __pyx_r;
+static int __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_action(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, CYTHON_UNUSED __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, CYTHON_UNUSED __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg) {
+  int __pyx_r;
 
-  /* "mettagrid/actions/actions.pyx":55
+  /* "mettagrid/actions/actions.pyx":69
  *         Agent * actor,
  *         ActionArg arg):
  *         return False             # <<<<<<<<<<<<<<
@@ -22743,10 +22928,10 @@ static char __pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_ac
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "mettagrid/actions/actions.pyx":50
+  /* "mettagrid/actions/actions.pyx":64
  *         return result
  * 
- *     cdef char _handle_action(             # <<<<<<<<<<<<<<
+ *     cdef bint _handle_action(             # <<<<<<<<<<<<<<
  *         self,
  *         unsigned int actor_id,
  */
@@ -24142,7 +24327,6 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_kp_u__7, __pyx_k__7, sizeof(__pyx_k__7), 0, 1, 0, 0},
     {&__pyx_n_s_abc, __pyx_k_abc, sizeof(__pyx_k_abc), 0, 0, 1, 1},
     {&__pyx_kp_u_action, __pyx_k_action, sizeof(__pyx_k_action), 0, 1, 0, 0},
-    {&__pyx_n_s_action_cost, __pyx_k_action_cost, sizeof(__pyx_k_action_cost), 0, 0, 1, 1},
     {&__pyx_n_s_action_name, __pyx_k_action_name, sizeof(__pyx_k_action_name), 0, 0, 1, 1},
     {&__pyx_n_u_agent, __pyx_k_agent, sizeof(__pyx_k_agent), 0, 1, 0, 1},
     {&__pyx_kp_u_agent_energy, __pyx_k_agent_energy, sizeof(__pyx_k_agent_energy), 0, 1, 0, 0},
@@ -24318,7 +24502,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__8);
   __Pyx_GIVEREF(__pyx_tuple__8);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy.core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -24329,7 +24513,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__9);
   __Pyx_GIVEREF(__pyx_tuple__9);
 
-  /* "../../miniforge3/envs/metta-new/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
+  /* "../../../../miniforge3/envs/metta/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -24543,8 +24727,8 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtabptr_10puffergrid_6action_ActionHandler = (struct __pyx_vtabstruct_10puffergrid_6action_ActionHandler*)__Pyx_GetVtable(__pyx_ptype_10puffergrid_6action_ActionHandler); if (unlikely(!__pyx_vtabptr_10puffergrid_6action_ActionHandler)) __PYX_ERR(0, 2, __pyx_L1_error)
   __pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler = &__pyx_vtable_9mettagrid_7actions_7actions_MettaActionHandler;
   __pyx_vtable_9mettagrid_7actions_7actions_MettaActionHandler.__pyx_base = *__pyx_vtabptr_10puffergrid_6action_ActionHandler;
-  __pyx_vtable_9mettagrid_7actions_7actions_MettaActionHandler.__pyx_base.handle_action = (char (*)(struct __pyx_obj_10puffergrid_6action_ActionHandler *, unsigned int, GridObjectId, __pyx_t_10puffergrid_6action_ActionArg))__pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_action;
-  __pyx_vtable_9mettagrid_7actions_7actions_MettaActionHandler._handle_action = (char (*)(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *, unsigned int, __pyx_t_9mettagrid_7objects_Agent *, __pyx_t_10puffergrid_6action_ActionArg))__pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_action;
+  __pyx_vtable_9mettagrid_7actions_7actions_MettaActionHandler.__pyx_base.handle_action = (int (*)(struct __pyx_obj_10puffergrid_6action_ActionHandler *, unsigned int, GridObjectId, __pyx_t_10puffergrid_6action_ActionArg))__pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler_handle_action;
+  __pyx_vtable_9mettagrid_7actions_7actions_MettaActionHandler._handle_action = (int (*)(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *, unsigned int, __pyx_t_9mettagrid_7objects_Agent *, __pyx_t_10puffergrid_6action_ActionArg))__pyx_f_9mettagrid_7actions_7actions_18MettaActionHandler__handle_action;
   #if CYTHON_USE_TYPE_SPECS
   __pyx_t_2 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_10puffergrid_6action_ActionHandler); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 13, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -24787,12 +24971,12 @@ static int __Pyx_modinit_type_import_code(void) {
   __pyx_ptype_10puffergrid_8grid_env_GridEnv = __Pyx_ImportType_3_0_11(__pyx_t_1, "puffergrid.grid_env", "GridEnv", sizeof(struct __pyx_obj_10puffergrid_8grid_env_GridEnv), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_10puffergrid_8grid_env_GridEnv),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_10puffergrid_8grid_env_GridEnv) __PYX_ERR(8, 18, __pyx_L1_error)
   __pyx_vtabptr_10puffergrid_8grid_env_GridEnv = (struct __pyx_vtabstruct_10puffergrid_8grid_env_GridEnv*)__Pyx_GetVtable(__pyx_ptype_10puffergrid_8grid_env_GridEnv); if (unlikely(!__pyx_vtabptr_10puffergrid_8grid_env_GridEnv)) __PYX_ERR(8, 18, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyImport_ImportModule("mettagrid.objects"); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 185, __pyx_L1_error)
+  __pyx_t_1 = PyImport_ImportModule("mettagrid.objects"); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 193, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_ptype_9mettagrid_7objects_ResetHandler = __Pyx_ImportType_3_0_11(__pyx_t_1, "mettagrid.objects", "ResetHandler", sizeof(struct __pyx_obj_9mettagrid_7objects_ResetHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_9mettagrid_7objects_ResetHandler),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_9mettagrid_7objects_ResetHandler) __PYX_ERR(3, 185, __pyx_L1_error)
-  __pyx_vtabptr_9mettagrid_7objects_ResetHandler = (struct __pyx_vtabstruct_9mettagrid_7objects_ResetHandler*)__Pyx_GetVtable(__pyx_ptype_9mettagrid_7objects_ResetHandler); if (unlikely(!__pyx_vtabptr_9mettagrid_7objects_ResetHandler)) __PYX_ERR(3, 185, __pyx_L1_error)
-  __pyx_ptype_9mettagrid_7objects_MettaObservationEncoder = __Pyx_ImportType_3_0_11(__pyx_t_1, "mettagrid.objects", "MettaObservationEncoder", sizeof(struct __pyx_obj_9mettagrid_7objects_MettaObservationEncoder), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_9mettagrid_7objects_MettaObservationEncoder),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_9mettagrid_7objects_MettaObservationEncoder) __PYX_ERR(3, 194, __pyx_L1_error)
-  __pyx_vtabptr_9mettagrid_7objects_MettaObservationEncoder = (struct __pyx_vtabstruct_9mettagrid_7objects_MettaObservationEncoder*)__Pyx_GetVtable(__pyx_ptype_9mettagrid_7objects_MettaObservationEncoder); if (unlikely(!__pyx_vtabptr_9mettagrid_7objects_MettaObservationEncoder)) __PYX_ERR(3, 194, __pyx_L1_error)
+  __pyx_ptype_9mettagrid_7objects_ResetHandler = __Pyx_ImportType_3_0_11(__pyx_t_1, "mettagrid.objects", "ResetHandler", sizeof(struct __pyx_obj_9mettagrid_7objects_ResetHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_9mettagrid_7objects_ResetHandler),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_9mettagrid_7objects_ResetHandler) __PYX_ERR(3, 193, __pyx_L1_error)
+  __pyx_vtabptr_9mettagrid_7objects_ResetHandler = (struct __pyx_vtabstruct_9mettagrid_7objects_ResetHandler*)__Pyx_GetVtable(__pyx_ptype_9mettagrid_7objects_ResetHandler); if (unlikely(!__pyx_vtabptr_9mettagrid_7objects_ResetHandler)) __PYX_ERR(3, 193, __pyx_L1_error)
+  __pyx_ptype_9mettagrid_7objects_MettaObservationEncoder = __Pyx_ImportType_3_0_11(__pyx_t_1, "mettagrid.objects", "MettaObservationEncoder", sizeof(struct __pyx_obj_9mettagrid_7objects_MettaObservationEncoder), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_9mettagrid_7objects_MettaObservationEncoder),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_9mettagrid_7objects_MettaObservationEncoder) __PYX_ERR(3, 205, __pyx_L1_error)
+  __pyx_vtabptr_9mettagrid_7objects_MettaObservationEncoder = (struct __pyx_vtabstruct_9mettagrid_7objects_MettaObservationEncoder*)__Pyx_GetVtable(__pyx_ptype_9mettagrid_7objects_MettaObservationEncoder); if (unlikely(!__pyx_vtabptr_9mettagrid_7objects_MettaObservationEncoder)) __PYX_ERR(3, 205, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -32063,77 +32247,6 @@ raise_neg_overflow:
     return (unsigned short) -1;
 }
 
-/* CIntToPy */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_char(char value) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const char neg_one = (char) -1, const_zero = (char) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-    if (is_unsigned) {
-        if (sizeof(char) < sizeof(long)) {
-            return PyInt_FromLong((long) value);
-        } else if (sizeof(char) <= sizeof(unsigned long)) {
-            return PyLong_FromUnsignedLong((unsigned long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(char) <= sizeof(unsigned PY_LONG_LONG)) {
-            return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);
-#endif
-        }
-    } else {
-        if (sizeof(char) <= sizeof(long)) {
-            return PyInt_FromLong((long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(char) <= sizeof(PY_LONG_LONG)) {
-            return PyLong_FromLongLong((PY_LONG_LONG) value);
-#endif
-        }
-    }
-    {
-        unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4
-        if (is_unsigned) {
-            return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1);
-        } else {
-            return PyLong_FromNativeBytes(bytes, sizeof(value), -1);
-        }
-#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000
-        int one = 1; int little = (int)*(unsigned char *)&one;
-        return _PyLong_FromByteArray(bytes, sizeof(char),
-                                     little, !is_unsigned);
-#else
-        int one = 1; int little = (int)*(unsigned char *)&one;
-        PyObject *from_bytes, *result = NULL;
-        PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes");
-        if (!from_bytes) return NULL;
-        py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(char));
-        if (!py_bytes) goto limited_bad;
-        order_str = PyUnicode_FromString(little ? "little" : "big");
-        if (!order_str) goto limited_bad;
-        arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
-        if (!arg_tuple) goto limited_bad;
-        if (!is_unsigned) {
-            kwds = PyDict_New();
-            if (!kwds) goto limited_bad;
-            if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(Py_True))) goto limited_bad;
-        }
-        result = PyObject_Call(from_bytes, arg_tuple, kwds);
-        limited_bad:
-        Py_XDECREF(kwds);
-        Py_XDECREF(arg_tuple);
-        Py_XDECREF(order_str);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(from_bytes);
-        return result;
-#endif
-    }
-}
-
 /* MemviewSliceInit */
 static int
 __Pyx_init_memviewslice(struct __pyx_memoryview_obj *memview,