Gui improvement

Gui.py

@@ -163,6 +163,38 @@ def guiMain(args=None):
     swordsLabel = Label(swordsFrame, text='Swords')
     swordsLabel.pack(side=LEFT)
 
+    itemFuncFrame = Frame(drowDownFrame)
+    itemFuncVar = StringVar()
+    itemFuncVar.set('normal')
+    itemFuncOptionMenu = OptionMenu(itemFuncFrame, itemFuncVar, 'normal', 'hard', 'expert')
+    itemFuncOptionMenu.pack(side=RIGHT)
+    itemFuncLabel = Label(itemFuncFrame, text='Item Functionality')
+    itemFuncLabel.pack(side=LEFT)
+
+    accessibilityFrame = Frame(drowDownFrame)
+    accessibilityVar = StringVar()
+    accessibilityVar.set('items')
+    accessibilityOptionMenu = OptionMenu(accessibilityFrame, accessibilityVar, 'items', 'locations', 'none')
+    accessibilityOptionMenu.pack(side=RIGHT)
+    accessibilityLabel = Label(accessibilityFrame, text='Accessibility')
+    accessibilityLabel.pack(side=LEFT)
+
+    crystalsGanonFrame = Frame(drowDownFrame)
+    crystalsGanonVar = StringVar()
+    crystalsGanonVar.set('7')
+    crystalsGanonOptionMenu = OptionMenu(crystalsGanonFrame, crystalsGanonVar, 'random', '0', '1', '2', '3', '4', '5', '6', '7')
+    crystalsGanonOptionMenu.pack(side=RIGHT)
+    crystalsGanonLabel = Label(crystalsGanonFrame, text='Ganon Vulnerable')
+    crystalsGanonLabel.pack(side=LEFT)
+
+    crystalsGTFrame = Frame(drowDownFrame)
+    crystalsGTVar = StringVar()
+    crystalsGTVar.set('7')
+    crystalsGTOptionMenu = OptionMenu(crystalsGTFrame, crystalsGTVar, 'random', '0', '1', '2', '3', '4', '5', '6', '7')
+    crystalsGTOptionMenu.pack(side=RIGHT)
+    crystalsGTLabel = Label(crystalsGTFrame, text='Open Tower')
+    crystalsGTLabel.pack(side=LEFT)
+
     goalFrame = Frame(drowDownFrame)
     goalVar = StringVar()
     goalVar.set('ganon')
@@ -243,15 +275,23 @@ def guiMain(args=None):
     fastMenuLabel = Label(fastMenuFrame, text='Menu speed')
     fastMenuLabel.pack(side=LEFT)
 
-    modeFrame.pack(expand=True, anchor=E)
     logicFrame.pack(expand=True, anchor=E)
+    accessibilityFrame.pack(expand=True, anchor=E)
+
     goalFrame.pack(expand=True, anchor=E)
+    crystalsGTFrame.pack(expand=True, anchor=E)
+    crystalsGanonFrame.pack(expand=True, anchor=E)
+
+    modeFrame.pack(expand=True, anchor=E)
+    shuffleFrame.pack(expand=True, anchor=E)
+    doorShuffleFrame.pack(expand=True, anchor=E)
+
+    swordsFrame.pack(expand=True, anchor=E)
     difficultyFrame.pack(expand=True, anchor=E)
+    itemFuncFrame.pack(expand=True, anchor=E)
     timerFrame.pack(expand=True, anchor=E)
     progressiveFrame.pack(expand=True, anchor=E)
     algorithmFrame.pack(expand=True, anchor=E)
-    shuffleFrame.pack(expand=True, anchor=E)
-    doorShuffleFrame.pack(expand=True, anchor=E)
     heartbeepFrame.pack(expand=True, anchor=E)
     heartcolorFrame.pack(expand=True, anchor=E)
     fastMenuFrame.pack(expand=True, anchor=E)
@@ -332,6 +372,10 @@ def guiMain(args=None):
         guiargs.mode = modeVar.get()
         guiargs.logic = logicVar.get()
         guiargs.swords = swordsVar.get()
+        guiargs.item_functionality = itemFuncVar.get()
+        guiargs.accessibility = accessibilityVar.get()
+        guiargs.crystals_ganon = crystalsGanonVar.get()
+        guiargs.crystals_gt = crystalsGTVar.get()
         guiargs.goal = goalVar.get()
         guiargs.difficulty = difficultyVar.get()
         guiargs.timer = timerVar.get()