merge latest#2
Merged
Merged
Conversation
* Can pass Logic a RequirementsSettings * Import tweak, need to sort this out properly * Can pass Logic a RequirementsSettings * Import tweak, need to sort this out properly * Final changes before the monthly * Allow readEntrances to correctly read screens with multiple entrances * Fixed reading outdoors->outdoors when multiple doors on screen * Added an LttP overworld check * Finished adding alttp checks * One more alttp check * Allows reentering some entrances in decoupled ER * Used castle_frontdoor instead of creating outside_castle_main_entrance * Leaving the castle bush entrance doesn't need a bush breaker * First pass at adding names * Switched location arg positions * Saved requirements_settings in Logic * Added Location.friendlyName * Fixed a couple name issues * Named a D7 location, gave unnamed locations a friendlyName * Fixed a couple pit_bush exits * Hamfisted circular import tweaks * Added CheckMetadata for the keyhole checks * More hamfisting * Added shopsanity metadata * Added a Library location name * Initial proof of concept test * Oops * Finished assigning IDs and definitely didn't break anything * See, didn't break anything * Name the id parameter during entrance connection * Fixed some merge issues * Oops, missed overworld * Revert a bunch of magpie stuff * Fix some dumb stuff * Oops, missed an Error reference * And another...
…w the wrong palette
…aning up the code that deals with this.
…what tunic you have.
…ings, split the goal settings so the list isnt longer than the screen.
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
3 participants
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.
No description provided.