Fix a bunch of stuff
Defaults from settings file, then CLI, then canned defaults Fix Adjust settings Fix Custom Item Array settings Create error message for Enemizer Not Found
This commit is contained in:
@@ -154,6 +154,8 @@ def create_guiargs(parent):
|
||||
arg = options[mainpage][subpage][widget]
|
||||
setattr(guiargs, arg, parent.pages[mainpage].pages[subpage].widgets[widget].storageVar.get())
|
||||
|
||||
guiargs.enemizercli = parent.pages["randomizer"].pages["enemizer"].enemizerCLIpathVar.get()
|
||||
|
||||
guiargs.multi = int(parent.pages["randomizer"].pages["multiworld"].widgets["worlds"].storageVar.get())
|
||||
|
||||
guiargs.rom = parent.pages["randomizer"].pages["generation"].romVar.get()
|
||||
@@ -162,6 +164,19 @@ def create_guiargs(parent):
|
||||
guiargs.seed = int(parent.frames["bottom"].seedVar.get()) if parent.frames["bottom"].seedVar.get() else None
|
||||
guiargs.count = int(parent.frames["bottom"].widgets["generationcount"].storageVar.get()) if parent.frames["bottom"].widgets["generationcount"].storageVar.get() != '1' else None
|
||||
|
||||
adjustargs = {
|
||||
"nobgm": "disablemusic",
|
||||
"quickswap": "quickswap",
|
||||
"heartcolor": "heartcolor",
|
||||
"heartbeep": "heartbeep",
|
||||
"menuspeed": "fastmenu",
|
||||
"owpalettes": "ow_palettes",
|
||||
"uwpalettes": "uw_palettes"
|
||||
}
|
||||
for adjustarg in adjustargs:
|
||||
internal = adjustargs[adjustarg]
|
||||
setattr(guiargs,"adjust." + internal, parent.pages["adjust"].content.widgets[adjustarg].storageVar.get())
|
||||
|
||||
customitems = [
|
||||
"bow", "silversupgrade", "boomerang", "redmerang", "hookshot", "mushroom", "powder", "firerod",
|
||||
"icerod", "bombos", "ether", "quake", "lamp", "hammer", "shovel", "flute", "bugnet",
|
||||
|
||||
@@ -65,4 +65,8 @@ def custom_page(top,parent):
|
||||
self.customWidgets[key] = dictWidgets[key]
|
||||
self.customWidgets[key].pack()
|
||||
|
||||
keys = list(self.customWidgets.keys())
|
||||
for i in range(0, len(keys)):
|
||||
self.customWidgets[keys[i]].storageVar.set(top.settings["customitemarray"][i])
|
||||
|
||||
return self
|
||||
|
||||
@@ -29,9 +29,6 @@ def enemizer_page(parent,settings):
|
||||
enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ")
|
||||
enemizerCLIlabel.pack(side=LEFT)
|
||||
self.enemizerCLIpathVar = StringVar(value=settings["enemizercli"])
|
||||
def saveEnemizerPath(caller,_,mode):
|
||||
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)
|
||||
def EnemizerSelectPath():
|
||||
|
||||
@@ -29,9 +29,6 @@ def generation_page(parent,settings):
|
||||
baseRomFrame = Frame(self.frames["baserom"])
|
||||
baseRomLabel = Label(baseRomFrame, text='Base Rom: ')
|
||||
self.romVar = StringVar()
|
||||
def saveBaseRom(caller,_,mode):
|
||||
settings["rom"] = self.romVar.get()
|
||||
self.romVar.trace_add("write",saveBaseRom)
|
||||
romEntry = Entry(baseRomFrame, textvariable=self.romVar)
|
||||
self.romVar.set(settings["rom"])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user