From 579f6c609d26b542abf7d572a7f4a52bb0455e82 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 15 Oct 2021 00:42:42 -0500
Subject: [PATCH] Added Mystery options for OWG and Shuffle Ganon

---
 CLI.py              | 2 +-
 Mystery.py          | 4 +++-
 mystery_example.yml | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CLI.py b/CLI.py
index 1d0f9a43..41b812f8 100644
--- a/CLI.py
+++ b/CLI.py
@@ -97,7 +97,7 @@ def parse_cli(argv, no_defaults=False):
                          'ow_shuffle', 'ow_crossed', 'ow_keepsimilar', 'ow_mixed', 'ow_fluteshuffle',
                          'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
                          'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
-                         'bombbag',
+                         'bombbag', 'shuffleganon',
                          'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
                          'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
                          'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
diff --git a/Mystery.py b/Mystery.py
index f18a4205..933a4fc1 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -120,7 +120,7 @@ def roll_settings(weights):
     if glitches_required not in ['none', 'no_logic']:
         print("Only NMG and No Logic supported")
         glitches_required = 'none'
-    ret.logic = {'none': 'noglitches', 'no_logic': 'nologic'}[glitches_required]
+    ret.logic = {'none': 'noglitches', 'owg': 'owglitches', 'no_logic': 'nologic'}[glitches_required]
 
     item_placement = get_choice('item_placement')
     # not supported in ER
@@ -167,6 +167,8 @@ def roll_settings(weights):
                 }[goal]
     ret.openpyramid = goal == 'fast_ganon' if ret.shuffle in ['vanilla', 'dungeonsfull', 'dungeonssimple'] else False
 
+    ret.shuffleganon = get_choice('shuffleganon') == 'on'
+
     ret.crystals_gt = get_choice('tower_open')
 
     ret.crystals_ganon = get_choice('ganon_open')
diff --git a/mystery_example.yml b/mystery_example.yml
index 9d1d1501..f9e276a6 100644
--- a/mystery_example.yml
+++ b/mystery_example.yml
@@ -48,6 +48,12 @@
     full: 2
     crossed: 3
     insanity: 1
+  shufflelinks:
+    on: 1
+    off: 1
+  shuffleganon:
+    on: 1
+    off: 1
   world_state:
     standard: 1
     open: 1
@@ -81,6 +87,7 @@
     off: 1
   glitches_required:
     none: 1
+    owg: 0
     no_logic: 0
   accessibility:
     items: 1