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

implement dict-based meta_ignore

This commit is contained in:
Fabian Dill 2020-02-22 03:04:55 +01:00
parent 5a204a75f5
commit b755e9a9ee
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Mystery.py
View File

@ -85,6 +85,10 @@ def main():
erargs.outputname = seedname erargs.outputname = seedname
erargs.outputpath = args.outputpath erargs.outputpath = args.outputpath
# set up logger
loglevel = {'error': logging.ERROR, 'info': logging.INFO, 'warning': logging.WARNING, 'debug': logging.DEBUG}[erargs.loglevel]
logging.basicConfig(format='%(message)s', level=loglevel)
if args.rom: if args.rom:
erargs.rom = args.rom erargs.rom = args.rom
if args.enemizercli: if args.enemizercli:
@ -103,7 +107,10 @@ def main():
option = get_choice(key, meta_weights) option = get_choice(key, meta_weights)
if option is not None: if option is not None:
for player, path in player_path_cache.items(): for player, path in player_path_cache.items():
if key not in weights_cache[path]["meta_ignore"]: players_meta = weights_cache[path]["meta_ignore"]
if key not in players_meta:
weights_cache[path][key] = option
elif type(players_meta) == dict and option not in players_meta[key]:
weights_cache[path][key] = option weights_cache[path][key] = option
for player in range(1, args.multi + 1): for player in range(1, args.multi + 1):
@ -118,9 +125,7 @@ def main():
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}')
# set up logger
loglevel = {'error': logging.ERROR, 'info': logging.INFO, 'warning': logging.WARNING, 'debug': logging.DEBUG}[erargs.loglevel]
logging.basicConfig(format='%(message)s', level=loglevel)
erargs.names = ",".join(erargs.name[i] for i in sorted(erargs.name.keys())) erargs.names = ",".join(erargs.name[i] for i in sorted(erargs.name.keys()))
ERmain(erargs, seed) ERmain(erargs, seed)