Mystery spoiler fixes

Main.py

@@ -161,7 +161,7 @@ def main(args, seed=None, fish=None):
     if world.spoiler_mode != 'none' and not args.jsonout:
         logger.info(world.fish.translate("cli", "cli", "create.meta"))
         world.spoiler.meta_to_file(output_path(f'{outfilebase}_Spoiler.txt'))
-    if args.mystery and not (args.suppress_meta or args.create_spoiler):
+    if args.mystery and not (args.suppress_meta or args.spoiler != 'none'):
         world.spoiler.mystery_meta_to_file(output_path(f'{outfilebase}_meta.txt'))
 
     for player in range(1, world.players + 1):
@@ -362,7 +362,7 @@ def main(args, seed=None, fish=None):
                 with open(output_path('%s_multidata' % outfilebase), 'wb') as f:
                     f.write(multidata)
 
-    if args.mystery and not (args.suppress_meta or args.create_spoiler):
+    if args.mystery and not (args.suppress_meta or args.spoiler not in ['full']):
         world.spoiler.hashes_to_file(output_path(f'{outfilebase}_meta.txt'))
     elif world.spoiler_mode != 'none' and not args.jsonout:
         world.spoiler.hashes_to_file(output_path(f'{outfilebase}_Spoiler.txt'))

Plando.py

@@ -87,7 +87,7 @@ def main(args):
     outfilebase = 'Plando_%s_%s' % (os.path.splitext(os.path.basename(args.plando))[0], world.seed)
 
     rom.write_to_file('%s.sfc' % outfilebase)
-    if args.create_spoiler:
+    if args.spoiler != 'none':
         world.spoiler.to_file('%s_Spoiler.txt' % outfilebase)
 
     logger.info('Done. Enjoy.')
@@ -223,7 +223,7 @@ def prefill_world(world, plando, text_patches):
 
 def start():
     parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument('--create_spoiler', help='Output a Spoiler File', action='store_true')
+    parser.add_argument('--spoiler', default='none', help='Output a Spoiler File')
     parser.add_argument('--ignore_unsolvable', help='Do not abort if seed is deemed unsolvable.', action='store_true')
     parser.add_argument('--rom', default='Zelda no Densetsu - Kamigami no Triforce (Japan).sfc', help='Path to an ALttP JAP(1.0) rom to use as a base.')
     parser.add_argument('--loglevel', default='info', const='info', nargs='?', choices=['error', 'info', 'warning', 'debug'], help='Select level of logging for output.')

TestSuiteRandom.pyw

@@ -25,7 +25,7 @@ def main(args=None):
     alive = 0
 
     
-    basecommand = f'py Mystery.py --suppress_rom --suppress_meta --create_spoiler --outputpath L:/_Work/Zelda/ROMs/Bug/Automate/{datetime.now().strftime("%y%m%d")} --weights L:/_Work/Zelda/ROMs/Bug/Automate/_test.yml'
+    basecommand = f'py Mystery.py --suppress_rom --suppress_meta --spoiler full --outputpath L:/_Work/Zelda/ROMs/Bug/Automate/{datetime.now().strftime("%y%m%d")} --weights L:/_Work/Zelda/ROMs/Bug/Automate/_test.yml'
         
     def gen_seed():
         return subprocess.run(basecommand, capture_output=True, shell=True, text=True)