Remove some redundant code #171
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
| @@ -606,8 +606,6 @@ def setup_final_location(final_location, location_cache): | |||
| # Final location should be near the end of the cache | |||
| for i in range(len(location_cache) - 1, -1, -1): | |||
| if location_cache[i].name == final_location: | |||
| location_cache[i].locked = True | |||
| location_cache[i].event = True | |||
There was a problem hiding this comment.
I think this is still important, as these are core AP flags that let us put the victory flag somewhere? I'm not totally sure as I'm not too familiar with the core code.
Edit: Sounds like this is flagged elsewhere and core sets these flags for us.
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?
This removes us manually setting event/locked flags on locations.
For
create_location, this was never even called becauseidis a built-in function and thus neverNone, and we never change the variable locally.For
setup_final_location, we never check for location event/locked flags in the world, and any location withaddress is Noneis caught by__init__.setup_events, which callsLocation.place_locked_item, which in turn sets both the event and locked flags, so us manually setting it on any location with addressNoneis redundant.How was this tested?
A few generations and checking spoiler logs for abnormalities.