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

remove duplicate shop setting in gui and make entrance/location cache renew slightly faster

Browse Source
This commit is contained in:
Fabian Dill
2020-08-27 04:05:11 +02:00
parent 9c69aff4c1
commit 112868b751
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Gui.py
View File

@@ -351,14 +351,6 @@ def guiMain(args=None):
shuffleLabel = Label(shuffleFrame, text='Entrance shuffle algorithm')
shuffleLabel.pack(side=LEFT)
shop_shuffleFrame = Frame(drowDownFrame)
shop_shuffleVar = StringVar()
shop_shuffleVar.set('off')
shop_shuffleOptionMenu = OptionMenu(shop_shuffleFrame, shop_shuffleVar, 'off', 'inventory', 'price',
'price and inventory')
shop_shuffleOptionMenu.pack(side=RIGHT)
shop_shuffleLabel = Label(shop_shuffleFrame, text='Shop Shuffle')
shop_shuffleLabel.pack(side=LEFT)
modeFrame.pack(expand=True, anchor=E)
logicFrame.pack(expand=True, anchor=E)
@@ -374,7 +366,6 @@ def guiMain(args=None):
accessibilityFrame.pack(expand=True, anchor=E)
algorithmFrame.pack(expand=True, anchor=E)
shuffleFrame.pack(expand=True, anchor=E)
shop_shuffleFrame.pack(expand=True, anchor=E)
enemizerFrame = LabelFrame(randomizerWindow, text="Enemizer", padx=5, pady=2)
@@ -505,7 +496,6 @@ def guiMain(args=None):
guiargs.accessibility = accessibilityVar.get()
guiargs.algorithm = algorithmVar.get()
guiargs.shuffle = shuffleVar.get()
guiargs.shop_shuffle = shop_shuffleVar.get()
guiargs.heartbeep = heartbeepVar.get()
guiargs.heartcolor = heartcolorVar.get()
guiargs.fastmenu = fastMenuVar.get()