Doing GitHub's work for them and ACTUALLY merging in DR v0.4.0.7 changes

This commit is contained in:
codemann8
2021-07-04 11:23:08 -05:00
parent 6e49f38bce
commit 433a1dfc35
18 changed files with 153 additions and 37 deletions

4
CLI.py
View File

@@ -102,7 +102,8 @@ def parse_cli(argv, no_defaults=False):
'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep',
'remote_items', 'shopsanity', 'keydropshuffle', 'mixed_travel', 'standardize_palettes', 'code']:
'remote_items', 'shopsanity', 'keydropshuffle', 'mixed_travel', 'standardize_palettes', 'code',
'reduce_flashing']:
value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
if player == 1:
setattr(ret, name, {1: value})
@@ -192,6 +193,7 @@ def parse_settings():
"fastmenu": "normal",
"ow_palettes": "default",
"uw_palettes": "default",
"reduce_flashing": False,
# Spoiler defaults to TRUE
# Playthrough defaults to TRUE