RANDO: Fix logic with OGC and mixed entrance pools #2830
Merged
Conversation
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
Adds a `GANONS_CASTLE_LEDGE` area and a `BuiltRainbowBridge` logic var. Added an event to `GANONS_CASTLE_GROUNDS` that sets `BuiltRainbowBridge` to true. Adds Entrances for `GANONS_CASTLE_LEDGE` to `GANONS_CASTLE_GROUNDS` when `IsAdult` and `BuiltRainbowBridge` (or the glitched logic that lets you skip the rainbow bridge) are true, `HYRULE_CASTLE_GROUNDS` when `IsChild` is true, and `GANONS_CASTLE_ENTRYWAY` When IsAdult is true (if child enters `GANONS_CASTLE_LEDGE` in game they are in `HYRULE_CASTLE_GROUNDS` and thus cannot go back into GANONS_CASTLE_ENTRYWAY). Adds Entrance for `GANONS_CASTLE_GROUNDS` to `GANONS_CASTLE_LEDGE` when `BuiltRainbowBridge` is true, or when the glitched logic that lets you skip the Rainbow Bridge is true.
Contributor
Author
|
This should fix issue #2810 |
Archez
reviewed
May 5, 2023
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Waiting on the 3drando version to get merged so I can send any changes they ask of me over here as well. |
briaguya0
approved these changes
May 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Adds a
GANONS_CASTLE_LEDGEarea and aBuiltRainbowBridgelogic var. Added an event toGANONS_CASTLE_GROUNDSthat setsBuiltRainbowBridgeto true. Adds Entrances forGANONS_CASTLE_LEDGEtoGANONS_CASTLE_GROUNDSwhenIsAdultandBuiltRainbowBridge(or the glitched logic that lets you skip the rainbow bridge) are true,HYRULE_CASTLE_GROUNDSwhenIsChildis true, andGANONS_CASTLE_ENTRYWAYWhen IsAdult is true (if child entersGANONS_CASTLE_LEDGEin game they are inHYRULE_CASTLE_GROUNDSand thus cannot go back into GANONS_CASTLE_ENTRYWAY). Adds Entrance forGANONS_CASTLE_GROUNDStoGANONS_CASTLE_LEDGEwhenBuiltRainbowBridgeis true, or when the glitched logic that lets you skip the Rainbow Bridge is true.If I'm understanding this correctly, this is also an issue upstream: gamestabled/OoT3D_Randomizer#673
Build Artifacts