mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-10-13 15:33:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix AddCheckToLogic bombchu handling (#7274)

Browse Source 
1. consistently include shop bombchus
2. fix boolean flip typo, that was filtering out ITEMTYPE_SHOP branch that coerces matching LogicVals
This commit is contained in:
Philip Dubé
2026-09-28 16:16:27 +00:00
committed by GitHub
parent 4f546bc87e
commit c42004bc42
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/3drando/fill.cpp
+2 -2
View File
@@ -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) {