From f918efb645c1ae92442c3e647d390ebaea8dc79f Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Sun, 31 May 2020 00:28:03 +0200
Subject: [PATCH] implement skip_playthrough in mystery

---
 Main.py         | 2 +-
 MultiMystery.py | 2 ++
 Mystery.py      | 2 ++
 host.yaml       | 9 ++++++---
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Main.py b/Main.py
index 90c8345d..125414d7 100644
--- a/Main.py
+++ b/Main.py
@@ -277,7 +277,7 @@ def main(args, seed=None):
 
     if args.jsonout:
         print(json.dumps({**jsonout, 'spoiler': world.spoiler.to_json()}))
-    elif args.create_spoiler and not args.skip_playthrough:
+    elif args.create_spoiler:
         world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase))
 
     logger.info('Done. Enjoy.')
diff --git a/MultiMystery.py b/MultiMystery.py
index a75429bb..227294db 100644
--- a/MultiMystery.py
+++ b/MultiMystery.py
@@ -99,6 +99,8 @@ if __name__ == "__main__":
 
         if create_spoiler:
             command += " --create_spoiler"
+            if create_spoiler == 2:
+                command += " --skip_playthrough"
         if race:
             command += " --race"
         if os.path.exists(os.path.join(player_files_path, meta_file_path)):
diff --git a/Mystery.py b/Mystery.py
index 667be8a9..821cafe7 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -31,6 +31,7 @@ def main():
     parser.add_argument('--multi', default=1, type=lambda value: min(max(int(value), 1), 255))
     parser.add_argument('--teams', default=1, type=lambda value: max(int(value), 1))
     parser.add_argument('--create_spoiler', action='store_true')
+    parser.add_argument('--skip_playthrough', action='store_true')
     parser.add_argument('--rom')
     parser.add_argument('--enemizercli')
     parser.add_argument('--outputpath')
@@ -87,6 +88,7 @@ def main():
     erargs.name = {x: "" for x in range(1, args.multi + 1)} # only so it can be overwrittin in mystery
     erargs.create_spoiler = args.create_spoiler
     erargs.race = args.race
+    erargs.skip_playthrough = args.skip_playthrough
     erargs.outputname = seedname
     erargs.outputpath = args.outputpath
     erargs.teams = args.teams
diff --git a/host.yaml b/host.yaml
index 7db95469..bb54f3ef 100644
--- a/host.yaml
+++ b/host.yaml
@@ -42,15 +42,18 @@ multi_mystery_options:
   output_path: "MultiMystery"
 #location of your Enemizer CLI, available here: https://github.com/Bonta0/Enemizer/releases
   enemizer_path: "EnemizerCLI/EnemizerCLI.Core.exe"
-#folder from which the player yaml files are pulled from
+  #folder from which the player yaml files are pulled from
   player_files_path: "Players"
-#meta file name, within players folder
+  #meta file name, within players folder
   meta_file_path: "meta.yaml"
-#automatically launches {player_name}.yaml's ROM file using the OS's default program once generation completes. (likely your emulator)
+  #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"
   player_name: "" # the hosts name
   #create a spoiler file
+  # 0 -> none
+  # 1 -> full spoiler
+  # 2- -> spoiler without playthrough
   create_spoiler: 1
   #Zip the resulting roms
   #0 -> Don't