monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gui: properly instantiate the Namespace object and fix default player settings

This commit is contained in:
Bonta-kun 2019-12-17 21:14:20 +01:00
parent 36bdb5f487
commit 3d4142bee4
1 changed files with 4 additions and 2 deletions

6
Gui.py
View File

@ -372,7 +372,7 @@ def guiMain(args=None):
countSpinbox = Spinbox(bottomFrame, from_=1, to=100, width=5, textvariable=countVar) countSpinbox = Spinbox(bottomFrame, from_=1, to=100, width=5, textvariable=countVar)
def generateRom(): def generateRom():
guiargs = Namespace guiargs = Namespace()
guiargs.multi = int(worldVar.get()) guiargs.multi = int(worldVar.get())
guiargs.names = namesVar.get() guiargs.names = namesVar.get()
guiargs.seed = int(seedVar.get()) if seedVar.get() else None guiargs.seed = int(seedVar.get()) if seedVar.get() else None
@ -428,6 +428,8 @@ def guiMain(args=None):
for k,v in vars(parse_arguments([])).items(): for k,v in vars(parse_arguments([])).items():
if k not in vars(guiargs): if k not in vars(guiargs):
setattr(guiargs, k, v) setattr(guiargs, k, v)
elif type(v) is dict: # use same settings for every player
setattr(guiargs, k, {player: getattr(guiargs, k) for player in range(1, guiargs.multi + 1)})
try: try:
if guiargs.count is not None: if guiargs.count is not None:
seed = guiargs.seed seed = guiargs.seed
@ -548,7 +550,7 @@ def guiMain(args=None):
bottomFrame2 = Frame(topFrame2) bottomFrame2 = Frame(topFrame2)
def adjustRom(): def adjustRom():
guiargs = Namespace guiargs = Namespace()
guiargs.heartbeep = heartbeepVar.get() guiargs.heartbeep = heartbeepVar.get()
guiargs.heartcolor = heartcolorVar.get() guiargs.heartcolor = heartcolorVar.get()
guiargs.fastmenu = fastMenuVar.get() guiargs.fastmenu = fastMenuVar.get()