From b311713064bae9ef0520f390657529bf191e747b Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Tue, 22 Jul 2025 01:08:48 -0400 Subject: [PATCH] Quick prototype of how switch to an icon during pickup makes the rendering bug go away and also looks better visually. --- assets/config.json | 10 ++++++++++ assets/icons/healing_potion_small_ICON.png | Bin 0 -> 11038 bytes assets/icons/torch_crappy_ICON.png | Bin 0 -> 7724 bytes gui/loot_ui.cpp | 2 +- gui/status_ui.cpp | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 assets/icons/healing_potion_small_ICON.png create mode 100644 assets/icons/torch_crappy_ICON.png diff --git a/assets/config.json b/assets/config.json index b4ff6c5..15fa3dc 100644 --- a/assets/config.json +++ b/assets/config.json @@ -80,6 +80,11 @@ "frame_width": 256, "frame_height": 256 }, + "torch_horizontal_floor_ICON": + {"path": "assets/icons/torch_crappy_ICON.png", + "frame_width": 128, + "frame_height": 128 + }, "peasant_girl": {"path": "assets/sprites/peasant_girl_2.png", "frame_width": 256, @@ -95,6 +100,11 @@ "frame_width": 256, "frame_height": 256 }, + "healing_potion_small_ICON": + {"path": "assets/icons/healing_potion_small_ICON.png", + "frame_width": 128, + "frame_height": 128 + }, "well_down": {"path": "assets/sprites/well_down.png", "frame_width": 256, diff --git a/assets/icons/healing_potion_small_ICON.png b/assets/icons/healing_potion_small_ICON.png new file mode 100644 index 0000000000000000000000000000000000000000..bc790e492cf4e71e81bf90db3195c0cccbf999cc GIT binary patch literal 11038 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 literal 0 HcmV?d00001 diff --git a/assets/icons/torch_crappy_ICON.png b/assets/icons/torch_crappy_ICON.png new file mode 100644 index 0000000000000000000000000000000000000000..ccc6480901b0075aa16c7fdc7dbdcabf666a9e8d GIT binary patch literal 7724 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 literal 0 HcmV?d00001 diff --git a/gui/loot_ui.cpp b/gui/loot_ui.cpp index 9a751d1..370a0d1 100644 --- a/gui/loot_ui.cpp +++ b/gui/loot_ui.cpp @@ -75,7 +75,7 @@ namespace gui { dbc::check($level.world->has(item), "item in inventory UI doesn't exist in world. New level?"); auto& sprite = $level.world->get(item); - $gui.set_init(id, {sprite.name}); + $gui.set_init(id, {fmt::format("{}_ICON", sprite.name)}); guecs::GrabSource grabber{ item, [&, id]() { return remove_slot(id); }}; diff --git a/gui/status_ui.cpp b/gui/status_ui.cpp index f10b210..14862f5 100644 --- a/gui/status_ui.cpp +++ b/gui/status_ui.cpp @@ -80,7 +80,7 @@ namespace gui { auto gui_id = $gui.entity(slot); auto& sprite = $level.world->get(world_entity); - $gui.set_init(gui_id, {sprite.name}); + $gui.set_init(gui_id, {fmt::format("{}_ICON", sprite.name)}); guecs::GrabSource grabber{ world_entity, [&, gui_id]() { return remove_slot(gui_id); }}; grabber.setSprite($gui, gui_id);