mettagrid 0.1.4__tar.gz → 0.1.5__tar.gz

{mettagrid-0.1.4 → mettagrid-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mettagrid
-Version: 0.1.4
+Version: 0.1.5
 Summary: A fast grid-based open-ended MARL environment
 Home-page: https://daveey.github.io
 License: MIT

{mettagrid-0.1.4 → mettagrid-0.1.5}/mettagrid/actions/swap.pyx

@@ -40,5 +40,7 @@ cdef class Swap(MettaActionHandler):
         if not target.swappable():
             return False
 
+        actor.stats.incr(b"swap", self._stats.target[target._type_id])
+
         self.env._grid.swap_objects(actor.id, target.id)
         return True

{mettagrid-0.1.4 → mettagrid-0.1.5}/mettagrid/grid.hpp

@@ -80,20 +80,23 @@ class Grid {
 
         inline void swap_objects(GridObjectId id1, GridObjectId id2) {
             GridObject* obj1 = objects[id1];
-            GridObject* obj2 = objects[id2];
             GridLocation loc1 = obj1->location;
+            Layer layer1 = loc1.layer;
+            grid[loc1.r][loc1.c][loc1.layer] = 0;
+
+            GridObject* obj2 = objects[id2];
             GridLocation loc2 = obj2->location;
-            Layer layer1 = obj1->location.layer;
-            Layer layer2 = obj2->location.layer;
+            Layer layer2 = loc2.layer;
+            grid[loc2.r][loc2.c][loc2.layer] = 0;
 
+            // Keep the layer the same
             obj1->location = loc2;
+            obj1->location.layer = layer1;
             obj2->location = loc1;
-            // Keep the layer the same
-            obj1->location.layer = layer2;
-            obj2->location.layer = layer1;
+            obj2->location.layer = layer2;
 
-            grid[loc1.r][loc1.c][loc1.layer] = id2;
-            grid[loc2.r][loc2.c][loc2.layer] = id1;
+            grid[obj1->location.r][obj1->location.c][obj1->location.layer] = id1;
+            grid[obj2->location.r][obj2->location.c][obj2->location.layer] = id2;
         }
 
         inline GridObject* object(GridObjectId obj_id) {

{mettagrid-0.1.4 → mettagrid-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "mettagrid"
-version = "0.1.4"
+version = "0.1.5"
 description = "A fast grid-based open-ended MARL environment"
 authors = ["David Bloomin <daveey@gmail.com>"]
 license = "MIT"