mettagrid 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

build/mettagrid/actions/change_color.cpp

@@ -22,8 +22,8 @@
             "-std=c++11"
         ],
         "include_dirs": [
-            "mettagrid/objects",
-            "mettagrid"
+            "mettagrid",
+            "mettagrid/objects"
         ],
         "language": "c++",
         "name": "mettagrid.actions.change_color",

mettagrid/config/room/ascii.py

@@ -3,7 +3,7 @@ import numpy as np
 from mettagrid.config.room.room import Room
 
 SYMBOLS = {
-    "A": "agent",
+    "A": "agent.agent",
     "Ap": "agent.prey",
     "AP": "agent.predator",
     "a": "altar",
@@ -11,6 +11,8 @@ SYMBOLS = {
     "g": "generator",
     "W": "wall",
     " ": "empty",
+    "b": "block",
+    "L": "lasery"
 }
 
 class Ascii(Room):

mettagrid/grid.hpp

@@ -83,8 +83,15 @@ class Grid {
             GridObject* obj2 = objects[id2];
             GridLocation loc1 = obj1->location;
             GridLocation loc2 = obj2->location;
+            Layer layer1 = obj1->location.layer;
+            Layer layer2 = obj2->location.layer;
+
             obj1->location = loc2;
             obj2->location = loc1;
+            // Keep the layer the same
+            obj1->location.layer = layer2;
+            obj2->location.layer = layer1;
+
             grid[loc1.r][loc1.c][loc1.layer] = id2;
             grid[loc2.r][loc2.c][loc2.layer] = id1;
         }

{mettagrid-0.1.1.dist-info → mettagrid-0.1.3.dist-info}/METADATA

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

{mettagrid-0.1.1.dist-info → mettagrid-0.1.3.dist-info}/RECORD

@@ -42,7 +42,7 @@ build/mettagrid/action.cpp,sha256=GtU1WOd0X99cuCe9gFMtVdDyYNgZtWpIuzpg-n04Luc,11
 build/mettagrid/actions/actions.cpp,sha256=-d5_tRIHP-ONM3e1tVyZ2vfbd0ph1gbDOF3i05L2vSs,1162449
 build/mettagrid/actions/attack.cpp,sha256=zqBTW6acVQpLkROoTcGucKFopnI4o2E8J9CBHHNLe1Y,1147065
 build/mettagrid/actions/attack_nearest.cpp,sha256=IXlQY9X0tX0nI_lhJ3AXJREkTuKwJJ8Azx8zIUQxqpU,1112512
-build/mettagrid/actions/change_color.cpp,sha256=SWtt5cj7q-KO-p_a72Fp8axkfdYB7JNi2TqLsceJ_Ac,1108821
+build/mettagrid/actions/change_color.cpp,sha256=jYFXSZElhuxXSXKBT8McalFKSsmUSuqisHVcaO7gxW8,1108821
 build/mettagrid/actions/get_output.cpp,sha256=xPyfaGzCrCGNLJ9-Hbt05nMHzkwWS7R-qQSXydMLGSA,1125417
 build/mettagrid/actions/gift.cpp,sha256=5fLgXpYb8sLel3RlodSAk6wLzC6n0RLF20rcXXQ7eFs,1107553
 build/mettagrid/actions/move.cpp,sha256=Z2M54ItapI5Iye24LoQnY0OqbplEclWWiEfp3qTmtoE,1107192
@@ -186,7 +186,7 @@ mettagrid/actions/swap.pyx,sha256=SXgn5mCUFBt4P3BOe61bSBn4zdBRHxBGc6ePekpWQnM,14
 mettagrid/actions/use.cpython-311-darwin.so,sha256=jrGpfVPqU-LROL6a-6-C7_94B_ADYCcrgEneXFpbZ10,186760
 mettagrid/base_encoder.cpython-311-darwin.so,sha256=5YeHMdKCIGaxm71xEf_zB5shdgMQs_dC45nzJ399LjY,188064
 mettagrid/config/config.py,sha256=0Apm1TwHCDcd2LIdW2BH4pk6dqJ0fVNaVOTC309fI5g,1210
-mettagrid/config/room/ascii.py,sha256=KZ-juDmGcVDRgdrdsq7P-KRBy-72aGPR23pqVcoSS3U,751
+mettagrid/config/room/ascii.py,sha256=FxcA8eGTc-haNLDeT5fePi7QFtBYGxB-sIXJLbM2dik,793
 mettagrid/config/room/cognitive_evals/barriermaze.py,sha256=MPjGjY-SU06D57KNR-g9cWRIreXYReppp7G3cVxGcH8,4647
 mettagrid/config/room/cognitive_evals/corridor_maze.py,sha256=3KHz16kH6rYE-z0pKlqL1L4rMailcU50zTMeJze9s6U,3539
 mettagrid/config/room/cognitive_evals/cylinder.py,sha256=qFYwrS-_N1njEe0wajcM563yCIrLuBSmrVMYIWNYqRc,4027
@@ -207,7 +207,7 @@ mettagrid/event.pxd,sha256=-NTNGBu2ESVihtvp5CvmOICtvEZHKU8_d89-9mZ9isw,1110
 mettagrid/event.pyx,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mettagrid/grid.cpp,sha256=7iYUHvvcBnu2EMkb8yiqxwIdKOPpRcYXLQ-D4cu8HrY,20
 mettagrid/grid.cpython-311-darwin.so,sha256=7G4qtvzw8b_rcrLYNyRkkfsdq5JnDbyWTYGL9T_Ulqw,16744
-mettagrid/grid.hpp,sha256=gL6xyIFbd14qdkIHEWIG5W59QfAmG25aUX0XWRGVnaI,6289
+mettagrid/grid.hpp,sha256=GRiUM5-82bJcBozR6wDqWSbgmoO86twwZnjiMnSxAVc,6514
 mettagrid/grid.pxd,sha256=wKNHILQsToB1eqGp42pmSuVG-hQrANYjSD4RbNYoV1w,1794
 mettagrid/grid_agent.pxd,sha256=JRPk0TAJabTdxV4wlUoP3PeOnVkXNcAlMWqPnnXfwTE,134
 mettagrid/grid_agent.pyx,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -320,7 +320,7 @@ tests/regen_track_last_action_trace.py,sha256=a1QdBRkvvBC7C0ZANQiwknb3QFQa6iHkNm
 tests/test_basic.py,sha256=moICNw_9L_lfSQRT2k7LWdEIEC9x2kwK1o46ClVvz2Q,4861
 tests/test_kinship.py,sha256=TvyPBbVazgYMGP-KbkWqKoo1QO1d3iT2uPwccyKypss,2406
 tests/test_leaks.py,sha256=Uo-L5h68knTDVcnSUZ8rNXeb-rcMTOqZNOB0SYTC5_I,570
-mettagrid-0.1.1.dist-info/LICENSE,sha256=_0ZygdDOImEUQjXap6LgAetwhuvlOfOqcMDmNlAdjLo,1070
-mettagrid-0.1.1.dist-info/METADATA,sha256=1biSv0M2k4TptfBiwhZ6YM1TbVifP4mRrHx2a4avXNI,7166
-mettagrid-0.1.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mettagrid-0.1.1.dist-info/RECORD,,
+mettagrid-0.1.3.dist-info/LICENSE,sha256=_0ZygdDOImEUQjXap6LgAetwhuvlOfOqcMDmNlAdjLo,1070
+mettagrid-0.1.3.dist-info/METADATA,sha256=ufVd6N0CuhNWi9y1a1XN5TRRbZh9XaSwwAlwSKm6tMA,7166
+mettagrid-0.1.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mettagrid-0.1.3.dist-info/RECORD,,