Deduplicate code determining shop price

Author: fenhl

World.py

@@ -694,18 +694,23 @@ 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]:
-                        if self.settings.shopsanity_prices == 'random':
-                            self.shop_prices[location.name] = int(random.betavariate(1.5, 2) * 60) * 5
-                        elif self.settings.shopsanity_prices == 'random_starting':
-                            self.shop_prices[location.name] = random.randrange(0, 100, 5)
-                        elif self.settings.shopsanity_prices == 'random_adult':
-                            self.shop_prices[location.name] = random.randrange(0, 201, 5)
-                        elif self.settings.shopsanity_prices == 'random_giant':
-                            self.shop_prices[location.name] = random.randrange(0, 501, 5)
-                        elif self.settings.shopsanity_prices == 'random_tycoon':
-                            self.shop_prices[location.name] = random.randrange(0, 1000, 5)
-                        elif self.settings.shopsanity_prices == 'affordable':
-                            self.shop_prices[location.name] = 10
+                        self.shop_prices[location.name] = self.new_shop_price()
+
+    def new_shop_price(self) -> int:
+        if self.settings.shopsanity_prices == 'random':
+            return int(random.betavariate(1.5, 2) * 60) * 5
+        elif self.settings.shopsanity_prices == 'random_starting':
+            return random.randrange(0, 100, 5)
+        elif self.settings.shopsanity_prices == 'random_adult':
+            return random.randrange(0, 201, 5)
+        elif self.settings.shopsanity_prices == 'random_giant':
+            return random.randrange(0, 501, 5)
+        elif self.settings.shopsanity_prices == 'random_tycoon':
+            return random.randrange(0, 1000, 5)
+        elif self.settings.shopsanity_prices == 'affordable':
+            return 10
+        else:
+            raise ValueError(f'Unimplemented shopsanity_prices option {self.settings.shopsanity_prices!r}')
 
     def set_scrub_prices(self) -> None:
         # Get Deku Scrub Locations
@@ -1205,19 +1210,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.
-                if self.settings.shopsanity_prices == 'random':
-                    new_price = int(random.betavariate(1.5, 2) * 60) * 5
-                elif self.settings.shopsanity_prices == 'random_starting':
-                    new_price = random.randrange(0, 100, 5)
-                elif self.settings.shopsanity_prices == 'random_adult':
-                    new_price = random.randrange(0, 201, 5)
-                elif self.settings.shopsanity_prices == 'random_giant':
-                    new_price = random.randrange(0, 501, 5)
-                elif self.settings.shopsanity_prices == 'random_tycoon':
-                    new_price = random.randrange(0, 1000, 5)
-                elif self.settings.shopsanity_prices == 'affordable':
-                    new_price = 10
-                price = min(location.price, new_price)
+                price = min(location.price, self.new_shop_price())
         else:
             price = item.price