Merge branch 'main' into breaking_changes

# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py

Gui.py

@@ -64,8 +64,13 @@ def guiMain(args=None):
     createSpoilerCheckbutton = Checkbutton(checkBoxFrame, text="Create Spoiler Log", variable=createSpoilerVar)
     suppressRomVar = IntVar()
     suppressRomCheckbutton = Checkbutton(checkBoxFrame, text="Do not create patched Rom", variable=suppressRomVar)
-    openpyramidVar = IntVar()
-    openpyramidCheckbutton = Checkbutton(checkBoxFrame, text="Pre-open Pyramid Hole", variable=openpyramidVar)
+    openpyramidFrame = Frame(checkBoxFrame)
+    openpyramidVar = StringVar()
+    openpyramidVar.set('auto')
+    openpyramidOptionMenu = OptionMenu(openpyramidFrame, openpyramidVar, 'auto', 'goal', 'yes', 'no')
+    openpyramidLabel = Label(openpyramidFrame, text='Pre-open Pyramid Hole')
+    openpyramidLabel.pack(side=LEFT)
+    openpyramidOptionMenu.pack(side=LEFT)
     mcsbshuffleFrame = Frame(checkBoxFrame)
     mcsbLabel = Label(mcsbshuffleFrame, text="Shuffle: ")
 
@@ -102,7 +107,7 @@ def guiMain(args=None):
 
     createSpoilerCheckbutton.pack(expand=True, anchor=W)
     suppressRomCheckbutton.pack(expand=True, anchor=W)
-    openpyramidCheckbutton.pack(expand=True, anchor=W)
+    openpyramidFrame.pack(expand=True, anchor=W)
     mcsbshuffleFrame.pack(expand=True, anchor=W)
     mcsbLabel.grid(row=0, column=0)
     mapshuffleCheckbutton.grid(row=0, column=1)
@@ -488,6 +493,18 @@ def guiMain(args=None):
     shopUpgradeShuffleButton = Checkbutton(shopframe, text="Lootable Upgrades", variable=shopUpgradeShuffleVar)
     shopUpgradeShuffleButton.grid(row=0, column=2, sticky=W)
 
+    shopInventoryShuffleVar = IntVar()
+    shopInventoryShuffleButton = Checkbutton(shopframe, text="New Inventories", variable=shopInventoryShuffleVar)
+    shopInventoryShuffleButton.grid(row=1, column=0, sticky=W)
+
+    shopPoolShuffleVar = IntVar()
+    shopPoolShuffleButton = Checkbutton(shopframe, text="Itempool in Shops", variable=shopPoolShuffleVar)
+    shopPoolShuffleButton.grid(row=1, column=1, sticky=W)
+
+    shopWitchShuffleVar = IntVar()
+    shopWitchShuffleButton = Checkbutton(shopframe, text="Custom Potion Shop", variable=shopWitchShuffleVar)
+    shopWitchShuffleButton.grid(row=1, column=2, sticky=W)
+
     multiworldframe = LabelFrame(randomizerWindow, text="Multiworld", padx=5, pady=2)
 
     worldLabel = Label(multiworldframe, text='Players per Team')
@@ -552,7 +569,7 @@ def guiMain(args=None):
         guiargs.create_spoiler = bool(createSpoilerVar.get())
         guiargs.skip_playthrough = not bool(createSpoilerVar.get())
         guiargs.suppress_rom = bool(suppressRomVar.get())
-        guiargs.open_pyramid = bool(openpyramidVar.get())
+        guiargs.open_pyramid = openpyramidVar.get()
         guiargs.mapshuffle = bool(mapshuffleVar.get())
         guiargs.compassshuffle = bool(compassshuffleVar.get())
         guiargs.keyshuffle = {"on": True, "universal": "universal", "off": False}[keyshuffleVar.get()]
@@ -586,6 +603,12 @@ def guiMain(args=None):
             guiargs.shop_shuffle += "p"
         if shopUpgradeShuffleVar.get():
             guiargs.shop_shuffle += "u"
+        if shopInventoryShuffleVar.get():
+            guiargs.shop_shuffle += "f"
+        if shopWitchShuffleVar.get():
+            guiargs.shop_shuffle += "w"
+        if shopPoolShuffleVar.get():
+            guiargs.shop_shuffle_slots = 30
         guiargs.shuffle_prizes = {"none": "",
                                   "bonk": "b",
                                   "general": "g",
@@ -1891,5 +1914,5 @@ if __name__ == '__main__':
             top.update()
         print("Done updating sprites")
     else:
-        logging.basicConfig(format='%(message)s', level=logging.INFO)
+        logging.basicConfig(level=logging.INFO)
         guiMain()