diff --git a/assets/config.json b/assets/config.json index cc97800..c204fad 100644 --- a/assets/config.json +++ b/assets/config.json @@ -55,7 +55,29 @@ "ritual_crafting_area": "assets/ritual_crafting_area.png", "the_ritual_circle": "assets/the_ritual_circle.png", "paper_ui_background": "assets/paper_ui_background.png", - "full_screen_paper": "assets/full_screen_paper.png" + "full_screen_paper": "assets/full_screen_paper.png", + "broken_locket-64": "assets/rituals/broken_locket-64.png", + "broken_locket-128": "assets/rituals/broken_locket-128.png", + "broken_pen_knife-64": "assets/rituals/broken_pen_knife-64.png", + "broken_pen_knife-128": "assets/rituals/broken_pen_knife-128.png", + "broken_yoyo-64": "assets/rituals/broken_yoyo-64.png", + "broken_yoyo-128": "assets/rituals/broken_yoyo-128.png", + "chess_pawn-64": "assets/rituals/chess_pawn-64.png", + "chess_pawn-128": "assets/rituals/chess_pawn-128.png", + "dirty_kerchief-64": "assets/rituals/dirty_kerchief-64.png", + "dirty_kerchief-128": "assets/rituals/dirty_kerchief-128.png", + "leather_pouch-64": "assets/rituals/leather_pouch-64.png", + "leather_pouch-128": "assets/rituals/leather_pouch-128.png", + "mushroom-64": "assets/rituals/mushroom-64.png", + "mushroom-128": "assets/rituals/mushroom-128.png", + "pocket_watch-64": "assets/rituals/pocket_watch-64.png", + "pocket_watch-128": "assets/rituals/pocket_watch-128.png", + "rusty_nails-64": "assets/rituals/rusty_nails-64.png", + "rusty_nails-128": "assets/rituals/rusty_nails-128.png", + "severed_finger-64": "assets/rituals/severed_finger-64.png", + "severed_finger-128": "assets/rituals/severed_finger-128.png", + "stone_doll_cursed-64": "assets/rituals/stone_doll_cursed-64.png", + "stone_doll_cursed-128": "assets/rituals/stone_doll_cursed-128.png" }, "worldgen": { "enemy_probability": 50, diff --git a/assets/rituals/broken_locket-128.png b/assets/rituals/broken_locket-128.png new file mode 100644 index 0000000..b74c845 Binary files /dev/null and b/assets/rituals/broken_locket-128.png differ diff --git a/assets/rituals/broken_locket-64.png b/assets/rituals/broken_locket-64.png new file mode 100644 index 0000000..c4b692e Binary files /dev/null and b/assets/rituals/broken_locket-64.png differ diff --git a/assets/rituals/broken_pen_knife-128.png b/assets/rituals/broken_pen_knife-128.png new file mode 100644 index 0000000..b82e363 Binary files /dev/null and b/assets/rituals/broken_pen_knife-128.png differ diff --git a/assets/rituals/broken_pen_knife-64.png b/assets/rituals/broken_pen_knife-64.png new file mode 100644 index 0000000..b1cde5f Binary files /dev/null and b/assets/rituals/broken_pen_knife-64.png differ diff --git a/assets/rituals/broken_yoyo-128.png b/assets/rituals/broken_yoyo-128.png new file mode 100644 index 0000000..c2f1630 Binary files /dev/null and b/assets/rituals/broken_yoyo-128.png differ diff --git a/assets/rituals/broken_yoyo-64.png b/assets/rituals/broken_yoyo-64.png new file mode 100644 index 0000000..d900691 Binary files /dev/null and b/assets/rituals/broken_yoyo-64.png differ diff --git a/assets/rituals/chess_pawn-128.png b/assets/rituals/chess_pawn-128.png new file mode 100644 index 0000000..b730d4f Binary files /dev/null and b/assets/rituals/chess_pawn-128.png differ diff --git a/assets/rituals/chess_pawn-64.png b/assets/rituals/chess_pawn-64.png new file mode 100644 index 0000000..6f0e6bc Binary files /dev/null and b/assets/rituals/chess_pawn-64.png differ diff --git a/assets/rituals/dirty_kerchief-128.png b/assets/rituals/dirty_kerchief-128.png new file mode 100644 index 0000000..86d091a Binary files /dev/null and b/assets/rituals/dirty_kerchief-128.png differ diff --git a/assets/rituals/dirty_kerchief-64.png b/assets/rituals/dirty_kerchief-64.png new file mode 100644 index 0000000..f9bb1eb Binary files /dev/null and b/assets/rituals/dirty_kerchief-64.png differ diff --git a/assets/rituals/leather_pouch-128.png b/assets/rituals/leather_pouch-128.png new file mode 100644 index 0000000..0f6ea12 Binary files /dev/null and b/assets/rituals/leather_pouch-128.png differ diff --git a/assets/rituals/leather_pouch-64.png b/assets/rituals/leather_pouch-64.png new file mode 100644 index 0000000..552935d Binary files /dev/null and b/assets/rituals/leather_pouch-64.png differ diff --git a/assets/rituals/mushroom-128.png b/assets/rituals/mushroom-128.png new file mode 100644 index 0000000..8cc7723 Binary files /dev/null and b/assets/rituals/mushroom-128.png differ diff --git a/assets/rituals/mushroom-64.png b/assets/rituals/mushroom-64.png new file mode 100644 index 0000000..3eac5d3 Binary files /dev/null and b/assets/rituals/mushroom-64.png differ diff --git a/assets/rituals/pocket_watch-128.png b/assets/rituals/pocket_watch-128.png new file mode 100644 index 0000000..fb20d80 Binary files /dev/null and b/assets/rituals/pocket_watch-128.png differ diff --git a/assets/rituals/pocket_watch-64.png b/assets/rituals/pocket_watch-64.png new file mode 100644 index 0000000..ecddcd7 Binary files /dev/null and b/assets/rituals/pocket_watch-64.png differ diff --git a/assets/rituals/rusty_nails-128.png b/assets/rituals/rusty_nails-128.png new file mode 100644 index 0000000..feddbfc Binary files /dev/null and b/assets/rituals/rusty_nails-128.png differ diff --git a/assets/rituals/rusty_nails-64.png b/assets/rituals/rusty_nails-64.png new file mode 100644 index 0000000..7f7d8a1 Binary files /dev/null and b/assets/rituals/rusty_nails-64.png differ diff --git a/assets/rituals/severed_finger-128.png b/assets/rituals/severed_finger-128.png new file mode 100644 index 0000000..1672175 Binary files /dev/null and b/assets/rituals/severed_finger-128.png differ diff --git a/assets/rituals/severed_finger-64.png b/assets/rituals/severed_finger-64.png new file mode 100644 index 0000000..bea8dc0 Binary files /dev/null and b/assets/rituals/severed_finger-64.png differ diff --git a/assets/rituals/stone_doll_cursed-128.png b/assets/rituals/stone_doll_cursed-128.png new file mode 100644 index 0000000..e88b7e0 Binary files /dev/null and b/assets/rituals/stone_doll_cursed-128.png differ diff --git a/assets/rituals/stone_doll_cursed-64.png b/assets/rituals/stone_doll_cursed-64.png new file mode 100644 index 0000000..ac753d9 Binary files /dev/null and b/assets/rituals/stone_doll_cursed-64.png differ diff --git a/combat_ui.cpp b/combat_ui.cpp index 2f1b9f6..1676661 100644 --- a/combat_ui.cpp +++ b/combat_ui.cpp @@ -11,29 +11,20 @@ namespace gui { { $gui.position(COMBAT_UI_X, COMBAT_UI_Y, COMBAT_UI_WIDTH, COMBAT_UI_HEIGHT); $gui.layout( - "[*%(100,150)button_attack1 | *%(100,150)button_attack2 | *%(100,150)button_attack3 | *%(100,150)button_heal]" - "[ >.%(100,50)label_hp | *%.(198,50)bar_hp | _ ]"); + "[*%(100,150)button_attack1 | *%(100,150)button_attack2 | *%(100,150)button_attack3 | *%(100,150)button_heal]"); } void CombatUI::init() { auto& world = $gui.world(); - world.set_the({$gui.$parser}); + world.set_the({$gui.$parser, ColorValue::DARK_MID}); for(auto& [name, cell] : $gui.cells()) { if(name.starts_with("button_")) { auto button = $gui.entity(name); - world.set(button, {}); + world.set(button, {"leather_pouch-128"}); world.set(button, guecs::make_action(*$level.world, Events::GUI::ATTACK)); - world.set