From bf8a2dc0c5f62ceeb2d0863d7d92d4ef36163005 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Apr 2025 12:32:28 -0400
Subject: [PATCH] Simple quick way to do different attacks that play different
 shaders.

---
 combat_ui.cpp        | 17 ++++++-----------
 combat_ui.hpp        |  3 +--
 guecs.cpp            |  7 +++++++
 guecs.hpp            |  1 +
 gui_fsm.cpp          |  4 +++-
 gui_fsm.hpp          |  1 +
 matrix.hpp           |  2 ++
 systems.cpp          |  4 ++--
 systems.hpp          |  2 +-
 tools/fragviewer.cpp |  2 +-
 10 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/combat_ui.cpp b/combat_ui.cpp
index 9849800..e052218 100644
--- a/combat_ui.cpp
+++ b/combat_ui.cpp
@@ -13,7 +13,7 @@ namespace gui {
         "[*%(100,150)button_attack | *%(100,150)button_block | *%(100,150)button_evade | *%(100,150)button_heal]");
   }
 
-  void CombatUI::make_button(std::string name, std::wstring label, Events::GUI event) {
+  void CombatUI::make_button(std::string name, std::wstring label, Events::GUI event, int action) {
     auto button = $gui.entity(name);
     $gui.set<Sprite>(button, {"leather_pouch-128"});
     $gui.set<Rectangle>(button, {});
@@ -21,27 +21,22 @@ namespace gui {
     $gui.set<Label>(button, {label});
     $gui.set<Effect>(button, {.duration=0.1f});
     $gui.set<Clickable>(button,
-        guecs::make_action(*$level.world, event));
+        guecs::make_action(*$level.world, event, {action}));
   }
 
   void CombatUI::init() {
     $gui.world().set_the<Background>({$gui.$parser, ColorValue::DARK_MID});
-    make_button("button_attack", L"Attack", Events::GUI::ATTACK);
-    make_button("button_block", L"Block", Events::GUI::BLOCK);
-    make_button("button_evade", L"Evade", Events::GUI::EVADE);
-    make_button("button_heal", L"Heal", Events::GUI::HEAL);
+    make_button("button_attack", L"Attack", Events::GUI::ATTACK, 1);
+    make_button("button_block", L"Block", Events::GUI::ATTACK, 2);
+    make_button("button_evade", L"Evade", Events::GUI::EVADE, 0);
+    make_button("button_heal", L"Heal", Events::GUI::HEAL, 0);
     $gui.init();
   }
 
   void CombatUI::render(sf::RenderWindow& window) {
-    auto& player_combat = $level.world->get<components::Combat>($level.player);
-    set_damage(float(player_combat.hp) / float(player_combat.max_hp));
     $gui.render(window);
   }
 
-  void CombatUI::set_damage(float) {
-  }
-
   void CombatUI::update_level(GameLevel &level) {
     $level = level;
     init();
diff --git a/combat_ui.hpp b/combat_ui.hpp
index 2eb01d3..388c11b 100644
--- a/combat_ui.hpp
+++ b/combat_ui.hpp
@@ -16,8 +16,7 @@ namespace gui {
       void init();
       void render(sf::RenderWindow& window);
       void update_level(GameLevel &level);
-      void set_damage(float percent);
       bool mouse(float x, float y, bool hover);
-      void make_button(std::string name, std::wstring label, Events::GUI event);
+      void make_button(std::string name, std::wstring label, Events::GUI event, int action);
   };
 }
diff --git a/guecs.cpp b/guecs.cpp
index 360fe6b..2257b82 100644
--- a/guecs.cpp
+++ b/guecs.cpp
@@ -307,4 +307,11 @@ namespace guecs {
     }};
   }
 
+  Clickable make_action(DinkyECS::World& target, Events::GUI event, std::any data) {
+    return {[&, event, data](auto ent, auto){
+      // remember that ent is passed in from the UI::mouse handler
+      target.send<Events::GUI>(event, ent, data);
+    }};
+  }
+
 }
diff --git a/guecs.hpp b/guecs.hpp
index a7c2cb2..33d60bd 100644
--- a/guecs.hpp
+++ b/guecs.hpp
@@ -232,5 +232,6 @@ namespace guecs {
   };
 
   Clickable make_action(DinkyECS::World& target, Events::GUI event);
+  Clickable make_action(DinkyECS::World& target, Events::GUI event, std::any data);
 
 }
diff --git a/gui_fsm.cpp b/gui_fsm.cpp
index b47cab0..71e8134 100644
--- a/gui_fsm.cpp
+++ b/gui_fsm.cpp
@@ -79,7 +79,7 @@ namespace gui {
     using enum Event;
     switch(ev) {
       case TICK: {
-        System::combat($level);
+        System::combat($level, $temp_attack_id);
         run_systems();
         state(State::IN_COMBAT);
        } break;
@@ -400,6 +400,8 @@ namespace gui {
           dbc::log("YOU NEED TO IMPLEMENT THIS!!!!!");
           break;
         case eGUI::ATTACK:
+          $temp_attack_id = std::any_cast<int>(data);
+          fmt::println("ATTACK with action={}", $temp_attack_id);
           event(Event::ATTACK);
           break;
         case eGUI::STAIRS_DOWN:
diff --git a/gui_fsm.hpp b/gui_fsm.hpp
index e6667d2..0da9a5a 100644
--- a/gui_fsm.hpp
+++ b/gui_fsm.hpp
@@ -48,6 +48,7 @@ namespace gui {
       bool $draw_stats = false;
       bool autowalking = false;
       bool $map_open = false;
+      int $temp_attack_id = 0;
       LevelManager $levels;
       DebugUI $debug_ui;
       MainUI $main_ui;
diff --git a/matrix.hpp b/matrix.hpp
index 3974043..3ab95ac 100644
--- a/matrix.hpp
+++ b/matrix.hpp
@@ -11,12 +11,14 @@
 #include "dbc.hpp"
 #include "shiterator.hpp"
 
+
 namespace matrix {
   using Row = shiterator::BaseRow<int>;
   using Matrix = shiterator::Base<int>;
 
   using viewport = shiterator::viewport_t<Matrix>;
 
+
   using each_cell = shiterator::each_cell_t<Matrix>;
 
   using each_row = shiterator::each_row_t<Matrix>;
diff --git a/systems.cpp b/systems.cpp
index 987e600..952d4ab 100644
--- a/systems.cpp
+++ b/systems.cpp
@@ -204,7 +204,7 @@ inline void animate_entity(DinkyECS::World &world, DinkyECS::Entity entity) {
   }
 }
 
-void System::combat(GameLevel &level) {
+void System::combat(GameLevel &level, int attack_id) {
   auto &collider = *level.collision;
   auto &world = *level.world;
   auto player = world.get_the<Player>();
@@ -238,7 +238,7 @@ void System::combat(GameLevel &level) {
     };
 
     if(result.player_did > 0) {
-      auto effect = shaders::get("lightning");
+      auto effect = shaders::get(attack_id == 1 ? "flame" : "lightning");
       world.set<SpriteEffect>(enemy.entity, {100, effect});
     }
 
diff --git a/systems.hpp b/systems.hpp
index 777a6a1..9e25a0f 100644
--- a/systems.hpp
+++ b/systems.hpp
@@ -20,7 +20,7 @@ namespace System {
   std::wstring draw_map(GameLevel level, size_t view_x, size_t view_y, int compass_dir);
 
   void enemy_ai(GameLevel &level);
-  void combat(GameLevel &level);
+  void combat(GameLevel &level, int attack_id);
 
   std::shared_ptr<sf::Shader> sprite_effect(GameLevel &level, DinkyECS::Entity entity);
 
diff --git a/tools/fragviewer.cpp b/tools/fragviewer.cpp
index 6f48dfa..40ee33c 100644
--- a/tools/fragviewer.cpp
+++ b/tools/fragviewer.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
 
   dbc::check(sf::Shader::isAvailable(), "You apparently are a time traveler from the 80s who doesn't have shaders.");
 
-  while((opt = getopt(argc, argv, "-hs:f:-x:-y:")) != -1) {
+  while((opt = getopt(argc, argv, "hs:f:x:y:")) != -1) {
     switch(opt) {
       case 's':
         sprite_name = optarg;