Set default value for --enemizercli

This commit is contained in:
Bonta-kun 2020-01-06 18:39:18 +01:00
parent eb7ca4fdf9
commit 71b4f6e94b
4 changed files with 6 additions and 4 deletions

3
.gitignore vendored
View File

@ -13,4 +13,5 @@ README.html
*multisave *multisave
EnemizerCLI/ EnemizerCLI/
.mypy_cache/ .mypy_cache/
RaceRom.py RaceRom.py
weights/

View File

@ -256,7 +256,7 @@ def parse_arguments(argv, no_defaults=False):
for VT site integration, do not use otherwise. for VT site integration, do not use otherwise.
''') ''')
parser.add_argument('--skip_playthrough', action='store_true', default=defval(False)) parser.add_argument('--skip_playthrough', action='store_true', default=defval(False))
parser.add_argument('--enemizercli', default=defval('')) parser.add_argument('--enemizercli', default=defval('EnemizerCLI/EnemizerCLI.Core'))
parser.add_argument('--shufflebosses', default=defval('none'), choices=['none', 'basic', 'normal', 'chaos']) parser.add_argument('--shufflebosses', default=defval('none'), choices=['none', 'basic', 'normal', 'chaos'])
parser.add_argument('--shuffleenemies', default=defval('none'), choices=['none', 'shuffled', 'chaos']) parser.add_argument('--shuffleenemies', default=defval('none'), choices=['none', 'shuffled', 'chaos'])
parser.add_argument('--enemy_health', default=defval('default'), choices=['default', 'easy', 'normal', 'hard', 'expert']) parser.add_argument('--enemy_health', default=defval('default'), choices=['default', 'easy', 'normal', 'hard', 'expert'])

2
Gui.py
View File

@ -309,7 +309,7 @@ def guiMain(args=None):
enemizerPathFrame.grid(row=0, column=0, columnspan=3, sticky=W) enemizerPathFrame.grid(row=0, column=0, columnspan=3, sticky=W)
enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ") enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ")
enemizerCLIlabel.pack(side=LEFT) enemizerCLIlabel.pack(side=LEFT)
enemizerCLIpathVar = StringVar() enemizerCLIpathVar = StringVar(value="EnemizerCLI/EnemizerCLI.Core")
enemizerCLIpathEntry = Entry(enemizerPathFrame, textvariable=enemizerCLIpathVar, width=80) enemizerCLIpathEntry = Entry(enemizerPathFrame, textvariable=enemizerCLIpathVar, width=80)
enemizerCLIpathEntry.pack(side=LEFT) enemizerCLIpathEntry.pack(side=LEFT)
def EnemizerSelectPath(): def EnemizerSelectPath():

View File

@ -75,7 +75,8 @@ def main():
if args.rom: if args.rom:
erargs.rom = args.rom erargs.rom = args.rom
erargs.enemizercli = args.enemizercli if args.enemizercli:
erargs.enemizercli = args.enemizercli
settings_cache = {k: (roll_settings(v) if args.samesettings else None) for k, v in weights_cache.items()} settings_cache = {k: (roll_settings(v) if args.samesettings else None) for k, v in weights_cache.items()}