Merge branch 'StairLoops' of github.com:Catobat/ALttPDoorRandomizer into Catobat-StairLoops

This commit is contained in:
aerinon
2023-08-07 12:15:13 -06:00
14 changed files with 59 additions and 15 deletions

3
CLI.py
View File

@@ -141,7 +141,7 @@ def parse_cli(argv, no_defaults=False):
'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle',
'mixed_travel', 'standardize_palettes', 'code', 'reduce_flashing', 'shuffle_sfx',
'msu_resume', 'collection_rate', 'colorizepots', 'decoupledoors', 'door_type_mode',
'trap_door_mode', 'key_logic_algorithm']:
'trap_door_mode', 'key_logic_algorithm', 'door_self_loops']:
value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
if player == 1:
setattr(ret, name, {1: value})
@@ -218,6 +218,7 @@ def parse_settings():
'trap_door_mode': 'optional',
'key_logic_algorithm': 'default',
'decoupledoors': False,
'door_self_loops': False,
'experimental': False,
'dungeon_counters': 'default',
'mixed_travel': 'prevent',