Make Shuffle Ganon the Default

This commit is contained in:
Kevin Cathcart 2018-01-27 17:11:53 -05:00
parent e19c0ada70
commit 570ee24fc0
3 changed files with 10 additions and 7 deletions

View File

@ -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

1
Gui.py
View File

@ -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)

View File

@ -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