mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 06:41:52 -05:00
Code Issues Projects Releases Wiki Activity

Fix scarce and minimal item pools removing shuffled sticks and nuts. (#4787)

Browse Source 
* fix scarce and minimal item pools removing stick and nut upgrades when they are shuffled.

* improve clarity
This commit is contained in:
Pepper0ni 2025-01-02 21:12:12 +00:00 committed by GitHub
parent 966a86c508
commit 237f8b903a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
View File

@ -665,8 +665,8 @@ static void SetScarceItemPool() {
ReplaceMaxItem(RG_BOMBCHU_20, 0);
ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, 1);
ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, 1);
ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG) ? 2 : 1);
ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG) ? 2 : 1);
ReplaceMaxItem(RG_PROGRESSIVE_BOW, 2);
ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 2);
ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 2);
@ -682,8 +682,8 @@ static void SetMinimalItemPool() {
ReplaceMaxItem(RG_NAYRUS_LOVE, 0);
ReplaceMaxItem(RG_PROGRESSIVE_MAGIC_METER, 1);
ReplaceMaxItem(RG_DOUBLE_DEFENSE, 0);
ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, 0);
ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, 0);
ReplaceMaxItem(RG_PROGRESSIVE_STICK_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_STICK_BAG) ? 1 : 0);
ReplaceMaxItem(RG_PROGRESSIVE_NUT_UPGRADE, ctx->GetOption(RSK_SHUFFLE_DEKU_NUT_BAG) ? 1 : 0);
ReplaceMaxItem(RG_PROGRESSIVE_BOW, 1);
ReplaceMaxItem(RG_PROGRESSIVE_SLINGSHOT, 1);
ReplaceMaxItem(RG_PROGRESSIVE_BOMB_BAG, 1);