Merged in DR v1.0.0.2

This commit is contained in:
codemann8
2022-03-27 14:56:16 -05:00
35 changed files with 2376 additions and 693 deletions

4
CLI.py
View File

@@ -97,7 +97,7 @@ def parse_cli(argv, no_defaults=False):
'ow_shuffle', 'ow_crossed', 'ow_keepsimilar', 'ow_mixed', 'ow_whirlpool', 'ow_fluteshuffle',
'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
'bombbag', 'shuffleganon',
'bombbag', 'shuffleganon', 'overworld_map', 'restrict_boss_items',
'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
@@ -141,6 +141,7 @@ def parse_settings():
"progressive": "on",
"accessibility": "items",
"algorithm": "balanced",
"restrict_boss_items": "none",
# Shuffle Ganon defaults to TRUE
"openpyramid": False,
@@ -153,6 +154,7 @@ def parse_settings():
"ow_fluteshuffle": "vanilla",
"shuffle": "vanilla",
"shufflelinks": False,
"overworld_map": "default",
"pseudoboots": False,
"shufflepots": False,