From e898ae078b6efc472cdb468c45123c89877f9797 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Sat, 22 Feb 2020 01:43:39 -0800 Subject: [PATCH] Try to fix some options --- CLI.py | 4 ++-- Main.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CLI.py b/CLI.py index c354da1b..c8bdab49 100644 --- a/CLI.py +++ b/CLI.py @@ -187,7 +187,7 @@ def parse_arguments(argv, no_defaults=False): base game. ''') parser.add_argument('--experimental', default=defval(settings["experimental"] != 0), help='Enable experimental features', action='store_true') - parser.add_argument('--dungeon_counters', default=defval(settings["dungeon_counters"]), help='Enable dungeon chest counters', action='store_true') + parser.add_argument('--dungeon_counters', default=defval(settings["dungeon_counters"]), help='Enable dungeon chest counters', const='off', nargs='?', choices=['off', 'on', 'pickup']) parser.add_argument('--crystals_ganon', default=defval(settings["crystals_ganon"]), const='7', nargs='?', choices=['random', '0', '1', '2', '3', '4', '5', '6', '7'], help='''\ How many crystals are needed to defeat ganon. Any other @@ -247,7 +247,7 @@ def parse_arguments(argv, no_defaults=False): Make telepathic tiles and storytellers give helpful hints. ''', action='store_true') # included for backwards compatibility - parser.add_argument('--shuffleganon', help=argparse.SUPPRESS, action='store_true', default=defval(True)) + parser.add_argument('--shuffleganon', help=argparse.SUPPRESS, action='store_true', default=defval(settings["shuffleganon"] != 0)) parser.add_argument('--no-shuffleganon', help='''\ If set, the Pyramid Hole and Ganon's Tower are not included entrance shuffle pool. diff --git a/Main.py b/Main.py index 859baaeb..2c7670f8 100644 --- a/Main.py +++ b/Main.py @@ -57,7 +57,6 @@ def main(args, seed=None): world.enemy_health = args.enemy_health.copy() world.enemy_damage = args.enemy_damage.copy() world.beemizer = args.beemizer.copy() - world.dungeon_counters = args.dungeon_counters.copy() world.experimental = args.experimental.copy() world.dungeon_counters = args.dungeon_counters.copy()