Merged in DR v1.4.5

resources/app/cli/args.json

@@ -254,7 +254,7 @@
   },
   "key_logic_algorithm": {
     "choices": [
-      "default",
+      "dangerous",
       "partial",
       "strict"
     ]
@@ -516,6 +516,21 @@
     "action": "store_true",
     "type": "bool"
   },
+  "skullwoods": {
+    "choices": [
+      "original",
+      "restricted",
+      "loose",
+      "followlinked"
+    ]
+  },
+  "linked_drops": {
+    "choices": [
+      "unset",
+      "linked",
+      "independent"
+    ]
+  },
   "overworld_map": {
     "choices": [
       "default",

resources/app/cli/lang/en.json

@@ -305,7 +305,7 @@
     ],
     "key_logic_algorithm": [
       "Key Logic Algorithm (default: %(default)s)",
-      "default: Balance between safety and randomization",
+      "dangerous: Key usage must follow logic for safety",
       "partial: Partial protection when using certain minor glitches",
       "strict:  Ensure small keys are available"
     ],
@@ -431,6 +431,20 @@
     "shuffletavern": [
       "Include the back of the tavern in the entrance shuffle pool. (default: %(default)s)"
     ],
+    "skullwoods": [
+      "Select how to shuffle skull woods (default: %(default)s)",
+      "Original:       Skull Woods is shuffled amongst itself",
+      "Restricted:     Drops are vanilla. Entrances stay in skull woods",
+      "Loose:          Drops are vanilla. Entrances go in the main pool",
+      "Followlinked:   If drops are linked, then pinball/left side will be vanilla",
+      "                with other drops paired with an entrance. Otherwise, all go into the main pool"
+    ],
+    "linked_drops": [
+      "Select how drops are treated in entrance shuffle. (default: %(default)s)",
+      "Unset:          The shuffle mode determines the setting.",
+      "Linked:         Dropdowns will be linked with entrance caves",
+      "Independent:    Dropdowns will not be linked"
+    ],
     "overworld_map": [
       "Control if and how the overworld map indicators show the locations of dungeons (default: %(default)s)"
     ],