Retro break up of various options

resources/app/cli/args.json

@@ -48,6 +48,14 @@
       "active"
     ]
   },
+  "bow_mode": {
+    "choices": [
+      "progressive",
+      "silvers",
+      "retro",
+      "retro_silvers"
+    ]
+  },
   "goal": {
     "choices": [
       "ganon",
@@ -266,8 +274,11 @@
     "type": "bool"
   },
   "keyshuffle": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "none",
+      "wild",
+      "universal"
+    ]
   },
   "bigkeyshuffle": {
     "action": "store_true",
@@ -286,6 +297,13 @@
     "action": "store_true",
     "type": "bool"
   },
+  "take_any": {
+    "choices": [
+      "none",
+      "random",
+      "fixed"
+    ]
+  },
   "startinventory": {},
   "usestartinventory": {
     "type": "bool"

resources/app/cli/lang/en.json

@@ -122,10 +122,17 @@
       "Expert:         Greatly reduced functionality."
     ],
     "flute_mode": [
-      "Determine if you need to wake up the bird or not on flute pickup (default: %(default)s)",
+      "Determines if you need to wake up the bird or not on flute pickup (default: %(default)s)",
       "Normal:         Normal functionality.",
       "Active:         Flute is activated on pickup."
     ],
+    "bow_mode": [
+      "Determines how the bow acts in the pool (default: %(default)s)",
+      "Progressive:       Two progressive bows placed. First picked up is the bow. Second is silvers.",
+      "Silvers Separate:  Bow and silvers are completely separate items.",
+      "Retro:             Z1 Bow where arrows cost money and the Single Arrow must be bought or found to shoot",
+      "Retro + Silvers:   Bow and silvers are completely separate items."
+    ],
     "timer": [
       "Select game timer setting. Affects available itempool. (default: %(default)s)",
       "None:           No timer.",
@@ -300,6 +307,12 @@
       "Keys are universal, shooting arrows costs rupees,",
       "and a few other little things make this more like Zelda-1. (default: %(default)s)"
     ],
+    "take_any": [
+      "Take Any caves from Zelda 1 (default: %(default)s)",
+      "None:           No take any caves",
+      "Random:         Take any caves can replace a random set of un-interesting caves. See documentation for full list",
+      "Fixed:          Take any caves will replace certain location. See documentation for full list"
+    ],
     "pseudoboots": [ " Players starts with pseudo boots that allow dashing but no item checks (default: %(default)s"],
     "bombbag": ["Start with 0 bomb capacity. Two capacity upgrades (+10) are added to the pool (default: %(default)s)" ],
     "startinventory": [ "Specifies a list of items that will be in your starting inventory (separated by commas). (default: %(default)s)" ],

resources/app/gui/lang/en.json

@@ -53,6 +53,9 @@
     "randomizer.dungeon.mapshuffle": "Maps",
     "randomizer.dungeon.compassshuffle": "Compasses",
     "randomizer.dungeon.smallkeyshuffle": "Small Keys",
+    "randomizer.dungeon.smallkeyshuffle.standard": "In Dungeon",
+    "randomizer.dungeon.smallkeyshuffle.wild": "Randomized",
+    "randomizer.dungeon.smallkeyshuffle.universal": "Universal",
     "randomizer.dungeon.bigkeyshuffle": "Big Keys",
     "randomizer.dungeon.keydropshuffle": "Key Drop Shuffle (Legacy)",
     "randomizer.dungeon.decoupledoors": "Decouple Doors",
@@ -155,7 +158,10 @@
     "randomizer.entrance.entranceshuffle.dungeonsfull": "Dungeons + Full",
     "randomizer.entrance.entranceshuffle.dungeonssimple": "Dungeons + Simple",
 
-
+    "randomizer.entrance.take_any": "Take Any Caves",
+    "randomizer.entrance.take_any.none": "None",
+    "randomizer.entrance.take_any.random": "Random",
+    "randomizer.entrance.take_any.fixed": "Fixed",
 
     "randomizer.gameoptions.nobgm": "Disable Music & MSU-1",
     "randomizer.gameoptions.quickswap": "L/R Quickswapping",
@@ -219,7 +225,7 @@
     "randomizer.generation.rom.dialog.allfiles": "All Files",
 
     "randomizer.item.hints": "Include Helpful Hints",
-    "randomizer.item.retro": "Retro mode (universal keys)",
+    "randomizer.item.retro": "Retro mode",
     "randomizer.item.pseudoboots": "Start with Pseudo Boots",
     "randomizer.item.bombbag": "Bombbag",
 
@@ -289,6 +295,12 @@
     "randomizer.item.flute_mode.normal": "Normal",
     "randomizer.item.flute_mode.active": "Pre-Activated",
 
+    "randomizer.item.bow_mode": "Bow Mode",
+    "randomizer.item.bow_mode.progressive": "Progressive",
+    "randomizer.item.bow_mode.silvers": "Silvers Separate",
+    "randomizer.item.bow_mode.retro": "Retro (Progressive)",
+    "randomizer.item.bow_mode.retro_silvers": "Retro + Silvers",
+
     "randomizer.item.timer": "Timer Setting",
     "randomizer.item.timer.none": "No Timer",
     "randomizer.item.timer.display": "Stopwatch",

resources/app/gui/randomize/dungeon/keysanity.json

@@ -2,7 +2,6 @@
   "keysanity": {
     "mapshuffle":       { "type": "checkbox" },
     "compassshuffle":   { "type": "checkbox" },
-    "smallkeyshuffle":  { "type": "checkbox" },
     "bigkeyshuffle":    { "type": "checkbox" }
   }
 }

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

@@ -1,5 +1,13 @@
 {
   "widgets": {
+    "keyshuffle": {
+      "type": "selectbox",
+      "options": [
+        "standard",
+        "wild",
+        "universal"
+      ]
+    },
     "dungeondoorshuffle": {
       "type": "selectbox",
       "default": "basic",

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

@@ -29,6 +29,14 @@
       "config": {
         "width": 45
       }
+    },
+    "take_any":  {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "random",
+        "fixed"
+      ]
     }
   }
 }

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

@@ -85,6 +85,15 @@
         "active"
       ]
     },
+    "bow_mode": {
+      "type": "selectbox",
+      "options": [
+        "progressive",
+        "silvers",
+        "retro",
+        "retro_silvers"
+      ]
+    },
     "timer": {
       "type": "selectbox",
       "options": [