Skip to content

Fix Logic with OGC and mixed entrance pools#673

Merged
gymnast86 merged 6 commits intogamestabled:mainfrom
leggettc18:ocg-logic-fix
Jun 8, 2023
Merged

Fix Logic with OGC and mixed entrance pools#673
gymnast86 merged 6 commits intogamestabled:mainfrom
leggettc18:ocg-logic-fix

Conversation

@leggettc18
Copy link
Contributor

@leggettc18 leggettc18 commented May 4, 2023

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.

EDIT: Added a CASTLE_GROUNDS_FROM_GANONS_CASTLE to handle age-checking and sending Child Link to HYRULE_CASTLE_GROUNDS and Adult Link to GANONS_CASTLE_LEDGE. GANONS_CASTLE_LEDGE then does not have to worry about Link's Age for it's entrances to GANONS_CASTLE_GROUNDS or going back to GANONS_CASTLE_ENTRYWAY

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.
@leggettc18
Copy link
Contributor Author

Confirmed, if I hardcode SoT on OGC_GS and turn on mixed entrance pools and Closed Door of Time, seeds fail to generate. Without hardcoding Song of TIme, seeds generate just fine, indicating that this resolves the issue.

@leggettc18
Copy link
Contributor Author

Also confirmed if I hardcode SoT on OGC_GS on the main branch, the seed does generate successfully, despite the fact that seed should be unbeatable.

@Kewlan Kewlan mentioned this pull request May 8, 2023
@gymnast86 gymnast86 merged commit 51e1f83 into gamestabled:main Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants