Ensure no conflicting settings are specified in plandos#1562
Merged
cjohnson57 merged 1 commit intoMay 30, 2022
Conversation
cjohnson57
approved these changes
May 11, 2022
cjohnson57
left a comment
Collaborator
There was a problem hiding this comment.
Note that this PR prevents 2 conflicted settings set in plando, but if there's a setting in plando that conflicts with an effective GUI setting it won't catch it. This will likely be added later.
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
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
disablefield onSetting_Infois supposed to ensure that incompatible settings, such as glitched logic and entrance randomizer, aren't selected together. It does this by disabling the setting's GUI element and setting it to itsdisabled_defaultvalue. However, nothing is validated when settings are specified via plando. In the case of glitched logic + ER, seed generation fails later (because it will try to shuffle nonexistent entrances), but with #1531 this lack of validation can lead to softlocks. This PR adds this validation, which also makes the already failing combinations fail faster and with a better error message.I've done a quick test and this seems to be working as expected, but I'm not very comfortable with the plando section of the code.