Merge 'Fix NameError with vanilla special deal prices' (#2534)

Author: cjohnson57

CHANGELOG.md

@@ -23,6 +23,7 @@
 * Added some missing or incorrectly named locations in advanced logic.
 * Various minor fixes for advanced logic.
 * Fix for advanced logic tricks being cached when switching to glitchless logic.
+* Fix for failure to generate when special deal prices are set to vanilla.
 
 ## Other Changes
 * It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.

World.py

@@ -704,11 +704,14 @@ def random_shop_prices(self) -> None:
             for location in region.locations:
                 if location.type == 'Shop':
                     if location.name[-1:] in shop_item_indexes[:shop_item_count]:
-                        self.shop_prices[location.name] = self.new_shop_price()
+                        self.shop_prices[location.name] = self.new_shop_price(location)
 
-    def new_shop_price(self) -> int:
+    def new_shop_price(self, location: Location) -> int:
         if self.settings.special_deal_price_distribution == 'vanilla':
-            return ItemInfo.items[location.vanilla_item].price
+            price = location.price
+            if price is None:
+                price = ItemInfo.items[location.vanilla_item].price
+            return price
         elif self.settings.special_deal_price_max < self.settings.special_deal_price_min:
             raise ValueError('Maximum special deal price is lower than minimum, perhaps you meant to swap them?')
         elif self.settings.special_deal_price_max == self.settings.special_deal_price_min:
@@ -1226,7 +1229,7 @@ def push_item(self, location: str | Location, item: Item, manual: bool = False)
                 # Reduce the frequency of obvious scams by rerolling the price once if it's too high, and taking the lower value.
                 # This affects logic so it should only be applied to refills that are logically irrelevant.
                 # Otherwise there could be seeds with e.g. a wallet that's hinted as logically required for a purchase even though the price was rerolled to no longer require the wallet.
-                price = min(location.price, self.new_shop_price())
+                price = min(location.price, self.new_shop_price(location))
         else:
             price = item.price
 

version.py

@@ -1,4 +1,4 @@
-__version__ = '9.0.34'
+__version__ = '9.0.35'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0