diff --git a/Gui.py b/Gui.py index 3a815344..7486e06c 100644 --- a/Gui.py +++ b/Gui.py @@ -105,11 +105,27 @@ def guiMain(args=None): difficultyFrame = Frame(drowDownFrame) difficultyVar = StringVar() difficultyVar.set('normal') - difficultyOptionMenu = OptionMenu(difficultyFrame, difficultyVar, 'normal', 'timed', 'timed-ohko', 'timed-countdown') + difficultyOptionMenu = OptionMenu(difficultyFrame, difficultyVar, 'easy', 'normal', 'hard', 'expert', 'insane') difficultyOptionMenu.pack(side=RIGHT) difficultyLabel = Label(difficultyFrame, text='Game difficulty') difficultyLabel.pack(side=LEFT) + timerFrame = Frame(drowDownFrame) + timerVar = StringVar() + timerVar.set('none') + timerOptionMenu = OptionMenu(timerFrame, timerVar, 'none', 'timed', 'timed-ohko', 'timed-countdown') + timerOptionMenu.pack(side=RIGHT) + timerLabel = Label(timerFrame, text='Timer setting') + timerLabel.pack(side=LEFT) + + progressiveFrame = Frame(drowDownFrame) + progressiveVar = StringVar() + progressiveVar.set('on') + progressiveOptionMenu = OptionMenu(progressiveFrame, progressiveVar, 'on', 'off', 'random') + progressiveOptionMenu.pack(side=RIGHT) + progressiveLabel = Label(progressiveFrame, text='Progressive equipment') + progressiveLabel.pack(side=LEFT) + algorithmFrame = Frame(drowDownFrame) algorithmVar = StringVar() algorithmVar.set('vt26') @@ -138,6 +154,8 @@ def guiMain(args=None): logicFrame.pack(expand=True, anchor=E) goalFrame.pack(expand=True, anchor=E) difficultyFrame.pack(expand=True, anchor=E) + timerFrame.pack(expand=True, anchor=E) + progressiveFrame.pack(expand=True, anchor=E) algorithmFrame.pack(expand=True, anchor=E) shuffleFrame.pack(expand=True, anchor=E) heartbeepFrame.pack(expand=True, anchor=E) @@ -159,6 +177,8 @@ def guiMain(args=None): guiargs.logic = logicVar.get() guiargs.goal = goalVar.get() guiargs.difficulty = difficultyVar.get() + guiargs.timer = timerVar.get() + guiargs.progressive = progressiveVar.get() guiargs.algorithm = algorithmVar.get() guiargs.shuffle = shuffleVar.get() guiargs.heartbeep = heartbeepVar.get() @@ -215,6 +235,8 @@ def guiMain(args=None): seedVar.set(str(args.seed)) modeVar.set(args.mode) difficultyVar.set(args.difficulty) + timerVar.set(args.timer) + progressiveVar.set(args.progressive) goalVar.set(args.goal) algorithmVar.set(args.algorithm) shuffleVar.set(args.shuffle)