Merged DR v1.2.0.0

source/gui/adjust/overview.py

@@ -157,8 +157,8 @@ def adjust_page(top, parent, settings):
             "quickswap": "quickswap",
             "nobgm": "disablemusic",
             "reduce_flashing": "reduce_flashing",
-            'msu_resume': 'msu_resume',
             "shuffle_sfx": "shuffle_sfx",
+            "msu_resume": "msu_resume"
         }
         guiargs = Namespace()
         for option in options:

source/gui/bottom.py

@@ -220,6 +220,11 @@ def create_guiargs(parent):
     # Get baserom path
     guiargs.rom = parent.pages["randomizer"].pages["generation"].widgets["rom"].storageVar.get()
 
+    # Get customizer path
+    customizer_value = parent.pages["randomizer"].pages["generation"].widgets["customizer"].storageVar.get()
+    if customizer_value and customizer_value != 'None':
+        guiargs.customizer = customizer_value
+
     # Get if we're using the Custom Item Pool
     guiargs.custom = bool(parent.pages["randomizer"].pages["generation"].widgets["usecustompool"].storageVar.get())
 
@@ -280,4 +285,12 @@ def create_guiargs(parent):
         guiargs.dropshuffle = 1
         guiargs.pottery = 'keys' if guiargs.pottery == 'none' else guiargs.pottery
 
+    if 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/randomize/entrando.py

@@ -27,7 +27,7 @@ def entrando_page(parent):
             for key in dictWidgets:
                 self.widgets[key] = dictWidgets[key]
                 packAttrs = {"anchor":E}
-                if self.widgets[key].type == "checkbox" or key == "openpyramid":
+                if self.widgets[key].type == "checkbox" or key in ["openpyramid", "take_any"]:
                     packAttrs["anchor"] = W
                 self.widgets[key].pack(packAttrs)
 

source/gui/randomize/generation.py

@@ -79,6 +79,48 @@ def generation_page(parent,settings):
     # frame: pack
     self.widgets[widget].pieces["frame"].pack(fill=X)
 
+
+    self.frames["customizer"] = Frame(self)
+    self.frames["customizer"].pack(anchor=W, fill=X)
+    ## Customizer file
+    # This one's more-complicated, build it and stuff it
+    # widget ID
+    widget = "customizer"
+
+    # Empty object
+    self.widgets[widget] = Empty()
+    # pieces
+    self.widgets[widget].pieces = {}
+
+    # frame
+    self.widgets[widget].pieces["frame"] = Frame(self.frames["customizer"])
+    # frame: label
+    self.widgets[widget].pieces["frame"].label = Label(self.widgets[widget].pieces["frame"], text='Customizer File: ')
+    # storage var
+    self.widgets[widget].storageVar = StringVar()
+    # textbox
+    self.widgets[widget].pieces["textbox"] = Entry(self.widgets[widget].pieces["frame"],
+                                                   textvariable=self.widgets[widget].storageVar)
+    self.widgets[widget].storageVar.set(settings["customizer"])
+
+    # FIXME: Translate these
+    def FileSelect():
+        file = filedialog.askopenfilename(filetypes=[("Yaml Files", (".yaml", ".yml")), ("All Files", "*")],
+                                          initialdir=os.path.join("."))
+        self.widgets["customizer"].storageVar.set(file)
+    # dialog button
+    self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"],
+                                                   text='Select File', command=FileSelect)
+
+    # frame label: pack
+    self.widgets[widget].pieces["frame"].label.pack(side=LEFT)
+    # textbox: pack
+    self.widgets[widget].pieces["textbox"].pack(side=LEFT, fill=X, expand=True)
+    # button: pack
+    self.widgets[widget].pieces["button"].pack(side=LEFT)
+    # frame: pack
+    self.widgets[widget].pieces["frame"].pack(fill=X)
+
     ## Run Diagnostics
     # This one's more-complicated, build it and stuff it
     # widget ID