From 66937c84236bdbce4b195c23b90cf5f03c5cd277 Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 26 May 2025 13:17:09 +0200 Subject: [PATCH] Add icons to ap item notifications --- .../parameter_static/gArchipelagoJunk.png | Bin 0 -> 18666 bytes .../gArchipelagoProgressive.png | Bin 0 -> 17362 bytes .../parameter_static/gArchipelagoUseful.png | Bin 0 -> 17899 bytes soh/soh/Network/Archipelago/Archipelago.cpp | 17 ++++++++++++- .../Archipelago/ArchipelagoSettingsWindow.cpp | 24 +++++++++++++----- soh/soh/Notification/Notification.cpp | 2 +- 6 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 soh/assets/custom/textures/parameter_static/gArchipelagoJunk.png create mode 100644 soh/assets/custom/textures/parameter_static/gArchipelagoProgressive.png create mode 100644 soh/assets/custom/textures/parameter_static/gArchipelagoUseful.png diff --git a/soh/assets/custom/textures/parameter_static/gArchipelagoJunk.png b/soh/assets/custom/textures/parameter_static/gArchipelagoJunk.png new file mode 100644 index 0000000000000000000000000000000000000000..8103d86aa1802633b7ffa242ee7c784d955ee944 GIT binary patch literal 18666 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 literal 0 HcmV?d00001 diff --git a/soh/assets/custom/textures/parameter_static/gArchipelagoProgressive.png b/soh/assets/custom/textures/parameter_static/gArchipelagoProgressive.png new file mode 100644 index 0000000000000000000000000000000000000000..953a817058098ecc4c390770c59e31e27efb673d GIT binary patch literal 17362 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 I*sa?1FJJHxr2qf` literal 0 HcmV?d00001 diff --git a/soh/assets/custom/textures/parameter_static/gArchipelagoUseful.png b/soh/assets/custom/textures/parameter_static/gArchipelagoUseful.png new file mode 100644 index 0000000000000000000000000000000000000000..05d2e0c2dcb23d8a891a54f35fb5a86f229802dc GIT binary patch literal 17899 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 literal 0 HcmV?d00001 diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index 3c46d90c0..f079ed5d0 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -362,7 +362,22 @@ void RegisterArchipelago() { if (isGiSkipped && gi.modIndex == MOD_RANDOMIZER && (gi.getItemId == RG_ARCHIPELAGO_ITEM_PROGRESSIVE || gi.getItemId == RG_ARCHIPELAGO_ITEM_USEFUL || gi.getItemId == RG_ARCHIPELAGO_ITEM_JUNK)) { - Notification::Emit({ + + const char* itemIcon = ""; + switch (gi.getItemId) { + case RG_ARCHIPELAGO_ITEM_PROGRESSIVE: + itemIcon = "Archipelago Progressive Icon"; + break; + case RG_ARCHIPELAGO_ITEM_USEFUL: + itemIcon = "Archipelago Useful Icon"; + break; + case RG_ARCHIPELAGO_ITEM_JUNK: + itemIcon = "Archipelago Junk Icon"; + break; + } + + Notification::Emit({ + .itemIcon = itemIcon, .prefix = std::string(gSaveContext.ship.quest.data.archipelago.locations[rc].itemName), .message = " for ", .suffix = std::string(gSaveContext.ship.quest.data.archipelago.locations[rc].playerName) diff --git a/soh/soh/Network/Archipelago/ArchipelagoSettingsWindow.cpp b/soh/soh/Network/Archipelago/ArchipelagoSettingsWindow.cpp index 10902419f..e41b0bf78 100644 --- a/soh/soh/Network/Archipelago/ArchipelagoSettingsWindow.cpp +++ b/soh/soh/Network/Archipelago/ArchipelagoSettingsWindow.cpp @@ -16,12 +16,12 @@ void ArchipelagoSettingsWindow::DrawElement() { ImGui::Text("Server Address"); UIWidgets::CVarInputString("##ArchipelagoServerAddress", CVAR_REMOTE_ARCHIPELAGO("ServerAddress"), - UIWidgets::InputOptions() - .Color(THEME_COLOR) - .PlaceholderText("archipelago.gg:38281") - .DefaultValue("archipelago.gg:38281") - .Size(ImVec2(ImGui::GetFontSize() * 15, 0)) - .LabelPosition(UIWidgets::LabelPositions::None)); + UIWidgets::InputOptions() + .Color(THEME_COLOR) + .PlaceholderText("archipelago.gg:38281") + .DefaultValue("archipelago.gg:38281") + .Size(ImVec2(ImGui::GetFontSize() * 15, 0)) + .LabelPosition(UIWidgets::LabelPositions::None)); ImGui::Text("Slot Name"); UIWidgets::CVarInputString("##ArchipelagoSlotName", CVAR_REMOTE_ARCHIPELAGO("SlotName"), UIWidgets::InputOptions() @@ -66,6 +66,18 @@ void ArchipelagoSettingsWindow::DrawElement() { ArchipelagoClient::GetInstance().OnItemReceived(16711816, true); } } + + static bool sArchipelagoTexturesLoaded = false; + if (!sArchipelagoTexturesLoaded) { + Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage( + "Archipelago Progressive Icon", "textures/parameter_static/gArchipelagoProgressive.png"); + Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage( + "Archipelago Useful Icon", "textures/parameter_static/gArchipelagoUseful.png"); + Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage( + "Archipelago Junk Icon", "textures/parameter_static/gArchipelagoJunk.png"); + + sArchipelagoTexturesLoaded = true; + } }; void ArchipelagoSettingsWindow::InitElement() { diff --git a/soh/soh/Notification/Notification.cpp b/soh/soh/Notification/Notification.cpp index 14873b068..5108ae2cb 100644 --- a/soh/soh/Notification/Notification.cpp +++ b/soh/soh/Notification/Notification.cpp @@ -89,7 +89,7 @@ void Window::Draw() { if (notification.itemIcon != nullptr) { ImGui::Image(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(notification.itemIcon), - ImVec2(24, 24)); + ImVec2(32, 32)); ImGui::SameLine(); } if (!notification.prefix.empty()) {