MichaelTMatthews · BaselOmari · Mar 13, 2024 · Mar 13, 2024 · Apr 3, 2024 · Apr 3, 2024
diff --git a/craftax/craftax/constants.py b/craftax/craftax/constants.py
@@ -20,6 +20,7 @@
     pathlib.Path(__file__).parent.resolve(), "assets", "texture_cache.pbz2"
 )
 
+
 # ENUMS
 class BlockType(Enum):
     INVALID = 0

diff --git a/craftax/craftax/world_gen/world_gen.py b/craftax/craftax/world_gen/world_gen.py
@@ -266,7 +266,10 @@ def _add_path(carry, path_index):
 
     rng, _rng = jax.random.split(rng)
     included_rooms_mask = jnp.zeros(num_rooms, dtype=bool).at[-1].set(True)
-    (padded_map, _, _), _, = jax.lax.scan(
+    (
+        (padded_map, _, _),
+        _,
+    ) = jax.lax.scan(
         _add_path, (padded_map, included_rooms_mask, _rng), jnp.arange(0, num_rooms)
     )
 

diff --git a/craftax/craftax_classic/constants.py b/craftax/craftax_classic/constants.py
@@ -21,6 +21,7 @@
     pathlib.Path(__file__).parent.resolve(), "assets", "texture_cache_classic.pbz2"
 )
 
+
 # ENUMS
 class BlockType(Enum):
     INVALID = 0
@@ -390,9 +391,7 @@ def apply_alpha(texture):
         np.linspace(-1, 1, OBS_DIM[0] * block_pixel_size),
         np.linspace(-1, 1, OBS_DIM[1] * block_pixel_size),
     )
-    night_noise_intensity_texture = (
-        1 - np.exp(-0.5 * (xs**2 + ys**2) / (0.5**2)).T
-    )
+    night_noise_intensity_texture = 1 - np.exp(-0.5 * (xs**2 + ys**2) / (0.5**2)).T
 
     night_noise_intensity_texture = jnp.expand_dims(
         night_noise_intensity_texture, axis=-1

diff --git a/craftax/craftax_env.py b/craftax/craftax_env.py
@@ -14,6 +14,14 @@
     CraftaxClassicSymbolicEnv,
     CraftaxClassicSymbolicEnvNoAutoReset,
 )
+from craftax.craftax_marl.envs.craftax_symbolic_env import (
+    CraftaxMARLSymbolicEnv,
+    CraftaxMARLSymbolicEnvNoAutoReset,
+)
+from craftax.craftax_marl.envs.craftax_pixels_env import (
+    CraftaxMARLPixelsEnv,
+    CraftaxMARLPixelsEnvNoAutoReset,
+)
 
 
 def make_craftax_env_from_name(name: str, auto_reset: bool):
@@ -32,6 +40,17 @@ def make_craftax_env_from_name(name: str, auto_reset: bool):
             or name == "Craftax-Classic-Pixels-AutoReset-v1"
         ):
             return CraftaxClassicPixelsEnv()
+
+        if (
+            name == "Craftax-MARL-Symbolic-v1"
+            or name == "Craftax-MARL-Symbolic-AutoReset-v1"
+        ):
+            return CraftaxMARLSymbolicEnv()
+        elif (
+            name == "Craftax-MARL-Pixels-v1"
+            or name == "Craftax-MARL-Pixels-AutoReset-v1"
+        ):
+            return CraftaxMARLPixelsEnv()
     else:
         if name == "Craftax-Symbolic-v1":
             return CraftaxSymbolicEnvNoAutoReset()
@@ -41,6 +60,10 @@ def make_craftax_env_from_name(name: str, auto_reset: bool):
             return CraftaxClassicSymbolicEnvNoAutoReset()
         elif name == "Craftax-Classic-Pixels-v1":
             return CraftaxClassicPixelsEnvNoAutoReset()
+        elif name == "Craftax-MARL-Symbolic-v1":
+            return CraftaxMARLSymbolicEnvNoAutoReset()
+        elif name == "Craftax-MARL-Pixels-v1":
+            return CraftaxMARLPixelsEnvNoAutoReset()
 
     raise ValueError(f"Unknown craftax environment: {name}")
 

diff --git a/craftax/craftax_marl/__init__.py b/craftax/craftax_marl/__init__.py
diff --git a/craftax/craftax_marl/assets/0.png b/craftax/craftax_marl/assets/0.png
diff --git a/craftax/craftax_marl/assets/1.png b/craftax/craftax_marl/assets/1.png
diff --git a/craftax/craftax_marl/assets/2.png b/craftax/craftax_marl/assets/2.png
diff --git a/craftax/craftax_marl/assets/3.png b/craftax/craftax_marl/assets/3.png
diff --git a/craftax/craftax_marl/assets/4.png b/craftax/craftax_marl/assets/4.png
diff --git a/craftax/craftax_marl/assets/5.png b/craftax/craftax_marl/assets/5.png
diff --git a/craftax/craftax_marl/assets/6.png b/craftax/craftax_marl/assets/6.png
diff --git a/craftax/craftax_marl/assets/7.png b/craftax/craftax_marl/assets/7.png
diff --git a/craftax/craftax_marl/assets/8.png b/craftax/craftax_marl/assets/8.png
diff --git a/craftax/craftax_marl/assets/9.png b/craftax/craftax_marl/assets/9.png
diff --git a/craftax/craftax_marl/assets/arrow-down.png b/craftax/craftax_marl/assets/arrow-down.png
diff --git a/craftax/craftax_marl/assets/arrow-left.png b/craftax/craftax_marl/assets/arrow-left.png
diff --git a/craftax/craftax_marl/assets/arrow-right.png b/craftax/craftax_marl/assets/arrow-right.png
diff --git a/craftax/craftax_marl/assets/arrow-up.png b/craftax/craftax_marl/assets/arrow-up.png
diff --git a/craftax/craftax_marl/assets/arrow_fire_enchantment.png b/craftax/craftax_marl/assets/arrow_fire_enchantment.png
diff --git a/craftax/craftax_marl/assets/arrow_ice_enchantment.png b/craftax/craftax_marl/assets/arrow_ice_enchantment.png
diff --git a/craftax/craftax_marl/assets/bat.png b/craftax/craftax_marl/assets/bat.png
diff --git a/craftax/craftax_marl/assets/book.png b/craftax/craftax_marl/assets/book.png
diff --git a/craftax/craftax_marl/assets/boots_fire_enchantment.png b/craftax/craftax_marl/assets/boots_fire_enchantment.png
diff --git a/craftax/craftax_marl/assets/boots_ice_enchantment.png b/craftax/craftax_marl/assets/boots_ice_enchantment.png
diff --git a/craftax/craftax_marl/assets/bow.png b/craftax/craftax_marl/assets/bow.png
diff --git a/craftax/craftax_marl/assets/chest.png b/craftax/craftax_marl/assets/chest.png
diff --git a/craftax/craftax_marl/assets/chestplate_fire_enchantment.png b/craftax/craftax_marl/assets/chestplate_fire_enchantment.png
diff --git a/craftax/craftax_marl/assets/chestplate_ice_enchantment.png b/craftax/craftax_marl/assets/chestplate_ice_enchantment.png
diff --git a/craftax/craftax_marl/assets/coal.png b/craftax/craftax_marl/assets/coal.png
diff --git a/craftax/craftax_marl/assets/cow.png b/craftax/craftax_marl/assets/cow.png
diff --git a/craftax/craftax_marl/assets/dagger.png b/craftax/craftax_marl/assets/dagger.png
diff --git a/craftax/craftax_marl/assets/debug-2.png b/craftax/craftax_marl/assets/debug-2.png
diff --git a/craftax/craftax_marl/assets/debug-3.png b/craftax/craftax_marl/assets/debug-3.png
diff --git a/craftax/craftax_marl/assets/debug.png b/craftax/craftax_marl/assets/debug.png
diff --git a/craftax/craftax_marl/assets/debug_tile.png b/craftax/craftax_marl/assets/debug_tile.png
diff --git a/craftax/craftax_marl/assets/deep_thing.png b/craftax/craftax_marl/assets/deep_thing.png
diff --git a/craftax/craftax_marl/assets/dexterity.png b/craftax/craftax_marl/assets/dexterity.png
diff --git a/craftax/craftax_marl/assets/diamond.png b/craftax/craftax_marl/assets/diamond.png
diff --git a/craftax/craftax_marl/assets/diamond_boots.png b/craftax/craftax_marl/assets/diamond_boots.png
diff --git a/craftax/craftax_marl/assets/diamond_chestplate.png b/craftax/craftax_marl/assets/diamond_chestplate.png
diff --git a/craftax/craftax_marl/assets/diamond_helmet.png b/craftax/craftax_marl/assets/diamond_helmet.png
diff --git a/craftax/craftax_marl/assets/diamond_pants.png b/craftax/craftax_marl/assets/diamond_pants.png
diff --git a/craftax/craftax_marl/assets/diamond_pickaxe.png b/craftax/craftax_marl/assets/diamond_pickaxe.png
diff --git a/craftax/craftax_marl/assets/diamond_sword.png b/craftax/craftax_marl/assets/diamond_sword.png
diff --git a/craftax/craftax_marl/assets/drink.png b/craftax/craftax_marl/assets/drink.png
diff --git a/craftax/craftax_marl/assets/enchantment_table_fire.png b/craftax/craftax_marl/assets/enchantment_table_fire.png
diff --git a/craftax/craftax_marl/assets/enchantment_table_ice.png b/craftax/craftax_marl/assets/enchantment_table_ice.png
diff --git a/craftax/craftax_marl/assets/energy.png b/craftax/craftax_marl/assets/energy.png
diff --git a/craftax/craftax_marl/assets/fence.png b/craftax/craftax_marl/assets/fence.png
diff --git a/craftax/craftax_marl/assets/fire_elemental.png b/craftax/craftax_marl/assets/fire_elemental.png
diff --git a/craftax/craftax_marl/assets/fire_grass.png b/craftax/craftax_marl/assets/fire_grass.png
diff --git a/craftax/craftax_marl/assets/fire_stone.png b/craftax/craftax_marl/assets/fire_stone.png
diff --git a/craftax/craftax_marl/assets/fire_tree.png b/craftax/craftax_marl/assets/fire_tree.png
diff --git a/craftax/craftax_marl/assets/fireball.png b/craftax/craftax_marl/assets/fireball.png
diff --git a/craftax/craftax_marl/assets/food.png b/craftax/craftax_marl/assets/food.png
diff --git a/craftax/craftax_marl/assets/fountain.png b/craftax/craftax_marl/assets/fountain.png
diff --git a/craftax/craftax_marl/assets/frost_troll.png b/craftax/craftax_marl/assets/frost_troll.png
diff --git a/craftax/craftax_marl/assets/furnace.png b/craftax/craftax_marl/assets/furnace.png
diff --git a/craftax/craftax_marl/assets/gnome_archer.png b/craftax/craftax_marl/assets/gnome_archer.png
diff --git a/craftax/craftax_marl/assets/gnome_warrior.png b/craftax/craftax_marl/assets/gnome_warrior.png
diff --git a/craftax/craftax_marl/assets/grass.png b/craftax/craftax_marl/assets/grass.png
diff --git a/craftax/craftax_marl/assets/grave.png b/craftax/craftax_marl/assets/grave.png
diff --git a/craftax/craftax_marl/assets/grave2.png b/craftax/craftax_marl/assets/grave2.png
diff --git a/craftax/craftax_marl/assets/grave3.png b/craftax/craftax_marl/assets/grave3.png
diff --git a/craftax/craftax_marl/assets/gravel.png b/craftax/craftax_marl/assets/gravel.png
diff --git a/craftax/craftax_marl/assets/health.png b/craftax/craftax_marl/assets/health.png
diff --git a/craftax/craftax_marl/assets/helmet_fire_enchantment.png b/craftax/craftax_marl/assets/helmet_fire_enchantment.png
diff --git a/craftax/craftax_marl/assets/helmet_ice_enchantment.png b/craftax/craftax_marl/assets/helmet_ice_enchantment.png
diff --git a/craftax/craftax_marl/assets/ice_elemental.png b/craftax/craftax_marl/assets/ice_elemental.png
diff --git a/craftax/craftax_marl/assets/ice_grass.png b/craftax/craftax_marl/assets/ice_grass.png
diff --git a/craftax/craftax_marl/assets/ice_shrub.png b/craftax/craftax_marl/assets/ice_shrub.png
diff --git a/craftax/craftax_marl/assets/iceball.png b/craftax/craftax_marl/assets/iceball.png
diff --git a/craftax/craftax_marl/assets/intelligence.png b/craftax/craftax_marl/assets/intelligence.png
diff --git a/craftax/craftax_marl/assets/iron.png b/craftax/craftax_marl/assets/iron.png
diff --git a/craftax/craftax_marl/assets/iron_boots.png b/craftax/craftax_marl/assets/iron_boots.png
diff --git a/craftax/craftax_marl/assets/iron_chestplate.png b/craftax/craftax_marl/assets/iron_chestplate.png
diff --git a/craftax/craftax_marl/assets/iron_helmet.png b/craftax/craftax_marl/assets/iron_helmet.png
diff --git a/craftax/craftax_marl/assets/iron_pants.png b/craftax/craftax_marl/assets/iron_pants.png
diff --git a/craftax/craftax_marl/assets/iron_pickaxe.png b/craftax/craftax_marl/assets/iron_pickaxe.png
diff --git a/craftax/craftax_marl/assets/iron_sword.png b/craftax/craftax_marl/assets/iron_sword.png
diff --git a/craftax/craftax_marl/assets/knight.png b/craftax/craftax_marl/assets/knight.png
diff --git a/craftax/craftax_marl/assets/knight_archer.png b/craftax/craftax_marl/assets/knight_archer.png
diff --git a/craftax/craftax_marl/assets/kobold.png b/craftax/craftax_marl/assets/kobold.png
diff --git a/craftax/craftax_marl/assets/ladder_down.png b/craftax/craftax_marl/assets/ladder_down.png
diff --git a/craftax/craftax_marl/assets/ladder_down_blocked.png b/craftax/craftax_marl/assets/ladder_down_blocked.png
diff --git a/craftax/craftax_marl/assets/ladder_up.png b/craftax/craftax_marl/assets/ladder_up.png
diff --git a/craftax/craftax_marl/assets/lava.png b/craftax/craftax_marl/assets/lava.png
diff --git a/craftax/craftax_marl/assets/leaves.png b/craftax/craftax_marl/assets/leaves.png
diff --git a/craftax/craftax_marl/assets/lizard.png b/craftax/craftax_marl/assets/lizard.png
diff --git a/craftax/craftax_marl/assets/log.png b/craftax/craftax_marl/assets/log.png
diff --git a/craftax/craftax_marl/assets/mana.png b/craftax/craftax_marl/assets/mana.png
diff --git a/craftax/craftax_marl/assets/necromancer.png b/craftax/craftax_marl/assets/necromancer.png
diff --git a/craftax/craftax_marl/assets/necromancer_vulnerable.png b/craftax/craftax_marl/assets/necromancer_vulnerable.png
diff --git a/craftax/craftax_marl/assets/orc_mage.png b/craftax/craftax_marl/assets/orc_mage.png
diff --git a/craftax/craftax_marl/assets/orc_soldier.png b/craftax/craftax_marl/assets/orc_soldier.png
diff --git a/craftax/craftax_marl/assets/pants_fire_enchantment.png b/craftax/craftax_marl/assets/pants_fire_enchantment.png
diff --git a/craftax/craftax_marl/assets/pants_ice_enchantment.png b/craftax/craftax_marl/assets/pants_ice_enchantment.png
diff --git a/craftax/craftax_marl/assets/path.png b/craftax/craftax_marl/assets/path.png
diff --git a/craftax/craftax_marl/assets/path_moss.png b/craftax/craftax_marl/assets/path_moss.png
diff --git a/craftax/craftax_marl/assets/pigman.png b/craftax/craftax_marl/assets/pigman.png
diff --git a/craftax/craftax_marl/assets/plant-ripe.png b/craftax/craftax_marl/assets/plant-ripe.png
diff --git a/craftax/craftax_marl/assets/plant-young.png b/craftax/craftax_marl/assets/plant-young.png
diff --git a/craftax/craftax_marl/assets/plant.png b/craftax/craftax_marl/assets/plant.png
diff --git a/craftax/craftax_marl/assets/plant_on_grass.png b/craftax/craftax_marl/assets/plant_on_grass.png
diff --git a/craftax/craftax_marl/assets/player-dead.png b/craftax/craftax_marl/assets/player-dead.png
diff --git a/craftax/craftax_marl/assets/player-down.png b/craftax/craftax_marl/assets/player-down.png
diff --git a/craftax/craftax_marl/assets/player-left.png b/craftax/craftax_marl/assets/player-left.png
diff --git a/craftax/craftax_marl/assets/player-right.png b/craftax/craftax_marl/assets/player-right.png
diff --git a/craftax/craftax_marl/assets/player-sleep.png b/craftax/craftax_marl/assets/player-sleep.png
diff --git a/craftax/craftax_marl/assets/player-up.png b/craftax/craftax_marl/assets/player-up.png
diff --git a/craftax/craftax_marl/assets/player.png b/craftax/craftax_marl/assets/player.png
diff --git a/craftax/craftax_marl/assets/pointer-right-dead.png b/craftax/craftax_marl/assets/pointer-right-dead.png
diff --git a/craftax/craftax_marl/assets/pointer-right.png b/craftax/craftax_marl/assets/pointer-right.png
diff --git a/craftax/craftax_marl/assets/pointer-top-right-dead.png b/craftax/craftax_marl/assets/pointer-top-right-dead.png
diff --git a/craftax/craftax_marl/assets/pointer-top-right.png b/craftax/craftax_marl/assets/pointer-top-right.png
diff --git a/craftax/craftax_marl/assets/potion_blue.png b/craftax/craftax_marl/assets/potion_blue.png
diff --git a/craftax/craftax_marl/assets/potion_cyan.png b/craftax/craftax_marl/assets/potion_cyan.png
diff --git a/craftax/craftax_marl/assets/potion_green.png b/craftax/craftax_marl/assets/potion_green.png
diff --git a/craftax/craftax_marl/assets/potion_pink.png b/craftax/craftax_marl/assets/potion_pink.png
diff --git a/craftax/craftax_marl/assets/potion_red.png b/craftax/craftax_marl/assets/potion_red.png
diff --git a/craftax/craftax_marl/assets/potion_yellow.png b/craftax/craftax_marl/assets/potion_yellow.png
diff --git a/craftax/craftax_marl/assets/ripe_plant_on_grass.png b/craftax/craftax_marl/assets/ripe_plant_on_grass.png
diff --git a/craftax/craftax_marl/assets/ruby.png b/craftax/craftax_marl/assets/ruby.png
diff --git a/craftax/craftax_marl/assets/sand.png b/craftax/craftax_marl/assets/sand.png
diff --git a/craftax/craftax_marl/assets/sapling.png b/craftax/craftax_marl/assets/sapling.png
diff --git a/craftax/craftax_marl/assets/sapphire.png b/craftax/craftax_marl/assets/sapphire.png
diff --git a/craftax/craftax_marl/assets/skeleton.png b/craftax/craftax_marl/assets/skeleton.png
diff --git a/craftax/craftax_marl/assets/slimeball.png b/craftax/craftax_marl/assets/slimeball.png
diff --git a/craftax/craftax_marl/assets/snail.png b/craftax/craftax_marl/assets/snail.png
diff --git a/craftax/craftax_marl/assets/spider.png b/craftax/craftax_marl/assets/spider.png
diff --git a/craftax/craftax_marl/assets/stalagmite.png b/craftax/craftax_marl/assets/stalagmite.png
diff --git a/craftax/craftax_marl/assets/stone.png b/craftax/craftax_marl/assets/stone.png
diff --git a/craftax/craftax_marl/assets/stone_pickaxe.png b/craftax/craftax_marl/assets/stone_pickaxe.png
diff --git a/craftax/craftax_marl/assets/stone_sword.png b/craftax/craftax_marl/assets/stone_sword.png
diff --git a/craftax/craftax_marl/assets/strength.png b/craftax/craftax_marl/assets/strength.png
diff --git a/craftax/craftax_marl/assets/sword_fire_enchantment.png b/craftax/craftax_marl/assets/sword_fire_enchantment.png
diff --git a/craftax/craftax_marl/assets/sword_ice_enchantment.png b/craftax/craftax_marl/assets/sword_ice_enchantment.png
diff --git a/craftax/craftax_marl/assets/table.png b/craftax/craftax_marl/assets/table.png
diff --git a/craftax/craftax_marl/assets/torch_in_inventory.png b/craftax/craftax_marl/assets/torch_in_inventory.png
diff --git a/craftax/craftax_marl/assets/torch_on_path.png b/craftax/craftax_marl/assets/torch_on_path.png
diff --git a/craftax/craftax_marl/assets/tree.png b/craftax/craftax_marl/assets/tree.png
diff --git a/craftax/craftax_marl/assets/troll.png b/craftax/craftax_marl/assets/troll.png
diff --git a/craftax/craftax_marl/assets/unknown.png b/craftax/craftax_marl/assets/unknown.png
diff --git a/craftax/craftax_marl/assets/wall.png b/craftax/craftax_marl/assets/wall.png
diff --git a/craftax/craftax_marl/assets/wall2.png b/craftax/craftax_marl/assets/wall2.png
diff --git a/craftax/craftax_marl/assets/wall_moss.png b/craftax/craftax_marl/assets/wall_moss.png
diff --git a/craftax/craftax_marl/assets/water.png b/craftax/craftax_marl/assets/water.png
diff --git a/craftax/craftax_marl/assets/wood.png b/craftax/craftax_marl/assets/wood.png
diff --git a/craftax/craftax_marl/assets/wood_pickaxe.png b/craftax/craftax_marl/assets/wood_pickaxe.png
diff --git a/craftax/craftax_marl/assets/wood_sword.png b/craftax/craftax_marl/assets/wood_sword.png
diff --git a/craftax/craftax_marl/assets/xp.png b/craftax/craftax_marl/assets/xp.png
diff --git a/craftax/craftax_marl/assets/zombie.png b/craftax/craftax_marl/assets/zombie.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
         pathlib.Path(__file__).parent.resolve(), "assets", "texture_cache.pbz2"
     )
     # ENUMS
     class BlockType(Enum):
         INVALID = 0
@@ Expand Down @@