Merged Parallel Worlds into OW Layout Shuffle setting

resources/app/cli/args.json

@@ -111,19 +111,14 @@
   "ow_shuffle": {
     "choices": [
       "vanilla",
-      "simple",
-      "full",
-      "crossed"
+      "parallel",
+      "full"
     ]
   },
   "ow_keepsimilar": {
     "action": "store_true",
     "type": "bool"
   },
-  "ow_parallel": {
-    "action": "store_true",
-    "type": "bool"
-  },
   "shuffle": {
     "choices": [
       "vanilla",

resources/app/cli/lang/en.json

@@ -194,19 +194,17 @@
       "the overworld vanilla."
     ],
     "ow_shuffle": [
-      "Select Overworld Shuffling Algorithm. (default: %(default)s)",
+      "This shuffles the layout of the overworld.",
       "Vanilla:        All overworld transitions are connected the same",
       "                way they were in the base game.",
-      "Simple:         Overworld retains the same vanilla shape, but some overworld",
-      "                screens will be swapped with their opposite world version.",
-      "Full:           Overworld screen transitions will lead to other",
-      "                overworld screens from the same world.",
-      "Crossed:        Overworld screen transitions can lead to any other overworld screen."
+      "Parallel:       Overworld transitions are shuffled, but both worlds",
+      "                will have the same pattern/shape.",
+      "Full:           Overworld transitions are shuffled, but both worlds",
+      "                will have an independent map shape."
     ],
     "ow_keepsimilar": [
       "This keeps similar edge transitions together. ie. the two west edges on",
       "Potion Shop will be paired with another similar pair." ],
-    "ow_parallel": [ "This ensures the layouts of both worlds are the same shape." ],
     "door_shuffle": [
       "Select Door Shuffling Algorithm. (default: %(default)s)",
       "Basic:          Doors are mixed within a single dungeon.",

resources/app/gui/lang/en.json

@@ -109,14 +109,12 @@
     "randomizer.enemizer.enemizercli.online": "(get online)",
 
 
-    "randomizer.overworld.overworldshuffle": "Overworld Shuffle",
+    "randomizer.overworld.overworldshuffle": "Layout Shuffle",
     "randomizer.overworld.overworldshuffle.vanilla": "Vanilla",
-    "randomizer.overworld.overworldshuffle.simple": "Simple",
+    "randomizer.overworld.overworldshuffle.parallel": "Parallel",
     "randomizer.overworld.overworldshuffle.full": "Full",
-    "randomizer.overworld.overworldshuffle.crossed": "Crossed",
 
     "randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
-    "randomizer.overworld.parallelworlds": "Parallel Worlds",
     
     "randomizer.entrance.openpyramid": "Pre-open Pyramid Hole",
     "randomizer.entrance.shuffleganon": "Include Ganon's Tower and Pyramid Hole in shuffle pool",

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

@@ -2,19 +2,16 @@
   "widgets": {
     "overworldshuffle": {
       "type": "selectbox",
-      "default": "full",
+      "default": "parallel",
       "options": [
         "vanilla",
+        "parallel",
         "full"
       ]
     },
     "keepsimilar": {
       "type": "checkbox",
       "default": true
-    },
-    "parallelworlds": {
-      "type": "checkbox",
-      "default": true
     }
   }
 }