Merge 'Settings for more control over special deal prices' (#2037)

# Conflicts:
#	data/presets_default.json

Author: fenhl

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Dev
 
+* New settings for more control over special deal prices.
+
 # 8.3
 
 ## New Settings and Options

SettingsList.py

@@ -1992,8 +1992,8 @@ class SettingInfos:
             'random': 'Random # of Items Per Shop',
         },
         disable        = {
-            'off':  {'settings': ['shopsanity_prices']},
-            '0':    {'settings': ['shopsanity_prices']},
+            'off':  {'settings': ['special_deal_price_distribution', 'special_deal_price_min', 'special_deal_price_max']},
+            '0':    {'settings': ['special_deal_price_distribution', 'special_deal_price_min', 'special_deal_price_max']},
         },
         gui_tooltip    = '''\
             Randomizes Shop contents.
@@ -2034,40 +2034,77 @@ class SettingInfos:
         },
     )
 
-    shopsanity_prices = Combobox(
-        gui_text         = 'Shopsanity Prices',
-        default          = 'random',
+    special_deal_price_distribution = Combobox(
+        gui_text         = 'Special Deal Prices',
+        default          = 'betavariate',
         choices          = {
-            'random':          "Random",
-            'random_starting': "Starting Wallet",
-            'random_adult':    "Adult's Wallet",
-            'random_giant':    "Giant's Wallet",
-            'random_tycoon':   "Tycoon's Wallet",
-            'affordable':      "Affordable",
+            'vanilla':     'Vanilla',
+            'betavariate': 'Weighted',
+            'uniform':     'Uniform',
+        },
+        disable          = {
+            'vanilla': {'settings': ['special_deal_price_min', 'special_deal_price_max']},
         },
         gui_tooltip      = '''\
-            Controls the randomization of prices for shopsanity items.
-            For more control, utilize the plandomizer.
+            Controls how the prices for Special Deal items in shops are
+            selected. For more control, utilize the plandomizer.
 
-            'Random': The default randomization. Shop prices for
-            shopsanity items will range between 0 to 300 rupees,
-            with a bias towards values slightly below the middle of the
-            range, in multiples of 5.
+            'Vanilla': Each item will be sold for the price of the item
+            that appears in its slot in the vanilla game.
 
-            'X Wallet': Shop prices for shopsanity items will range
-            between 0 and the specified wallet's maximum capacity,
-            in multiples of 5.
+            'Weighted': Shop prices will be biased towards slightly below
+            the middle of the selected range, with very low or very high
+            prices only appearing rarely.
 
-            'Affordable': Shop prices for shopsanity items will be
-            fixed to 10 rupees.
+            'Uniform': Each price value in the selected range is equally
+            likely.
         ''',
-        disabled_default =  'random',
         shared           = True,
         gui_params       = {
             "hide_when_disabled": True,
         },
     )
 
+    special_deal_price_min = Scale(
+        gui_text       = 'Minimum Special Deal Price',
+        default        = 0,
+        minimum        = 0,
+        maximum        = 995,
+        step           = 5,
+        shared         = True,
+        gui_tooltip    = '''\
+            Select the minimum price in rupees for Special Deal
+            items in shops. Prices will be selected randomly in
+            multiples of 5 according to the "Special Deal Price
+            Distribution" setting. Set this setting and "Maximum
+            Special Deal Price" to the same value to give all
+            Special Deals a fixed price.
+        ''',
+        gui_params     = {
+            "hide_when_disabled": True,
+        },
+    )
+
+    special_deal_price_max = Scale(
+        gui_text       = 'Maximum Special Deal Price',
+        default        = 300,
+        minimum        = 0,
+        maximum        = 995,
+        step           = 5,
+        shared         = True,
+        gui_tooltip    = '''\
+            Select the maximum price in rupees for Special Deal
+            items in shops. Prices will be selected randomly in
+            multiples of 5 according to the "Special Deal Price
+            Distribution" setting. Set this setting and "Minimum
+            Special Deal Price" to the same value to give all
+            Special Deals a fixed price.
+        ''',
+        gui_params     = {
+            "hide_when_disabled": True,
+        },
+    )
+
     tokensanity = Combobox(
         gui_text       = 'Tokensanity',
         default        = 'off',

World.py

@@ -694,18 +694,18 @@ 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
+                        if self.settings.special_deal_price_distribution == 'vanilla':
+                            self.shop_prices[location.name] = ItemInfo.items[location.vanilla_item].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:
+                            self.shop_prices[location.name] = self.settings.special_deal_price_min
+                        elif self.settings.special_deal_price_distribution == 'betavariate':
+                            self.shop_prices[location.name] = self.settings.special_deal_price_min + int(random.betavariate(1.5, 2) * (self.settings.special_deal_price_max - self.settings.special_deal_price_min) / 5) * 5
+                        elif self.settings.special_deal_price_distribution == 'uniform':
+                            self.shop_prices[location.name] = random.randrange(self.settings.special_deal_price_min, self.settings.special_deal_price_max + 1, 5)
+                        else:
+                            raise NotImplementedError(f'Unimplemented special deal distribution: {self.settings.special_deal_price_distribution}')
 
     def set_scrub_prices(self) -> None:
         # Get Deku Scrub Locations

data/presets_default.json

@@ -64,7 +64,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "off",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "off",
         "shuffle_child_trade": [],
@@ -263,7 +265,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "off",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "off",
         "shuffle_child_trade": [],
@@ -467,7 +471,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "4",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "dungeons",
         "shuffle_scrubs": "low",
         "shuffle_child_trade": [],
@@ -680,7 +686,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "off",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "off",
         "shuffle_child_trade": [],
@@ -899,7 +907,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "off",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "off",
         "shuffle_child_trade": [],
@@ -1108,7 +1118,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "4",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "dungeons",
         "shuffle_scrubs": "low",
         "shuffle_child_trade": [],
@@ -1323,7 +1335,9 @@
         "free_bombchu_drops": true,
         "shuffle_song_items": "any",
         "shopsanity": "0",
-        "shopsanity_prices": "random_tycoon",
+        "special_deal_price_distribution": "uniform",
+        "special_deal_price_min": 995,
+        "special_deal_price_max": 995,
         "tokensanity": "all",
         "shuffle_scrubs": "random",
         "shuffle_child_trade": [
@@ -1706,7 +1720,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "off",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "off",
         "shuffle_child_trade": [],
@@ -1906,7 +1922,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "off",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "low",
         "shuffle_child_trade": [],
@@ -2137,7 +2155,9 @@
         "free_bombchu_drops": false,
         "shuffle_song_items": "song",
         "shopsanity": "4",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "low",
         "shuffle_child_trade": [],
@@ -2347,7 +2367,9 @@
         "free_bombchu_drops": true,
         "shuffle_song_items": "any",
         "shopsanity": "4",
-        "shopsanity_prices": "random",
+        "special_deal_price_distribution": "betavariate",
+        "special_deal_price_min": 0,
+        "special_deal_price_max": 300,
         "tokensanity": "off",
         "shuffle_scrubs": "low",
         "shuffle_child_trade": [],

data/settings_mapping.json

@@ -191,7 +191,9 @@
           "settings": [
             "shuffle_song_items",
             "shopsanity",
-            "shopsanity_prices",
+            "special_deal_price_distribution",
+            "special_deal_price_min",
+            "special_deal_price_max",
             "tokensanity",
             "shuffle_scrubs",
             "shuffle_child_trade",

version.py

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