diff --git a/data/Hints/scrubs.json b/data/Hints/scrubs.json index e6a11e121e..01e0d2877e 100644 --- a/data/Hints/scrubs.json +++ b/data/Hints/scrubs.json @@ -1,33 +1,36 @@ { "name": "scrubs", "gui_name": "Scrubs", - "description": "Tournament hints used for Scrubs Races. Duplicates of each hint except foolish and item which are placed at ToT. Skull Mask, Ice Cavern Final Room and Castle Great Fairies are always hinted, 4 Path, 3 Foolish (no Dungeons), 1 Item, 9 sometimes, HC(Storms) & HF(Cow Grotto) junked.", - "add_locations": [ + "description": "Tournament hints used for Scrubs Races. Duplicates of each hint except foolish which are placed at ToT. Skull Mask, Ice Cavern Final Room, Frogs Rewards and Castle Great Fairies are always hinted, 5 Path, 4 Foolish (2 Dungeons), 8 sometimes (2 Dual), HC(Storms) & HF(Cow Grotto) junked.", + "add_locations": [ { "location": "Castle Fairy Checks", "types": ["dual_always"] }, { "location": "Ice Cavern Final Room", "types": ["dual_always"] }, - { "location": "Deku Theater Skull Mask", "types": ["always"] } - ], - "remove_locations": [ + { "location": "Deku Theater Skull Mask", "types": ["always"] }, + { "location": "ZR Frogs Rewards", "types": ["dual_always"] } + ], + "remove_locations": [ + { "location": "the Haunted Wasteland", "types": ["barren"] }, { "location": "Hyrule Castle", "types": ["barren"] }, - { "location": "OGC Great Fairy Reward", "types": ["always"] }, - { "location": "Sheik at Temple", "types": ["always", "sometimes"] }, - { "location": "ZR Frogs Rewards", "types": ["dual_always", "dual"] }, + { "location": "Gerudo's Fortress", "types": ["barren"] }, + { "location": "the Temple of Time", "types": ["barren"] }, + { "location": "ZR Frogs Ocarina Game", "types": ["always"] }, { "location": "Sheik in Forest", "types": ["sometimes"] }, { "location": "Sheik in Crater", "types": ["sometimes"] }, - { "location": "Sheik in Kakariko", "types": ["always", "sometimes"] }, { "location": "Sheik in Ice Cavern", "types": ["sometimes"] }, { "location": "Sheik at Colossus", "types": ["sometimes"] }, { "location": "Song from Royal Familys Tomb", "types": ["sometimes"] }, - { "location": "Song from Ocarina of Time", "types": ["always", "sometimes"] }, - { "location": "Deku Theater Rewards", "types": ["dual_always"] } - ], + { "location": "Deku Theater Rewards", "types": ["dual_always", "dual"] }, + { "location": "Fire Temple Lower Loop", "types": ["dual"] }, + { "location": "GF Horseback Archery Rewards", "types": ["dual_always", "dual"] }, + { "location": "Kak Anju as Child", "types": ["sometimes"] } + ], "add_items": [], - "remove_items": [ + "remove_items": [ { "item": "Zeldas Lullaby", "types": ["woth", "goal"] }, { "item": "Nocturne of Shadow", "types": ["woth", "goal"] } - ], - "dungeons_woth_limit": 2, - "dungeons_barren_limit": 0, + ], + "dungeons_woth_limit": 5, + "dungeons_barren_limit": 2, "named_items_required": true, "vague_named_items": false, "use_default_goals": true, @@ -56,13 +59,13 @@ "HC (Storms Grotto)", "HF (Cow Grotto)" ]}, - "barren": {"order": 4, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [ + "barren": {"order": 4, "weight": 0.0, "fixed": 4, "copies": 1, "priority_stones": [ "ToT (Left)", "ToT (Left-Center)", "ToT (Right)", "ToT (Right-Center)" ]}, - "goal": {"order": 5, "weight": 0.0, "fixed": 4, "copies": 2, "remove_stones": [ + "goal": {"order": 5, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [ "ToT (Left)", "ToT (Left-Center)", "ToT (Right)", @@ -78,11 +81,13 @@ "HC (Storms Grotto)", "HF (Cow Grotto)" ]}, - "item": {"order": 7, "weight": 0.0, "fixed": 1, "copies": 1, "priority_stones": [ + "dual": {"order": 7, "weight": 0.0, "fixed": 2, "copies": 2, "remove_stones": [ "ToT (Left)", "ToT (Left-Center)", "ToT (Right)", - "ToT (Right-Center)" + "ToT (Right-Center)", + "HC (Storms Grotto)", + "HF (Cow Grotto)" ]}, "junk": {"order": 8, "weight": 0.0, "fixed": 1, "copies": 2, "priority_stones": [ "HC (Storms Grotto)", @@ -104,7 +109,7 @@ "song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, "overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, "dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, - "dual": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0}, + "item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0}, "named-item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, "entrance_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, "important_check": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0} diff --git a/data/presets_default.json b/data/presets_default.json index fa45c72384..ff1b3d98e9 100644 --- a/data/presets_default.json +++ b/data/presets_default.json @@ -950,10 +950,19 @@ "enhance_map_compass": true, "logic_no_night_tokens_without_suns_song": false, "disabled_locations": [ + "Sheik at Temple", "Deku Theater Mask of Truth", "Kak 40 Gold Skulltula Reward", "Kak 50 Gold Skulltula Reward", - "GF HBA 1500 Points" + "GF HBA 1500 Points", + "Ganons Castle Light Trial First Left Chest", + "Ganons Castle Light Trial Second Left Chest", + "Ganons Castle Light Trial Third Left Chest", + "Ganons Castle Light Trial First Right Chest", + "Ganons Castle Light Trial Second Right Chest", + "Ganons Castle Light Trial Third Right Chest", + "Ganons Castle Light Trial Invisible Enemies Chest", + "Ganons Castle Light Trial Lullaby Chest" ], "allowed_tricks": [ "logic_fewer_tunic_requirements", @@ -973,10 +982,13 @@ ], "advanced_allowed_tricks": [], "starting_equipment": [ - "deku_shield" + "deku_shield", + "hylian_shield", + "defense" ], "starting_inventory": [ "ocarina", + "farores_wind", "lens", "zeldas_letter" ], @@ -984,8 +996,8 @@ "prelude" ], "start_with_consumables": true, - "start_with_rupees": true, - "starting_hearts": 4, + "start_with_rupees": false, + "starting_hearts": 3, "skip_reward_from_rauru": true, "no_escape_sequence": true, "no_guard_stealth": true, @@ -1001,7 +1013,7 @@ "easier_fire_arrow_entry": false, "fae_torch_count": 3, "ruto_already_f1_jabu": true, - "fast_shadow_boat": false, + "fast_shadow_boat": true, "chicken_count_random": false, "chicken_count": 3, "big_poe_count_random": false, @@ -1016,9 +1028,10 @@ "ganondorf", "20_skulltulas", "30_skulltulas", - "warp_songs_and_owls" + "warp_songs_and_owls", + "big_poes" ], - "correct_chest_appearances": "textures", + "correct_chest_appearances": "both", "chest_textures_specific": [ "major", "bosskeys", @@ -1030,7 +1043,7 @@ "minor_items_as_major_chest": [], "invisible_chests": false, "correct_potcrate_appearances": "textures_unchecked", - "key_appearance_match_dungeon": false, + "key_appearance_match_dungeon": true, "potcrate_textures_specific": [ "major", "bosskeys", @@ -1044,9 +1057,9 @@ "damage_multiplier": "normal", "deadly_bonks": "none", "starting_tod": "default", - "blue_fire_arrows": false, + "blue_fire_arrows": true, "fix_broken_drops": false, - "tcg_requires_lens": false, + "tcg_requires_lens": true, "no_collectible_hearts": false, "one_item_per_dungeon": false, "item_pool_value": "balanced",