mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-20 05:13:39 -07:00
Bombchu logic fixes, Add BetterBombchShopping enhancment and some adjacent cleanups (#3733)
* Initial Bombchu rework implementation * Finish bombchus in logic overhaul * address reviews * Post resolution fixes * fix git being dumb * Readd Child Wallet To Bombchu Bowling Logic * post merge fixes * fix some oversights in bombchu shopping logic * doesn't work, linker errors * cleanup old reviews * Make it build, likely broken by VB * attempt to fix carpet man second purchse text * commit to change branch * mostly have carpet guy working * badly fix carpet salesman * fix better bombchu shopping * fix bombchu drops * remember you need bombchus in inventory to get drops * Address reviews * post-SCL clean up and redo the bombchu ammo logic to apply better to the spirit edge case * fix oversight which could have allowed for bombchus to logical exist when they shouldn't * Remove special bombchu playthrough checks which are causing bugs and no longer needed * fix Slingshot logic reset * Convert helpers I touched into CanUse and HasItem * last cleanups
This commit is contained in:
parent
d3edbcd042
commit
9c2e773ce4
45 changed files with 521 additions and 414 deletions
|
@ -1293,7 +1293,6 @@ bool IsCheckShuffled(RandomizerCheck rc) {
|
|||
loc->GetQuest() == RCQUEST_VANILLA && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsVanilla()
|
||||
) &&
|
||||
(loc->GetRCType() != RCTYPE_SHOP || (showShops && loc->GetActorParams() > 0x03)) &&
|
||||
(loc->GetRandomizerCheck() != RC_MARKET_BOMBCHU_BOWLING_BOMBCHUS) &&
|
||||
(rc != RC_TRIFORCE_COMPLETED || !hideTriforceCompleted) &&
|
||||
(rc != RC_GIFT_FROM_SAGES || !IS_RANDO) &&
|
||||
(loc->GetRCType() != RCTYPE_SCRUB ||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue