Moved Crossed OW Shuffle to its own setting, Renamed Tile Swap to Mixed

resources/app/cli/args.json

@@ -116,17 +116,18 @@
       "full"
     ]
   },
-  "ow_swap": {
-    "choices": [
-      "vanilla",
-      "mixed",
-      "crossed"
-    ]
+  "ow_crossed": {
+    "action": "store_true",
+    "type": "bool"
   },
   "ow_keepsimilar": {
     "action": "store_true",
     "type": "bool"
   },
+  "ow_mixed": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "ow_fluteshuffle": {
     "choices": [
       "vanilla",

resources/app/cli/lang/en.json

@@ -201,22 +201,19 @@
       "Full:           Overworld transitions are shuffled, but both worlds",
       "                will have an independent map shape."
     ],
-    "ow_swap": [
-      "This swaps the tiles of the overworld from one world to the other.",
-      "Vanilla:        All overworld tiles remain in their original world as",
-      "                they were in the base game.",
-      "Mixed:          Overworld tiles are randomly chosen to become part of",
-      "                the opposite world.",
-      "Crossed:        Overworld tiles remain in their original world, but",
-      "                the transitions are shuffled cross world."
-    ],
+    "ow_crossed": [
+      "This allows cross-world connections to occur on the overworld." ],
     "ow_keepsimilar": [
       "This keeps similar edge transitions together. ie. the two west edges on",
       "Potion Shop will be paired with another similar pair." ],
+    "ow_mixed": [
+      "Overworld tiles are randomly chosen to become part of the opposite world."
+    ],
     "ow_fluteshuffle": [
       "This randomizes the flute spot destinations.",
       "Vanilla:        All flute spots remain unchanged.",
-      "Balanced:       New flute spots will be generated but prevents flute spots from being on any adjacent screen.",
+      "Balanced:       New flute spots will be generated but prevents flute",
+      "                spots from being on any adjacent screen.",
       "Random:         New flute spots will be generated with minimal bias."
     ],
     "door_shuffle": [

resources/app/gui/lang/en.json

@@ -117,12 +117,9 @@
     "randomizer.overworld.overworldshuffle.parallel": "Parallel",
     "randomizer.overworld.overworldshuffle.full": "Full",
 
-    "randomizer.overworld.overworldswap": "Tile Swap",
-    "randomizer.overworld.overworldswap.vanilla": "Vanilla",
-    "randomizer.overworld.overworldswap.mixed": "Mixed",
-    "randomizer.overworld.overworldswap.crossed": "Crossed",
-
+    "randomizer.overworld.crossed": "Crossed",
     "randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
+    "randomizer.overworld.mixed": "Mixed",
 
     "randomizer.overworld.overworldflute": "Flute Shuffle",
     "randomizer.overworld.overworldflute.vanilla": "Vanilla",

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

@@ -9,15 +9,6 @@
         "full"
       ]
     },
-    "overworldswap": {
-      "type": "selectbox",
-      "default": "mixed",
-      "options": [
-        "vanilla",
-        "mixed",
-        "crossed"
-      ]
-    },
     "overworldflute": {
       "type": "selectbox",
       "default": "vanilla",
@@ -29,6 +20,14 @@
     }
   },
   "rightOverworldFrame": {
+    "crossed": {
+      "type": "checkbox",
+      "default": false
+    },
+    "mixed": {
+      "type": "checkbox",
+      "default": true
+    },
     "keepsimilar": {
       "type": "checkbox",
       "default": true