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

Core: log race mode enabled

This commit is contained in:
Fabian Dill 2023-05-18 15:52:55 +02:00 committed by Fabian Dill
parent 1d565b9aaf
commit 527f30d91a
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Generate.py
View File

@ -27,9 +27,6 @@ from worlds.AutoWorld import AutoWorldRegister
import copy import copy
def mystery_argparse(): def mystery_argparse():
options = get_options() options = get_options()
defaults = options["generator"] defaults = options["generator"]
@ -74,10 +71,12 @@ def main(args=None, callback=ERmain):
args, options = mystery_argparse() args, options = mystery_argparse()
seed = get_seed(args.seed) seed = get_seed(args.seed)
Utils.init_logging(f"Generate_{seed}", loglevel=args.log_level)
random.seed(seed) random.seed(seed)
seed_name = get_seed_name(random) seed_name = get_seed_name(random)
if args.race: if args.race:
logging.info("Race mode enabled. Using non-deterministic random source.")
random.seed() # reset to time-based random source random.seed() # reset to time-based random source
weights_cache: Dict[str, Tuple[Any, ...]] = {} weights_cache: Dict[str, Tuple[Any, ...]] = {}
@ -86,15 +85,15 @@ def main(args=None, callback=ERmain):
weights_cache[args.weights_file_path] = read_weights_yamls(args.weights_file_path) weights_cache[args.weights_file_path] = read_weights_yamls(args.weights_file_path)
except Exception as e: except Exception as e:
raise ValueError(f"File {args.weights_file_path} is destroyed. Please fix your yaml.") from e raise ValueError(f"File {args.weights_file_path} is destroyed. Please fix your yaml.") from e
print(f"Weights: {args.weights_file_path} >> " logging.info(f"Weights: {args.weights_file_path} >> "
f"{get_choice('description', weights_cache[args.weights_file_path][-1], 'No description specified')}") f"{get_choice('description', weights_cache[args.weights_file_path][-1], 'No description specified')}")
if args.meta_file_path and os.path.exists(args.meta_file_path): if args.meta_file_path and os.path.exists(args.meta_file_path):
try: try:
meta_weights = read_weights_yamls(args.meta_file_path)[-1] meta_weights = read_weights_yamls(args.meta_file_path)[-1]
except Exception as e: except Exception as e:
raise ValueError(f"File {args.meta_file_path} is destroyed. Please fix your yaml.") from e raise ValueError(f"File {args.meta_file_path} is destroyed. Please fix your yaml.") from e
print(f"Meta: {args.meta_file_path} >> {get_choice('meta_description', meta_weights)}") logging.info(f"Meta: {args.meta_file_path} >> {get_choice('meta_description', meta_weights)}")
try: # meta description allows us to verify that the file named meta.yaml is intentionally a meta file try: # meta description allows us to verify that the file named meta.yaml is intentionally a meta file
del(meta_weights["meta_description"]) del(meta_weights["meta_description"])
except Exception as e: except Exception as e:
@ -120,17 +119,18 @@ def main(args=None, callback=ERmain):
for filename, yaml_data in weights_cache.items(): for filename, yaml_data in weights_cache.items():
if filename not in {args.meta_file_path, args.weights_file_path}: if filename not in {args.meta_file_path, args.weights_file_path}:
for yaml in yaml_data: for yaml in yaml_data:
print(f"P{player_id} Weights: {filename} >> " logging.info(f"P{player_id} Weights: {filename} >> "
f"{get_choice('description', yaml, 'No description specified')}") f"{get_choice('description', yaml, 'No description specified')}")
player_files[player_id] = filename player_files[player_id] = filename
player_id += 1 player_id += 1
args.multi = max(player_id - 1, args.multi) args.multi = max(player_id - 1, args.multi)
print(f"Generating for {args.multi} player{'s' if args.multi > 1 else ''}, {seed_name} Seed {seed} with plando: " logging.info(f"Generating for {args.multi} player{'s' if args.multi > 1 else ''}, "
f"{args.plando}") f"{seed_name} Seed {seed} with plando: {args.plando}")
if not weights_cache: if not weights_cache:
raise Exception(f"No weights found. Provide a general weights file ({args.weights_file_path}) or individual player files. " raise Exception(f"No weights found. "
f"Provide a general weights file ({args.weights_file_path}) or individual player files. "
f"A mix is also permitted.") f"A mix is also permitted.")
erargs = parse_arguments(['--multi', str(args.multi)]) erargs = parse_arguments(['--multi', str(args.multi)])
erargs.seed = seed erargs.seed = seed
@ -141,8 +141,6 @@ def main(args=None, callback=ERmain):
erargs.outputname = seed_name erargs.outputname = seed_name
erargs.outputpath = args.outputpath erargs.outputpath = args.outputpath
Utils.init_logging(f"Generate_{seed}", loglevel=args.log_level)
settings_cache: Dict[str, Tuple[argparse.Namespace, ...]] = \ settings_cache: Dict[str, Tuple[argparse.Namespace, ...]] = \
{fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.samesettings else None) {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.samesettings else None)
for fname, yamls in weights_cache.items()} for fname, yamls in weights_cache.items()}