Merge pull request #123 from utilForever/pillar

Add PILLAR and the Pillar Yard level

Author: utilForever

Extensions/BabaEditor/LevelEditor.cpp

@@ -163,6 +163,7 @@ const std::vector<ObjectEntry>& ObjectCatalog()
         { ObjectType::KEKE, "KEKE", "Text: Nouns", ColorU8(238, 238, 238) },
         { ObjectType::LAVA, "LAVA", "Text: Nouns", ColorU8(238, 238, 238) },
         { ObjectType::LOVE, "LOVE", "Text: Nouns", ColorU8(238, 238, 238) },
+        { ObjectType::PILLAR, "PILLAR", "Text: Nouns", ColorU8(238, 238, 238) },
         { ObjectType::ROCK, "ROCK", "Text: Nouns", ColorU8(238, 238, 238) },
         { ObjectType::SKULL, "SKULL", "Text: Nouns", ColorU8(238, 238, 238) },
         { ObjectType::STAR, "STAR", "Text: Nouns", ColorU8(238, 238, 238) },
@@ -187,6 +188,7 @@ const std::vector<ObjectEntry>& ObjectCatalog()
           ColorU8(238, 238, 238) },
         { ObjectType::ICON_ALGAE, "ALGAE", "Objects", ColorU8(84, 150, 64) },
         { ObjectType::ICON_BABA, "BABA", "Objects", ColorU8(236, 236, 236) },
+        { ObjectType::ICON_BRICK, "BRICK", "Objects", ColorU8(42, 47, 39) },
         { ObjectType::ICON_CRAB, "CRAB", "Objects", ColorU8(196, 90, 117) },
         { ObjectType::ICON_FLAG, "FLAG", "Objects", ColorU8(237, 217, 96) },
         { ObjectType::ICON_FLOWER, "FLOWER", "Objects", ColorU8(216, 52, 105) },
@@ -196,6 +198,7 @@ const std::vector<ObjectEntry>& ObjectCatalog()
         { ObjectType::ICON_KEKE, "KEKE", "Objects", ColorU8(196, 90, 117) },
         { ObjectType::ICON_LAVA, "LAVA", "Objects", ColorU8(225, 74, 52) },
         { ObjectType::ICON_LOVE, "LOVE", "Objects", ColorU8(241, 120, 242) },
+        { ObjectType::ICON_PILLAR, "PILLAR", "Objects", ColorU8(81, 111, 148) },
         { ObjectType::ICON_ROCK, "ROCK", "Objects", ColorU8(74, 67, 55) },
         { ObjectType::ICON_SKULL, "SKULL", "Objects", ColorU8(238, 238, 238) },
         { ObjectType::ICON_STAR, "STAR", "Objects", ColorU8(227, 142, 89) },

Extensions/BabaGUI/main.py

@@ -10,6 +10,7 @@
 icon_images = {
     pyBaba.ObjectType.ICON_ALGAE: "ALGAE",
     pyBaba.ObjectType.ICON_BABA: "BABA",
+    pyBaba.ObjectType.ICON_BRICK: "BRICK",
     pyBaba.ObjectType.ICON_CRAB: "CRAB",
     pyBaba.ObjectType.ICON_FLAG: "FLAG",
     pyBaba.ObjectType.ICON_ICE: "ICE",
@@ -22,6 +23,7 @@
     pyBaba.ObjectType.ICON_GRASS: "GRASS",
     pyBaba.ObjectType.ICON_LAVA: "LAVA",
     pyBaba.ObjectType.ICON_LOVE: "LOVE",
+    pyBaba.ObjectType.ICON_PILLAR: "PILLAR",
     pyBaba.ObjectType.ICON_SKULL: "SKULL",
     pyBaba.ObjectType.ICON_STAR: "STAR",
     pyBaba.ObjectType.ICON_FLOWER: "FLOWER",
@@ -51,6 +53,7 @@
     pyBaba.ObjectType.MELT: "MELT",
     pyBaba.ObjectType.MOVE: "MOVE",
     pyBaba.ObjectType.HOT: "HOT",
+    pyBaba.ObjectType.PILLAR: "PILLAR",
     pyBaba.ObjectType.SKULL: "SKULL",
     pyBaba.ObjectType.STAR: "STAR",
     pyBaba.ObjectType.DEFEAT: "DEFEAT",

Extensions/BabaGUI/sprites/icon/BRICK.gif

@@ -0,0 +1,15 @@
+24 14
+25 67 86 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132 132
+132 111 132 132 132 132 132 132 132 132 132 132 132 132 132 132 111 132 158 132 132 132 132 132
+132 132 132 132 132 48 67 79 132 132 158 132 132 132 132 132 132 111 132 132 132 132 111 132
+132 132 132 132 132 132 132 132 132 132 132 132 158 132 132 132 132 132 132 132 111 132 132 132
+132 132 132 121 121 121 132 121 132 121 132 132 132 132 132 132 132 132 132 132 132 132 132 132
+132 132 132 121 174 174 174 174 174 121 132 132 132 132 132 166 166 166 166 166 132 132 132 132
+64 132 132 121 174 170 170 170 174 121 132 132 132 132 121 166 121 121 121 166 132 132 132 132
+67 132 132 121 174 170 114 170 158 121 121 121 121 121 121 166 121 135 121 166 132 132 132 132
+78 132 132 121 174 170 170 170 174 121 111 132 132 132 132 166 121 121 121 166 111 132 132 132
+132 132 132 121 174 174 174 174 174 121 132 132 132 132 132 166 166 166 166 166 132 132 132 132
+132 132 132 121 121 132 132 121 121 121 132 132 132 132 132 132 132 132 132 132 132 132 132 132
+132 111 132 132 132 132 132 132 132 132 132 158 132 132 132 132 132 132 132 132 132 132 132 132
+132 132 132 132 132 4 67 77 132 132 132 132 132 132 132 111 132 158 132 111 132 132 132 132
+132 132 132 132 132 132 132 132 132 132 132 132 132 132 111 132 132 132 132 132 132 56 67 87

Extensions/BabaGUI/sprites/icon/PILLAR.gif

@@ -454,6 +454,40 @@ def test_game_turns_rules_multiple_you_and_win():
     assert game.GetPlayState() == pyBaba.PlayState.WON
 
 
+def test_game_pillar_yard_load_and_reset():
+    game = pyBaba.Game("Resources/Maps/pillar_yard.txt")
+    assert game.GetMap().GetWidth() == 24
+    assert game.GetMap().GetHeight() == 14
+    assert game.GetRuleManager().GetNumRules() == 5
+    assert game.GetMap().At(6, 7).HasType(pyBaba.ObjectType.ICON_BABA)
+    assert game.GetMap().At(8, 7).HasType(pyBaba.ObjectType.ICON_PILLAR)
+    assert game.GetMap().At(3, 4).HasType(pyBaba.ObjectType.ICON_BRICK)
+    assert game.GetMap().At(15, 7).HasType(pyBaba.ObjectType.ICON_STAR)
+    assert game.GetMap().At(17, 7).HasType(pyBaba.ObjectType.ICON_FLAG)
+
+    game.MovePlayer(pyBaba.Direction.RIGHT)
+    game.Reset()
+    assert game.GetMap().At(6, 7).HasType(pyBaba.ObjectType.ICON_BABA)
+    assert game.GetMap().At(8, 7).HasType(pyBaba.ObjectType.ICON_PILLAR)
+    assert game.GetRuleManager().GetNumRules() == 5
+    assert game.GetPlayState() == pyBaba.PlayState.PLAYING
+
+
+def test_game_pillar_yard_forms_pillar_is_you_and_wins():
+    game = pyBaba.Game("Resources/Maps/pillar_yard.txt")
+    solution = (
+        "RRRRRRUUUUUULLDDDDDLDRRRDDDDDLUUUULURRRRUUUUUULLLLLLLLL"
+        "DDLDRRRRURDDDDDDDRDLLLLULD"
+    )
+
+    _move(game, solution)
+    assert game.GetRuleManager().HasProperty(
+        [pyBaba.ObjectType.ICON_PILLAR], pyBaba.ObjectType.YOU
+    )
+    assert game.GetMap().At(17, 7).HasType(pyBaba.ObjectType.ICON_PILLAR)
+    assert game.GetPlayState() == pyBaba.PlayState.WON
+
+
 def test_game_sink_reparses_destroyed_rule_text():
     game = pyBaba.Game("Resources/Maps/sink_rule_reparse.txt")
 

Extensions/BabaGUI/sprites/text/PILLAR.gif

@@ -1,6 +1,8 @@
 """Behavior checks for GUI-owned direction decisions."""
 
+import importlib.util
 from pathlib import Path
+import sys
 
 import pyBaba
 
@@ -81,19 +83,25 @@ def _gif_palette_starts(data):
         position += 1
 
 
-def test_affection_sprite_palettes_keep_colored_pixels_opaque():
+def test_sprite_palettes_keep_colored_pixels_opaque():
     root = Path(__file__).parents[2]
     sprites = {
-        "Extensions/BabaGUI/sprites/text/ALGAE.gif": ((84, 150, 64), 1),
-        "Extensions/BabaGUI/sprites/text/KEKE.gif": ((196, 90, 117), 1),
-        "Extensions/BabaGUI/sprites/text/LOVE.gif": ((241, 120, 242), 1),
-        "Extensions/BabaGUI/sprites/text/MOVE.gif": ((119, 171, 63), 1),
-        "Extensions/BabaGUI/sprites/icon/ALGAE.gif": ((84, 150, 64), 1),
-        "Extensions/BabaGUI/sprites/icon/KEKE.gif": ((196, 90, 117), 2),
-        "Extensions/BabaGUI/sprites/icon/LOVE.gif": ((241, 120, 242), 1),
+        "Extensions/BabaGUI/sprites/text/ALGAE.gif": (((84, 150, 64),), 1),
+        "Extensions/BabaGUI/sprites/text/KEKE.gif": (((196, 90, 117),), 1),
+        "Extensions/BabaGUI/sprites/text/LOVE.gif": (((241, 120, 242),), 1),
+        "Extensions/BabaGUI/sprites/text/MOVE.gif": (((119, 171, 63),), 1),
+        "Extensions/BabaGUI/sprites/icon/ALGAE.gif": (((84, 150, 64),), 1),
+        "Extensions/BabaGUI/sprites/icon/KEKE.gif": (((196, 90, 117),), 2),
+        "Extensions/BabaGUI/sprites/icon/LOVE.gif": (((241, 120, 242),), 1),
+        "Extensions/BabaGUI/sprites/text/PILLAR.gif": (((81, 111, 148),), 1),
+        "Extensions/BabaGUI/sprites/icon/PILLAR.gif": (
+            ((81, 111, 148), (36, 36, 36)),
+            2,
+        ),
+        "Extensions/BabaGUI/sprites/icon/BRICK.gif": (((42, 47, 39),), 1),
     }
 
-    for relative, (color, transparent_index) in sprites.items():
+    for relative, (colors, transparent_index) in sprites.items():
         data = (root / relative).read_bytes()
         assert int.from_bytes(data[6:8], "little") == 24
         assert int.from_bytes(data[8:10], "little") == 24
@@ -111,8 +119,10 @@ def test_affection_sprite_palettes_keep_colored_pixels_opaque():
         assert all(data[index + 6] == transparent_index for index in controls)
 
         for start in palettes:
-            assert tuple(data[start : start + 3]) == color
+            for palette_index, color in enumerate(colors):
+                offset = start + palette_index * 3
+                assert tuple(data[offset : offset + 3]) == color
 
-            for palette_index in range(1, transparent_index + 1):
+            for palette_index in range(len(colors), transparent_index + 1):
                 offset = start + palette_index * 3
                 assert max(data[offset : offset + 3]) <= 8

Resources/Maps/pillar_yard.txt

@@ -183,6 +183,44 @@ TEST_CASE("Editor - Affection sprite assets")
     }
 }
 
+TEST_CASE("Editor - Pillar Yard round trip and sprite assets")
+{
+    namespace fs = std::filesystem;
+
+    LevelFile pillarYard;
+    REQUIRE(LoadLevelFile(MAPS_DIR "pillar_yard.txt", pillarYard));
+    CHECK(pillarYard.width == 24);
+    CHECK(pillarYard.height == 14);
+    CHECK(pillarYard.tiles[2 * pillarYard.width + 5][0] == ObjectType::PILLAR);
+    CHECK(pillarYard.tiles[7 * pillarYard.width + 8][0] ==
+          ObjectType::ICON_PILLAR);
+    CHECK(pillarYard.tiles[4 * pillarYard.width + 3][0] ==
+          ObjectType::ICON_BRICK);
+
+    const fs::path path =
+        fs::current_path() / "baba-is-auto-pillar-yard-round-trip.txt";
+    std::error_code error;
+    CHECK(SaveLevelFile(path, pillarYard));
+
+    LevelFile loaded;
+    REQUIRE(LoadLevelFile(path, loaded));
+    CHECK(loaded.tiles == pillarYard.tiles);
+    CHECK(loaded.directions == pillarYard.directions);
+
+    fs::remove(path, error);
+
+    const fs::path root = (fs::path(MAPS_DIR) / "../..").lexically_normal();
+
+    for (const char* asset : {
+             "Extensions/BabaGUI/sprites/text/PILLAR.gif",
+             "Extensions/BabaGUI/sprites/icon/PILLAR.gif",
+             "Extensions/BabaGUI/sprites/icon/BRICK.gif",
+         })
+    {
+        CHECK(fs::is_regular_file(root / asset));
+    }
+}
+
 TEST_CASE("Editor - Layer tile direction updates")
 {
     LevelFile::LayerTile tiles{ ObjectType::ICON_EMPTY, ObjectType::ICON_EMPTY,

Tests/PythonTests/test_game.py

@@ -328,6 +328,42 @@ TEST_CASE("Game - Turns")
     }
 }
 
+TEST_CASE("Game - Pillar Yard")
+{
+    SUBCASE("Loads and resets")
+    {
+        Game game(MAPS_DIR "pillar_yard.txt");
+        CHECK(game.GetMap().GetWidth() == 24);
+        CHECK(game.GetMap().GetHeight() == 14);
+        CHECK(game.GetRuleManager().GetNumRules() == 5);
+        CHECK(game.GetMap().At(6, 7).HasType(ObjectType::ICON_BABA));
+        CHECK(game.GetMap().At(8, 7).HasType(ObjectType::ICON_PILLAR));
+        CHECK(game.GetMap().At(3, 4).HasType(ObjectType::ICON_BRICK));
+        CHECK(game.GetMap().At(15, 7).HasType(ObjectType::ICON_STAR));
+        CHECK(game.GetMap().At(17, 7).HasType(ObjectType::ICON_FLAG));
+
+        game.MovePlayer(Direction::RIGHT);
+        game.Reset();
+        CHECK(game.GetMap().At(6, 7).HasType(ObjectType::ICON_BABA));
+        CHECK(game.GetMap().At(8, 7).HasType(ObjectType::ICON_PILLAR));
+        CHECK(game.GetRuleManager().GetNumRules() == 5);
+        CHECK(game.GetPlayState() == PlayState::PLAYING);
+    }
+
+    SUBCASE("Forms PILLAR IS YOU and wins")
+    {
+        Game game(MAPS_DIR "pillar_yard.txt");
+
+        Move(game,
+             "RRRRRRUUUUUULLDDDDDLDRRRDDDDDLUUUULURRRRUUUUUULLLLLLLLL"
+             "DDLDRRRRURDDDDDDDRDLLLLULD");
+        CHECK(game.GetRuleManager().HasProperty({ ObjectType::ICON_PILLAR },
+                                                ObjectType::YOU));
+        CHECK(game.GetMap().At(17, 7).HasType(ObjectType::ICON_PILLAR));
+        CHECK(game.GetPlayState() == PlayState::WON);
+    }
+}
+
 TEST_CASE("Game - Editor Smoke Map")
 {
     Game game(MAPS_DIR "editor_smoke.txt");