morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

encode port into patch, also reverse defaulting order for server;

Browse Source 
cmd args overwrite yaml now
This commit is contained in:
Fabian Dill
2020-04-02 11:21:33 +02:00
parent 44086152a2
commit 8b02103b93
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MultiMystery.py
View File

@@ -28,10 +28,10 @@ if __name__ == "__main__":
ModuleUpdate.update()
from Utils import parse_yaml, get_public_ipv4
from Utils import parse_yaml, get_public_ipv4, get_options
from Patch import create_patch_file
options = parse_yaml(open("host.yaml").read())
options = get_options()
multi_mystery_options = options["multi_mystery_options"]
output_path = multi_mystery_options["output_path"]
@@ -49,6 +49,7 @@ if __name__ == "__main__":
meta_file_path = multi_mystery_options["meta_file_path"]
teams = multi_mystery_options["teams"]
rom_file = options["general_options"]["rom_file"]
port = options["server_options"]["port"]
py_version = f"{sys.version_info.major}.{sys.version_info.minor}"
@@ -140,7 +141,7 @@ if __name__ == "__main__":
zipname = os.path.join(output_path, f"ER_{seedname}.{typical_zip_ending}")
print(f"Creating zipfile {zipname}")
ipv4 = get_public_ipv4()
ipv4 = get_public_ipv4() + ":" + str(port)
with zipfile.ZipFile(zipname, "w", compression=compression, compresslevel=9) as zf:
for file in os.listdir(output_path):
if file.endswith(".sfc") and seedname in file: