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)"
     ],

resources/app/gui/lang/en.json

@@ -92,7 +92,7 @@
     "randomizer.dungeon.trap_door_mode.oneway": "Remove All Annoying Traps",
 
     "randomizer.dungeon.key_logic_algorithm": "Key Logic Algorithm",
-    "randomizer.dungeon.key_logic_algorithm.default": "Default",
+    "randomizer.dungeon.key_logic_algorithm.dangerous": "Dangerous",
     "randomizer.dungeon.key_logic_algorithm.partial": "Partial Protection",
     "randomizer.dungeon.key_logic_algorithm.strict": "Strict",
 
@@ -195,6 +195,17 @@
     "randomizer.entrance.entranceshuffle.dungeonsfull": "Dungeons + Full",
     "randomizer.entrance.entranceshuffle.dungeonssimple": "Dungeons + Simple",
 
+    "randomizer.entrance.skullwoods": "Skull Woods Shuffle",
+    "randomizer.entrance.skullwoods.original": "Original",
+    "randomizer.entrance.skullwoods.restricted": "Vanilla Drops, Entrances Restricted",
+    "randomizer.entrance.skullwoods.loose": "Vanilla Drops, Entrances use Shuffle",
+    "randomizer.entrance.skullwoods.followlinked": "Follow Linked Drops Setting",
+
+    "randomizer.entrance.linked_drops": "Linked Drops Override",
+    "randomizer.entrance.linked_drops.unset": "Determined by Shuffle",
+    "randomizer.entrance.linked_drops.linked": "Always Linked",
+    "randomizer.entrance.linked_drops.independent": "Independent",
+
     "randomizer.gameoptions.nobgm": "Disable Music & MSU-1",
     "randomizer.gameoptions.quickswap": "L/R Quickswapping",
     "randomizer.gameoptions.reduce_flashing": "Reduce Flashing",

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

@@ -14,11 +14,11 @@
     },
     "key_logic_algorithm": {
       "type": "selectbox",
-      "default": "default",
+      "default": "partial",
       "options": [
-        "default",
         "partial",
-        "strict"
+        "strict",
+        "dangerous"
       ],
       "config": {
         "padx": [20,0],

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

@@ -35,6 +35,26 @@
         "padx": [20,0]
       }
     },
+    "skullwoods": {
+      "type": "selectbox",
+      "options": [
+        "original",
+        "restricted",
+        "loose",
+        "followlinked"
+      ],
+      "config": {
+        "width": 30
+      }
+    },
+    "linked_drops": {
+      "type": "selectbox",
+      "options": [
+        "unset",
+        "linked",
+        "independent"
+      ]
+    },
     "openpyramid": {
       "type": "selectbox",
       "options": [

resources/ci/common/common.py

@@ -19,7 +19,7 @@ global FILESIZE_CHECK
 #  windows:  2022, 2019
 #  macos:    14, 13, 12, 11
 DEFAULT_EVENT = "event"
-DEFAULT_REPO_SLUG = "miketrethewey/ALttPDoorRandomizer"
+DEFAULT_REPO_SLUG = "codemann8/ALttPDoorRandomizer"
 FILENAME_CHECKS = [
   "DungeonRandomizer",
   "Gui",

resources/ci/common/prepare_release.py

@@ -71,7 +71,7 @@ if len(BUILD_FILENAMES) > 0:
   # clean the git slate
   git_clean()
 
-	# mv dirs from source code
+  # mv dirs from source code
   dirs = [
     os.path.join(".",".git"),
     os.path.join(".",".github"),
@@ -98,8 +98,8 @@ if len(BUILD_FILENAMES) > 0:
       	if "linux" in env["OS_NAME"] or "ubuntu" in env["OS_NAME"] or "mac" in env["OS_NAME"] or "osx" in env["OS_NAME"]:
       		os.chmod(os.path.join(".",BUILD_FILENAME),0o755)
 
-	# .zip if windows
-	# .tar.gz otherwise
+  # .zip if windows
+  # .tar.gz otherwise
   if len(BUILD_FILENAMES) > 1:
     # ZIP_FILENAME = os.path.join("..","deploy",env["REPO_NAME"])
     ZIP_FILENAME = os.path.join("..","deploy","ALttPOverworldRandomizer")
@@ -112,7 +112,7 @@ if len(BUILD_FILENAMES) > 0:
     make_archive(ZIP_FILENAME,"gztar")
     ZIP_FILENAME += ".tar.gz"
 
-	# mv dirs back
+  # mv dirs back
   for dir in dirs:
     if os.path.isdir(os.path.join("..","build",dir)):
       move(