From 7a38d3afc4b3e3488be9dc07519b8c2554f21641 Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Wed, 12 Feb 2020 04:23:57 -0800
Subject: [PATCH] Remove Experimental

---
 CLI.py                   | 8 ++++----
 Gui.py                   | 1 -
 gui/randomize/dungeon.py | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CLI.py b/CLI.py
index d29a3b41..32895166 100644
--- a/CLI.py
+++ b/CLI.py
@@ -176,7 +176,7 @@ def parse_arguments(argv, no_defaults=False):
                              The dungeon variants only mix up dungeons and keep the rest of
                              the overworld vanilla.
                              ''')
-    parser.add_argument('--door_shuffle', default=defval('basic'), const='vanilla', nargs='?', choices=['vanilla', 'basic', 'crossed', 'experimental'],
+    parser.add_argument('--door_shuffle', default=defval('basic'), const='vanilla', nargs='?', choices=['vanilla', 'basic', 'crossed'],
                         help='''\
                             Select Door Shuffling Algorithm. (default: %(default)s)
                             Basic:      Doors are mixed within a single dungeon.
@@ -184,9 +184,9 @@ def parse_arguments(argv, no_defaults=False):
                             Crossed:    Doors are mixed between all dungeons.
                                         (Not yet implemented)
                             Vanilla:    All doors are connected the same way they were in the
-                                        base game.
-                            Experimental: Experimental mixes live here. Use at your own risk.
+                                        base game.                        
                         ''')
+    parser.add_argument('--experimental', default=defval(False), help='Enable experimental features', action='store_true')
     parser.add_argument('--crystals_ganon', default=defval('7'), const='7', nargs='?', choices=['random', '0', '1', '2', '3', '4', '5', '6', '7'],
                         help='''\
                              How many crystals are needed to defeat ganon. Any other
@@ -305,7 +305,7 @@ def parse_arguments(argv, no_defaults=False):
             for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality',
                          'shuffle', 'door_shuffle', 'crystals_ganon', 'crystals_gt', 'openpyramid',
                          'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
-                         'retro', 'accessibility', 'hints', 'beemizer',
+                         'retro', 'accessibility', 'hints', 'beemizer', 'experimental',
                          'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
                          'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep',
                          'remote_items']:
diff --git a/Gui.py b/Gui.py
index cd7ae882..95dc5493 100755
--- a/Gui.py
+++ b/Gui.py
@@ -120,7 +120,6 @@ def guiMain(args=None):
 
     # Adjuster Controls
     self.adjustContent,self.working_dirs = adjust_page(self,self.adjustWindow,self.working_dirs)
-#    self.adjustContent,self.working_dirs = adjust_page(self,self.adjustWindow,self.working_dirs)
     self.adjustContent.pack(side=TOP, fill=BOTH, expand=True)
 
     # Custom Controls
diff --git a/gui/randomize/dungeon.py b/gui/randomize/dungeon.py
index b036389f..88291d73 100644
--- a/gui/randomize/dungeon.py
+++ b/gui/randomize/dungeon.py
@@ -70,8 +70,7 @@ def dungeon_page(parent):
       {
         "Vanilla": "vanilla",
         "Basic": "basic",
-        "Crossed": "crossed",
-        "Experimental": "experimental"
+        "Crossed": "crossed"
       }
     )
     self.dungeonWidgets[key].pack(anchor=W)