Merged in DR v0.4.0.4

This commit is contained in:
codemann8
2021-05-24 18:16:02 -05:00
20 changed files with 193 additions and 52 deletions

3
CLI.py
View File

@@ -98,7 +98,7 @@ def parse_cli(argv, no_defaults=False):
'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
'triforce_min_difference', 'triforce_goal', 'triforce_pool',
'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks',
'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep',
@@ -145,6 +145,7 @@ def parse_settings():
"ow_shuffle": "vanilla",
"ow_keepsimilar": False,
"shuffle": "vanilla",
"shufflelinks": False,
"shufflepots": False,
"shuffleenemies": "none",