Merge 'Update of Scrubs Preset and Scrubs Hints' (#2074)

OoTRandomizer · Aug 26, 2023 · c90f1b5 · c90f1b5
2 parents 3c24413 + 8f36af7
commit c90f1b5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/data/Hints/scrubs.json b/data/Hints/scrubs.json
@@ -1,9 +1,11 @@
 {
     "name":                  "scrubs",
     "gui_name":              "Scrubs",
-    "description":           "Tournament hints used for Scrubs Races. Duplicates of each hint, Sheik at Temple is an always hint, 5 WotH, 5 Foolish, 6 sometimes.",
+    "description":           "Tournament hints used for Scrubs Races. Duplicates of each hint, HBA 1000, Ice Cavern Iron Boots and OGC Great Fairy are always hints, 5 WotH, 3 Foolish (no Dungeons), 7 sometimes.",
     "add_locations":         [
-        { "location": "Sheik at Temple", "types": ["always"] },
+        { "location": "GF HBA 1000 Points", "types": ["always"] },
+        { "location": "OGC Great Fairy Reward", "types": ["always"] },
+        { "location": "Ice Cavern Iron Boots Chest", "types": ["always"] },
         { "location": "Deku Theater Skull Mask", "types": ["always"] },
         { "location": "Deku Theater Mask of Truth", "types": ["always"] }
     ],
@@ -13,7 +15,7 @@
         { "item": "Zeldas Lullaby", "types": ["woth"] }
     ],
     "dungeons_woth_limit":   2,
-    "dungeons_barren_limit": 2,
+    "dungeons_barren_limit": 0,
     "named_items_required":  true,
     "vague_named_items":     false,
     "use_default_goals":     true,
@@ -22,7 +24,7 @@
         "entrance_always":  {"order": 2, "weight": 0.0, "fixed":   0, "copies": 2},
         "always":           {"order": 3, "weight": 0.0, "fixed":   0, "copies": 2},
         "woth":             {"order": 4, "weight": 0.0, "fixed":   5, "copies": 2},
-        "barren":           {"order": 5, "weight": 0.0, "fixed":   5, "copies": 2},
+        "barren":           {"order": 5, "weight": 0.0, "fixed":   3, "copies": 2},
         "entrance":         {"order": 6, "weight": 0.0, "fixed":   3, "copies": 2},
         "sometimes":        {"order": 7, "weight": 0.0, "fixed": 100, "copies": 2},
         "random":           {"order": 8, "weight": 9.0, "fixed":   0, "copies": 2},

diff --git a/data/presets_default.json b/data/presets_default.json
@@ -714,15 +714,15 @@
         "lacs_rewards": 9,
         "lacs_tokens": 100,
         "lacs_hearts": 20,
-        "bridge": "stones",
+        "bridge": "dungeons",
         "bridge_medallions": 6,
         "bridge_stones": 3,
         "bridge_rewards": 9,
         "bridge_tokens": 100,
         "bridge_hearts": 20,
         "trials_random": false,
         "trials": 0,
-        "shuffle_ganon_bosskey": "on_lacs",
+        "shuffle_ganon_bosskey": "remove",
         "ganon_bosskey_medallions": 6,
         "ganon_bosskey_stones": 3,
         "ganon_bosskey_rewards": 9,
@@ -739,8 +739,8 @@
         "silver_rupee_pouches_choice": "off",
         "silver_rupee_pouches": [],
         "shuffle_mapcompass": "startwith",
-        "enhance_map_compass": false,
-        "open_forest": "open",
+        "enhance_map_compass": true,
+        "open_forest": "closed_deku",
         "open_kakariko": "open",
         "open_door_of_time": true,
         "zora_fountain": "closed",
@@ -751,9 +751,9 @@
         "mq_dungeons_mode": "vanilla",
         "mq_dungeons_specific": [],
         "mq_dungeons_count": 0,
-        "empty_dungeons_mode": "none",
+        "empty_dungeons_mode": "count",
         "empty_dungeons_specific": [],
-        "empty_dungeons_count": 2,
+        "empty_dungeons_count": 3,
         "shuffle_interior_entrances": "off",
         "shuffle_hideout_entrances": false,
         "shuffle_grotto_entrances": false,
@@ -790,7 +790,7 @@
         "shuffle_loach_reward": "off",
         "logic_no_night_tokens_without_suns_song": false,
         "disabled_locations": [
-            "Sheik in Kakariko",
+            "Sheik in Ice Cavern",
             "Deku Theater Mask of Truth",
             "Kak 40 Gold Skulltula Reward",
             "Kak 50 Gold Skulltula Reward",
@@ -824,8 +824,8 @@
             "zeldas_letter"
         ],
         "start_with_consumables": true,
-        "start_with_rupees": false,
-        "starting_hearts": 5,
+        "start_with_rupees": true,
+        "starting_hearts": 4,
         "no_escape_sequence": true,
         "no_guard_stealth": true,
         "no_epona_race": true,
@@ -838,14 +838,14 @@
         "auto_equip_masks": false,
         "plant_beans": false,
         "chicken_count_random": false,
-        "chicken_count": 5,
+        "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": "off",
+        "correct_chest_appearances": "textures",
         "minor_items_as_major_chest": false,
         "invisible_chests": false,
         "correct_potcrate_appearances": "textures_unchecked",
@@ -856,8 +856,9 @@
         "item_hints": [],
         "hint_dist_user": {},
         "misc_hints": [
-            "altar",
             "ganondorf",
+            "20_skulltulas",
+            "30_skulltulas",
             "warp_songs_and_owls"
         ],
         "text_shuffle": "none",

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