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

resources/app/cli/args.json

@@ -136,6 +136,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "ow_whirlpool": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "ow_fluteshuffle": {
     "choices": [
       "vanilla",
@@ -149,6 +153,8 @@
       "simple",
       "restricted",
       "full",
+      "lite",
+      "lean",
       "crossed",
       "insanity",
       "dungeonsfull",

resources/app/cli/lang/en.json

@@ -178,14 +178,18 @@
     ],
     "shuffle": [
       "Select Entrance Shuffling Algorithm. (default: %(default)s)",
-      "Full:           Mix cave and dungeon entrances freely while limiting",
-      "                multi-entrance caves to one world.",
       "Simple:         Shuffle Dungeon Entrances/Exits between each other",
       "                and keep all 4-entrance dungeons confined to one",
       "                location. All caves outside of death mountain are",
       "                shuffled in pairs and matched by original type.",
       "Restricted:     Use Dungeons shuffling from Simple but freely",
       "                connect remaining entrances.",
+      "Full:           Mix cave and dungeon entrances freely while limiting",
+      "                multi-entrance caves to one world.",
+      "Lite:           Entrances are put into separate pools based on their",
+      "                vanilla location. Dungeons, dropdowns, connector caves,",
+      "                and locations that have an item are shuffled from",
+      "                individual pools. Non-item locations remain vanilla.",
       "Crossed:        Mix cave and dungeon entrances freely while allowing",
       "                caves to cross between worlds.",
       "Insanity:       Decouple entrances and exits from each other and",
@@ -222,6 +226,9 @@
     "ow_mixed": [
       "Overworld tiles are randomly chosen to become part of the opposite world."
     ],
+    "ow_whirlpool": [
+      "Whirlpools will be shuffled and paired together."
+    ],
     "ow_fluteshuffle": [
       "This randomizes the flute spot destinations.",
       "Vanilla:        All flute spots remain unchanged.",

resources/app/gui/lang/en.json

@@ -123,9 +123,13 @@
     "randomizer.overworld.crossed.grouped": "Grouped",
     "randomizer.overworld.crossed.limited": "Limited",
     "randomizer.overworld.crossed.chaos": "Chaos",
+
     "randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
+    
     "randomizer.overworld.mixed": "Tile Swap (Mixed)",
 
+    "randomizer.overworld.whirlpool": "Whirlpool Shuffle",
+
     "randomizer.overworld.overworldflute": "Flute Shuffle",
     "randomizer.overworld.overworldflute.vanilla": "Vanilla",
     "randomizer.overworld.overworldflute.balanced": "Balanced",
@@ -140,6 +144,8 @@
     "randomizer.entrance.entranceshuffle.simple": "Simple",
     "randomizer.entrance.entranceshuffle.restricted": "Restricted",
     "randomizer.entrance.entranceshuffle.full": "Full",
+    "randomizer.entrance.entranceshuffle.lite": "Lite",
+    "randomizer.entrance.entranceshuffle.lean": "Lean",
     "randomizer.entrance.entranceshuffle.crossed": "Crossed",
     "randomizer.entrance.entranceshuffle.insanity": "Insanity",
     "randomizer.entrance.entranceshuffle.restricted_legacy": "Restricted (Legacy)",

resources/app/gui/randomize/entrando/widgets.json

@@ -10,6 +10,8 @@
         "simple",
         "restricted",
         "full",
+        "lite",
+        "lean",
         "crossed",
         "insanity",
         "dungeonsfull",

resources/app/gui/randomize/overworld/widgets.json

@@ -24,6 +24,10 @@
       "type": "checkbox",
       "default": true
     },
+    "whirlpool": {
+      "type": "checkbox",
+      "default": false
+    },
     "overworldflute": {
       "type": "selectbox",
       "default": "vanilla",