diff --git a/assets/animation.json b/assets/animation.json index aa01bef..e09d5fd 100644 --- a/assets/animation.json +++ b/assets/animation.json @@ -72,7 +72,7 @@ "frame_height": 341 }, "sequences": { - "idle": {"frames": [0, 1, 2], "durations": [25, 5, 20] } + "idle": {"frames": [0, 1, 2], "durations": [10, 5, 15] } }, "transforms": { "basic": { diff --git a/assets/config.json b/assets/config.json index 0882342..e0ba13b 100644 --- a/assets/config.json +++ b/assets/config.json @@ -95,6 +95,11 @@ {"path": "assets/stories/win_story.png", "frame_width": 1280, "frame_height": 720 + }, + "combat_active": + {"path": "assets/sprites/combat_active.png", + "frame_width": 170, + "frame_height": 170 } }, "worldgen": { diff --git a/assets/sprites/combat_active.png b/assets/sprites/combat_active.png new file mode 100644 index 0000000..cc72bd0 Binary files /dev/null and b/assets/sprites/combat_active.png differ diff --git a/src/gui/fsm.cpp b/src/gui/fsm.cpp index 69cafdd..8c8c393 100644 --- a/src/gui/fsm.cpp +++ b/src/gui/fsm.cpp @@ -282,10 +282,10 @@ namespace gui { $systems.runPickup(); break; case COMBAT_START: - fmt::println("!!!!!!!!!!!!!! COMBAT START in IDLE"); + $main_ui.show_combat(); break; case COMBAT_STOP: - fmt::println("!!!!!!!!!!!!!! COMBAT STOP in IDLE"); + $main_ui.close_combat(); break; default: break; // ignore everything else diff --git a/src/gui/main_ui.cpp b/src/gui/main_ui.cpp index 3f8c546..5cef5e2 100644 --- a/src/gui/main_ui.cpp +++ b/src/gui/main_ui.cpp @@ -157,4 +157,12 @@ namespace gui { $window.draw(*$hand.sprite); } } + + void MainUI::show_combat() { + $overlay_ui.show_sprite("top_right", "combat_active"); + } + + void MainUI::close_combat() { + $overlay_ui.close_sprite("top_right"); + } } diff --git a/src/gui/main_ui.hpp b/src/gui/main_ui.hpp index 6fb5e1a..9a429bc 100644 --- a/src/gui/main_ui.hpp +++ b/src/gui/main_ui.hpp @@ -51,5 +51,7 @@ namespace gui { void play_hands(); bool hands_playing(); void render_hands(); + void show_combat(); + void close_combat(); }; }