diff options
| author | Philip Dubé <159546+serprex@users.noreply.github.com> | 2026-09-28 16:16:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-28 16:16:27 +0000 |
| commit | c42004bc420571bd360ccd7801494fa279a57d51 (patch) | |
| tree | 7c4ae9e1be729c3b3b33e663e4471338e5505616 | |
| parent | 4f546bc87e4de080fb6c549057f76f4d12e9f241 (diff) | |
Fix AddCheckToLogic bombchu handling (#7274)
1. consistently include shop bombchus
2. fix boolean flip typo, that was filtering out ITEMTYPE_SHOP branch that coerces matching LogicVals
| -rw-r--r-- | soh/soh/Enhancements/randomizer/3drando/fill.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp index 561850237..0f8f0ccbf 100644 --- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp @@ -423,12 +423,12 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals ApplyOrStoreItem(location, gals, addToPlaythrough); } // If we want to ignore bombchus, only add if bombchu is not in the name - else if (IsBombchus(ignore) && !IsBombchus(locItem, true)) { + else if (IsBombchus(ignore, true) && !IsBombchus(locItem, true)) { ApplyOrStoreItem(location, gals, addToPlaythrough); } // We want to ignore a specific Buy item. Buy items with different RandomizerGets are recognised by a // shared GetLogicVal - else if (ignore != RG_GOLD_SKULLTULA_TOKEN && IsBombchus(ignore)) { + else if (ignore != RG_GOLD_SKULLTULA_TOKEN && !IsBombchus(ignore, true)) { if ((type == ITEMTYPE_SHOP && Rando::StaticData::GetItemTable()[ignore].GetLogicVal() != location->GetPlacedItem().GetLogicVal()) || type != ITEMTYPE_SHOP) { |