Merge branch 'DoorDev' into ci-dev

This commit is contained in:
Mike A. Trethewey
2020-03-04 14:05:49 -08:00
5 changed files with 8 additions and 7 deletions

4
CLI.py
View File

@@ -186,7 +186,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', const='off', nargs='?', choices=['off', 'on', 'pickup'])
parser.add_argument('--dungeon_counters', default=defval(settings["dungeon_counters"]), help='Enable dungeon chest counters', const='off', nargs='?', choices=['off', 'on', 'pickup', 'default'])
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
@@ -356,7 +356,7 @@ def get_settings():
"keysanity": False,
"door_shuffle": "basic",
"experimental": 0,
"dungeon_counters": "off",
"dungeon_counters": "default",
"multi": 1,
"names": "",