Arrayify more stuff

Ignore settings file
Rip out working_dirs in favor of settings
Set main pages to array
Set bottom frame to array

gui/randomize/enemizer.py

@@ -2,7 +2,7 @@ import os
 from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, LabelFrame, OptionMenu, N, E, W, LEFT, RIGHT, X
 import gui.widgets as widgets
 
-def enemizer_page(parent,working_dirs):
+def enemizer_page(parent,settings):
     # Enemizer
     self = ttk.Frame(parent)
 
@@ -24,9 +24,9 @@ def enemizer_page(parent,working_dirs):
     enemizerPathFrame = Frame(self)
     enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ")
     enemizerCLIlabel.pack(side=LEFT)
-    self.enemizerCLIpathVar = StringVar(value=working_dirs["enemizer.cli"])
+    self.enemizerCLIpathVar = StringVar(value=settings["enemizercli"])
     def saveEnemizerPath(caller,_,mode):
-        working_dirs["enemizer.cli"] = self.enemizerCLIpathVar.get()
+        settings["enemizercli"] = self.enemizerCLIpathVar.get()
     self.enemizerCLIpathVar.trace_add("write",saveEnemizerPath)
     enemizerCLIpathEntry = Entry(enemizerPathFrame, textvariable=self.enemizerCLIpathVar)
     enemizerCLIpathEntry.pack(side=LEFT, fill=X, expand=True)
@@ -34,7 +34,7 @@ def enemizer_page(parent,working_dirs):
         path = filedialog.askopenfilename(filetypes=[("EnemizerCLI executable", "*EnemizerCLI*")], initialdir=os.path.join("."))
         if path:
             self.enemizerCLIpathVar.set(path)
-            working_dirs["enemizer.cli"] = path
+            settings["enemizercli"] = path
     enemizerCLIbrowseButton = Button(enemizerPathFrame, text='...', command=EnemizerSelectPath)
     enemizerCLIbrowseButton.pack(side=LEFT)
     enemizerPathFrame.pack(fill=X, expand=True)
@@ -115,4 +115,4 @@ def enemizer_page(parent,working_dirs):
     )
     self.enemizerWidgets[key].pack(anchor=E)
 
-    return self,working_dirs
+    return self,settings

gui/randomize/generation.py

@@ -2,7 +2,7 @@ import os
 from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, E, W, LEFT, RIGHT, X
 import gui.widgets as widgets
 
-def generation_page(parent,working_dirs):
+def generation_page(parent,settings):
     # Generation Setup
     self = ttk.Frame(parent)
 
@@ -47,10 +47,10 @@ def generation_page(parent,working_dirs):
     baseRomLabel = Label(baseRomFrame, text='Base Rom: ')
     self.romVar = StringVar()
     def saveBaseRom(caller,_,mode):
-        working_dirs["rom.base"] = self.romVar.get()
+        settings["rom"] = self.romVar.get()
     self.romVar.trace_add("write",saveBaseRom)
     romEntry = Entry(baseRomFrame, textvariable=self.romVar)
-    self.romVar.set(working_dirs["rom.base"])
+    self.romVar.set(settings["rom"])
 
     def RomSelect():
         rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
@@ -62,4 +62,4 @@ def generation_page(parent,working_dirs):
     romSelectButton.pack(side=LEFT)
     baseRomFrame.pack(fill=X, expand=True)
 
-    return self,working_dirs
+    return self,settings

gui/randomize/multiworld.py

@@ -1,7 +1,7 @@
 from tkinter import ttk, StringVar, Entry, Frame, Label, Spinbox, N, E, W, X, LEFT, RIGHT
 import gui.widgets as widgets
 
-def multiworld_page(parent,working_dirs):
+def multiworld_page(parent,settings):
     # Multiworld
     self = ttk.Frame(parent)
 
@@ -23,13 +23,13 @@ def multiworld_page(parent,working_dirs):
     ## List of Player Names
     namesFrame = Frame(self)
     namesLabel = Label(namesFrame, text='Player names')
-    self.namesVar = StringVar(value=working_dirs["multi.names"])
+    self.namesVar = StringVar(value=settings["names"])
     def saveMultiNames(caller,_,mode):
-        working_dirs["multi.names"] = self.namesVar.get()
+        settings["names"] = self.namesVar.get()
     self.namesVar.trace_add("write",saveMultiNames)
     namesEntry = Entry(namesFrame, textvariable=self.namesVar)
     namesLabel.pack(side=LEFT)
     namesEntry.pack(side=LEFT, fill=X, expand=True)
     namesFrame.pack(anchor=N, fill=X, expand=True)
 
-    return self,working_dirs
+    return self,settings