Merge remote-tracking branch 'codemann/OverworldShuffle' into codemann_OverworldShuffle

resources/app/cli/args.json

@@ -177,6 +177,22 @@
       "full"
     ]
   },
+  "ow_layout": {
+    "choices": [
+      "vanilla",
+      "grid",
+      "wild"
+    ]
+  },
+  "ow_parallel": {
+    "action": "store_true",
+    "help": "suppress",
+    "type": "bool"
+  },
+  "ow_unparallel": {
+    "action": "store_true",
+    "dest": "ow_parallel"
+  },
   "ow_terrain": {
     "action": "store_true",
     "type": "bool"
@@ -212,6 +228,15 @@
       "random"
     ]
   },
+  "ow_fog": {
+    "action": "store_true",
+    "help": "suppress",
+    "type": "bool"
+  },
+  "ow_no_fog": {
+    "action": "store_true",
+    "dest": "ow_fog"
+  },
   "shuffle": {
     "choices": [
       "vanilla",

resources/app/cli/lang/en.json

@@ -235,14 +235,18 @@
       "the entrances vanilla."
     ],
     "ow_shuffle": [
+      "Deprecated, use ow_layout and ow_unparallel instead."
+    ],
+    "ow_layout": [
       "This shuffles the layout of the overworld.",
       "Vanilla:        All overworld transitions are connected the same",
       "                way they were in the base game.",
-      "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."
+      "Grid:           OW Screens are arranged on 8x8 grids and OW Transitions",
+      "                work according to this arrangement.",
+      "Wild:           OW Transitions are shuffled with no respect to geometric coherence."
     ],
+    "ow_unparallel": [
+      "With OW Layout Shuffle, this no longer forces both worlds to have a matching layout." ],
     "ow_terrain": [
       "With OW Layout Shuffle, this allows land and water edges to be connected." ],
     "ow_crossed": [
@@ -277,6 +281,9 @@
       "                spots from being on any adjacent screen.",
       "Random:         New flute spots will be generated with minimal bias."
     ],
+    "ow_no_fog": [
+      "With OW Grid Layout Shuffle or Mixed, this disables the fog that prevents",
+      "you from seeing unvisited screens on the overworld map." ],
     "door_shuffle": [
       "Select Door Shuffling Algorithm. (default: %(default)s)",
       "Basic:          Doors are mixed within a single dungeon.",

resources/app/gui/lang/en.json

@@ -157,10 +157,12 @@
     "randomizer.enemizer.enemylogic.allow_all": "Allow special enemies anywhere",
 
 
-    "randomizer.overworld.overworldshuffle": "Layout Shuffle",
-    "randomizer.overworld.overworldshuffle.vanilla": "Vanilla",
-    "randomizer.overworld.overworldshuffle.parallel": "Parallel",
-    "randomizer.overworld.overworldshuffle.full": "Full",
+    "randomizer.overworld.layout": "Layout Shuffle",
+    "randomizer.overworld.layout.vanilla": "Vanilla",
+    "randomizer.overworld.layout.grid": "Grid",
+    "randomizer.overworld.layout.wild": "Wild",
+
+    "randomizer.overworld.parallel": "Keep Worlds Parallel",
 
     "randomizer.overworld.terrain": "Free Terrain",
 
@@ -181,6 +183,8 @@
     "randomizer.overworld.overworldflute.balanced": "Balanced",
     "randomizer.overworld.overworldflute.random": "Random",
 
+    "randomizer.overworld.fog": "Overworld Map Fog",
+
     
     "randomizer.entrance.openpyramid": "Pre-open Pyramid Hole",
     "randomizer.entrance.openpyramid.auto": "Auto",

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

@@ -1,13 +1,13 @@
 {
   "topOverworldFrame": {},
   "leftOverworldFrame": {
-    "overworldshuffle": {
+    "layout": {
       "type": "selectbox",
       "default": "vanilla",
       "options": [
         "vanilla",
-        "parallel",
-        "full"
+        "grid",
+        "wild"
       ]
     },
     "crossed": {
@@ -18,7 +18,10 @@
         "grouped",
         "polar",
         "unrestricted"
-      ]
+      ],
+      "config": {
+        "pady": [16,0]
+      }
     },
     "mixed": {
       "type": "checkbox",
@@ -45,22 +48,27 @@
       "config": {
         "pady": [20,0]
       }
+    },
+    "fog": {
+      "type": "checkbox",
+      "default": true,
+      "config": {
+        "pady": [20,0]
+      }
     }
   },
   "rightOverworldFrame": {
+    "parallel": {
+      "type": "checkbox",
+      "default": true
+    },
     "terrain": {
       "type": "checkbox",
-      "default": false,
-      "config": {
-        "pady": [3,0]
-      }
+      "default": false
     },
     "keepsimilar": {
       "type": "checkbox",
-      "default": false,
-      "config": {
-        "pady": [6,0]
-      }
+      "default": false
     }
   }
 }