diff --git a/assets/config.json b/assets/config.json index e2977e3..885e979 100644 --- a/assets/config.json +++ b/assets/config.json @@ -22,7 +22,12 @@ "ui_hover": "assets/sounds/ui_hover.ogg", "punch_cartoony": "assets/sounds/punch_cartoony.ogg", "electric_shock_01": "assets/sounds/electric_shock_01.ogg", - "fireball_01": "assets/sounds/fireball_01.ogg" + "fireball_01": "assets/sounds/fireball_01.ogg", + "hp_status_80": "assets/sounds/hp_status_80.ogg", + "hp_status_60": "assets/sounds/hp_status_60.ogg", + "hp_status_30": "assets/sounds/hp_status_30.ogg", + "hp_status_10": "assets/sounds/hp_status_10.ogg", + "hp_status_00": "assets/sounds/hp_status_00.ogg" }, "sprites": { "gold_savior": diff --git a/assets/sounds/hp_status_00.ogg b/assets/sounds/hp_status_00.ogg new file mode 100644 index 0000000..dad539b Binary files /dev/null and b/assets/sounds/hp_status_00.ogg differ diff --git a/assets/sounds/hp_status_10.ogg b/assets/sounds/hp_status_10.ogg new file mode 100644 index 0000000..08c1dc2 Binary files /dev/null and b/assets/sounds/hp_status_10.ogg differ diff --git a/assets/sounds/hp_status_30.ogg b/assets/sounds/hp_status_30.ogg new file mode 100644 index 0000000..b9c8ddc Binary files /dev/null and b/assets/sounds/hp_status_30.ogg differ diff --git a/assets/sounds/hp_status_60.ogg b/assets/sounds/hp_status_60.ogg new file mode 100644 index 0000000..84849dc Binary files /dev/null and b/assets/sounds/hp_status_60.ogg differ diff --git a/assets/sounds/hp_status_80.ogg b/assets/sounds/hp_status_80.ogg new file mode 100644 index 0000000..fd2d2b6 Binary files /dev/null and b/assets/sounds/hp_status_80.ogg differ diff --git a/combat_ui.cpp b/combat_ui.cpp index 37def37..2806ccb 100644 --- a/combat_ui.cpp +++ b/combat_ui.cpp @@ -12,7 +12,9 @@ namespace gui { { $gui.position(COMBAT_UI_X, COMBAT_UI_Y, COMBAT_UI_WIDTH, COMBAT_UI_HEIGHT); $gui.layout( - "[*%(100,150)button_0 | *%(100,150)button_1 | *%(100,150)button_2 | *%(100,150)button_3]"); + "[button_0 | button_1 | button_2 | button_3" + "|button_4 | button_5 | button_6 | hp_gauge ]" + ); } DinkyECS::Entity CombatUI::make_button(std::string name, std::wstring label, Events::GUI event, int action, const std::string &icon_name, @@ -24,7 +26,7 @@ namespace gui { // $gui.set(button, {}); // $gui.set