monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mystery: fix player naming if per-player and general weights are mixed

This commit is contained in:
Fabian Dill 2020-08-11 22:11:37 +02:00
parent d92c461ad3
commit 5247bd0ff0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mystery.py
View File

@ -161,7 +161,8 @@ def main(args=None, callback = ERmain):
if path: if path:
try: try:
settings = settings_cache[path] if settings_cache[path] else roll_settings(weights_cache[path]) settings = settings_cache[path] if settings_cache[path] else roll_settings(weights_cache[path])
if settings.sprite is not None and not os.path.isfile(settings.sprite) and not get_sprite_from_name(settings.sprite): if settings.sprite is not None and not os.path.isfile(settings.sprite) and not get_sprite_from_name(
settings.sprite):
logging.warning( logging.warning(
f"Warning: The chosen sprite, \"{settings.sprite}\", for yaml \"{path}\", does not exist.") f"Warning: The chosen sprite, \"{settings.sprite}\", for yaml \"{path}\", does not exist.")
for k, v in vars(settings).items(): for k, v in vars(settings).items():
@ -171,12 +172,11 @@ def main(args=None, callback = ERmain):
raise ValueError(f"File {path} is destroyed. Please fix your yaml.") from e raise ValueError(f"File {path} is destroyed. Please fix your yaml.") from e
else: else:
raise RuntimeError(f'No weights specified for player {player}') raise RuntimeError(f'No weights specified for player {player}')
if not erargs.name[player]: if path == args.weights: # if name came from the weights file, just use base player name
erargs.name[player] = f"Player{player}"
elif not erargs.name[player]: # if name was not specified, generate it from filename
erargs.name[player] = os.path.split(path)[-1].split(".")[0] erargs.name[player] = os.path.split(path)[-1].split(".")[0]
if args.weights: erargs.names = ",".join(erargs.name[i] for i in range(1, args.multi + 1))
erargs.names = ""
else:
erargs.names = ",".join(erargs.name[i] for i in range(1, args.multi + 1))
del (erargs.name) del (erargs.name)
if args.yaml_output: if args.yaml_output:
import yaml import yaml