github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

clanged

Browse source
This commit is contained in:
Pepper0ni 2025-04-26 12:26:46 +01:00
commit 0353c0ae0a
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
soh/soh/Enhancements/randomizer/location_access.cpp
View file

@ -253,10 +253,10 @@ bool Here(const RandomizerRegion region, ConditionFn condition) {
* the second condition is the same for adult 1F lock, and the third is the access from the boss door. * the second condition is the same for adult 1F lock, and the third is the access from the boss door.
*/ */
bool SpiritExplosiveKeyLogic() { bool SpiritExplosiveKeyLogic() {
return logic->SmallKeys(RR_SPIRIT_TEMPLE, return logic->SmallKeys(RR_SPIRIT_TEMPLE, logic->SpiritBrokenWallToStatue() ? 1
logic->SpiritBrokenWallToStatue() ? 1 : ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() ? 2 : 3); : ctx->GetOption(RSK_BOMBCHU_BAG) && logic->BombchuRefill() ? 2
: 3);
} }
// clang-format off // clang-format off
@ -291,17 +291,17 @@ std::map<RandomizerRegion, SpiritLogicData> Region::spiritLogicData = {
}; };
// clang-format on // clang-format on
bool SpiritCertainAccess(RandomizerRegion region){ bool SpiritCertainAccess(RandomizerRegion region) {
SpiritLogicData& curRegionData = Region::spiritLogicData[region]; SpiritLogicData& curRegionData = Region::spiritLogicData[region];
uint8_t keys = curRegionData.adultKeys; uint8_t keys = curRegionData.adultKeys;
bool reverseAccess = logic->ReverseSpiritAdult; bool reverseAccess = logic->ReverseSpiritAdult;
if (logic->IsChild){ if (logic->IsChild) {
// If child enters in reverse, then they have access to Certain Access to Broken Wall room in 6 keys, // If child enters in reverse, then they have access to Certain Access to Broken Wall room in 6 keys,
// the ability to hit switches and the ability to climb because only child can reach the initial child lock // the ability to hit switches and the ability to climb because only child can reach the initial child lock
// without opening the Statue room to Broken Wall Room lock first // without opening the Statue room to Broken Wall Room lock first
keys = (logic->ReverseSpiritChild && logic->CanHitSwitch() /* && CanClimbHigh()*/) keys = (logic->ReverseSpiritChild && logic->CanHitSwitch() /* && CanClimbHigh()*/)
? curRegionData.childReverseKeys ? curRegionData.childReverseKeys
: curRegionData.childKeys; : curRegionData.childKeys;
reverseAccess = logic->ReverseSpiritChild; reverseAccess = logic->ReverseSpiritChild;
} }
// If we have enough keys that an age cannot be kept out, we have Certain Access // If we have enough keys that an age cannot be kept out, we have Certain Access