Prevent Special hints and skipped Impa's song from being Gossip Stone hints.#3060
Closed
Pepper0ni wants to merge 16 commits intoHarbourMasters:develop-randofrom
Closed
Prevent Special hints and skipped Impa's song from being Gossip Stone hints.#3060Pepper0ni wants to merge 16 commits intoHarbourMasters:develop-randofrom
Pepper0ni wants to merge 16 commits intoHarbourMasters:develop-randofrom
Conversation
Contributor
Author
|
merged in a change currently on develop-sulu that is needed to test this feature properly, but it is not the same commit ID so should be removed before trying to merge to avoid a conflict later |
0258789 to
d347ffe
Compare
Contributor
Author
|
OK, should be good to merge now, i removed the testing commit as well as the granny fix as that is in #3108 instead |
Contributor
Author
|
Added a small semi-related change that makes it so Impa's song can no longer be hinted if you skip zelda because you already have it. This is not a separate PR because it would likely conflict with this and the scope is related. |
c4249c2 to
78d67f1
Compare
78d67f1 to
ec15216
Compare
55c51ae to
7a425c7
Compare
* typo on asset attribute * base address fix
* Color and Invisible Checkbox GI model crashes when talking to mask salesman * Update z_player.c Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Update z_player.c Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Move bunny hood coloring to patch --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
…song shuffle text from spoiler logs
…song shuffle text from spoiler logs
…eing hinted elsewhere unless they are locked by that item.
…ial final frogs hint is enabled.
fcef6a5 to
c6b145e
Compare
6123307 to
2d6d12a
Compare
Contributor
|
|
Contributor
Author
|
Closed due to accidental merger with #3110, merge that as both |
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.
THIS PR NOW INCLUDES #3110 DUE TO CONFLICTS. Please either review and merge that one first or close that one once this has been reviewed.
A series of changes that aims to prevent duplication of hints between special hints and gossip stones, except in the case where the hinted item is blocking the special hint.
This only prevents the hinted locations from being the target of location and WotH hints (by marking IsHinted) but not always hints, including conditional always hints whose condition is met. The exception to this is when the Special hint always points at the same location as an always hint (E.G., high skull hints), in which case the always is removed by adding the special hint setting to the conditions.
Full change-list:
While I can test the obvious things like the skulls always hints spawning, I cannot (or do not know how to) easily test the negative cases where hints shouldn't be able to spawn, so I am making this PR now for testing but it should not be merged until it has been played with a bit and checked for obvious issues.
Additionally, I have Added a fix for a random crash when generating seeds caused by the granny's shop check not having hint text.
Build Artifacts