From d93bc1615cc34cd8ad89f7f158495f851ca502b4 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 14:03:41 -0400
Subject: [PATCH] Big changes to use the new lel-guecs setup but now almost
 everything works. Only thing missing is Issue #16 in quecs.

---
 assets/map_tiles.png  | Bin 9148 -> 9292 bytes
 assets/palette.json   |   2 +-
 gui/boss_fight_ui.cpp |  22 +++++++++++-----------
 gui/debug_ui.cpp      |   2 +-
 gui/guecstra.cpp      |  11 +++++++----
 gui/loot_ui.cpp       |  12 ++++++------
 gui/map_view.cpp      |   4 ++--
 gui/mini_map.hpp      |   2 +-
 gui/overlay_ui.cpp    |  16 ++++------------
 gui/overlay_ui.hpp    |   3 ---
 gui/ritual_ui.cpp     |   8 ++++----
 gui/status_ui.cpp     |  14 +++++++-------
 tools/arena_ui.cpp    |  12 ++++++------
 wraps/lel-guecs.wrap  |   2 +-
 14 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/assets/map_tiles.png b/assets/map_tiles.png
index 6da17711234bb8e782522ac581415fef29084db8..5c958abf00f6f5c1ab14be329dd33d6bca443dbe 100644
GIT binary patch
literal 9292
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
ALjV8(

literal 9148
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
a!U4dcW&;|McrgYb|7_N*x4dOe4gD|i8bXc$

diff --git a/assets/palette.json b/assets/palette.json
index b61f138..49f621d 100644
--- a/assets/palette.json
+++ b/assets/palette.json
@@ -1,6 +1,6 @@
 {
   "color": {
-    "transparent": [255, 255, 255, 255],
+    "transparent": [100, 100, 100, 100],
     "BAD": [255, 0, 0]
   },
   "gui/theme": {
diff --git a/gui/boss_fight_ui.cpp b/gui/boss_fight_ui.cpp
index 269286b..f7c8d05 100644
--- a/gui/boss_fight_ui.cpp
+++ b/gui/boss_fight_ui.cpp
@@ -14,17 +14,17 @@ namespace gui {
     $status.position(0, 0, BOSS_VIEW_X, SCREEN_HEIGHT);
     $status.layout(
         "[main_status]"
-        "[(150)status_3|(150)status_4]"
-        "[(150)status_5|(150)status_6]"
-        "[(150)status_7|(150)status_8]");
+        "[=status_3|=status_4]"
+        "[=status_5|=status_6]"
+        "[=status_7|=status_8]");
 
     $overlay.position(BOSS_VIEW_X, BOSS_VIEW_Y,
         BOSS_VIEW_WIDTH, BOSS_VIEW_HEIGHT);
 
-    $overlay.layout("[overlay_1|overlay_2|overlay_4]"
-      "[overlay_5|overlay_6|overlay_8]"
-      "[overlay_9|overlay_10|overlay_12]"
-      "[overlay_13|overlay_14|overlay_16]");
+    $overlay.layout("[=overlay_1|=overlay_2|=overlay_4]"
+      "[=overlay_5|=overlay_6|=overlay_8]"
+      "[=overlay_9|=overlay_10|=overlay_12]"
+      "[=overlay_13|=overlay_14|=overlay_16]");
 
     $sounds = $world->get<components::Sound>($boss_id);
     $combat = $world->get<components::Combat>($boss_id);
@@ -73,9 +73,9 @@ namespace gui {
           }
       });
       if(name == "main_status") {
-        $status.set<Textual>(button, {fmt::format(L"HP: {}", $combat.hp)});
+        $status.set<Text>(button, {fmt::format(L"HP: {}", $combat.hp)});
       } else {
-        $status.set<Label>(button, {L"Attack"});
+        $status.set<Text>(button, {L"Attack"});
       }
     }
     $status.init();
@@ -131,8 +131,8 @@ namespace gui {
     }
 
     if($combat.hp == 0) {
-      $overlay.show_label("overlay_1", L"YOU WON!");
-      $overlay.show_label("overlay_4", L"CLICK TO CONTINUE...");
+      $overlay.show_text("overlay_1", L"YOU WON!");
+      $overlay.show_text("overlay_4", L"CLICK TO CONTINUE...");
     }
 
     $status.render(window);
diff --git a/gui/debug_ui.cpp b/gui/debug_ui.cpp
index 014f243..33bf7c6 100644
--- a/gui/debug_ui.cpp
+++ b/gui/debug_ui.cpp
@@ -85,7 +85,7 @@ namespace gui {
       $gui.show_text("debug_text", L"STATS");
     } else {
       // it's off now, close it
-      $gui.close<Textual>("debug_text");
+      $gui.close<Text>("debug_text");
     }
   }
 
diff --git a/gui/guecstra.cpp b/gui/guecstra.cpp
index e028f31..d0b0581 100644
--- a/gui/guecstra.cpp
+++ b/gui/guecstra.cpp
@@ -21,10 +21,13 @@ namespace guecs {
   }
 
   void GrabSource::setSprite(guecs::UI& gui, guecs::Entity gui_id) {
-    dbc::check(gui.has<guecs::Icon>(gui_id), "GrabSource given sprite gui_id that doesn't exist");
-
-    auto& sp = gui.get<guecs::Icon>(gui_id);
-    sprite = sp.sprite;
+    if(auto sp = gui.get_if<guecs::Icon>(gui_id)) {
+      sprite = sp->sprite;
+    } else if(auto sp = gui.get_if<guecs::Sprite>(gui_id)) {
+      sprite = sp->sprite;
+    } else {
+      dbc::sentinel("GrabSource given sprite gui_id that doesn't exist");
+    }
   }
 
   void GrabSource::move(sf::Vector2f pos) {
diff --git a/gui/loot_ui.cpp b/gui/loot_ui.cpp
index f5f91e2..22fc8ca 100644
--- a/gui/loot_ui.cpp
+++ b/gui/loot_ui.cpp
@@ -15,10 +15,10 @@ namespace gui {
         RAY_VIEW_Y+RAY_VIEW_HEIGHT/2-200, 400, 400);
 
     $gui.layout(
-        "[item_0 | item_1 |item_2 | item_3 ]"
-        "[item_4 | item_5 |item_6 | item_7 ]"
-        "[item_8 | item_9 |item_10| item_11]"
-        "[item_12| item_13|item_14|item_15 ]"
+        "[=item_0 | =item_1 |=item_2 |=item_3 ]"
+        "[=item_4 | =item_5 |=item_6 |=item_7 ]"
+        "[=item_8 | =item_9 |=item_10|=item_11]"
+        "[=item_12| =item_13|=item_14|=item_15 ]"
         "[ =take_all | =close| =destroy]");
 
     $level.world->set<inventory::Model>($temp_loot, {});
@@ -29,7 +29,7 @@ namespace gui {
 
     auto button = $gui.entity(name);
     $gui.set<guecs::Rectangle>(button, {});
-    $gui.set<guecs::Label>(button, {label});
+    $gui.set<guecs::Text>(button, {label});
     $gui.set<guecs::Clickable>(button,
         guecs::make_action($level, event));
   }
@@ -49,7 +49,7 @@ namespace gui {
       auto id = $gui.entity(name);
 
       $gui.set<guecs::Rectangle>(id, {THEME.PADDING,
-          THEME.TRANSPARENT, THEME.LIGHT_MID });
+           THEME.TRANSPARENT, THEME.LIGHT_MID });
       $gui.set<guecs::Effect>(id, {0.4f, "ui_shader"});
       $gui.set<guecs::Clickable>(id, {
           guecs::make_action($level, Events::GUI::LOOT_SELECT, {id})
diff --git a/gui/map_view.cpp b/gui/map_view.cpp
index e1d2edc..abac584 100644
--- a/gui/map_view.cpp
+++ b/gui/map_view.cpp
@@ -41,7 +41,7 @@ namespace gui {
 
     $log_to = $gui.entity("log_view");
     $gui.set<Rectangle>($log_to, {10, THEME.DARK_MID, THEME.BORDER_COLOR, 10});
-    $gui.set<Textual>($log_to, {L"Welcome to the Game!", 25, THEME.TEXT_COLOR, 10});
+    $gui.set<Text>($log_to, {L"Welcome to the Game!", 25, THEME.TEXT_COLOR, 10});
 
     auto map_cell = lel::center(MAP_TILE_DIM * MAP_WIDTH, MAP_TILE_DIM * MAP_HEIGHT, $gui.cell_for("map_grid"));
     $map_sprite.setPosition({(float)map_cell.x, (float)map_cell.y + 30});
@@ -59,7 +59,7 @@ namespace gui {
   }
 
   void MapViewUI::update() {
-    if(auto text = $gui.get_if<Textual>($log_to)) {
+    if(auto text = $gui.get_if<Text>($log_to)) {
       //BUG: I'm calling this what it is, fix it
       wstring log_garbage;
       for(auto msg : $messages) {
diff --git a/gui/mini_map.hpp b/gui/mini_map.hpp
index ed2727e..38055b0 100644
--- a/gui/mini_map.hpp
+++ b/gui/mini_map.hpp
@@ -6,7 +6,7 @@
 namespace gui {
   class MiniMapUI {
     public:
-      guecs::Textual $map_grid;
+      guecs::Text $map_grid;
       guecs::UI $gui;
       GameLevel $level;
       shared_ptr<sf::Font> $font = nullptr;
diff --git a/gui/overlay_ui.cpp b/gui/overlay_ui.cpp
index a24ac73..89f879e 100644
--- a/gui/overlay_ui.cpp
+++ b/gui/overlay_ui.cpp
@@ -10,9 +10,9 @@ namespace gui {
   OverlayUI::OverlayUI() {
     $gui.position(RAY_VIEW_X, RAY_VIEW_Y, RAY_VIEW_WIDTH, RAY_VIEW_HEIGHT);
     $gui.layout(
-        "[*%(100,300)left|top|>(170,170)top_right]"
-        "[_|middle|middle_right]"
-        "[_|bottom|bottom_right]"
+        "[*%(100,300)left|=top|>(170,170)top_right]"
+        "[_|=middle|=middle_right]"
+        "[_|=bottom|=bottom_right]"
         );
     $gui.init();
   }
@@ -52,15 +52,7 @@ namespace gui {
   }
 
   void OverlayUI::close_text(string region) {
-    $gui.close<Textual>(region);
-  }
-
-  void OverlayUI::show_label(string region, wstring content) {
-    $gui.show_label(region, content);
-  }
-
-  void OverlayUI::close_label(string region) {
-    $gui.close<Label>(region);
+    $gui.close<Text>(region);
   }
 
   void OverlayUI::update_level(GameLevel level) {
diff --git a/gui/overlay_ui.hpp b/gui/overlay_ui.hpp
index f445b89..62f23eb 100644
--- a/gui/overlay_ui.hpp
+++ b/gui/overlay_ui.hpp
@@ -23,8 +23,5 @@ namespace gui {
       void show_text(std::string region, std::wstring content);
       void update_text(std::string region, std::wstring content);
       void close_text(std::string region);
-      void show_label(std::string region, std::wstring content);
-      void update_label(std::string region, std::wstring content);
-      void close_label(std::string region);
   };
 }
diff --git a/gui/ritual_ui.cpp b/gui/ritual_ui.cpp
index a248efc..6d08b00 100644
--- a/gui/ritual_ui.cpp
+++ b/gui/ritual_ui.cpp
@@ -24,7 +24,7 @@ namespace gui {
           "[inv_slot8 | inv_slot9 | inv_slot10| inv_slot11]"
           "[inv_slot12 | inv_slot13 | inv_slot14| inv_slot15]"
           "[inv_slot16 | inv_slot17 | inv_slot18| inv_slot19]"
-          "[_                      |*%(200,400)result_text|_]"
+          "[_                      |=*%(200,400)result_text|_]"
           "[*%(100,200)result_image|_                     |_]"
           "[_|_|_]"
           "[_|_|_]"
@@ -217,7 +217,7 @@ namespace gui {
       auto combine = $gui.entity("result_image");
 
       if($craft_state.is_combined()) {
-        $gui.show_label("result_text", L"This might work...");
+        $gui.show_text("result_text", L"This might work...");
 
         switch(ritual.element) {
           case FIRE:
@@ -234,7 +234,7 @@ namespace gui {
           [&](auto, auto){ event(Event::COMBINE); }
         });
       } else {
-        $gui.show_label("result_text", L"That won't work.");
+        $gui.show_text("result_text", L"That won't work.");
         $gui.show_sprite("result_image", "dubious_combination");
         $gui.remove<Clickable>(combine);
         return;
@@ -247,7 +247,7 @@ namespace gui {
 
     void UI::clear_craft_result() {
       $blanket.reset();
-      $gui.close<Label>("result_text");
+      $gui.close<Text>("result_text");
       $gui.close<Sprite>("result_image");
     }
   }
diff --git a/gui/status_ui.cpp b/gui/status_ui.cpp
index 011d2f2..19999f6 100644
--- a/gui/status_ui.cpp
+++ b/gui/status_ui.cpp
@@ -17,15 +17,15 @@ namespace gui {
     $gui.position(STATUS_UI_X, STATUS_UI_Y, STATUS_UI_WIDTH, STATUS_UI_HEIGHT);
     $gui.layout(
         "[ritual_ui]"
-        "[earring|armor_head|amulet]"
-        "[back|*%(200,300)character_view|_|armor_bdy]"
-        "[hand_r|_|_                        |hand_l]"
-        "[ring_r|_|_                        |ring_l]"
-        "[pocket_r|armor_leg|pocket_l]");
+        "[=earring|=armor_head|=amulet]"
+        "[=back|=*%(200,300)character_view|_|=armor_bdy]"
+        "[=hand_r|_|_                        |=hand_l]"
+        "[=ring_r|_|_                        |=ring_l]"
+        "[=pocket_r|=armor_leg|=pocket_l]");
   }
 
   void StatusUI::init() {
-    $gui.set<Background>($gui.MAIN, {$gui.$parser});
+    $gui.set<Background>($gui.MAIN, {$gui.$parser, });
 
     for(auto& [name, cell] : $gui.cells()) {
       auto gui_id = $gui.entity(name);
@@ -43,7 +43,7 @@ namespace gui {
           });
           $gui.set<Sound>(gui_id, {"pickup"});
         } else {
-          $gui.set<Textual>(gui_id, {guecs::to_wstring(name)});
+          $gui.set<Text>(gui_id, {guecs::to_wstring(name)});
           $gui.set<Clickable>(gui_id, {
             guecs::make_action($level, Events::GUI::INV_SELECT, {gui_id})
           });
diff --git a/tools/arena_ui.cpp b/tools/arena_ui.cpp
index 447e4ce..a75df88 100644
--- a/tools/arena_ui.cpp
+++ b/tools/arena_ui.cpp
@@ -14,14 +14,14 @@ namespace arena {
     $status.position(0, 0, BOSS_VIEW_X, SCREEN_HEIGHT);
     $status.layout(
         "[main_status]"
-        "[(150)status_3|(150)status_4]"
-        "[(150)status_5|(150)status_6]"
-        "[(150)status_7|(150)status_8]");
+        "[=status_3|=status_4]"
+        "[=status_5|=status_6]"
+        "[=status_7|=status_8]");
 
     $overlay.position(BOSS_VIEW_X, BOSS_VIEW_Y,
         BOSS_VIEW_WIDTH, BOSS_VIEW_HEIGHT);
 
-    $overlay.layout("[_|=(256,256)enemy|_]");
+    $overlay.layout("[_|(256,256)enemy|_]");
 
     $sounds = $world->get<components::Sound>($entity_id);
     $combat = $world->get<components::Combat>($entity_id);
@@ -74,9 +74,9 @@ namespace arena {
           }
       });
       if(name == "main_status") {
-        $status.set<Textual>(button, {fmt::format(L"HP: {}", $combat.hp)});
+        $status.set<Text>(button, {fmt::format(L"HP: {}", $combat.hp)});
       } else {
-        $status.set<Label>(button, {L"Attack"});
+        $status.set<Text>(button, {L"Attack"});
       }
     }
     $status.init();
diff --git a/wraps/lel-guecs.wrap b/wraps/lel-guecs.wrap
index e046e7a..da50cea 100644
--- a/wraps/lel-guecs.wrap
+++ b/wraps/lel-guecs.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
-directory=lel-guecs-0.4.1
+directory=lel-guecs-0.5.0
 url=https://git.learnjsthehardway.com/learn-code-the-hard-way/lel-guecs.git
 revision=HEAD
 depth=1