From a06344fe7b915a2cc1b0d26c5e752466f9d4e7a0 Mon Sep 17 00:00:00 2001
From: dyceron <dycerontv@gmail.com>
Date: Wed, 17 Jul 2024 22:01:01 -0400
Subject: [PATCH] Add unique icon for powerups

---
 .../files/custom/sprites_texturehud.lua       |  11 ++++++++++-
 .../files/romfs/gui/textures/texturehud.bctex | Bin 524555 -> 524555 bytes
 .../pickups/pickup.py                         |   7 +++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/open_samus_returns_rando/files/custom/sprites_texturehud.lua b/src/open_samus_returns_rando/files/custom/sprites_texturehud.lua
index 3293178..fb0722a 100644
--- a/src/open_samus_returns_rando/files/custom/sprites_texturehud.lua
+++ b/src/open_samus_returns_rando/files/custom/sprites_texturehud.lua
@@ -1,6 +1,6 @@
 Game.ImportLibrary("gui/scripts/sprites_texturehud_original.lua")
 
-GUI.AddSpriteSheetItem("item_powerup", "gui/textures/texturehud.bctex", {
+GUI.AddSpriteSheetItem("item_nothing", "gui/textures/texturehud.bctex", {
     TextureWidth = "512",
     TextureHeight = "256",
     UPixelOffset = "144",
@@ -9,6 +9,15 @@ GUI.AddSpriteSheetItem("item_powerup", "gui/textures/texturehud.bctex", {
     VPixelScale = "8",
     AngleOffset = "0"
 })
+GUI.AddSpriteSheetItem("item_powerup", "gui/textures/texturehud.bctex", {
+    TextureWidth = "512",
+    TextureHeight = "256",
+    UPixelOffset = "96",
+    VPixelOffset = "40",
+    UPixelScale = "8",
+    VPixelScale = "8",
+    AngleOffset = "0"
+})
 GUI.AddSpriteSheetItem("item_offworld", "gui/textures/texturehud.bctex", {
     TextureWidth = "512",
     TextureHeight = "256",
diff --git a/src/open_samus_returns_rando/files/romfs/gui/textures/texturehud.bctex b/src/open_samus_returns_rando/files/romfs/gui/textures/texturehud.bctex
index 5ba51b881cdd00ab0b52f0ddad33188fef4c2706..9a5d19d32cb88fac85a6a5429f154631cdbc4515 100644
GIT binary patch
delta 491
zcmZXQze~eF6vr<=E@=|cs;!EP-9*UZa&$8pE1`5SgV0r+vvh4~1&1IK6wW#b?i~aL
zaS^f<T*N=X#XrFQ3(xnijS@Wg-n;kmxliEIVIv(j22WbOCG(l?XCjcTLtayjoJQJ_
z2LOx~)@;8nPiA`6{_D%1_sZ>mI)|~6VU>BL9V?wozV-Ern&VGs9+y3}Exx!|Ed)p}
zFC+u`5ot*l?DQcFEjS1_A&y-PgVWL68iovlfJ3*-AicAp*E5i1*jo_A6+Cai=$6r)
zVv&o^$a;`m5$oZMSY6G@Mb2i^gieQn5dAgW7+ky%WWvK2gPZC6t%TseVqz{|9b}2;
z$U1N~G2r@b3GUySl97}+Ay#1WNtMDes~EFz71iIi9e?-SZEF}EV_-}S$5_v9+twa`
E09MMd2mk;8

delta 208
zcmeBfQs{0{XxPFi>bc#vit!BN^oM5{g{OZw#mK_Sc<}#B=IMbvOpB)<0P-c7fP7XU
z<^+iYF$)m$05Km(jj}9A3WNoq7$gl+#s|baASEu-L%kUVCOQ~Q_w-_wR{$9YvI1lr
wNFRvJ0K_0YAog@dAI3(IQU_#x4(*J7j6lo;#LPg<0>rF9%(k7;kDY5X0Mh_ghyVZp

diff --git a/src/open_samus_returns_rando/pickups/pickup.py b/src/open_samus_returns_rando/pickups/pickup.py
index 9ee61db..91eebef 100644
--- a/src/open_samus_returns_rando/pickups/pickup.py
+++ b/src/open_samus_returns_rando/pickups/pickup.py
@@ -328,8 +328,8 @@ def patch_minimap(self, editor: PatcherEditor, scenario_name: str, actor_name: s
                     pickup_tile_icon.icon = "itemenabledheat"
                 else:
                     pickup_tile_icon.icon = "itemenabled"
-            # Powerups and Nothing items use a "custom" itemsphere so they update on the map
-            elif "itemsphere" in pickup_model or "powerup" in pickup_model or "babyhatchling" in pickup_model:
+            # Powerups use a modified Samus helmet icon
+            elif "powerup" in pickup_model or "babyhatchling" in pickup_model:
                 pickup_tile_icon.icon = "item_powerup"
             # DNA uses a custom icon
             elif "adn" in pickup_model:
@@ -337,6 +337,9 @@ def patch_minimap(self, editor: PatcherEditor, scenario_name: str, actor_name: s
             # Offworld powerups use the offworld model
             elif "offworld" in pickup_model:
                 pickup_tile_icon.icon = "item_offworld"
+            # Nothing items use an "updated" itemsphere icon so they update on the map
+            elif "itemsphere" in pickup_model:
+                pickup_tile_icon.icon = "item_nothing"
             else:
                 # Tanks use their respective tank icon
                 pickup_tile_icon.icon = pickup_model