Enable settingsfile for multiworld generation

This commit is contained in:
Kris Davie
2023-01-22 11:13:40 +01:00
committed by GitHub
parent 4547a0a43b
commit f67cf929f7

5
CLI.py
View File

@@ -122,6 +122,11 @@ def parse_cli(argv, no_defaults=False):
defaults = copy.deepcopy(ret) defaults = copy.deepcopy(ret)
for player in range(1, player_num + 1): for player in range(1, player_num + 1):
playerargs = parse_cli(shlex.split(getattr(ret, f"p{player}")), True) playerargs = parse_cli(shlex.split(getattr(ret, f"p{player}")), True)
if playerargs.filename:
playersettings = apply_settings_file({}, playerargs.filename)
for k, v in playersettings.items():
setattr(playerargs, k, v)
for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality', for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality',
'flute_mode', 'bow_mode', 'take_any', 'boots_hint', 'flute_mode', 'bow_mode', 'take_any', 'boots_hint',