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

resources/app/cli/args.json

@@ -151,11 +151,15 @@
       "full"
     ]
   },
+  "ow_terrain": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "ow_crossed": {
     "choices": [
       "none",
-      "polar",
       "grouped",
+      "polar",
       "limited",
       "chaos"
     ]

resources/app/cli/lang/en.json

@@ -219,11 +219,15 @@
       "Full:           Overworld transitions are shuffled, but both worlds",
       "                will have an independent map shape."
     ],
+    "ow_terrain": [
+      "With OW Layout Shuffle, this allows land and water edges to be connected." ],
     "ow_crossed": [
       "This allows cross-world connections to occur on the overworld.",
       "None:           No transitions are cross-world connections.",
-      "Polar:          Only used when Mixed is enabled. This retains original",
-      "                connections even when overworld tiles are swapped.",
+      "Grouped:        This ensures a two-plane separation so that you cannot", 
+      "                walk around and access the other plane version by walking.",
+      "Polar:          Only used when Tile Flip is enabled. This retains original",
+      "                connections even when overworld tiles are flipped.",
       "Limited:        Exactly nine transitions are randomly chosen as",
       "                cross-world connections (to emulate the nine portals).",
       "Chaos:          Every transition has a 50/50 chance to become a",
@@ -231,7 +235,7 @@
     ],
     "ow_keepsimilar": [
       "This keeps similar edge transitions together. ie. the two west edges on",
-      "Potion Shop will be paired with another similar pair." ],
+      "Sanctuary will be paired with another similar pair." ],
     "ow_mixed": [
       "Overworld tiles are randomly chosen to become part of the opposite world."
     ],

resources/app/gui/lang/en.json

@@ -131,16 +131,18 @@
     "randomizer.overworld.overworldshuffle.parallel": "Parallel",
     "randomizer.overworld.overworldshuffle.full": "Full",
 
+    "randomizer.overworld.terrain": "Free Terrain",
+
     "randomizer.overworld.crossed": "Crossed",
     "randomizer.overworld.crossed.none": "None",
-    "randomizer.overworld.crossed.polar": "Polar",
     "randomizer.overworld.crossed.grouped": "Grouped",
+    "randomizer.overworld.crossed.polar": "Polar",
     "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.mixed": "Tile Flip (Mixed)",
 
     "randomizer.overworld.whirlpool": "Whirlpool Shuffle",
 

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

@@ -20,15 +20,15 @@
       "default": "vanilla",
       "options": [
         "none",
-        "polar",
         "grouped",
+        "polar",
         "limited",
         "chaos"
       ]
     },
     "mixed": {
       "type": "checkbox",
-      "default": true
+      "default": false
     },
     "whirlpool": {
       "type": "checkbox",
@@ -45,9 +45,13 @@
     }
   },
   "rightOverworldFrame": {
+    "terrain": {
+      "type": "checkbox",
+      "default": false
+    },
     "keepsimilar": {
       "type": "checkbox",
-      "default": true
+      "default": false
     }
   }
 }