From 570ee24fc012a879c66c991374f88727f66ae3b9 Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Sat, 27 Jan 2018 17:11:53 -0500
Subject: [PATCH] Make Shuffle Ganon the Default

---
 EntranceRandomizer.py | 10 ++++++----
 Gui.py                |  1 +
 README.md             |  6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py
index 91b3a633..fc759ec6 100755
--- a/EntranceRandomizer.py
+++ b/EntranceRandomizer.py
@@ -174,10 +174,12 @@ def start():
                              ensure all locations are reachable. This only has an effect
                              on the restrictive algorithm currently.
                              ''', action='store_true')
-    parser.add_argument('--shuffleganon', help='''\
-                             If set, include the Pyramid Hole and Ganon's Tower in the
-                             entrance shuffle pool.
-                             ''', action='store_true')
+    # included for backwards compatibility
+    parser.add_argument('--shuffleganon', help=argparse.SUPPRESS, action='store_true', default=True)
+    parser.add_argument('--no-shuffleganon', help='''\
+                             If set, the Pyramid Hole and Ganon's Tower are not
+                             included entrance shuffle pool.
+                             ''', action='store_false', dest='shuffleganon')
     parser.add_argument('--heartbeep', default='normal', const='normal', nargs='?', choices=['normal', 'half', 'quarter', 'off'],
                         help='''\
                              Select the rate at which the heart beep sound is played at
diff --git a/Gui.py b/Gui.py
index c04ba514..0a806d1d 100755
--- a/Gui.py
+++ b/Gui.py
@@ -69,6 +69,7 @@ def guiMain(args=None):
     disableMusicVar = IntVar()
     disableMusicCheckbutton = Checkbutton(checkBoxFrame, text="Disable game music", variable=disableMusicVar)
     shuffleGanonVar = IntVar()
+    shuffleGanonVar.set(1) #set default
     shuffleGanonCheckbutton = Checkbutton(checkBoxFrame, text="Include Ganon's Tower and Pyramid Hole in shuffle pool", variable=shuffleGanonVar)
     customVar = IntVar()
     customCheckbutton = Checkbutton(checkBoxFrame, text="Use custom item pool", variable=customVar)
diff --git a/README.md b/README.md
index e5455b9b..1c68328a 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Insane     50/50
 
 Standard game completion requiring you to collect the 7 crystals and then beat Ganon.
 
-This is only noticeably different if the --shuffleganon option is enabled.
+This is only noticeably different if the the Ganon shuffle option is enabled.
 
 ## Game Difficulty
 
@@ -422,10 +422,10 @@ Use to select a different sprite sheet to use for Link. Path to a binary file of
 Enables the "Only Ensure Seed Beatable" option (default: False)
 
 ```
---shuffleganon
+--no-shuffleganon
 ```
 
-Enables the "Include Ganon's Tower and Pyramid Hole in Shuffle pool" option. (default: false)
+Disables the "Include Ganon's Tower and Pyramid Hole in Shuffle pool" option. (default: Enabled)
 
 ```
 --suppress_rom