morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Timer display

Browse Source 
Makes these two files support that setting. Also fixes a bug in the command line display for the timer settings.
This commit is contained in:
AmazingAmpharos
2017-11-11 18:08:41 -06:00
committed by GitHub
parent ff3420cab7
commit 13197e4ffe
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EntranceRandomizer.py
View File

@@ -60,10 +60,12 @@ if __name__ == '__main__':
Expert: A harder yet setting with minimum equipment and health. Expert: A harder yet setting with minimum equipment and health.
Insane: A setting with the absolute minimum in equipment and no extra health. Insane: A setting with the absolute minimum in equipment and no extra health.
''') ''')
parser.add_argument('--timer', default='none', const='normal', nargs='?', choices=['none', 'hard', 'expert', 'insane'], parser.add_argument('--timer', default='none', const='normal', nargs='?', choices=['none', 'display', 'timed', 'timed-ohko', 'timed-countdown'],
help='''\ help='''\
Select game timer setting. Affects available itempool. (default: %(default)s) Select game timer setting. Affects available itempool. (default: %(default)s)
None: No timer. None: No timer.
Display: Displays a timer but does not affect
the itempool.
Timed: Starts with clock at zero. Green Clocks Timed: Starts with clock at zero. Green Clocks
subtract 4 minutes (Total: 20), Blue Clocks subtract 4 minutes (Total: 20), Blue Clocks
subtract 2 minutes (Total: 10), Red Clocks add subtract 2 minutes (Total: 10), Red Clocks add

2
Gui.py
View File

@@ -113,7 +113,7 @@ def guiMain(args=None):
timerFrame = Frame(drowDownFrame) timerFrame = Frame(drowDownFrame)
timerVar = StringVar() timerVar = StringVar()
timerVar.set('none') timerVar.set('none')
timerOptionMenu = OptionMenu(timerFrame, timerVar, 'none', 'timed', 'timed-ohko', 'timed-countdown') timerOptionMenu = OptionMenu(timerFrame, timerVar, 'none', 'display', 'timed', 'timed-ohko', 'timed-countdown')
timerOptionMenu.pack(side=RIGHT) timerOptionMenu.pack(side=RIGHT)
timerLabel = Label(timerFrame, text='Timer setting') timerLabel = Label(timerFrame, text='Timer setting')
timerLabel.pack(side=LEFT) timerLabel.pack(side=LEFT)