KDL3: Fix invalid animal placements and fill error #3152
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
github-actions
bot
added
the
waiting-on: peer-review
ScipioWright
added
the
is: bug/fix
agilbert1412
approved these changes
Apr 15, 2024
| elif (not (world.multiworld.players > 1 or world.options.consumables or world.options.starsanity) and | ||
| new_stage in first_world_limit and | ||
| sum(p_stage in first_world_limit for p_stage in placed_stages) | ||
| >= (2 if world.options.open_world else 1)): |
There was a problem hiding this comment.
This condition is already huge and hard to read, I'd put at least the 2 if world.options.open_world else 1 in a local variable "max_first_world_stages" (or however you'd prefer to call it)
Berserker66
approved these changes
Apr 18, 2024
qwint
pushed a commit
to qwint/Archipelago
that referenced
this pull request
Jun 24, 2024
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.
What is this fixing or adding?
Addresses two bugs found through tests.
fill_restrictivein pre_fill, it could return an invalid placement that would render the world uncompleteable.How was this tested?
Unittests, including running the failing seeds as well as several random seeds.
Also confirmed on test generation of shuffled animals that the animals were still properly shuffled with this change.