Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle

2021-10-30 13:58:45 -07:00
parent 0c9270bdb0 9a902ef98d
commit b8304c4c76
32 changed files with 2505 additions and 1873 deletions
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -80,6 +80,7 @@ SETTINGSTOPROCESS = {
      "crossed": "ow_crossed",
      "keepsimilar": "ow_keepsimilar",
      "mixed": "ow_mixed",
+      "whirlpool": "ow_whirlpool",
      "overworldflute": "ow_fluteshuffle"
    },
    "entrance": {
--- a/source/gui/randomize/overworld.py
+++ b/source/gui/randomize/overworld.py
@@ -33,7 +33,7 @@ def overworld_page(parent):
                    packAttrs = {"side":LEFT, "pady":(18,0)}
                elif key == "overworldflute":
                    packAttrs["pady"] = (20,0)
-                elif key == "mixed":
+                elif key in ["whirlpool", "mixed"]:
                    packAttrs = {"anchor":W, "padx":(79,0)}
                
                self.widgets[key].pack(packAttrs)