Merged DR v1.2.0.0

resources/app/cli/args.json

@@ -34,6 +34,10 @@
       "retro"
     ]
   },
+  "boots_hint": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "swords": {
     "choices": [
       "random",
@@ -42,6 +46,20 @@
       "vanilla"
     ]
   },
+  "flute_mode": {
+    "choices": [
+      "normal",
+      "active"
+    ]
+  },
+  "bow_mode": {
+    "choices": [
+      "progressive",
+      "silvers",
+      "retro",
+      "retro_silvers"
+    ]
+  },
   "goal": {
     "choices": [
       "ganon",
@@ -198,6 +216,7 @@
   "door_shuffle": {
     "choices": [
       "basic",
+      "partitioned",
       "crossed",
       "vanilla"
     ]
@@ -210,6 +229,18 @@
       "random"
     ]
   },
+  "door_type_mode": {
+    "choices":[
+      "original",
+      "big",
+      "all",
+      "chaos"
+    ]
+  },
+  "decoupledoors": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "experimental": {
     "action": "store_true",
     "type": "bool"
@@ -312,8 +343,11 @@
     "type": "bool"
   },
   "keyshuffle": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "none",
+      "wild",
+      "universal"
+    ]
   },
   "bigkeyshuffle": {
     "action": "store_true",
@@ -332,6 +366,13 @@
     "action": "store_true",
     "type": "bool"
   },
+  "take_any": {
+    "choices": [
+      "none",
+      "random",
+      "fixed"
+    ]
+  },
   "startinventory": {},
   "usestartinventory": {
     "type": "bool"
@@ -429,6 +470,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "shuffletavern": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "overworld_map": {
     "choices": [
       "default",

resources/app/cli/lang/en.json

@@ -122,6 +122,18 @@
       "Hard:           Reduced functionality.",
       "Expert:         Greatly reduced functionality."
     ],
+    "flute_mode": [
+      "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.",
@@ -250,6 +262,7 @@
     "door_shuffle": [
       "Select Door Shuffling Algorithm. (default: %(default)s)",
       "Basic:          Doors are mixed within a single dungeon.",
+      "Partitioned     Doors are mixed in 3 partitions: L1-3+HC+AT, D1-4, D5-8",
       "Crossed:        Doors are mixed between all dungeons.",
       "Vanilla:        All doors are connected the same way they were in the",
       "                base game."
@@ -261,6 +274,14 @@
       "3:       And shuffles dungeon lobbies",
       "random:  Picks one of those at random"
     ],
+    "door_type_mode" : [
+      "Door Types to Shuffle (default: %(default)s)",
+      "original: Shuffles key doors, bombable, and dashable doors",
+      "big:      Adds big key doors",
+      "all:      Adds traps doors (and any future supported door types)",
+      "chaos:    Increases the number of door types in all dungeon pools"
+    ],
+    "decoupledoors" : [ "Door entrances and exits are decoupled" ],
     "experimental": [ "Enable experimental features. (default: %(default)s)" ],
     "dungeon_counters": [ "Enable dungeon chest counters. (default: %(default)s)" ],
     "crystals_ganon": [
@@ -331,10 +352,17 @@
       "Keys are universal, shooting arrows costs rupees,",
       "and a few other little things make this more like Zelda-1. (default: %(default)s)"
     ],
-    "pseudoboots": [ " Players starts with pseudo boots that allow dashing but no item checks (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": [ " Start 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)" ],
     "usestartinventory": [ "Toggle usage of Starting Inventory." ],
+    "customizer": ["Path to a customizer file."],
     "custom": [ "Not supported." ],
     "customitemarray": [ "Not supported." ],
     "accessibility": [
@@ -359,6 +387,9 @@
     "shufflelinks": [
       "Include Link's House in the entrance shuffle pool. (default: %(default)s)"
     ],
+    "shuffletavern": [
+      "Include the back of the tavern in the entrance shuffle pool. (default: %(default)s)"
+    ],
     "overworld_map": [
       "Control if and how the overworld map indicators show the locations of dungeons (default: %(default)s)"
     ],