Fix: Actually display correct GS token count in message for vanilla and rando#2651
Merged
briaguya0 merged 2 commits intoHarbourMasters:develop-khanfrom Apr 1, 2023
Merged
Conversation
briaguya0
approved these changes
Apr 1, 2023
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
2 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.
This PR reverts #2597, as the fix done there although correctly addresses the GS count on vanilla saves being off, it also introduced an issue where rando saves now displayed the wrong count when getting a GS token from a non-GS check.
This was investigated and reported here #2516 (comment)
The new solution now checks if the save is a rando save to conditionally add the
+1when displaying the count as randomizer checks present the message box prior to giving the token (which is when the count is actually incremented)Truly fixes #2516 and #2075
(I'll take my 🥖)
Build Artifacts