diff --git a/assets/ambient_1.ogg b/assets/ambient_1.ogg new file mode 100644 index 0000000..55b2bdb Binary files /dev/null and b/assets/ambient_1.ogg differ diff --git a/assets/config.json b/assets/config.json index 0f35f0b..00cd639 100644 --- a/assets/config.json +++ b/assets/config.json @@ -5,7 +5,8 @@ "monster_1": "assets/monster-1.ogg", "walk": "assets/blank.ogg", "blank": "assets/blank.ogg", - "pickup": "assets/pickup.ogg" + "pickup": "assets/pickup.ogg", + "ambient_1": "assets/ambient_1.ogg" }, "sprites": { "armored_knight": "assets/armored_knight_1-256.png", diff --git a/boss_fight_ui.cpp b/boss_fight_ui.cpp index 2a924de..1b746f7 100644 --- a/boss_fight_ui.cpp +++ b/boss_fight_ui.cpp @@ -2,20 +2,22 @@ #include "easings.hpp" namespace gui { - BossFightUI::BossFightUI() { + BossFightUI::BossFightUI(GameLevel level) + : $level(level) + { $status.position(0, 0, 300, SCREEN_HEIGHT); $status.layout( - "[(150)status_1|(150)status_2]" + "[main_status]" "[(150)status_3|(150)status_4]" "[(150)status_5|(150)status_6]" "[(150)status_7|(150)status_8]" ); $overlay.position(300, 0, SCREEN_WIDTH - 300, SCREEN_HEIGHT); - $overlay.layout("[overlay_1|overlay_2|overlay_3|overlay_4]" - "[overlay_5|overlay_6|overlay_7|overlay_8]" - "[overlay_9|overlay_10|overlay_11|overlay_12]" - "[overlay_13|overlay_14|overlay_15|overlay_16]"); + $overlay.layout("[overlay_1|overlay_2|overlay_4]" + "[overlay_5|overlay_6|overlay_8]" + "[overlay_9|overlay_10|overlay_12]" + "[overlay_13|overlay_14|overlay_16]"); $boss_image = textures::get("boss_fight"); auto bounds = $boss_image.sprite->getLocalBounds(); @@ -32,7 +34,11 @@ namespace gui { $status.set(button, { [this, name](auto, auto){ fmt::println("STATUS: {}", name); } }); - $status.set