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 0000000..8f49779 Binary files /dev/null and b/assets/peasant_girl_2-256.png differ diff --git a/gui/fsm.hpp b/gui/fsm.hpp index 5c6dc15..d4e3064 100644 --- a/gui/fsm.hpp +++ b/gui/fsm.hpp @@ -1,7 +1,7 @@ #pragma once #include "constants.hpp" #include "levelmanager.hpp" -#include "../fsm.hpp" +#include "simplefsm.hpp" #include "gui/debug_ui.hpp" #include "gui/main_ui.hpp" #include "gui/combat_ui.hpp" diff --git a/gui/ritual_ui.hpp b/gui/ritual_ui.hpp index 63cc163..431617a 100644 --- a/gui/ritual_ui.hpp +++ b/gui/ritual_ui.hpp @@ -5,7 +5,7 @@ #include "textures.hpp" #include #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