From 57e042e786f640ee46d462cc00eb804cc68085b2 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 15 Apr 2025 12:02:24 -0400
Subject: [PATCH] Now have a do_if on GUECS for many of the 'if this exists do
 this' patterns.

---
 combat_ui.cpp |  2 +-
 guecs.cpp     | 18 ++++++------------
 guecs.hpp     |  8 +++++++-
 ritual_ui.cpp |  2 ++
 status_ui.cpp |  1 +
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/combat_ui.cpp b/combat_ui.cpp
index 0e2fee0..9f03455 100644
--- a/combat_ui.cpp
+++ b/combat_ui.cpp
@@ -17,7 +17,7 @@ namespace gui {
     auto button = $gui.entity(name);
     $gui.set<Sprite>(button, {"leather_pouch-128"});
     // $gui.set<Rectangle>(button, {});
-    $gui.set<Sound>(button, {"ui_click", "ui_hover"});
+    $gui.set<Sound>(button, {"ui_click"});
     $gui.set<Label>(button, {label});
     $gui.set<Effect>(button, {.duration=0.1f});
     $gui.set<Clickable>(button,
diff --git a/guecs.cpp b/guecs.cpp
index 528d0fe..c1dade4 100644
--- a/guecs.cpp
+++ b/guecs.cpp
@@ -60,10 +60,7 @@ namespace guecs {
   }
 
   void Sound::play(bool hover) {
-    if(hover) {
-      // BUG: need to sort out how to make hover a one shot thing
-      // sound::play(on_hover);
-    } else {
+    if(!hover) {
       sound::play(on_click);
     }
   }
@@ -235,17 +232,14 @@ namespace guecs {
       if((x >= cell.x && x <= cell.x + cell.w) &&
           (y >= cell.y && y <= cell.y + cell.h))
       {
-        if($world.has<Effect>(ent)) {
-          auto& effect = $world.get<Effect>(ent);
+        do_if<Effect>(ent, [hover](auto& effect) {
           effect.$shader->setUniform("hover", hover);
           effect.run();
-        }
-
-        if($world.has<Sound>(ent)) {
-          auto& sound = $world.get<Sound>(ent);
-          sound.play(hover);
-        }
+        });
 
+        do_if<Sound>(ent, [hover](auto& sound) {
+            sound.play(hover);
+        });
 
         if(hover) return; // kinda gross
 
diff --git a/guecs.hpp b/guecs.hpp
index 36477ee..897a78d 100644
--- a/guecs.hpp
+++ b/guecs.hpp
@@ -99,7 +99,6 @@ namespace guecs {
 
   struct Sound {
     std::string on_click{""};
-    std::string on_hover{""};
 
     void play(bool hover);
   };
@@ -166,6 +165,13 @@ namespace guecs {
         $world.set<Comp>(ent, val);
       }
 
+      template <typename Comp>
+      void do_if(DinkyECS::Entity ent, std::function<void(Comp &)> cb) {
+        if($world.has<Comp>(ent)) {
+          cb($world.get<Comp>(ent));
+        }
+      }
+
       lel::Cell& cell_for(DinkyECS::Entity ent) {
         return $world.get<lel::Cell>(ent);
       }
diff --git a/ritual_ui.cpp b/ritual_ui.cpp
index 2be5c9d..b09ced1 100644
--- a/ritual_ui.cpp
+++ b/ritual_ui.cpp
@@ -51,6 +51,7 @@ namespace gui {
         $gui.set<Sprite>(button, {
             fmt::format("{}-64", junk_list[button % junk_list.size()])});
         $gui.set<Effect>(button, {0.4f});
+        $gui.set<Sound>(button, {"ui_click"});
         $gui.set<Clickable>(button, {
             [&](auto ent, auto){ inv_slot_clicked(ent); }
         });
@@ -58,6 +59,7 @@ namespace gui {
         $gui.set<Clickable>(button, {
             [&](auto, auto){ toggle(); }
         });
+        $gui.set<Sound>(button, {"pickup"});
       }
     }
 
diff --git a/status_ui.cpp b/status_ui.cpp
index 98aaef4..2cd5723 100644
--- a/status_ui.cpp
+++ b/status_ui.cpp
@@ -48,6 +48,7 @@ namespace gui {
           $gui.set<Clickable>(button, {
               [this](auto, auto){ select_ritual(); }
           });
+          $gui.set<Sound>(button, {"pickup"});
         } else {
           $gui.set<Clickable>(button, {
               [this](auto ent, auto data){ select_slot(ent, data); }