Merge branch 'main' into breaking_changes

# Conflicts:
#	BaseClasses.py
This commit is contained in:
Fabian Dill
2021-03-06 05:27:16 +01:00
9 changed files with 142 additions and 75 deletions

View File

@@ -46,6 +46,7 @@ if __name__ == "__main__":
player_name = multi_mystery_options["player_name"]
meta_file_path = multi_mystery_options["meta_file_path"]
weights_file_path = multi_mystery_options["weights_file_path"]
pre_roll = multi_mystery_options["pre_roll"]
teams = multi_mystery_options["teams"]
rom_file = options["general_options"]["rom_file"]
host = options["server_options"]["host"]
@@ -104,6 +105,8 @@ if __name__ == "__main__":
command += f" --meta {os.path.join(player_files_path, meta_file_path)}"
if os.path.exists(weights_file_path):
command += f" --weights {weights_file_path}"
if pre_roll:
command += " --pre_roll"
logging.info(command)
import time