PyPI - mettagrid - Versions diffs - 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (66) hide show

README.md +75 -2
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/actions.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/attack.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/gift.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/move.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/noop.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/rotate.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/shield.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/actions/use.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/mettagrid_c.cpython-311-darwin.so +0 -0
build/lib.macosx-11.0-arm64-cpython-311/mettagrid/objects.cpython-311-darwin.so +0 -0
build/mettagrid/actions/actions.cpp +706 -593
build/mettagrid/actions/attack.cpp +1589 -1185
build/mettagrid/actions/gift.cpp +550 -515
build/mettagrid/actions/move.cpp +739 -638
build/mettagrid/actions/noop.cpp +32376 -0
build/mettagrid/actions/rotate.cpp +550 -545
build/mettagrid/actions/shield.cpp +594 -531
build/mettagrid/actions/use.cpp +654 -589
build/mettagrid/mettagrid.cpp +4011 -1495
build/mettagrid/objects.cpp +1449 -824
mettagrid/actions/actions.cpython-311-darwin.so +0 -0
mettagrid/actions/actions.pxd +2 -2
mettagrid/actions/actions.pyx +19 -5
mettagrid/actions/attack.cpython-311-darwin.so +0 -0
mettagrid/actions/attack.pyx +12 -3
mettagrid/actions/gift.cpython-311-darwin.so +0 -0
mettagrid/actions/gift.pyx +4 -1
mettagrid/actions/move.cpython-311-darwin.so +0 -0
mettagrid/actions/move.pyx +16 -6
mettagrid/actions/noop.cpython-311-darwin.so +0 -0
mettagrid/actions/noop.pxd +4 -0
mettagrid/actions/noop.pyx +25 -0
mettagrid/actions/rotate.cpython-311-darwin.so +0 -0
mettagrid/actions/rotate.pyx +5 -3
mettagrid/actions/shield.cpython-311-darwin.so +0 -0
mettagrid/actions/shield.pyx +10 -3
mettagrid/actions/use.cpython-311-darwin.so +0 -0
mettagrid/actions/use.pyx +9 -4
mettagrid/mettagrid.pyx +35 -1
mettagrid/mettagrid_c.cpython-311-darwin.so +0 -0
mettagrid/mettagrid_env.py +44 -72
mettagrid/objects.cpython-311-darwin.so +0 -0
mettagrid/objects.pxd +25 -12
mettagrid/objects.pyx +19 -21
mettagrid/renderer/assets/agent.png +0 -0
mettagrid/renderer/assets/altar.png +0 -0
mettagrid/renderer/assets/arial.ttf +0 -0
mettagrid/renderer/assets/converter.png +0 -0
mettagrid/renderer/assets/generator.png +0 -0
mettagrid/renderer/json_renderer.py +0 -0
mettagrid/renderer/raylib_renderer.py +410 -0
mettagrid/renderer/render_code_example.py +56 -0
mettagrid-0.0.3.dist-info/METADATA +96 -0
mettagrid-0.0.3.dist-info/RECORD +81 -0
setup.py +1 -0
test_perf.py +2 -2
mettagrid/actions.cpython-311-darwin.so +0 -0
mettagrid/renderer/raylib_client.py +0 -180
mettagrid-0.0.2.dist-info/METADATA +0 -23
mettagrid-0.0.2.dist-info/RECORD +0 -70
/mettagrid/renderer/assets/{tiny_galaxy_items.png → items.png} +0 -0
/mettagrid/renderer/assets/{tiny_galaxy_monsters.png → monsters.png} +0 -0
/mettagrid/renderer/assets/{wall1-0.png → wall.png} +0 -0
{mettagrid-0.0.2.dist-info → mettagrid-0.0.3.dist-info}/LICENSE +0 -0
{mettagrid-0.0.2.dist-info → mettagrid-0.0.3.dist-info}/WHEEL +0 -0

build/mettagrid/actions/move.cpp CHANGED Viewed

@@ -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.move",
@@ -1719,7 +1719,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             # <<<<<<<<<<<<<<
@@ -1728,7 +1728,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             # <<<<<<<<<<<<<<
@@ -1737,7 +1737,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             # <<<<<<<<<<<<<<
@@ -1746,7 +1746,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             # <<<<<<<<<<<<<<
@@ -1755,7 +1755,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             # <<<<<<<<<<<<<<
@@ -1764,7 +1764,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             # <<<<<<<<<<<<<<
@@ -1773,7 +1773,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             # <<<<<<<<<<<<<<
@@ -1782,7 +1782,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             # <<<<<<<<<<<<<<
@@ -1791,7 +1791,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             # <<<<<<<<<<<<<<
@@ -1800,7 +1800,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             # <<<<<<<<<<<<<<
@@ -1809,7 +1809,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             # <<<<<<<<<<<<<<
@@ -1818,7 +1818,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             # <<<<<<<<<<<<<<
@@ -1827,7 +1827,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             # <<<<<<<<<<<<<<
@@ -1836,7 +1836,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             # <<<<<<<<<<<<<<
@@ -1845,7 +1845,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             # <<<<<<<<<<<<<<
@@ -1854,7 +1854,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             # <<<<<<<<<<<<<<
@@ -1863,7 +1863,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             # <<<<<<<<<<<<<<
@@ -1872,7 +1872,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             # <<<<<<<<<<<<<<
@@ -1881,7 +1881,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             # <<<<<<<<<<<<<<
@@ -1890,7 +1890,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             # <<<<<<<<<<<<<<
@@ -1899,7 +1899,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             # <<<<<<<<<<<<<<
@@ -1977,7 +1977,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             # <<<<<<<<<<<<<<
@@ -1986,7 +1986,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             # <<<<<<<<<<<<<<
@@ -1995,7 +1995,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             # <<<<<<<<<<<<<<
@@ -2004,7 +2004,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             # <<<<<<<<<<<<<<
@@ -2020,7 +2020,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:             # <<<<<<<<<<<<<<
@@ -2032,7 +2032,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:             # <<<<<<<<<<<<<<
@@ -2048,7 +2048,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:             # <<<<<<<<<<<<<<
@@ -2062,7 +2062,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:             # <<<<<<<<<<<<<<
@@ -2073,7 +2073,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             # <<<<<<<<<<<<<<
@@ -2083,7 +2083,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):             # <<<<<<<<<<<<<<
@@ -2092,14 +2092,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):             # <<<<<<<<<<<<<<
@@ -2110,24 +2109,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);
@@ -2140,7 +2143,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):             # <<<<<<<<<<<<<<
@@ -2158,7 +2161,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):             # <<<<<<<<<<<<<<
@@ -2167,7 +2170,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) {
@@ -2178,7 +2181,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):             # <<<<<<<<<<<<<<
@@ -2189,7 +2192,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) {
@@ -2200,7 +2203,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):             # <<<<<<<<<<<<<<
@@ -2307,6 +2310,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;
@@ -2340,7 +2345,7 @@ struct __pyx_obj_10puffergrid_6action_ActionHandler {
 };
-/* "mettagrid/objects.pxd":185
+/* "mettagrid/objects.pxd":193
  * cdef map[TypeId, GridLayer] ObjectLayers
  *
  * cdef class ResetHandler(EventHandler):             # <<<<<<<<<<<<<<
@@ -2352,17 +2357,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;
 };
@@ -2563,7 +2569,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;
@@ -2578,12 +2584,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):             # <<<<<<<<<<<<<<
@@ -2597,16 +2604,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;
@@ -2621,12 +2629,12 @@ static struct __pyx_vtabstruct_9mettagrid_7objects_MettaObservationEncoder *__py
 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;
-/* "mettagrid/actions/move.pyx":12
+/* "mettagrid/actions/move.pyx":11
  * from mettagrid.actions.actions cimport MettaActionHandler
  *
  * cdef class Move(MettaActionHandler):             # <<<<<<<<<<<<<<
@@ -3286,9 +3294,6 @@ static void __Pyx_WriteUnraisable(const char *name, int clineno,
   #define __PYX_STD_MOVE_IF_SUPPORTED(x) x
 #endif
-/* ModInt[long].proto */
-static CYTHON_INLINE long __Pyx_mod_long(long, long);
 /* CallNextTpTraverse.proto */
 static int __Pyx_call_next_tp_traverse(PyObject* obj, visitproc v, void *a, traverseproc current_tp_traverse);
@@ -3752,9 +3757,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);
 /* CIntFromPy.proto */
 static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
@@ -3814,7 +3816,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_4move_4Move__handle_action(struct __pyx_obj_9mettagrid_7actions_4move_Move *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg); /* proto*/
+static unsigned char __pyx_f_9mettagrid_7actions_4move_4Move_max_arg(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_4move_Move *__pyx_v_self); /* proto*/
+static int __pyx_f_9mettagrid_7actions_4move_4Move__handle_action(struct __pyx_obj_9mettagrid_7actions_4move_Move *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg); /* proto*/
 /* Module declarations from "libc.string" */
@@ -4028,6 +4031,7 @@ 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";
@@ -4047,7 +4051,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";
@@ -4055,6 +4061,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__";
@@ -19329,7 +19336,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:             # <<<<<<<<<<<<<<
@@ -19340,7 +19347,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)             # <<<<<<<<<<<<<<
@@ -19350,7 +19357,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:             # <<<<<<<<<<<<<<
@@ -19363,7 +19370,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):             # <<<<<<<<<<<<<<
@@ -19377,7 +19384,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)             # <<<<<<<<<<<<<<
@@ -19390,7 +19397,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):             # <<<<<<<<<<<<<<
@@ -19405,7 +19412,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:             # <<<<<<<<<<<<<<
@@ -19416,7 +19423,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)             # <<<<<<<<<<<<<<
@@ -19426,7 +19433,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:             # <<<<<<<<<<<<<<
@@ -19439,7 +19446,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:             # <<<<<<<<<<<<<<
@@ -19450,7 +19457,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)             # <<<<<<<<<<<<<<
@@ -19460,7 +19467,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:             # <<<<<<<<<<<<<<
@@ -19473,7 +19480,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:             # <<<<<<<<<<<<<<
@@ -19484,7 +19491,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)             # <<<<<<<<<<<<<<
@@ -19494,7 +19501,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:             # <<<<<<<<<<<<<<
@@ -19507,7 +19514,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:             # <<<<<<<<<<<<<<
@@ -19518,7 +19525,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)             # <<<<<<<<<<<<<<
@@ -19528,7 +19535,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:             # <<<<<<<<<<<<<<
@@ -19541,7 +19548,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:             # <<<<<<<<<<<<<<
@@ -19552,7 +19559,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)             # <<<<<<<<<<<<<<
@@ -19562,7 +19569,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:             # <<<<<<<<<<<<<<
@@ -19575,7 +19582,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):             # <<<<<<<<<<<<<<
@@ -19592,7 +19599,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)             # <<<<<<<<<<<<<<
@@ -19606,7 +19613,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):             # <<<<<<<<<<<<<<
@@ -19625,7 +19632,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):             # <<<<<<<<<<<<<<
@@ -19642,7 +19649,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)             # <<<<<<<<<<<<<<
@@ -19656,7 +19663,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):             # <<<<<<<<<<<<<<
@@ -19675,7 +19682,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):             # <<<<<<<<<<<<<<
@@ -19692,7 +19699,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)             # <<<<<<<<<<<<<<
@@ -19706,7 +19713,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):             # <<<<<<<<<<<<<<
@@ -19725,7 +19732,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):             # <<<<<<<<<<<<<<
@@ -19742,7 +19749,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)             # <<<<<<<<<<<<<<
@@ -19756,7 +19763,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):             # <<<<<<<<<<<<<<
@@ -19775,7 +19782,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):             # <<<<<<<<<<<<<<
@@ -19792,7 +19799,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)             # <<<<<<<<<<<<<<
@@ -19806,7 +19813,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):             # <<<<<<<<<<<<<<
@@ -19825,7 +19832,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):             # <<<<<<<<<<<<<<
@@ -19839,7 +19846,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):             # <<<<<<<<<<<<<<
@@ -19849,7 +19856,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             # <<<<<<<<<<<<<<
@@ -19861,7 +19868,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):             # <<<<<<<<<<<<<<
@@ -19870,7 +19877,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 ()             # <<<<<<<<<<<<<<
@@ -19884,7 +19891,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):             # <<<<<<<<<<<<<<
@@ -19899,7 +19906,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):             # <<<<<<<<<<<<<<
@@ -19909,7 +19916,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!             # <<<<<<<<<<<<<<
@@ -19918,7 +19925,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)             # <<<<<<<<<<<<<<
@@ -19927,7 +19934,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):             # <<<<<<<<<<<<<<
@@ -19938,7 +19945,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):             # <<<<<<<<<<<<<<
@@ -19953,7 +19960,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)             # <<<<<<<<<<<<<<
@@ -19962,7 +19969,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:             # <<<<<<<<<<<<<<
@@ -19972,7 +19979,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             # <<<<<<<<<<<<<<
@@ -19983,7 +19990,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:             # <<<<<<<<<<<<<<
@@ -19992,7 +19999,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             # <<<<<<<<<<<<<<
@@ -20004,7 +20011,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):             # <<<<<<<<<<<<<<
@@ -20019,7 +20026,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:             # <<<<<<<<<<<<<<
@@ -20043,7 +20050,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:             # <<<<<<<<<<<<<<
@@ -20059,7 +20066,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()             # <<<<<<<<<<<<<<
@@ -20068,7 +20075,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:             # <<<<<<<<<<<<<<
@@ -20082,7 +20089,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:             # <<<<<<<<<<<<<<
@@ -20097,7 +20104,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")             # <<<<<<<<<<<<<<
@@ -20112,7 +20119,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:             # <<<<<<<<<<<<<<
@@ -20128,7 +20135,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:             # <<<<<<<<<<<<<<
@@ -20151,7 +20158,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:             # <<<<<<<<<<<<<<
@@ -20175,7 +20182,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:             # <<<<<<<<<<<<<<
@@ -20191,7 +20198,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()             # <<<<<<<<<<<<<<
@@ -20200,7 +20207,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:             # <<<<<<<<<<<<<<
@@ -20214,7 +20221,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:             # <<<<<<<<<<<<<<
@@ -20229,7 +20236,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")             # <<<<<<<<<<<<<<
@@ -20244,7 +20251,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:             # <<<<<<<<<<<<<<
@@ -20260,7 +20267,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:             # <<<<<<<<<<<<<<
@@ -20283,7 +20290,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:             # <<<<<<<<<<<<<<
@@ -20307,7 +20314,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:             # <<<<<<<<<<<<<<
@@ -20323,7 +20330,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()             # <<<<<<<<<<<<<<
@@ -20332,7 +20339,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:             # <<<<<<<<<<<<<<
@@ -20346,7 +20353,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:             # <<<<<<<<<<<<<<
@@ -20361,7 +20368,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")             # <<<<<<<<<<<<<<
@@ -20376,7 +20383,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:             # <<<<<<<<<<<<<<
@@ -20392,7 +20399,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:             # <<<<<<<<<<<<<<
@@ -20415,7 +20422,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):             # <<<<<<<<<<<<<<
@@ -20426,7 +20433,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)             # <<<<<<<<<<<<<<
@@ -20436,7 +20443,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):             # <<<<<<<<<<<<<<
@@ -20449,7 +20456,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):             # <<<<<<<<<<<<<<
@@ -20460,7 +20467,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)             # <<<<<<<<<<<<<<
@@ -20470,7 +20477,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):             # <<<<<<<<<<<<<<
@@ -20483,7 +20490,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:             # <<<<<<<<<<<<<<
@@ -20494,7 +20501,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             # <<<<<<<<<<<<<<
@@ -20504,7 +20511,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:             # <<<<<<<<<<<<<<
@@ -20517,7 +20524,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:             # <<<<<<<<<<<<<<
@@ -20528,7 +20535,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             # <<<<<<<<<<<<<<
@@ -20538,7 +20545,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:             # <<<<<<<<<<<<<<
@@ -20551,7 +20558,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:             # <<<<<<<<<<<<<<
@@ -20562,7 +20569,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             # <<<<<<<<<<<<<<
@@ -20570,7 +20577,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:             # <<<<<<<<<<<<<<
@@ -20583,7 +20590,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):             # <<<<<<<<<<<<<<
@@ -20593,16 +20600,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):             # <<<<<<<<<<<<<<
@@ -20613,54 +20620,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):
@@ -20668,10 +20641,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
  *
  */
@@ -20681,7 +20654,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):             # <<<<<<<<<<<<<<
@@ -20691,7 +20664,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"]             # <<<<<<<<<<<<<<
@@ -20700,7 +20673,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"]             # <<<<<<<<<<<<<<
@@ -20709,16 +20682,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):             # <<<<<<<<<<<<<<
@@ -20729,29 +20702,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);
@@ -20760,10 +20734,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
  *
  */
@@ -20773,8 +20747,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))
@@ -20786,67 +20760,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))
@@ -20860,40 +20870,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
@@ -20905,12 +20946,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             # <<<<<<<<<<<<<<
@@ -20920,7 +20961,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             # <<<<<<<<<<<<<<
@@ -20931,29 +20972,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             # <<<<<<<<<<<<<<
@@ -20964,7 +21005,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             # <<<<<<<<<<<<<<
@@ -20975,7 +21016,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             # <<<<<<<<<<<<<<
@@ -20984,7 +21025,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):             # <<<<<<<<<<<<<<
@@ -20996,7 +21037,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]             # <<<<<<<<<<<<<<
@@ -21007,8 +21048,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
@@ -21018,7 +21059,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():             # <<<<<<<<<<<<<<
@@ -21042,46 +21083,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]             # <<<<<<<<<<<<<<
@@ -21094,33 +21135,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():             # <<<<<<<<<<<<<<
@@ -21141,7 +21182,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):             # <<<<<<<<<<<<<<
@@ -21154,7 +21195,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))             # <<<<<<<<<<<<<<
@@ -21163,16 +21204,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):             # <<<<<<<<<<<<<<
@@ -21187,7 +21228,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):             # <<<<<<<<<<<<<<
@@ -21198,7 +21239,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             # <<<<<<<<<<<<<<
@@ -21208,7 +21249,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             # <<<<<<<<<<<<<<
@@ -21218,7 +21259,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):             # <<<<<<<<<<<<<<
@@ -21229,7 +21270,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():             # <<<<<<<<<<<<<<
@@ -21247,27 +21288,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():             # <<<<<<<<<<<<<<
@@ -21285,7 +21326,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):             # <<<<<<<<<<<<<<
@@ -21298,7 +21339,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))             # <<<<<<<<<<<<<<
@@ -21307,34 +21348,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):             # <<<<<<<<<<<<<<
@@ -21349,46 +21390,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
  *
  */
@@ -21401,7 +21441,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):             # <<<<<<<<<<<<<<
@@ -21414,7 +21454,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             # <<<<<<<<<<<<<<
@@ -21424,7 +21464,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             # <<<<<<<<<<<<<<
@@ -21435,7 +21475,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             # <<<<<<<<<<<<<<
@@ -21446,7 +21486,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             # <<<<<<<<<<<<<<
@@ -21457,7 +21497,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):             # <<<<<<<<<<<<<<
@@ -21468,7 +21508,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():             # <<<<<<<<<<<<<<
@@ -21486,33 +21526,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():             # <<<<<<<<<<<<<<
@@ -21530,7 +21570,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):             # <<<<<<<<<<<<<<
@@ -21543,7 +21583,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))             # <<<<<<<<<<<<<<
@@ -21552,25 +21592,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             # <<<<<<<<<<<<<<
@@ -21579,7 +21619,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             # <<<<<<<<<<<<<<
@@ -21588,16 +21628,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):             # <<<<<<<<<<<<<<
@@ -21612,46 +21652,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
  *
  */
@@ -21664,7 +21703,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):             # <<<<<<<<<<<<<<
@@ -21678,7 +21717,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             # <<<<<<<<<<<<<<
@@ -21688,7 +21727,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             # <<<<<<<<<<<<<<
@@ -21698,7 +21737,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             # <<<<<<<<<<<<<<
@@ -21708,7 +21747,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             # <<<<<<<<<<<<<<
@@ -21718,7 +21757,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             # <<<<<<<<<<<<<<
@@ -21728,7 +21767,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             # <<<<<<<<<<<<<<
@@ -21738,7 +21777,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):             # <<<<<<<<<<<<<<
@@ -21753,7 +21792,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():             # <<<<<<<<<<<<<<
@@ -21771,39 +21810,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():             # <<<<<<<<<<<<<<
@@ -21821,7 +21860,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):             # <<<<<<<<<<<<<<
@@ -21834,7 +21873,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))             # <<<<<<<<<<<<<<
@@ -21843,25 +21882,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):             # <<<<<<<<<<<<<<
@@ -21876,7 +21915,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):             # <<<<<<<<<<<<<<
@@ -21887,7 +21926,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             # <<<<<<<<<<<<<<
@@ -21897,7 +21936,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             # <<<<<<<<<<<<<<
@@ -21907,7 +21946,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             # <<<<<<<<<<<<<<
@@ -21917,7 +21956,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):             # <<<<<<<<<<<<<<
@@ -21928,7 +21967,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():             # <<<<<<<<<<<<<<
@@ -21946,30 +21985,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():             # <<<<<<<<<<<<<<
@@ -21987,78 +22026,107 @@ 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();
 }
-/* "mettagrid/actions/move.pyx":13
+/* "mettagrid/actions/move.pyx":12
  *
  * cdef class Move(MettaActionHandler):
  *     def __init__(self, cfg: OmegaConf):             # <<<<<<<<<<<<<<
@@ -22102,12 +22170,12 @@ static int __pyx_pw_9mettagrid_7actions_4move_4Move_1__init__(PyObject *__pyx_v_
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 13, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L3_error)
         else goto __pyx_L5_argtuple_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(1, 13, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(1, 12, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 1)) {
       goto __pyx_L5_argtuple_error;
@@ -22118,7 +22186,7 @@ static int __pyx_pw_9mettagrid_7actions_4move_4Move_1__init__(PyObject *__pyx_v_
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 13, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 12, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -22157,14 +22225,14 @@ static int __pyx_pf_9mettagrid_7actions_4move_4Move___init__(struct __pyx_obj_9m
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
-  /* "mettagrid/actions/move.pyx":14
+  /* "mettagrid/actions/move.pyx":13
  * cdef class Move(MettaActionHandler):
  *     def __init__(self, cfg: OmegaConf):
  *         MettaActionHandler.__init__(self, cfg, "move")             # <<<<<<<<<<<<<<
  *
- *     cdef char _handle_action(
+ *     cdef unsigned char max_arg(self):
  */
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler), __pyx_n_s_init); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 14, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler), __pyx_n_s_init); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = NULL;
   __pyx_t_4 = 0;
@@ -22184,13 +22252,13 @@ static int __pyx_pf_9mettagrid_7actions_4move_4Move___init__(struct __pyx_obj_9m
     PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_self), __pyx_v_cfg, __pyx_n_u_move};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 3+__pyx_t_4);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 14, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 13, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  /* "mettagrid/actions/move.pyx":13
+  /* "mettagrid/actions/move.pyx":12
  *
  * cdef class Move(MettaActionHandler):
  *     def __init__(self, cfg: OmegaConf):             # <<<<<<<<<<<<<<
@@ -22212,73 +22280,184 @@ static int __pyx_pf_9mettagrid_7actions_4move_4Move___init__(struct __pyx_obj_9m
   return __pyx_r;
 }
-/* "mettagrid/actions/move.pyx":16
+/* "mettagrid/actions/move.pyx":15
+ *         MettaActionHandler.__init__(self, cfg, "move")
+ *
+ *     cdef unsigned char max_arg(self):             # <<<<<<<<<<<<<<
+ *         return 1
+ *
+ */
+static unsigned char __pyx_f_9mettagrid_7actions_4move_4Move_max_arg(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_4move_Move *__pyx_v_self) {
+  unsigned char __pyx_r;
+  /* "mettagrid/actions/move.pyx":16
+ *
+ *     cdef unsigned char max_arg(self):
+ *         return 1             # <<<<<<<<<<<<<<
+ *
+ *     cdef bint _handle_action(
+ */
+  __pyx_r = 1;
+  goto __pyx_L0;
+  /* "mettagrid/actions/move.pyx":15
  *         MettaActionHandler.__init__(self, cfg, "move")
  *
- *     cdef char _handle_action(             # <<<<<<<<<<<<<<
+ *     cdef unsigned char max_arg(self):             # <<<<<<<<<<<<<<
+ *         return 1
+ *
+ */
+  /* function exit code */
+  __pyx_L0:;
+  return __pyx_r;
+}
+/* "mettagrid/actions/move.pyx":18
+ *         return 1
+ *
+ *     cdef bint _handle_action(             # <<<<<<<<<<<<<<
  *         self,
  *         unsigned int actor_id,
  */
-static char __pyx_f_9mettagrid_7actions_4move_4Move__handle_action(struct __pyx_obj_9mettagrid_7actions_4move_Move *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg) {
+static int __pyx_f_9mettagrid_7actions_4move_4Move__handle_action(struct __pyx_obj_9mettagrid_7actions_4move_Move *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, __pyx_t_9mettagrid_7objects_Agent *__pyx_v_actor, __pyx_t_10puffergrid_6action_ActionArg __pyx_v_arg) {
   unsigned short __pyx_v_direction;
   Orientation __pyx_v_orientation;
   GridLocation __pyx_v_old_loc;
   GridLocation __pyx_v_new_loc;
-  char __pyx_r;
+  int __pyx_r;
   int __pyx_t_1;
   GridLocation __pyx_t_2;
-  /* "mettagrid/actions/move.pyx":22
+  /* "mettagrid/actions/move.pyx":24
  *         ActionArg arg):
  *
  *         cdef unsigned short direction = arg             # <<<<<<<<<<<<<<
- *         if direction >= 2:
- *             return False
+ *
+ *         cdef Orientation orientation = <Orientation>(actor.orientation)
  */
   __pyx_v_direction = __pyx_v_arg;
-  /* "mettagrid/actions/move.pyx":23
- *
+  /* "mettagrid/actions/move.pyx":26
  *         cdef unsigned short direction = arg
- *         if direction >= 2:             # <<<<<<<<<<<<<<
- *             return False
  *
+ *         cdef Orientation orientation = <Orientation>(actor.orientation)             # <<<<<<<<<<<<<<
+ *         if direction == 1:
+ *             if orientation == Orientation.Up:
  */
-  __pyx_t_1 = (__pyx_v_direction >= 2);
-  if (__pyx_t_1) {
+  __pyx_v_orientation = ((Orientation)__pyx_v_actor->orientation);
-    /* "mettagrid/actions/move.pyx":24
- *         cdef unsigned short direction = arg
- *         if direction >= 2:
- *             return False             # <<<<<<<<<<<<<<
+  /* "mettagrid/actions/move.pyx":27
  *
- *         cdef Orientation orientation = <Orientation>((actor.orientation + 2*(direction)) % 4)
+ *         cdef Orientation orientation = <Orientation>(actor.orientation)
+ *         if direction == 1:             # <<<<<<<<<<<<<<
+ *             if orientation == Orientation.Up:
+ *                 orientation = Orientation.Down
  */
-    __pyx_r = 0;
-    goto __pyx_L0;
+  __pyx_t_1 = (__pyx_v_direction == 1);
+  if (__pyx_t_1) {
-    /* "mettagrid/actions/move.pyx":23
+    /* "mettagrid/actions/move.pyx":28
+ *         cdef Orientation orientation = <Orientation>(actor.orientation)
+ *         if direction == 1:
+ *             if orientation == Orientation.Up:             # <<<<<<<<<<<<<<
+ *                 orientation = Orientation.Down
+ *             elif orientation == Orientation.Down:
+ */
+    switch (__pyx_v_orientation) {
+      case Up:
+      /* "mettagrid/actions/move.pyx":29
+ *         if direction == 1:
+ *             if orientation == Orientation.Up:
+ *                 orientation = Orientation.Down             # <<<<<<<<<<<<<<
+ *             elif orientation == Orientation.Down:
+ *                 orientation = Orientation.Up
+ */
+      __pyx_v_orientation = Down;
+      /* "mettagrid/actions/move.pyx":28
+ *         cdef Orientation orientation = <Orientation>(actor.orientation)
+ *         if direction == 1:
+ *             if orientation == Orientation.Up:             # <<<<<<<<<<<<<<
+ *                 orientation = Orientation.Down
+ *             elif orientation == Orientation.Down:
+ */
+      break;
+      case Down:
+      /* "mettagrid/actions/move.pyx":31
+ *                 orientation = Orientation.Down
+ *             elif orientation == Orientation.Down:
+ *                 orientation = Orientation.Up             # <<<<<<<<<<<<<<
+ *             elif orientation == Orientation.Left:
+ *                 orientation = Orientation.Right
+ */
+      __pyx_v_orientation = Up;
+      /* "mettagrid/actions/move.pyx":30
+ *             if orientation == Orientation.Up:
+ *                 orientation = Orientation.Down
+ *             elif orientation == Orientation.Down:             # <<<<<<<<<<<<<<
+ *                 orientation = Orientation.Up
+ *             elif orientation == Orientation.Left:
+ */
+      break;
+      case Left:
+      /* "mettagrid/actions/move.pyx":33
+ *                 orientation = Orientation.Up
+ *             elif orientation == Orientation.Left:
+ *                 orientation = Orientation.Right             # <<<<<<<<<<<<<<
+ *             elif orientation == Orientation.Right:
+ *                 orientation = Orientation.Left
+ */
+      __pyx_v_orientation = Right;
+      /* "mettagrid/actions/move.pyx":32
+ *             elif orientation == Orientation.Down:
+ *                 orientation = Orientation.Up
+ *             elif orientation == Orientation.Left:             # <<<<<<<<<<<<<<
+ *                 orientation = Orientation.Right
+ *             elif orientation == Orientation.Right:
+ */
+      break;
+      case Right:
+      /* "mettagrid/actions/move.pyx":35
+ *                 orientation = Orientation.Right
+ *             elif orientation == Orientation.Right:
+ *                 orientation = Orientation.Left             # <<<<<<<<<<<<<<
  *
- *         cdef unsigned short direction = arg
- *         if direction >= 2:             # <<<<<<<<<<<<<<
- *             return False
+ *         cdef GridLocation old_loc = actor.location
+ */
+      __pyx_v_orientation = Left;
+      /* "mettagrid/actions/move.pyx":34
+ *             elif orientation == Orientation.Left:
+ *                 orientation = Orientation.Right
+ *             elif orientation == Orientation.Right:             # <<<<<<<<<<<<<<
+ *                 orientation = Orientation.Left
  *
  */
-  }
+      break;
+      default: break;
+    }
-  /* "mettagrid/actions/move.pyx":26
- *             return False
+    /* "mettagrid/actions/move.pyx":27
  *
- *         cdef Orientation orientation = <Orientation>((actor.orientation + 2*(direction)) % 4)             # <<<<<<<<<<<<<<
- *         cdef GridLocation old_loc = actor.location
- *         cdef GridLocation new_loc = self.env._grid.relative_location(old_loc, orientation)
+ *         cdef Orientation orientation = <Orientation>(actor.orientation)
+ *         if direction == 1:             # <<<<<<<<<<<<<<
+ *             if orientation == Orientation.Up:
+ *                 orientation = Orientation.Down
  */
-  __pyx_v_orientation = ((Orientation)__Pyx_mod_long((__pyx_v_actor->orientation + (2 * __pyx_v_direction)), 4));
+  }
-  /* "mettagrid/actions/move.pyx":27
+  /* "mettagrid/actions/move.pyx":37
+ *                 orientation = Orientation.Left
  *
- *         cdef Orientation orientation = <Orientation>((actor.orientation + 2*(direction)) % 4)
  *         cdef GridLocation old_loc = actor.location             # <<<<<<<<<<<<<<
  *         cdef GridLocation new_loc = self.env._grid.relative_location(old_loc, orientation)
  *         if not self.env._grid.is_empty(new_loc.r, new_loc.c):
@@ -22286,55 +22465,55 @@ static char __pyx_f_9mettagrid_7actions_4move_4Move__handle_action(struct __pyx_
   __pyx_t_2 = __pyx_v_actor->location;
   __pyx_v_old_loc = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_2);
-  /* "mettagrid/actions/move.pyx":28
- *         cdef Orientation orientation = <Orientation>((actor.orientation + 2*(direction)) % 4)
+  /* "mettagrid/actions/move.pyx":38
+ *
  *         cdef GridLocation old_loc = actor.location
  *         cdef GridLocation new_loc = self.env._grid.relative_location(old_loc, orientation)             # <<<<<<<<<<<<<<
  *         if not self.env._grid.is_empty(new_loc.r, new_loc.c):
- *             return False
+ *             return 0
  */
   __pyx_v_new_loc = __pyx_v_self->__pyx_base.__pyx_base.env->_grid->relative_location(__pyx_v_old_loc, __pyx_v_orientation);
-  /* "mettagrid/actions/move.pyx":29
+  /* "mettagrid/actions/move.pyx":39
  *         cdef GridLocation old_loc = actor.location
  *         cdef GridLocation new_loc = self.env._grid.relative_location(old_loc, orientation)
  *         if not self.env._grid.is_empty(new_loc.r, new_loc.c):             # <<<<<<<<<<<<<<
- *             return False
+ *             return 0
  *         return self.env._grid.move_object(actor.id, new_loc)
  */
   __pyx_t_1 = (!(__pyx_v_self->__pyx_base.__pyx_base.env->_grid->is_empty(__pyx_v_new_loc.r, __pyx_v_new_loc.c) != 0));
   if (__pyx_t_1) {
-    /* "mettagrid/actions/move.pyx":30
+    /* "mettagrid/actions/move.pyx":40
  *         cdef GridLocation new_loc = self.env._grid.relative_location(old_loc, orientation)
  *         if not self.env._grid.is_empty(new_loc.r, new_loc.c):
- *             return False             # <<<<<<<<<<<<<<
+ *             return 0             # <<<<<<<<<<<<<<
  *         return self.env._grid.move_object(actor.id, new_loc)
  */
     __pyx_r = 0;
     goto __pyx_L0;
-    /* "mettagrid/actions/move.pyx":29
+    /* "mettagrid/actions/move.pyx":39
  *         cdef GridLocation old_loc = actor.location
  *         cdef GridLocation new_loc = self.env._grid.relative_location(old_loc, orientation)
  *         if not self.env._grid.is_empty(new_loc.r, new_loc.c):             # <<<<<<<<<<<<<<
- *             return False
+ *             return 0
  *         return self.env._grid.move_object(actor.id, new_loc)
  */
   }
-  /* "mettagrid/actions/move.pyx":31
+  /* "mettagrid/actions/move.pyx":41
  *         if not self.env._grid.is_empty(new_loc.r, new_loc.c):
- *             return False
+ *             return 0
  *         return self.env._grid.move_object(actor.id, new_loc)             # <<<<<<<<<<<<<<
  */
   __pyx_r = __pyx_v_self->__pyx_base.__pyx_base.env->_grid->move_object(__pyx_v_actor->id, __pyx_v_new_loc);
   goto __pyx_L0;
-  /* "mettagrid/actions/move.pyx":16
- *         MettaActionHandler.__init__(self, cfg, "move")
+  /* "mettagrid/actions/move.pyx":18
+ *         return 1
  *
- *     cdef char _handle_action(             # <<<<<<<<<<<<<<
+ *     cdef bint _handle_action(             # <<<<<<<<<<<<<<
  *         self,
  *         unsigned int actor_id,
  */
@@ -23880,7 +24059,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")             # <<<<<<<<<<<<<<
@@ -23891,7 +24070,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")             # <<<<<<<<<<<<<<
@@ -24026,14 +24205,14 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
 /* #### Code section: init_constants ### */
 static CYTHON_SMALL_CODE int __Pyx_InitConstants(void) {
-  if (__Pyx_CreateStringTabAndInitStrings() < 0) __PYX_ERR(1, 2, __pyx_L1_error);
-  __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_int_112105877 = PyInt_FromLong(112105877L); if (unlikely(!__pyx_int_112105877)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_int_136983863 = PyInt_FromLong(136983863L); if (unlikely(!__pyx_int_136983863)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_int_184977713 = PyInt_FromLong(184977713L); if (unlikely(!__pyx_int_184977713)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_CreateStringTabAndInitStrings() < 0) __PYX_ERR(1, 1, __pyx_L1_error);
+  __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_int_112105877 = PyInt_FromLong(112105877L); if (unlikely(!__pyx_int_112105877)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_int_136983863 = PyInt_FromLong(136983863L); if (unlikely(!__pyx_int_136983863)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_int_184977713 = PyInt_FromLong(184977713L); if (unlikely(!__pyx_int_184977713)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) __PYX_ERR(1, 1, __pyx_L1_error)
   return 0;
   __pyx_L1_error:;
   return -1;
@@ -24044,7 +24223,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitGlobals(void) {
   /* AssertionsEnabled.init */
   if (likely(__Pyx_init_assertions_enabled() == 0)); else
-if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 2, __pyx_L1_error)
+if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 1, __pyx_L1_error)
   return 0;
   __pyx_L1_error:;
@@ -24099,20 +24278,21 @@ static int __Pyx_modinit_type_init_code(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0);
   /*--- Type init code ---*/
-  __pyx_t_1 = PyImport_ImportModule("mettagrid.actions.actions"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_t_1 = PyImport_ImportModule("mettagrid.actions.actions"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler = __Pyx_ImportType_3_0_11(__pyx_t_1, "mettagrid.actions.actions", "MettaActionHandler", sizeof(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler = (struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler*)__Pyx_GetVtable(__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler); if (unlikely(!__pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler)) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler = __Pyx_ImportType_3_0_11(__pyx_t_1, "mettagrid.actions.actions", "MettaActionHandler", sizeof(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler = (struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler*)__Pyx_GetVtable(__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler); if (unlikely(!__pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler)) __PYX_ERR(1, 1, __pyx_L1_error)
   __pyx_vtabptr_9mettagrid_7actions_4move_Move = &__pyx_vtable_9mettagrid_7actions_4move_Move;
   __pyx_vtable_9mettagrid_7actions_4move_Move.__pyx_base = *__pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler;
-  __pyx_vtable_9mettagrid_7actions_4move_Move.__pyx_base._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_4move_4Move__handle_action;
+  __pyx_vtable_9mettagrid_7actions_4move_Move.__pyx_base.__pyx_base.max_arg = (unsigned char (*)(struct __pyx_obj_10puffergrid_6action_ActionHandler *))__pyx_f_9mettagrid_7actions_4move_4Move_max_arg;
+  __pyx_vtable_9mettagrid_7actions_4move_Move.__pyx_base._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_4move_4Move__handle_action;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_t_2 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 12, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 11, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_ptype_9mettagrid_7actions_4move_Move = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_9mettagrid_7actions_4move_Move_spec, __pyx_t_2);
   __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (unlikely(!__pyx_ptype_9mettagrid_7actions_4move_Move)) __PYX_ERR(1, 12, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_9mettagrid_7actions_4move_Move_spec, __pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 12, __pyx_L1_error)
+  if (unlikely(!__pyx_ptype_9mettagrid_7actions_4move_Move)) __PYX_ERR(1, 11, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_9mettagrid_7actions_4move_Move_spec, __pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 11, __pyx_L1_error)
   #else
   __pyx_ptype_9mettagrid_7actions_4move_Move = &__pyx_type_9mettagrid_7actions_4move_Move;
   #endif
@@ -24121,7 +24301,7 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_ptype_9mettagrid_7actions_4move_Move->tp_base = __pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler;
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 12, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 11, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_9mettagrid_7actions_4move_Move->tp_print = 0;
@@ -24131,13 +24311,13 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_9mettagrid_7actions_4move_Move->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_9mettagrid_7actions_4move_Move, __pyx_vtabptr_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 12, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_9mettagrid_7actions_4move_Move, __pyx_vtabptr_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 11, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 12, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 11, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Move, (PyObject *) __pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 12, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Move, (PyObject *) __pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 11, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 12, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_9mettagrid_7actions_4move_Move) < 0) __PYX_ERR(1, 11, __pyx_L1_error)
   #endif
   __pyx_vtabptr_array = &__pyx_vtable_array;
   __pyx_vtable_array.get_memview = (PyObject *(*)(struct __pyx_array_obj *))__pyx_array_get_memview;
@@ -24354,12 +24534,12 @@ static int __Pyx_modinit_type_import_code(void) {
   __pyx_ptype_10puffergrid_6action_ActionHandler = __Pyx_ImportType_3_0_11(__pyx_t_1, "puffergrid.action", "ActionHandler", sizeof(struct __pyx_obj_10puffergrid_6action_ActionHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(struct __pyx_obj_10puffergrid_6action_ActionHandler),__Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_10puffergrid_6action_ActionHandler) __PYX_ERR(9, 5, __pyx_L1_error)
   __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(9, 5, __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;
@@ -24377,11 +24557,11 @@ static int __Pyx_modinit_variable_import_code(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__Pyx_modinit_variable_import_code", 0);
   /*--- Variable import code ---*/
-  __pyx_t_1 = PyImport_ImportModule("mettagrid.objects"); if (!__pyx_t_1) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_t_1 = PyImport_ImportModule("mettagrid.objects"); if (!__pyx_t_1) __PYX_ERR(1, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  if (__Pyx_ImportVoidPtr_3_0_11(__pyx_t_1, "ObjectTypeNames", (void **)&__pyx_vp_9mettagrid_7objects_ObjectTypeNames, "std::vector<std::string> ") < 0) __PYX_ERR(1, 2, __pyx_L1_error)
-  if (__Pyx_ImportVoidPtr_3_0_11(__pyx_t_1, "InventoryItemNames", (void **)&__pyx_vp_9mettagrid_7objects_InventoryItemNames, "std::vector<std::string> ") < 0) __PYX_ERR(1, 2, __pyx_L1_error)
-  if (__Pyx_ImportVoidPtr_3_0_11(__pyx_t_1, "ObjectLayers", (void **)&__pyx_vp_9mettagrid_7objects_ObjectLayers, "std::map<TypeId,enum __pyx_t_9mettagrid_7objects_GridLayer> ") < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_ImportVoidPtr_3_0_11(__pyx_t_1, "ObjectTypeNames", (void **)&__pyx_vp_9mettagrid_7objects_ObjectTypeNames, "std::vector<std::string> ") < 0) __PYX_ERR(1, 1, __pyx_L1_error)
+  if (__Pyx_ImportVoidPtr_3_0_11(__pyx_t_1, "InventoryItemNames", (void **)&__pyx_vp_9mettagrid_7objects_InventoryItemNames, "std::vector<std::string> ") < 0) __PYX_ERR(1, 1, __pyx_L1_error)
+  if (__Pyx_ImportVoidPtr_3_0_11(__pyx_t_1, "ObjectLayers", (void **)&__pyx_vp_9mettagrid_7objects_ObjectLayers, "std::map<TypeId,enum __pyx_t_9mettagrid_7objects_GridLayer> ") < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -24588,26 +24768,26 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_move(PyObject *__pyx_pyinit_module
   #else
   #if PY_MAJOR_VERSION < 3
   __pyx_m = Py_InitModule4("move", __pyx_methods, 0, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m);
-  if (unlikely(!__pyx_m)) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (unlikely(!__pyx_m)) __PYX_ERR(1, 1, __pyx_L1_error)
   #elif CYTHON_USE_MODULE_STATE
-  __pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 1, __pyx_L1_error)
   {
     int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
     __pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to "move" pseudovariable */
-    if (unlikely((add_module_result < 0))) __PYX_ERR(1, 2, __pyx_L1_error)
+    if (unlikely((add_module_result < 0))) __PYX_ERR(1, 1, __pyx_L1_error)
     pystate_addmodule_run = 1;
   }
   #else
   __pyx_m = PyModule_Create(&__pyx_moduledef);
-  if (unlikely(!__pyx_m)) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (unlikely(!__pyx_m)) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   #endif
   CYTHON_UNUSED_VAR(__pyx_t_1);
-  __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) __PYX_ERR(1, 1, __pyx_L1_error)
   Py_INCREF(__pyx_d);
-  __pyx_b = __Pyx_PyImport_AddModuleRef(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_cython_runtime = __Pyx_PyImport_AddModuleRef((const char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(1, 2, __pyx_L1_error)
-  if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_b = __Pyx_PyImport_AddModuleRef(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_cython_runtime = __Pyx_PyImport_AddModuleRef((const char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(1, 1, __pyx_L1_error)
+  if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #if CYTHON_REFNANNY
 __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny");
 if (!__Pyx_RefNanny) {
@@ -24618,30 +24798,30 @@ if (!__Pyx_RefNanny) {
 }
 #endif
   __Pyx_RefNannySetupContext("__Pyx_PyMODINIT_FUNC PyInit_move(void)", 0);
-  if (__Pyx_check_binary_version(__PYX_LIMITED_VERSION_HEX, __Pyx_get_runtime_version(), CYTHON_COMPILING_IN_LIMITED_API) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_check_binary_version(__PYX_LIMITED_VERSION_HEX, __Pyx_get_runtime_version(), CYTHON_COMPILING_IN_LIMITED_API) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #ifdef __Pxy_PyFrame_Initialize_Offsets
   __Pxy_PyFrame_Initialize_Offsets();
   #endif
-  __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) __PYX_ERR(1, 2, __pyx_L1_error)
-  __pyx_empty_unicode = PyUnicode_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_unicode)) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) __PYX_ERR(1, 1, __pyx_L1_error)
+  __pyx_empty_unicode = PyUnicode_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_unicode)) __PYX_ERR(1, 1, __pyx_L1_error)
   #ifdef __Pyx_CyFunction_USED
-  if (__pyx_CyFunction_init(__pyx_m) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__pyx_CyFunction_init(__pyx_m) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   #ifdef __Pyx_FusedFunction_USED
-  if (__pyx_FusedFunction_init(__pyx_m) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__pyx_FusedFunction_init(__pyx_m) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   #ifdef __Pyx_Coroutine_USED
-  if (__pyx_Coroutine_init(__pyx_m) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__pyx_Coroutine_init(__pyx_m) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   #ifdef __Pyx_Generator_USED
-  if (__pyx_Generator_init(__pyx_m) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__pyx_Generator_init(__pyx_m) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   #ifdef __Pyx_AsyncGen_USED
-  if (__pyx_AsyncGen_init(__pyx_m) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__pyx_AsyncGen_init(__pyx_m) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   #ifdef __Pyx_StopAsyncIteration_USED
-  if (__pyx_StopAsyncIteration_init(__pyx_m) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__pyx_StopAsyncIteration_init(__pyx_m) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   /*--- Library function declarations ---*/
   /*--- Threads initialization code ---*/
@@ -24649,38 +24829,38 @@ if (!__Pyx_RefNanny) {
   PyEval_InitThreads();
   #endif
   /*--- Initialize various global constants etc. ---*/
-  if (__Pyx_InitConstants() < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_InitConstants() < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   stringtab_initialized = 1;
-  if (__Pyx_InitGlobals() < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_InitGlobals() < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT)
-  if (__Pyx_init_sys_getdefaultencoding_params() < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_init_sys_getdefaultencoding_params() < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   if (__pyx_module_is_main_mettagrid__actions__move) {
-    if (PyObject_SetAttr(__pyx_m, __pyx_n_s_name_2, __pyx_n_s_main) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+    if (PyObject_SetAttr(__pyx_m, __pyx_n_s_name_2, __pyx_n_s_main) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   }
   #if PY_MAJOR_VERSION >= 3
   {
-    PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) __PYX_ERR(1, 2, __pyx_L1_error)
+    PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) __PYX_ERR(1, 1, __pyx_L1_error)
     if (!PyDict_GetItemString(modules, "mettagrid.actions.move")) {
-      if (unlikely((PyDict_SetItemString(modules, "mettagrid.actions.move", __pyx_m) < 0))) __PYX_ERR(1, 2, __pyx_L1_error)
+      if (unlikely((PyDict_SetItemString(modules, "mettagrid.actions.move", __pyx_m) < 0))) __PYX_ERR(1, 1, __pyx_L1_error)
     }
   }
   #endif
   /*--- Builtin init code ---*/
-  if (__Pyx_InitCachedBuiltins() < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_InitCachedBuiltins() < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   /*--- Constants init code ---*/
-  if (__Pyx_InitCachedConstants() < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_InitCachedConstants() < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   /*--- Global type/function init code ---*/
   (void)__Pyx_modinit_global_init_code();
   (void)__Pyx_modinit_variable_export_code();
   (void)__Pyx_modinit_function_export_code();
-  if (unlikely((__Pyx_modinit_type_init_code() < 0))) __PYX_ERR(1, 2, __pyx_L1_error)
-  if (unlikely((__Pyx_modinit_type_import_code() < 0))) __PYX_ERR(1, 2, __pyx_L1_error)
-  if (unlikely((__Pyx_modinit_variable_import_code() < 0))) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (unlikely((__Pyx_modinit_type_init_code() < 0))) __PYX_ERR(1, 1, __pyx_L1_error)
+  if (unlikely((__Pyx_modinit_type_import_code() < 0))) __PYX_ERR(1, 1, __pyx_L1_error)
+  if (unlikely((__Pyx_modinit_variable_import_code() < 0))) __PYX_ERR(1, 1, __pyx_L1_error)
   (void)__Pyx_modinit_function_import_code();
   /*--- Execution code ---*/
   #if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)
-  if (__Pyx_patch_abc() < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (__Pyx_patch_abc() < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   #endif
   /* "View.MemoryView":99
@@ -25196,24 +25376,24 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_pyx_unpickle_Enum, __pyx_t_7) < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-  /* "mettagrid/actions/move.pyx":4
+  /* "mettagrid/actions/move.pyx":3
  * from libc.stdio cimport printf
  *
  * from omegaconf import OmegaConf             # <<<<<<<<<<<<<<
  *
  * from puffergrid.grid_object cimport GridLocation, GridObjectId, GridObject, Orientation
  */
-  __pyx_t_7 = PyList_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 4, __pyx_L1_error)
+  __pyx_t_7 = PyList_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_INCREF(__pyx_n_s_OmegaConf);
   __Pyx_GIVEREF(__pyx_n_s_OmegaConf);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_7, 0, __pyx_n_s_OmegaConf)) __PYX_ERR(1, 4, __pyx_L1_error);
-  __pyx_t_4 = __Pyx_Import(__pyx_n_s_omegaconf, __pyx_t_7, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 4, __pyx_L1_error)
+  if (__Pyx_PyList_SET_ITEM(__pyx_t_7, 0, __pyx_n_s_OmegaConf)) __PYX_ERR(1, 3, __pyx_L1_error);
+  __pyx_t_4 = __Pyx_Import(__pyx_n_s_omegaconf, __pyx_t_7, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-  __pyx_t_7 = __Pyx_ImportFrom(__pyx_t_4, __pyx_n_s_OmegaConf); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 4, __pyx_L1_error)
+  __pyx_t_7 = __Pyx_ImportFrom(__pyx_t_4, __pyx_n_s_OmegaConf); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_OmegaConf, __pyx_t_7) < 0) __PYX_ERR(1, 4, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_OmegaConf, __pyx_t_7) < 0) __PYX_ERR(1, 3, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
@@ -25238,15 +25418,14 @@ if (!__Pyx_RefNanny) {
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_4) < 0) __PYX_ERR(0, 3, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  /* "mettagrid/actions/move.pyx":2
- *
+  /* "mettagrid/actions/move.pyx":1
  * from libc.stdio cimport printf             # <<<<<<<<<<<<<<
  *
  * from omegaconf import OmegaConf
  */
-  __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 2, __pyx_L1_error)
+  __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_4);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_4) < 0) __PYX_ERR(1, 2, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_4) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   /*--- Wrapped vars code ---*/
@@ -27777,13 +27956,6 @@ static void __Pyx_WriteUnraisable(const char *name, int clineno,
 #endif
 }
-/* ModInt[long] */
-static CYTHON_INLINE long __Pyx_mod_long(long a, long b) {
-    long r = a % b;
-    r += ((r != 0) & ((r ^ b) < 0)) * b;
-    return r;
-}
 /* CallNextTpTraverse */
 static int __Pyx_call_next_tp_traverse(PyObject* obj, visitproc v, void *a, traverseproc current_tp_traverse) {
     PyTypeObject* type = Py_TYPE(obj);
@@ -31029,77 +31201,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
-    }
-}
 /* CIntFromPy */
 static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
 #ifdef __Pyx_HAS_GCC_DIAGNOSTIC

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

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