[Fix] Merchant Check Fixes#3067
Merged
leggettc18 merged 2 commits intoHarbourMasters:develop-sulufrom Jul 13, 2023
Merged
Conversation
…ne and inf IDs so the tracker tracks it properly.
leggettc18
approved these changes
Jul 13, 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.
Change Granny's Shop collection type to RandomizerInf with proper scene and inf IDs so the tracker tracks it properly.
Also moved pending sale resolution to fix resolution for merchants selling rupees. Instead of like scrubs and shops, where the item is given and rupee values added before the price was deducted, merchants deduct the price before adding the value, and so the previous check for rupeeAccumulator being 0 wouldn't be hit in runtime because the accumulator would then immediately be positive because of the rupee being given. That check is now outside of the accumulator processing paired with a pendingSale check so that it's always run no matter what's given or when.
Build Artifacts