Fix: MQ logic for Ganons Castle main area #3275
Merged
Conversation
This file contains 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
inspectredc
approved these changes
Oct 11, 2023
inspectredc
reviewed
Oct 15, 2023
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
Outdated
Show resolved
Hide resolved
inspectredc
reviewed
Oct 27, 2023
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
Outdated
Show resolved
Hide resolved
inspectredc
approved these changes
Oct 29, 2023
garrettjoecox
approved these changes
Oct 30, 2023
briaguya-ai
approved these changes
Nov 4, 2023
aMannus
approved these changes
Nov 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 logic for Ganon's Castle did not distinguish between the first hallway and the main area. For vanilla this is basically fine as you can just go through the door, but in MQ there is an enemy clear requirement for the door to open. Additionally the enemy clear logic was placed on the "exit" of Ganon's Castle back to the overworld. This meant that logic was improperlly assuming you could get to the deku scrubs and other trials without weapons to defeat the enemies.
This PR breaks up the logic to have separate areas for the hallway and the main room and moves the enemy clear condition to the right door. The naming of these areas match with n64 logic.
Build Artifacts