From d09a03aace5a90887ab123789787194131081b89 Mon Sep 17 00:00:00 2001
From: CaitSith2 <d_good@caitsith2.com>
Date: Fri, 5 Mar 2021 11:32:24 -0800
Subject: [PATCH] Rip out unsafe yaml loading.

---
 MultiMystery.py |  3 ---
 Mystery.py      | 14 +++++++-------
 Utils.py        |  1 -
 host.yaml       |  6 ++----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/MultiMystery.py b/MultiMystery.py
index f78a6b66..d569d2a0 100644
--- a/MultiMystery.py
+++ b/MultiMystery.py
@@ -62,7 +62,6 @@ if __name__ == "__main__":
         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"]
-        use_pre_rolled = multi_mystery_options["use_pre_rolled"]
         teams = multi_mystery_options["teams"]
         rom_file = options["general_options"]["rom_file"]
         host = options["server_options"]["host"]
@@ -123,8 +122,6 @@ if __name__ == "__main__":
             command += f" --weights {weights_file_path}"
         if pre_roll:
             command += " --pre_roll"
-        if use_pre_rolled:
-            command += " --use_pre_rolled"
 
         logging.info(command)
         import time
diff --git a/Mystery.py b/Mystery.py
index eb423dce..98f07230 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -12,7 +12,7 @@ from BaseClasses import PlandoItem, PlandoConnection
 ModuleUpdate.update()
 
 import Bosses
-from Utils import parse_yaml, unsafe_parse_yaml
+from Utils import parse_yaml
 from Rom import Sprite
 from EntranceRandomizer import parse_arguments
 from Main import main as ERmain
@@ -38,7 +38,6 @@ def mystery_argparse():
     parser.add_argument('--create_spoiler', action='store_true')
     parser.add_argument('--skip_playthrough', action='store_true')
     parser.add_argument('--pre_roll', action='store_true')
-    parser.add_argument('--use_pre_rolled', action='store_true')
     parser.add_argument('--rom')
     parser.add_argument('--enemizercli')
     parser.add_argument('--outputpath')
@@ -95,7 +94,7 @@ def main(args=None, callback=ERmain):
         if path:
             try:
                 if path not in weights_cache:
-                    weights_cache[path] = get_weights(path, args.use_pre_rolled)
+                    weights_cache[path] = get_weights(path)
                 print(f"P{player} Weights: {path} >> "
                       f"{get_choice('description', weights_cache[path], 'No description specified')}")
 
@@ -193,14 +192,15 @@ def main(args=None, callback=ERmain):
                         settings.shuffle += f"-{random.randint(0, 2 ** 64)}"
 
                     pre_rolled = dict()
+                    pre_rolled["original_seed_number"] = seed
+                    pre_rolled["original_seed_name"] = seedname
                     pre_rolled["pre_rolled"] = vars(settings).copy()
                     if "plando_items" in pre_rolled["pre_rolled"]:
                         pre_rolled["pre_rolled"]["plando_items"] = [item.to_dict() for item in pre_rolled["pre_rolled"]["plando_items"]]
                     if "plando_connections" in pre_rolled["pre_rolled"]:
                         pre_rolled["pre_rolled"]["plando_connections"] = [connection.to_dict() for connection in pre_rolled["pre_rolled"]["plando_connections"]]
 
-
-                    with open(os.path.join(args.outputpath if args.outputpath else ".", f"{os.path.split(path)[-1].split('.')[0]}_pre_rolled_{seedname}.yaml"), "wt") as f:
+                    with open(os.path.join(args.outputpath if args.outputpath else ".", f"{os.path.split(path)[-1].split('.')[0]}_pre_rolled.yaml"), "wt") as f:
                         yaml.dump(pre_rolled, f)
                 for k, v in vars(settings).items():
                     if v is not None:
@@ -245,7 +245,7 @@ def main(args=None, callback=ERmain):
     callback(erargs, seed)
 
 
-def get_weights(path, use_pre_rolled=False):
+def get_weights(path):
     try:
         if urllib.parse.urlparse(path).scheme:
             yaml = str(urllib.request.urlopen(path).read(), "utf-8")
@@ -255,7 +255,7 @@ def get_weights(path, use_pre_rolled=False):
     except Exception as e:
         raise Exception(f"Failed to read weights ({path})") from e
 
-    return unsafe_parse_yaml(yaml) if use_pre_rolled else parse_yaml(yaml)
+    return parse_yaml(yaml)
 
 
 def interpret_on_off(value):
diff --git a/Utils.py b/Utils.py
index 489f7995..e5e0090d 100644
--- a/Utils.py
+++ b/Utils.py
@@ -214,7 +214,6 @@ def get_default_options() -> dict:
                 "weights_file_path": "weights.yaml",
                 "meta_file_path": "meta.yaml",
                 "pre_roll": False,
-                "use_pre_rolled": False,
                 "player_name": "",
                 "create_spoiler": 1,
                 "zip_roms": 0,
diff --git a/host.yaml b/host.yaml
index 558d5e05..eb1d3875 100644
--- a/host.yaml
+++ b/host.yaml
@@ -67,11 +67,9 @@ multi_mystery_options:
   # Meta file name, within the stated player_files_path location
   meta_file_path: "meta.yaml"
   # Option to pre-roll a yaml that will be used to roll future seeds with the exact same settings every single time.
+  # If using a pre-rolled yaml fails with "Please fix your yaml.", please file a bug report including both the original yaml
+  # as well as the generated pre-rolled yaml.
   pre_roll: false
-  # Option to use pre-rolled settings.  If not enabled, attempts to use a pre-rolled yaml WILL fail with
-  # "Please fix your yaml."
-  # Warning: only use this to load files you've created yourself.
-  use_pre_rolled: false
   # Automatically launches {player_name}.yaml's ROM file using the OS's default program once generation completes. (likely your emulator)
   # Does nothing if the name is not found
   # Example: player_name = "Berserker"