morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make "Prize" shuffling an option

Browse Source
This commit is contained in:
Fabian Dill
2020-09-20 04:35:45 +02:00
parent 37a3c8f0d5
commit a668aa3b23
7 changed files with 93 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Gui.py
View File

@@ -349,9 +349,17 @@ def guiMain(args=None):
'insanity', 'restricted_legacy', 'full_legacy', 'madness_legacy', 'insanity_legacy',
'dungeonsfull', 'dungeonssimple')
shuffleOptionMenu.pack(side=RIGHT)
shuffleLabel = Label(shuffleFrame, text='Entrance shuffle algorithm')
shuffleLabel = Label(shuffleFrame, text='Entrance shuffle')
shuffleLabel.pack(side=LEFT)
prizeFrame = Frame(drowDownFrame)
prizeVar = StringVar()
prizeVar.set('general')
prizeOptionMenu = OptionMenu(prizeFrame, prizeVar, 'none', 'general', 'bonk', 'both')
prizeOptionMenu.pack(side=RIGHT)
prizeLabel = Label(prizeFrame, text='Shuffle Prices/Drops')
prizeLabel.pack(side=LEFT)
modeFrame.pack(expand=True, anchor=E)
logicFrame.pack(expand=True, anchor=E)
@@ -367,6 +375,7 @@ def guiMain(args=None):
accessibilityFrame.pack(expand=True, anchor=E)
algorithmFrame.pack(expand=True, anchor=E)
shuffleFrame.pack(expand=True, anchor=E)
prizeFrame.pack(expand=True, anchor=E)
enemizerFrame = LabelFrame(randomizerWindow, text="Enemizer", padx=5, pady=2)
@@ -534,6 +543,10 @@ def guiMain(args=None):
guiargs.shop_shuffle += "p"
if shopUpgradeShuffleVar.get():
guiargs.shop_shuffle += "u"
guiargs.shuffle_prizes = {"none": "",
"bonk": "b",
"general": "g",
"both": "bg"}[prizeVar.get()]
guiargs.customitemarray = [int(bowVar.get()), int(silverarrowVar.get()), int(boomerangVar.get()),
int(magicboomerangVar.get()), int(hookshotVar.get()), int(mushroomVar.get()),
int(magicpowderVar.get()), int(firerodVar.get()),