Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

source/classes/constants.py

@@ -34,7 +34,7 @@ CUSTOMITEMLABELS = [
   "Ether", "Quake", "Lamp", "Hammer", "Shovel",
 
   "Ocarina", "Bug Catching Net", "Book of Mudora", "Bottle", "Cane of Somaria",
-  "Cane of Byrna", "Magic Cape", "Magic Mirror", "Pegasus Boots", "Power Glove",
+  "Cane of Byrna", "Cape", "Magic Mirror", "Pegasus Boots", "Power Glove",
   "Titans Mitts", "Progressive Glove", "Flippers", "Moon Pearl", "Piece of Heart",
 
   "Boss Heart Container", "Sanctuary Heart Container", "Fighter Sword", "Master Sword", "Tempered Sword",

source/gui/adjust/overview.py

@@ -7,6 +7,8 @@ import json
 import logging
 import os
 
+from Utils import output_path
+
 def adjust_page(top, parent, settings):
     # Adjust page
     self = ttk.Frame(parent)
@@ -90,6 +92,8 @@ def adjust_page(top, parent, settings):
 
     # These are the options to Adjust
     def adjustRom():
+        if output_path.cached_path is None:
+                output_path.cached_path = top.settings["outputpath"]
         options = {
           "heartbeep": "heartbeep",
           "heartcolor": "heartcolor",

source/gui/bottom.py

@@ -146,10 +146,13 @@ def bottom_frame(self, parent, args=None):
     self.widgets[widget].pieces["button"].pack(side=LEFT)
 
     def open_output():
-        if args and args.outputpath:
-            open_file(output_path(args.outputpath))
-        else:
-            open_file(output_path(parent.settings["outputpath"]))
+        if output_path.cached_path is None:
+            if args and args.outputpath:
+                output_path.cached_path = args.outputpath
+            else:
+                output_path.cached_path = parent.settings["outputpath"]
+
+        open_file(output_path('.'))
 
     ## Output Button
     # widget ID

source/gui/randomize/generation.py

@@ -66,7 +66,7 @@ def generation_page(parent,settings):
     # FIXME: Translate these
     def RomSelect():
         rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
-        self.widgets[widget].storageVar.set(rom)
+        self.widgets["rom"].storageVar.set(rom)
     # dialog button
     self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='Select Rom', command=RomSelect)