Merge branch 'DoorDevUnstable' into DoorDevVolatile

# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py

source/gui/bottom.py

@@ -214,7 +214,8 @@ def create_guiargs(parent):
                 arg = options[mainpage][subpage][widget] if subpage != "" else options[mainpage][widget]
                 page = parent.pages[mainpage].pages[subpage] if subpage != "" else parent.pages[mainpage]
                 pagewidgets = page.content.customWidgets if mainpage == "custom" else page.content.startingWidgets if mainpage == "startinventory" else page.widgets
-                setattr(guiargs, arg, pagewidgets[widget].storageVar.get())
+                if hasattr(pagewidgets[widget], 'storageVar'):
+                    setattr(guiargs, arg, pagewidgets[widget].storageVar.get())
 
     # Get Multiworld Worlds count
     guiargs.multi = int(parent.pages["bottom"].pages["content"].widgets["worlds"].storageVar.get())
@@ -282,17 +283,4 @@ def create_guiargs(parent):
 
     guiargs = update_deprecated_args(guiargs)
 
-    # Key drop shuffle stuff
-    if guiargs.keydropshuffle:
-        guiargs.dropshuffle = 'keys' if guiargs.dropshuffle == 'none' else guiargs.dropshuffle
-        guiargs.pottery = 'keys' if guiargs.pottery == 'none' else guiargs.pottery
-
-    if (hasattr(guiargs, 'retro') and guiargs.retro) or guiargs.mode == 'retro':
-        if guiargs.bow_mode == 'progressive':
-            guiargs.bow_mode = 'retro'
-        elif guiargs.bow_mode == 'silvers':
-            guiargs.bow_mode = 'retro_silvers'
-        guiargs.take_any = 'random' if guiargs.take_any == 'none' else guiargs.take_any
-        guiargs.keyshuffle = 'universal'
-
     return guiargs

source/gui/loadcliargs.py

@@ -57,7 +57,10 @@ def loadcliargs(gui, args, settings=None):
                                 pagewidgets[widget].selectbox.options = theseOptions
                             elif thisType == "spinbox":
                                 pagewidgets[widget].label.configure(text=label)
-                        pagewidgets[widget].storageVar.set(args[arg])
+                            elif thisType == 'button':
+                                pagewidgets[widget].button.configure(text=label)
+                        if hasattr(pagewidgets[widget], 'storageVar'):
+                            pagewidgets[widget].storageVar.set(args[arg])
                         # If we're on the Game Options page and it's not about Hints
                         if subpage == "gameoptions" and widget not in ["hints", "collection_rate"]:
                             # Check if we've got settings

source/gui/randomize/item.py

@@ -43,7 +43,10 @@ def item_page(parent):
     self.frames["leftPoolHeader"].pack(side=TOP, anchor=W)
 
     self.frames["leftPoolFrame"] = Frame(self.frames["leftPoolContainer"])
-    self.frames["leftPoolFrame"].pack(side=LEFT, fill=Y)
+    self.frames["leftPoolFrame"].pack(side=TOP, fill=Y)
+
+    self.frames["leftPoolFrame2"] = Frame(self.frames["leftPoolContainer"])
+    self.frames["leftPoolFrame2"].pack(side=LEFT, fill=Y)
     
     self.frames["rightPoolFrame"] = Frame(self.frames["poolFrame"])
     self.frames["rightPoolFrame"].pack(side=RIGHT)
@@ -62,14 +65,16 @@ def item_page(parent):
             for key in dictWidgets:
                 self.widgets[key] = dictWidgets[key]
                 packAttrs = {"anchor":E}
-                if self.widgets[key].type == "checkbox" or framename == "leftPoolFrame":
+                if key == "retro":
+                    packAttrs["side"] = RIGHT
+                if self.widgets[key].type == "checkbox" or framename.startswith("leftPoolFrame"):
                     packAttrs["anchor"] = W
                 if framename == "checkboxes":
                     packAttrs["side"] = LEFT
-                    packAttrs["padx"] = (10,0)
+                    packAttrs["padx"] = (10, 0)
                 elif framename == "leftPoolHeader":
                     packAttrs["side"] = LEFT
-                    packAttrs["padx"] = (0,20)
+                    packAttrs["padx"] = (0, 20)
                 packAttrs = widgets.add_padding_from_config(packAttrs, theseWidgets[key])
                 self.widgets[key].pack(packAttrs)
 

source/gui/widgets.py

@@ -1,4 +1,6 @@
+
 from tkinter import messagebox, Checkbutton, Entry, Frame, IntVar, Label, OptionMenu, Spinbox, StringVar, LEFT, RIGHT, X
+from tkinter import Button
 from source.classes.Empty import Empty
 
 # Override Spinbox to include mousewheel support for changing value
@@ -172,6 +174,22 @@ def make_textbox(self, parent, label, storageVar, manager, managerAttrs):
         widget.textbox.pack(managerAttrs["textbox"] if managerAttrs is not None and "textbox" in managerAttrs else None)
     return widget
 
+
+def make_button(self, parent, label, manager, managerAttrs, config):
+    self = Frame(parent)
+    if config and "command" in config:
+        self.command = config["command"]
+    else:
+        self.command = lambda: None
+
+    self.button = Button(parent, text=label, command=lambda: widget_command(self, self.command))
+    if managerAttrs is not None:
+        self.button.pack(managerAttrs)
+    else:
+        self.button.pack(anchor='w')
+    return self
+
+
 # Make a generic widget
 def make_widget(self, type, parent, label, storageVar=None, manager=None, managerAttrs=dict(),
                 options=None, config=None):
@@ -201,6 +219,8 @@ def make_widget(self, type, parent, label, storageVar=None, manager=None, manage
         if thisStorageVar is None:
             thisStorageVar = StringVar()
         widget = make_textbox(self, parent, label, thisStorageVar, manager, managerAttrs)
+    elif type == 'button':
+        widget = make_button(self, parent, label, manager, managerAttrs, config)
     widget.type = type
     return widget
 
@@ -243,47 +263,36 @@ def add_padding_from_config(packAttrs, defn):
 def widget_command(widget, command=""):
     root = widget.winfo_toplevel()
     text_output = ""
-    if command == "worldstate":
-        if widget.storageVar.get() == 'retro':
-            temp_widget = root.pages["randomizer"].pages["dungeon"].widgets["smallkeyshuffle"]
-            text_output += f'\n    {temp_widget.label.cget("text")}'
-            temp_widget.storageVar.set('universal')
+    if command == "retro":
+        temp_widget = root.pages["randomizer"].pages["dungeon"].widgets["smallkeyshuffle"]
+        text_output += f'\n    {temp_widget.label.cget("text")}'
+        temp_widget.storageVar.set('universal')
 
-            temp_widget = root.pages["randomizer"].pages["item"].widgets["bow_mode"]
-            text_output += f'\n    {temp_widget.label.cget("text")}'
-            if temp_widget.storageVar.get() == 'progressive':
-                temp_widget.storageVar.set('retro')
-            elif temp_widget.storageVar.get() == 'silvers':
-                temp_widget.storageVar.set('retro_silvers')
+        temp_widget = root.pages["randomizer"].pages["item"].widgets["bow_mode"]
+        text_output += f'\n    {temp_widget.label.cget("text")}'
+        if temp_widget.storageVar.get() == 'progressive':
+            temp_widget.storageVar.set('retro')
+        elif temp_widget.storageVar.get() == 'silvers':
+            temp_widget.storageVar.set('retro_silvers')
 
-            temp_widget = root.pages["randomizer"].pages["item"].widgets["take_any"]
-            text_output += f'\n    {temp_widget.label.cget("text")}'
-            if temp_widget.storageVar.get() == 'none':
-                temp_widget.storageVar.set('random')
+        temp_widget = root.pages["randomizer"].pages["item"].widgets["take_any"]
+        text_output += f'\n    {temp_widget.label.cget("text")}'
+        if temp_widget.storageVar.get() == 'none':
+            temp_widget.storageVar.set('random')
 
-            widget.storageVar.set('open')
-            messagebox.showinfo('', f'The following settings were changed:{text_output}')
+        messagebox.showinfo('', f'The following settings were changed:{text_output}')
     elif command == "keydropshuffle":
-        if widget.storageVar.get() > 0:
-            temp_widget = root.pages["randomizer"].pages["item"].widgets["pottery"]
-            if temp_widget.storageVar.get() == 'none':
-                text_output += f'\n    {temp_widget.label.cget("text")}'
-                temp_widget.storageVar.set('keys')
+        temp_widget = root.pages["randomizer"].pages["item"].widgets["pottery"]
+        text_output += f'\n    {temp_widget.label.cget("text")}'
+        if temp_widget.storageVar.get() == 'none':
+
+            temp_widget.storageVar.set('keys')
+
+        temp_widget = root.pages["randomizer"].pages["item"].widgets["dropshuffle"]
+        text_output += f'\n    {temp_widget.label.cget("text")}'
+        if temp_widget.storageVar.get() == 'none':
+            temp_widget.storageVar.set('keys')
+
+        if text_output:
+            messagebox.showinfo('', f'The following settings were changed:{text_output}')
 
-            temp_widget = root.pages["randomizer"].pages["item"].widgets["dropshuffle"]
-            if temp_widget.storageVar.get() == 'none':
-                temp_widget.storageVar.set('keys')
-                text_output += f'\n    {temp_widget.label.cget("text")}'
-            if text_output:
-                messagebox.showinfo('', f'The following settings were changed:{text_output}')
-        else:
-            temp_widget = root.pages["randomizer"].pages["item"].widgets["pottery"]
-            if temp_widget.storageVar.get() == 'keys':
-                text_output += f'\n    {temp_widget.label.cget("text")}'
-                temp_widget.storageVar.set('none')
-            temp_widget = root.pages["randomizer"].pages["item"].widgets["dropshuffle"]
-            if temp_widget.storageVar.get() == 'keys':
-                temp_widget.storageVar.set('none')
-                text_output += f'\n    {temp_widget.label.cget("text")}'
-            if text_output:
-                messagebox.showinfo('', f'The following settings were changed:{text_output}')