Skip overrides for vanilla items#820
Merged
HylianFreddy merged 3 commits intoMay 12, 2026
Merged
Conversation
- Update Business Scrub implementation - Add enum for delayed overrides
Kewlan
previously approved these changes
May 8, 2026
Collaborator
There was a problem hiding this comment.
Minor/inconsequential nitpick, but I'd prefer the prefix be DLYOVR_ rather than DELOVR_ simply because I'm used to "DEL" meaning delete
Collaborator
Author
There was a problem hiding this comment.
Done, thanks for the suggestion!
Roberto-Nessy
approved these changes
May 10, 2026
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.
This PR removes the item overrides from the patch for locations that are set to be vanilla (due to vanilla logic or disabled shuffle settings). This fixes freestanding rupees appearing as items even when they're not shuffled.
In the
ItemLocationclass I refactored thehiddenfield, previously used only to hide spoiler log entries, renaming it tooverriddento indicate if that location will have an override placed in the patch. Placing a random item will set it to true, and placing the vanilla item will set it to false.I also updated the business scrub code and removed the "hack" for seeds/arrows scrubs. I tested to make sure the scrubs still work correctly, checking both scrub types (respawning and non-respawning ones) with the setting enabled, disabled, and with vanilla logic.
For
DelayedandTempleRewarditem locations I chose to keep the overrides even when vanilla, because those items are always given by the rando code. I added an enum for delayed overrides to make them clearer.