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 5ba51b8..9a5d19d 100644 Binary files a/src/open_samus_returns_rando/files/romfs/gui/textures/texturehud.bctex and b/src/open_samus_returns_rando/files/romfs/gui/textures/texturehud.bctex differ 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