Fix GF Break Room Pot Logic#5223
Merged
aMannus merged 1 commit intoHarbourMasters:developfrom Mar 27, 2025
Merged
Conversation
serprex
reviewed
Mar 26, 2025
| LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && (logic->CanJumpslashExceptHammer() || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_BOOMERANG) || logic->HasExplosives() || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_DINS_FIRE)) && (logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_GF_KITCHEN) || ctx->GetTrickOption(RT_GF_JUMP)) && logic->CanGetNightTimeGS()), | ||
| LOCATION(RC_GF_BREAK_ROOM_POT_1, logic->CanBreakPots()), | ||
| LOCATION(RC_GF_BREAK_ROOM_POT_2, logic->CanBreakPots()), | ||
| LOCATION(RC_GF_BREAK_ROOM_POT_1, ((logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD)) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT)) && logic->CanBreakPots()), |
Contributor
There was a problem hiding this comment.
this reads oddly, assuming equip swap, should IsAdult apply more broadly?
Contributor
Author
There was a problem hiding this comment.
CanUse covers both HasItem and IsAdult for both Bow and Hookshot, so IsAdult is applied to all three pieces. I believe there are commented placeholders in the CanUse switch statement for future equip swap implementation.
Contributor
There was a problem hiding this comment.
To add, from what I gathered you can't even get to the break room if you're not adult, hence why the adult check is needed with the card. I'm sure this will get refined with the gerudo fortress area split.
aMannus
approved these changes
Mar 27, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The break room pots are only accessible as adult (without a trick - not yet implemented), and only reasonably with a way past the guards.
Build Artifacts