From 71b4f6e94b567bd917b52acc0ef14c014652074e Mon Sep 17 00:00:00 2001 From: Bonta-kun <40473493+Bonta0@users.noreply.github.com> Date: Mon, 6 Jan 2020 18:39:18 +0100 Subject: [PATCH] Set default value for --enemizercli --- .gitignore | 3 ++- EntranceRandomizer.py | 2 +- Gui.py | 2 +- Mystery.py | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c13bec1..83d5e97f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ README.html *multisave EnemizerCLI/ .mypy_cache/ -RaceRom.py \ No newline at end of file +RaceRom.py +weights/ diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py index c6f03721..064d58ff 100755 --- a/EntranceRandomizer.py +++ b/EntranceRandomizer.py @@ -256,7 +256,7 @@ def parse_arguments(argv, no_defaults=False): for VT site integration, do not use otherwise. ''') 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('--shuffleenemies', default=defval('none'), choices=['none', 'shuffled', 'chaos']) parser.add_argument('--enemy_health', default=defval('default'), choices=['default', 'easy', 'normal', 'hard', 'expert']) diff --git a/Gui.py b/Gui.py index b897866b..29b15442 100755 --- a/Gui.py +++ b/Gui.py @@ -309,7 +309,7 @@ def guiMain(args=None): enemizerPathFrame.grid(row=0, column=0, columnspan=3, sticky=W) enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ") enemizerCLIlabel.pack(side=LEFT) - enemizerCLIpathVar = StringVar() + enemizerCLIpathVar = StringVar(value="EnemizerCLI/EnemizerCLI.Core") enemizerCLIpathEntry = Entry(enemizerPathFrame, textvariable=enemizerCLIpathVar, width=80) enemizerCLIpathEntry.pack(side=LEFT) def EnemizerSelectPath(): diff --git a/Mystery.py b/Mystery.py index 06f57aca..d43ef6c5 100644 --- a/Mystery.py +++ b/Mystery.py @@ -75,7 +75,8 @@ def main(): if 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()}