Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	data/presets_default.json

README.md

@@ -75,7 +75,6 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
   * Support for multiworld on EverDrive ([#2042](https://github.com/OoTRandomizer/OoT-Randomizer/issues/2042))
   * Some settings have been renamed for clarity ([#1560](https://github.com/OoTRandomizer/OoT-Randomizer/pull/1560))
   * The conditions for forcing one-way entrances that lead to the Bolero, Nocturne, and Requiem warp pads have been adjusted to increase variety with some settings, such as “Guarantee Reachable Locations” set to “All Goals”, “Shuffle Dungeon Rewards”, or “Mix Entrance Pools” (based on [#1440](https://github.com/OoTRandomizer/OoT-Randomizer/pull/1440))
-  * New optional `one_hint_per_goal` hint distribution field which can be used to override the heuristic for how Goal hints are selected based on settings (based on [Elagatua's `feature/sgl-2023` branch](https://github.com/Elagatua/OoT-Randomizer/tree/feature/sgl-2023))
   * Gold skulltula tokens can be on excluded locations if there are no checks requiring them (such as in SAWS)
   * The GUI tweaks made by [`Dev-R`](https://github.com/Roman971/OoT-Randomizer) are further adjusted to balance consistency with [main `Dev`](https://github.com/OoTRandomizer/OoT-Randomizer) and ease of use.
   * The Lens of Truth can be in a foolish area if Treasure Chest Game keys are shuffled and all relevant “lensless” tricks are enabled.
@@ -224,6 +223,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * A message is shown the first time a seed with No Logic is generated, to warn the user that the seed may be unbeatable.
 * New hint distribution field `excluded_goal_categories` to disable specific goal categories.
 * Pre-completed dungeons are crossed out in the dungeon overview menus (A or D-left on the inventory screen).
+* New hint distribution field `one_hint_per_goal` can be set to `true` or `false` to override the automatic settings-based behavior of how goal hints are selected.
 
 #### Bug Fixes
 * Goal hints can now hint items required to defeat Ganon even if they're not required for the rainbow bridge, Ganon's boss key, or the trials. These items will be hinted as being on the "path of the hero".

data/Hints/weekly.json

@@ -1,7 +1,7 @@
 {
     "name":                  "weekly",
     "gui_name":              "Weekly",
-    "description":           "Hint distribution for the weekly races: 5 Always, 5 Goal, 3 Barren (ToT), 1 Song (ToT), 2 Dual, 5 Sometimes; HCstorms & HFcow junked; House of Skulltula (30/40/50).",
+    "description":           "Hint distribution for the weekly races: 5 Always, 5 WOTH, 3 Barren (ToT), 1 Song (ToT), 2 Dual, 5 Sometimes; HCstorms & HFcow junked; House of Skulltula (30/40/50).",
     "add_locations":         [
         { "location": "Sheik in Kakariko", "types": ["always"] },
         { "location": "Deku Theater Skull Mask", "types": ["always"] }
@@ -30,6 +30,7 @@
     "remove_items":          [
         { "item": "Zeldas Lullaby", "types": ["goal"] }
     ],
+    "dungeons_woth_limit":   2,
     "dungeons_barren_limit": 1,
     "named_items_required":  true,
     "vague_named_items":     false,
@@ -59,42 +60,49 @@
             "ToT (Right-Center)",
             "ToT (Right)"
         ]},
-        "goal":            {"order": 4, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [
+        "goal":            {"order": 4, "weight": 0.0, "fixed": 0, "copies": 0, "remove_stones": [
             "HC (Storms Grotto)",
             "HF (Cow Grotto)",
             "ToT (Left)",
             "ToT (Left-Center)",
             "ToT (Right-Center)",
             "ToT (Right)"
         ]},
-        "barren":          {"order": 5, "weight": 0.0, "fixed": 3, "copies": 1, "remove_stones": [
+        "woth":            {"order": 5, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [
+            "HC (Storms Grotto)",
+            "HF (Cow Grotto)",
+            "ToT (Left)",
+            "ToT (Left-Center)",
+            "ToT (Right-Center)",
+            "ToT (Right)"
+        ]},
+        "barren":          {"order": 6, "weight": 0.0, "fixed": 3, "copies": 1, "remove_stones": [
             "HC (Storms Grotto)",
             "HF (Cow Grotto)"
         ],  "priority_stones": [
             "ToT (Left)",
             "ToT (Left-Center)",
             "ToT (Right-Center)"
         ]},
-        "song":            {"order": 6, "weight": 0.0, "fixed": 1, "copies": 1, "remove_stones": [
+        "song":            {"order": 7, "weight": 0.0, "fixed": 1, "copies": 1, "remove_stones": [
             "HC (Storms Grotto)",
             "HF (Cow Grotto)"
         ],  "priority_stones": [
             "ToT (Right)"
         ]},
-        "dual":            {"order": 7, "weight": 0.0, "fixed": 2, "copies": 2, "remove_stones": [
+        "dual":            {"order": 8, "weight": 0.0, "fixed": 2, "copies": 2, "remove_stones": [
             "HC (Storms Grotto)",
             "HF (Cow Grotto)"
         ]},
-        "sometimes":       {"order": 8, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [
+        "sometimes":       {"order": 9, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [
             "HC (Storms Grotto)",
             "HF (Cow Grotto)"
         ]},
-        "junk":            {"order": 9, "weight": 1.0, "fixed": 0, "copies": 1, "priority_stones": [
+        "junk":            {"order": 10, "weight": 1.0, "fixed": 0, "copies": 1, "priority_stones": [
             "HC (Storms Grotto)",
             "HF (Cow Grotto)"
         ]},
         "entrance_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
-        "woth":            {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
         "entrance":        {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
         "random":          {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
         "item":            {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},

data/presets_default.json

@@ -3837,14 +3837,14 @@
             "Claim Check"
         ]
     },
-    "Standard Weekly (2024-09-13)": {
+    "Standard Weekly (2024-09-20)": {
         "aliases": [
             "Standard Weekly (Latest)",
             "weekly"
         ],
         "language": "english",
         "show_seed_info": true,
-        "user_message": "Standard Weekly (2024-09-13)",
+        "user_message": "Standard Weekly (2024-09-20)",
         "world_count": 1,
         "create_spoiler": true,
         "password_lock": false,
@@ -3919,7 +3919,7 @@
         "shuffle_gerudo_valley_river_exit": "off",
         "owl_drops": "off",
         "warp_songs": "off",
-        "shuffle_child_spawn": "off",
+        "shuffle_child_spawn": "balanced",
         "shuffle_adult_spawn": "off",
         "blue_warps": "dungeon",
         "exclusive_one_ways": false,

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.1.89'
+__version__ = '8.1.91'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 1