Merge 'Update weekly preset' (#2299)

OoTRandomizer · Sep 9, 2024 · 4366832 · 4366832
2 parents bb31ce7 + 3730b97
commit 4366832
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/data/Hints/weekly.json b/data/Hints/weekly.json
@@ -1,7 +1,7 @@
 {
     "name":                  "weekly",
     "gui_name":              "Weekly",
-    "description":           "Hint distribution for the weekly races: 5 Always, 1 Named-Item (light arrows), 5 Goal, 3 Barren (ToT), 1 Song (ToT), 2 Dual, 5 Sometimes; House of Skulltula (30/40/50).",
+    "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).",
     "add_locations":         [
         { "location": "Sheik in Kakariko", "types": ["always"] },
         { "location": "Deku Theater Skull Mask", "types": ["always"] }
@@ -26,9 +26,7 @@
         { "location": "Graveyard Royal Family Tomb Contents", "types": ["dual"] },
         { "location": "Ice Cavern Final Room", "types": ["dual"] }
     ],
-    "add_items": [
-        { "item": "Light Arrows", "types": ["named-item"] }
-    ],
+    "add_items":             [],
     "remove_items":          [
         { "item": "Zeldas Lullaby", "types": ["goal"] }
     ],
@@ -38,40 +36,63 @@
     "use_default_goals":     true,
     "distribution":          {
         "trial":           {"order": 1, "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)"
         ]},
         "always":          {"order": 2, "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)"
         ]},
         "named-item":      {"order": 3, "weight": 0.0, "fixed": 1, "copies": 2, "remove_stones": [
+            "HC (Storms Grotto)",
+            "HF (Cow Grotto)",
             "ToT (Left)",
             "ToT (Left-Center)",
             "ToT (Right-Center)",
             "ToT (Right)"
         ]},
         "goal":            {"order": 4, "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": 5, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [
+        "barren":          {"order": 5, "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, "priority_stones": [
+        "song":            {"order": 6, "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},
-        "sometimes":       {"order": 8, "weight": 0.0, "fixed": 5, "copies": 2},
-        "junk":            {"order": 9, "weight": 1.0, "fixed": 0, "copies": 1},
+        "dual":            {"order": 7, "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": [
+            "HC (Storms Grotto)",
+            "HF (Cow Grotto)"
+        ]},
+        "junk":            {"order": 9, "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},

diff --git a/data/presets_default.json b/data/presets_default.json
@@ -392,13 +392,13 @@
             "Claim Check"
         ]
     },
-    "Standard Weekly (2024-08-30)": {
+    "Standard Weekly (2024-09-13)": {
         "aliases": [
             "Standard Weekly (Latest)",
             "weekly"
         ],
         "show_seed_info": true,
-        "user_message": "Standard Weekly (2024-08-30)",
+        "user_message": "Standard Weekly (2024-09-13)",
         "world_count": 1,
         "create_spoiler": true,
         "password_lock": false,
@@ -542,7 +542,7 @@
         "big_poe_count": 1,
         "easier_fire_arrow_entry": false,
         "fae_torch_count": 3,
-        "ruto_already_f1_jabu": false,
+        "ruto_already_f1_jabu": true,
         "ocarina_songs": "off",
         "correct_chest_appearances": "both",
         "chest_textures_specific": [

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.1.85'
+__version__ = '8.1.86'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0