From 0eb245d113d6034f40dc3290217e953545cd2314 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 16 May 2025 01:22:12 -0400 Subject: [PATCH] Working on a better character view. --- assets/config.json | 2 +- assets/peasant_girl_2-256.png | Bin 0 -> 33630 bytes gui/fsm.hpp | 2 +- gui/ritual_ui.hpp | 2 +- gui/status_ui.cpp | 45 +++++++++------------------------- gui/status_ui.hpp | 3 --- fsm.hpp => simplefsm.hpp | 0 tests/battle.cpp | 2 +- tests/fsm.cpp | 2 +- tests/rituals.cpp | 2 +- 10 files changed, 18 insertions(+), 42 deletions(-) create mode 100644 assets/peasant_girl_2-256.png rename fsm.hpp => simplefsm.hpp (100%) diff --git a/assets/config.json b/assets/config.json index 56cd544..bc0ff49 100644 --- a/assets/config.json +++ b/assets/config.json @@ -86,7 +86,7 @@ "frame_height": 256 }, "peasant_girl": - {"path": "assets/undead_peasant-256.png", + {"path": "assets/peasant_girl_2-256.png", "frame_width": 256, "frame_height": 256 }, diff --git a/assets/peasant_girl_2-256.png b/assets/peasant_girl_2-256.png new file mode 100644 index 0000000000000000000000000000000000000000..8f49779096fec3e0bb4f5bf798b3b797707a1e89 GIT binary patch literal 33630 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 #include "rituals.hpp" -#include "fsm.hpp" +#include "simplefsm.hpp" namespace gui { namespace ritual { diff --git a/gui/status_ui.cpp b/gui/status_ui.cpp index abd9f9f..5c6c8b7 100644 --- a/gui/status_ui.cpp +++ b/gui/status_ui.cpp @@ -17,9 +17,9 @@ namespace gui { "[ ritual_ui ]" "[inv_slot1 | inv_slot2 | inv_slot3]" "[inv_slot4 | inv_slot5 | inv_slot6]" - "[*%(100,300)log_view]" - "[_]" - "[_]"); + "[*%(200,300)character_view|_|stat1]" + "[_|_|stat2]" + "[_|_|stat3]"); size_t inv_id = 0; for(auto [name, entity] : $gui.$name_ents) { @@ -33,10 +33,14 @@ namespace gui { $gui.set($gui.MAIN, {$gui.$parser}); for(auto& [name, cell] : $gui.cells()) { - if(name == "log_view") { - $log_to = $gui.entity("log_view"); - $gui.set($log_to, {}); - $gui.set($log_to, {L"Welcome to the Game!", 20}); + if(name == "character_view") { + auto char_view = $gui.entity(name); + $gui.set(char_view, {}); + $gui.set(char_view, {"peasant_girl"}); + } else if(name.starts_with("stat")) { + auto stat = $gui.entity(name); + $gui.set(stat, {}); + $gui.set