Skip to content

Fix: restrict Ask to Equip enhancement to only vanilla equipment items#2590

Merged
briaguya0 merged 1 commit intoHarbourMasters:develop-khanfrom
Archez:fix-equip-now-enhancement
Mar 7, 2023
Merged

Fix: restrict Ask to Equip enhancement to only vanilla equipment items#2590
briaguya0 merged 1 commit intoHarbourMasters:develop-khanfrom
Archez:fix-equip-now-enhancement

Conversation

@Archez
Copy link
Contributor

@Archez Archez commented Mar 7, 2023

The "Ask to Equip" enhancement was checking for "Yes/No" prompts for items in the range of all equipment (kokiri sword to zora tunic), but was not accounting for the vanilla mod index.

This meant any randomizer items that collided with the same item ID for kokoiri sword <-> zora tunic would equip their respective vanilla item when the randomizer item was purchased from a shop, and the shop owner prompts for "would you like to keep shopping".

This PR adds a simple check against the mod index value to ensure we are only performing the check against vanilla getItems

The following items were impacted:

  • RG_BOTTLE_WITH_FISH: equips Kokiri Sword
  • RG_BOTTLE_WITH_BLUE_FIRE: equips Master Sword
  • RG_BOTTLE_WITH_BUGS: equips Big Gorron Sword
  • RG_BOTTLE_WITH_POE: equips Deku Shield
  • RG_RUTOS_LETTER: would equip Hylian Shield (but doesn't as the itemId isn't the RG_ value)
  • RG_BOTTLE_WITH_BIG_POE: equips Mirror Shield
  • RG_ZELDAS_LULLABY: would equip Kokiri Tunic (but doesn't as the itemId isn't the RG_ value)
  • RG_EPONAS_SONG: would equip Goron Tunic (but doesn't as the itemId isn't the RG_ value)
  • RG_SARIAS_SONG: would equip Zora Tunic (but doesn't as the itemId isn't the RG_ value)

Fixes: #2589

Build Artifacts

@briaguya0 briaguya0 merged commit ce11527 into HarbourMasters:develop-khan Mar 7, 2023
@Archez Archez deleted the fix-equip-now-enhancement branch March 7, 2023 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants