Merge 'Update weekly preset' (OoTRandomizer#2255)

fenhl · Jul 1, 2024 · 295db7e · 295db7e
2 parents 90a889f + 5980335
commit 295db7e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 20 deletions.
diff --git a/data/Hints/weekly.json b/data/Hints/weekly.json
@@ -1,8 +1,9 @@
 {
     "name":                  "weekly",
     "gui_name":              "Weekly",
-    "description":           "Hint distribution for the weekly races. 6 Goal hints, 3 Barren hints, 6 Sometimes hints, 1 Dual hint, 4 Always hints.",
+    "description":           "Hint distribution for the weekly races: 5 Always, 6 Goal, 4 Barren at ToT, 5 Sometimes, 2 Dual, 30/40/50 hinted at Skull House.",
     "add_locations":         [
+        { "location": "Sheik in Kakariko", "types": ["always"] },
         { "location": "Deku Theater Skull Mask", "types": ["always"] }
     ],
     "remove_locations":      [
@@ -19,7 +20,6 @@
         { "location": "OGC Great Fairy Reward", "types": ["sometimes"] },
         { "location": "Gerudo Training Ground Maze Path Final Chest", "types": ["sometimes"] },
         { "location": "Ice Cavern Iron Boots Chest", "types": ["sometimes"] },
-        { "location": "Ganons Castle Shadow Trial Golden Gauntlets Chest", "types": ["sometimes"] },
         { "location": "Graveyard Dampe Race Rewards", "types": ["dual"] },
         { "location": "Graveyard Royal Family Tomb Contents", "types": ["dual"] },
         { "location": "Fire Temple Lower Loop", "types": ["dual"] },
@@ -28,8 +28,7 @@
         { "location": "Spirit Temple Child Lower", "types": ["dual"] },
         { "location": "Spirit Temple Adult Lower", "types": ["dual"] },
         { "location": "Shadow Temple Invisible Blades Chests", "types": ["dual"] },
-        { "location": "Shadow Temple Spike Walls Room", "types": ["dual"] },
-        { "location": "Ganons Castle Spirit Trial Chests", "types": ["dual"] }
+        { "location": "Shadow Temple Spike Walls Room", "types": ["dual"] }
     ],
     "add_items":             [],
     "remove_items":          [
@@ -42,11 +41,26 @@
     "distribution":          {
         "trial":           {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
         "entrance_always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2},
-        "always":          {"order": 3, "weight": 0.0, "fixed": 0, "copies": 2},
-        "goal":            {"order": 4, "weight": 0.0, "fixed": 6, "copies": 2},
-        "barren":          {"order": 5, "weight": 0.0, "fixed": 3, "copies": 2},
+        "always":          {"order": 3, "weight": 0.0, "fixed": 0, "copies": 2, "remove_stones": [
+            "ToT (Left)",
+            "ToT (Left-Center)",
+            "ToT (Right-Center)",
+            "ToT (Right)"
+        ]},
+        "goal":            {"order": 4, "weight": 0.0, "fixed": 6, "copies": 2, "remove_stones": [
+            "ToT (Left)",
+            "ToT (Left-Center)",
+            "ToT (Right-Center)",
+            "ToT (Right)"
+        ]},
+        "barren":          {"order": 5, "weight": 0.0, "fixed": 4, "copies": 1, "priority_stones": [
+            "ToT (Left)",
+            "ToT (Left-Center)",
+            "ToT (Right-Center)",
+            "ToT (Right)"
+        ]},
         "entrance":        {"order": 6, "weight": 0.0, "fixed": 0, "copies": 2},
-        "dual":            {"order": 7, "weight": 0.0, "fixed": 1, "copies": 2},
+        "dual":            {"order": 7, "weight": 0.0, "fixed": 2, "copies": 2},
         "sometimes":       {"order": 8, "weight": 1.0, "fixed": 0, "copies": 2},
         "random":          {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
         "item":            {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},

diff --git a/data/presets_default.json b/data/presets_default.json
@@ -390,13 +390,13 @@
             "Claim Check"
         ]
     },
-    "Standard Weekly (2024-06-08)": {
+    "Standard Weekly (2024-07-05)": {
         "aliases": [
             "Standard Weekly (Latest)",
             "weekly"
         ],
         "show_seed_info": true,
-        "user_message": "Standard Weekly (2024-06-08)",
+        "user_message": "Standard Weekly (2024-07-05)",
         "world_count": 1,
         "create_spoiler": true,
         "randomize_settings": false,
@@ -411,15 +411,15 @@
         "lacs_rewards": 9,
         "lacs_tokens": 100,
         "lacs_hearts": 20,
-        "bridge": "dungeons",
+        "bridge": "vanilla",
         "bridge_medallions": 6,
         "bridge_stones": 3,
         "bridge_rewards": 9,
         "bridge_tokens": 100,
         "bridge_hearts": 20,
         "trials_random": false,
         "trials": 0,
-        "shuffle_ganon_bosskey": "remove",
+        "shuffle_ganon_bosskey": "medallions",
         "ganon_bosskey_medallions": 6,
         "ganon_bosskey_stones": 3,
         "ganon_bosskey_rewards": 9,
@@ -449,10 +449,12 @@
         "mq_dungeons_mode": "vanilla",
         "mq_dungeons_specific": [],
         "mq_dungeons_count": 0,
-        "empty_dungeons_mode": "count",
+        "empty_dungeons_mode": "rewards",
         "empty_dungeons_specific": [],
-        "empty_dungeons_rewards": [],
-        "empty_dungeons_count": 2,
+        "empty_dungeons_rewards": [
+            "Kokiri Emerald"
+        ],
+        "empty_dungeons_count": 1,
         "shuffle_interior_entrances": "off",
         "shuffle_hideout_entrances": false,
         "shuffle_grotto_entrances": false,
@@ -533,13 +535,13 @@
         "fast_bunny_hood": true,
         "auto_equip_masks": false,
         "plant_beans": false,
-        "chicken_count_random": true,
-        "chicken_count": 7,
+        "chicken_count_random": false,
+        "chicken_count": 3,
         "big_poe_count_random": false,
         "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": [
@@ -571,6 +573,7 @@
             "altar",
             "ganondorf",
             "warp_songs_and_owls",
+            "30_skulltulas",
             "40_skulltulas",
             "50_skulltulas"
         ],
@@ -579,7 +582,7 @@
         "deadly_bonks": "none",
         "no_collectible_hearts": false,
         "starting_tod": "default",
-        "blue_fire_arrows": false,
+        "blue_fire_arrows": true,
         "fix_broken_drops": false,
         "item_pool_value": "balanced",
         "junk_ice_traps": "off",

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