Merge 'Update Weekly Preset and Hints' (#2039)

OoTRandomizer · Jul 14, 2023 · 45fa72c · 45fa72c
2 parents 4d619f1 + 57312b7
commit 45fa72c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 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 weekly races. 5 Goal hints, 3 Barren hints, 4 Entrance/Sometimes hints, 8 Always hints (including Skull Mask and Sheik in Kakariko).",
+    "description":           "Hint distribution for weekly races. 5 Goal hints, 3 Barren hints, 6 Entrance/Sometimes hints, 6 Always hints (including Skull Mask and Sheik in Kakariko).",
     "add_locations":         [
         { "location": "Deku Theater Skull Mask", "types": ["always"] },
         { "location": "Sheik in Kakariko", "types": ["always"] }
@@ -28,8 +28,8 @@
         "always":           {"order": 3, "weight": 0.0, "fixed":   0, "copies": 2},
         "goal":             {"order": 4, "weight": 0.0, "fixed":   5, "copies": 2},
         "barren":           {"order": 5, "weight": 0.0, "fixed":   3, "copies": 2},
-        "entrance":         {"order": 6, "weight": 1.0, "fixed":   0, "copies": 2},
-        "sometimes":        {"order": 7, "weight": 1.0, "fixed":   0, "copies": 2},
+        "entrance":         {"order": 6, "weight": 9.0, "fixed":   0, "copies": 2},
+        "sometimes":        {"order": 7, "weight": 9.0, "fixed":   0, "copies": 2},
         "random":           {"order": 8, "weight": 0.0, "fixed":   0, "copies": 2},
         "item":             {"order": 0, "weight": 0.0, "fixed":   0, "copies": 2},
         "song":             {"order": 0, "weight": 0.0, "fixed":   0, "copies": 2},

diff --git a/data/presets_default.json b/data/presets_default.json
@@ -265,7 +265,7 @@
         "world_count": 1,
         "randomize_settings": false,
         "logic_rules": "glitchless",
-        "open_forest": "closed_deku",
+        "open_forest": "open",
         "open_kakariko": "open",
         "open_door_of_time": true,
         "zora_fountain": "closed",
@@ -278,10 +278,10 @@
         "starting_age": "random",
         "mq_dungeons_mode": "vanilla",
         "empty_dungeons_mode": "none",
-        "shuffle_interior_entrances": "simple",
+        "shuffle_interior_entrances": "off",
         "shuffle_hideout_entrances": false,
         "shuffle_grotto_entrances": false,
-        "shuffle_dungeon_entrances": "off",
+        "shuffle_dungeon_entrances": "simple",
         "shuffle_bosses": "off",
         "shuffle_overworld_entrances": false,
         "owl_drops": false,
@@ -300,12 +300,13 @@
         "shuffle_crates": "off",
         "shuffle_cows": false,
         "shuffle_beehives": false,
-        "shuffle_kokiri_sword": true,
+        "shuffle_kokiri_sword": false,
         "shuffle_ocarinas": false,
         "shuffle_gerudo_card": false,
         "shuffle_beans": false,
         "shuffle_expensive_merchants": false,
         "shuffle_frog_song_rupees": false,
+        "shuffle_individual_ocarina_notes": false,
         "shuffle_mapcompass": "startwith",
         "shuffle_smallkeys": "dungeon",
         "shuffle_hideoutkeys": "vanilla",
@@ -314,7 +315,7 @@
         "shuffle_bosskeys": "dungeon",
         "shuffle_ganon_bosskey": "remove",
         "enhance_map_compass": false,
-        "reachable_locations": "all",
+        "reachable_locations": "beatable",
         "logic_no_night_tokens_without_suns_song": false,
         "disabled_locations": [
             "Deku Theater Mask of Truth"
@@ -325,6 +326,7 @@
             "logic_child_deadhand",
             "logic_man_on_roof",
             "logic_dc_jump",
+            "logic_dc_scarecrow_gs",
             "logic_rusted_switches",
             "logic_windmill_poh",
             "logic_crater_bean_poh_with_hovers",
@@ -374,7 +376,9 @@
         "misc_hints": [
             "altar",
             "ganondorf",
-            "warp_songs_and_owls"
+            "warp_songs_and_owls",
+            "40_skulltulas",
+            "50_skulltulas"
         ],
         "text_shuffle": "none",
         "damage_multiplier": "normal",

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