Adding new option for Bonk Drop Shuffle

BaseClasses.py

@@ -54,7 +54,7 @@ class World(object):
         self._entrance_cache = {}
         self._location_cache = {}
         self.required_locations = []
-        self.shuffle_bonk_prizes = False
+        self.shuffle_bonk_drops = {}
         self.light_world_light_cone = False
         self.dark_world_light_cone = False
         self.clock_mode = 'none'

CLI.py

@@ -109,7 +109,7 @@ def parse_cli(argv, no_defaults=False):
                          'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor',
                          'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle',
                          'mixed_travel', 'standardize_palettes', 'code', 'reduce_flashing', 'shuffle_sfx',
-                         'msu_resume', 'collection_rate', 'colorizepots']:
+                         'msu_resume', 'collection_rate', 'colorizepots', 'bonk_drops']:
                 value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
                 if player == 1:
                     setattr(ret, name, {1: value})
@@ -159,6 +159,7 @@ def parse_settings():
         "ow_mixed": False,
         "ow_whirlpool": False,
         "ow_fluteshuffle": "vanilla",
+        "bonk_drops": False,
         "shuffle": "vanilla",
         "shufflelinks": False,
         "overworld_map": "default",

Main.py

@@ -91,6 +91,7 @@ def main(args, seed=None, fish=None):
     world.owKeepSimilar = args.ow_keepsimilar.copy()
     world.owWhirlpoolShuffle = args.ow_whirlpool.copy()
     world.owFluteShuffle = args.ow_fluteshuffle.copy()
+    world.shuffle_bonk_drops = args.bonk_drops.copy()
     world.open_pyramid = args.openpyramid.copy()
     world.boss_shuffle = args.shufflebosses.copy()
     world.enemy_shuffle = args.shuffleenemies.copy()
@@ -438,6 +439,7 @@ def copy_world(world, partial_copy=False):
     ret.owKeepSimilar = world.owKeepSimilar.copy()
     ret.owWhirlpoolShuffle = world.owWhirlpoolShuffle.copy()
     ret.owFluteShuffle = world.owFluteShuffle.copy()
+    ret.shuffle_bonk_drops = world.shuffle_bonk_drops.copy()
     ret.open_pyramid = world.open_pyramid.copy()
     ret.boss_shuffle = world.boss_shuffle.copy()
     ret.enemy_shuffle = world.enemy_shuffle.copy()

Mystery.py

@@ -174,6 +174,7 @@ def roll_settings(weights):
     ret.ow_whirlpool = get_choice('whirlpool_shuffle') == 'on'
     overworld_flute = get_choice('flute_shuffle')
     ret.ow_fluteshuffle = overworld_flute if overworld_flute != 'none' else 'vanilla'
+    ret.shuffle_bonk_drops = get_choice('bonk_drops') == 'on'
     entrance_shuffle = get_choice('entrance_shuffle')
     ret.shuffle = entrance_shuffle if entrance_shuffle != 'none' else 'vanilla'
     overworld_map = get_choice('overworld_map')

resources/app/cli/args.json

@@ -167,6 +167,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "bonk_drops": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "ow_fluteshuffle": {
     "choices": [
       "vanilla",

resources/app/cli/lang/en.json

@@ -234,6 +234,9 @@
     "ow_whirlpool": [
       "Whirlpools will be shuffled and paired together."
     ],
+    "bonk_drops": [
+      "Bonk drops from trees, rocks, and statues are shuffled with the item pool."
+    ],
     "ow_fluteshuffle": [
       "This randomizes the flute spot destinations.",
       "Vanilla:        All flute spots remain unchanged.",

resources/app/gui/lang/en.json

@@ -145,6 +145,8 @@
 
     "randomizer.overworld.whirlpool": "Whirlpool Shuffle",
 
+    "randomizer.overworld.bonk_drops": "Bonk Drops",
+
     "randomizer.overworld.overworldflute": "Flute Shuffle",
     "randomizer.overworld.overworldflute.vanilla": "Vanilla",
     "randomizer.overworld.overworldflute.balanced": "Balanced",

resources/app/gui/randomize/overworld/widgets.json

@@ -1,4 +1,10 @@
 {
+  "topOverworldFrame": {
+    "bonk_drops": {
+      "type": "checkbox",
+      "default": false
+    }
+  },
   "leftOverworldFrame": {
     "overworldshuffle": {
       "type": "selectbox",

source/classes/constants.py

@@ -81,6 +81,7 @@ SETTINGSTOPROCESS = {
       "keepsimilar": "ow_keepsimilar",
       "mixed": "ow_mixed",
       "whirlpool": "ow_whirlpool",
+      "bonk_drops": "bonk_drops",
       "overworldflute": "ow_fluteshuffle"
     },
     "entrance": {

source/gui/randomize/overworld.py

@@ -15,13 +15,17 @@ def overworld_page(parent):
 
     # Load Overworld Shuffle option widgets as defined by JSON file
     # Defns include frame name, widget type, widget options, widget placement attributes
-    # These get split left & right
+    self.frames["topOverworldFrame"] = Frame(self)
     self.frames["leftOverworldFrame"] = Frame(self)
     self.frames["rightOverworldFrame"] = Frame(self)
 
+    self.frames["topOverworldFrame"].pack(side=TOP, anchor=NW)
     self.frames["leftOverworldFrame"].pack(side=LEFT, anchor=NW, fill=Y)
     self.frames["rightOverworldFrame"].pack(anchor=NW, fill=Y)
 
+    shuffleLabel = Label(self.frames["topOverworldFrame"], text="Shuffle: ")
+    shuffleLabel.pack(side=LEFT)
+    
     with open(os.path.join("resources","app","gui","randomize","overworld","widgets.json")) as overworldWidgets:
         myDict = json.load(overworldWidgets)
         for framename,theseWidgets in myDict.items():
@@ -33,7 +37,7 @@ def overworld_page(parent):
                     packAttrs = {"side":LEFT, "pady":(18,0)}
                 elif key == "overworldflute":
                     packAttrs["pady"] = (20,0)
-                elif key in ["whirlpool", "mixed"]:
+                elif key in ["mixed", "whirlpool"]:
                     packAttrs = {"anchor":W, "padx":(79,0)}
                 
                 self.widgets[key].pack(packAttrs)