Fix: More swordless fixes when time traveling #3510
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
|
Maybe you can just put all the swordless fixes behind a new cvar and just set it when needed and include it in the fixes tab. |
briaguya-ai
approved these changes
Dec 16, 2023
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.
Stick on B was occurring in MS shuffle when traveling as child -> adult for the second+ time while having a Kokiri sword equipped as child. The root cause is the swordless flag is unset for child and carries over to adult, causing stick on B. This PR adds a check for adult not having a sword equiped and to set the swordless flag again as adult.
Conversely, in this same situation, when switching back to child (swordless adult, to kokiri sword as child), the swordless flag was left on. This doesn't have any immediate impact from what I can see, but for correctness sake, this PR also adds a similar check to explicit remove the swordless flag as child.
This func is getting quite messy between regular rando, the change age cheats/enhancements, and now MS shuffle. Will most likely add this func to my list of things that can be cleaned up in develop.
Build Artifacts