Fix NameError with vanilla special deal prices#2534
Open
fenhl wants to merge 2 commits intoOoTRandomizer:Devfrom
Open
Fix NameError with vanilla special deal prices#2534fenhl wants to merge 2 commits intoOoTRandomizer:Devfrom
fenhl wants to merge 2 commits intoOoTRandomizer:Devfrom
Conversation
cjohnson57
reviewed
Mar 11, 2026
Comment on lines
+711
to
+713
| price = location.price | ||
| if price is None: | ||
| price = ItemInfo.items[location.vanilla_item].price |
Collaborator
There was a problem hiding this comment.
In what cases would there not be a price in vanilla, but there would be a price on location?
There was a problem hiding this comment.
Plandomizing a price onto a shop location puts the price on location, no?
Collaborator
Author
There was a problem hiding this comment.
Business scrubs, apparently. Caught that when testing the PR.
Collaborator
There was a problem hiding this comment.
So it correct that it should be done this way rather than the other way around, i.e., price = temInfo.items[location.vanilla_item].price, if price is None: price = location.price
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.
Fixes a generator failure introduced in #2418 that would occur when generating a seed with “Special Deal Prices” set to “Vanilla”.
Testing
This was discovered on settings string
BSALAJAAX2TB2XCHGA3UL62AWGAAAAAAJAAAJNAA86A8FA8ACACCB6AAAAAAAAAAAAAAAXEEWM8AAJ2ABAHAQABAALED3AA(9.0.21). Tested to make sure these settings now generate successfully.