From 1f9a89057dfd85c3c9cd4d087ad9f49883b3172d Mon Sep 17 00:00:00 2001 From: Fenhl Date: Sun, 29 Sep 2024 16:10:18 +0000 Subject: [PATCH] Update Tournament preset for season 8 --- data/Hints/tournament.json | 69 +++++++++++++++++++++++++------------- data/presets_default.json | 47 ++++++++++++-------------- version.py | 2 +- 3 files changed, 68 insertions(+), 50 deletions(-) diff --git a/data/Hints/tournament.json b/data/Hints/tournament.json index 634ac55cf..c17dc6f77 100644 --- a/data/Hints/tournament.json +++ b/data/Hints/tournament.json @@ -1,46 +1,69 @@ { "name": "tournament", "gui_name": "Tournament", - "description": "Hint Distribution for the S7 Tournament. 5 Goal hints, 3 Barren hints, 7 Sometimes hints (6 w/ scrub shuffle), 5 Always hints (6 w/ scrub shuffle).", + "description": "Hint Distribution for the S8 Tournament: 5 Always, 5 Goal, 3 Barren (ToT), 1 Song (ToT), 2 Dual, 6 Sometimes; House of Skulltula (30/40/50).", "add_locations": [ - { "location": "Deku Theater Skull Mask", "types": ["always"] }, { "location": "Sheik in Kakariko", "types": ["always"] }, - { "location": "DMC Deku Scrub", "types": ["always"] } + { "location": "Deku Theater Skull Mask", "types": ["always"] } ], "remove_locations": [ - { "location": "Ganons Castle Shadow Trial Golden Gauntlets Chest", "types": ["sometimes"] }, + { "location": "Song from Royal Familys Tomb", "types": ["sometimes"] }, { "location": "Sheik in Forest", "types": ["sometimes"] }, { "location": "Sheik at Temple", "types": ["sometimes"] }, { "location": "Sheik in Crater", "types": ["sometimes"] }, + { "location": "Sheik in Ice Cavern", "types": ["sometimes"] }, { "location": "Sheik at Colossus", "types": ["sometimes"] }, - { "location": "Song from Royal Familys Tomb", "types": ["sometimes"] } + { "location": "GF HBA 1500 Points", "types": ["sometimes"] }, + { "location": "GC Maze Left Chest", "types": ["sometimes"] }, + { "location": "GV Chest", "types": ["sometimes"] }, + { "location": "HC Great Fairy Reward", "types": ["sometimes"] }, + { "location": "OGC Great Fairy Reward", "types": ["sometimes"] }, + { "location": "Water Temple River Chest", "types": ["sometimes"] }, + { "location": "Gerudo Training Ground Maze Path Final Chest", "types": ["sometimes"] }, + { "location": "Spirit Temple Silver Gauntlets Chest", "types": ["sometimes"] }, + { "location": "Spirit Temple Mirror Shield Chest", "types": ["sometimes"] }, + { "location": "Graveyard Dampe Race Rewards", "types": ["dual"] }, + { "location": "Graveyard Royal Family Tomb Contents", "types": ["dual"] }, + { "location": "Ice Cavern Final Room", "types": ["dual"] } ], "add_items": [], "remove_items": [ { "item": "Zeldas Lullaby", "types": ["goal"] } ], "dungeons_barren_limit": 1, + "one_hint_per_goal": true, "named_items_required": true, "vague_named_items": false, "use_default_goals": true, "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": 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}, - "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}, - "overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, - "dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, - "junk": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, - "named-item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, - "woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}, - "dual_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0}, - "dual": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0}, - "important_check": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0} + "trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 0, "remove_stones": [ + "ToT (Left)", + "ToT (Left-Center)", + "ToT (Right-Center)", + "ToT (Right)" + ]}, + "always": {"order": 2, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [ + "ToT (Left)", + "ToT (Left-Center)", + "ToT (Right-Center)", + "ToT (Right)" + ]}, + "goal": {"order": 3, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [ + "ToT (Left)", + "ToT (Left-Center)", + "ToT (Right-Center)", + "ToT (Right)" + ]}, + "barren": {"order": 4, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [ + "ToT (Left)", + "ToT (Left-Center)", + "ToT (Right-Center)" + ]}, + "song": {"order": 5, "weight": 0.0, "fixed": 1, "copies": 1, "priority_stones": [ + "ToT (Right)" + ]}, + "dual": {"order": 6, "weight": 0.0, "fixed": 2, "copies": 2}, + "sometimes": {"order": 7, "weight": 0.0, "fixed": 6, "copies": 2}, + "junk": {"order": 8, "weight": 1.0, "fixed": 0, "copies": 1} } } diff --git a/data/presets_default.json b/data/presets_default.json index 6f679e6e8..01966f7f4 100644 --- a/data/presets_default.json +++ b/data/presets_default.json @@ -188,13 +188,13 @@ "Claim Check" ] }, - "S7 Tournament": { + "S8 Tournament": { "aliases": [ - "s7", + "s8", "tournament" ], "show_seed_info": true, - "user_message": "S7 Tournament", + "user_message": "S8 Tournament", "world_count": 1, "create_spoiler": true, "password_lock": false, @@ -210,7 +210,7 @@ "lacs_rewards": 9, "lacs_tokens": 100, "lacs_hearts": 20, - "bridge": "medallions", + "bridge": "vanilla", "bridge_medallions": 6, "bridge_stones": 3, "bridge_rewards": 9, @@ -218,7 +218,7 @@ "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, @@ -261,7 +261,9 @@ "shuffle_gerudo_valley_river_exit": false, "owl_drops": false, "warp_songs": false, - "spawn_positions": [], + "spawn_positions": [ + "child" + ], "free_bombchu_drops": false, "one_item_per_dungeon": false, "shuffle_song_items": "song", @@ -291,23 +293,22 @@ "Deku Theater Mask of Truth" ], "allowed_tricks": [ - "logic_fewer_tunic_requirements", "logic_grottos_without_agony", - "logic_child_deadhand", - "logic_man_on_roof", - "logic_dc_jump", + "logic_fewer_tunic_requirements", "logic_rusted_switches", + "logic_man_on_roof", "logic_windmill_poh", "logic_crater_bean_poh_with_hovers", + "logic_dc_jump", "logic_forest_vines", + "logic_child_deadhand", "logic_lens_botw", - "logic_lens_castle", - "logic_lens_gtg", "logic_lens_shadow", "logic_lens_shadow_platform", "logic_lens_bongo", "logic_lens_spirit", - "logic_visible_collisions" + "logic_lens_gtg", + "logic_lens_castle" ], "starting_equipment": [ "deku_shield" @@ -333,7 +334,7 @@ "auto_equip_masks": false, "plant_beans": false, "chicken_count_random": false, - "chicken_count": 7, + "chicken_count": 3, "big_poe_count_random": false, "big_poe_count": 1, "easier_fire_arrow_entry": false, @@ -351,14 +352,8 @@ "soa_unlocks_chest_texture": false, "minor_items_as_major_chest": [], "invisible_chests": false, - "correct_potcrate_appearances": "textures_content", - "potcrate_textures_specific": [ - "major", - "bosskeys", - "keys", - "tokens", - "hearts" - ], + "correct_potcrate_appearances": "off", + "potcrate_textures_specific": [], "soa_unlocks_potcrate_texture": false, "key_appearance_match_dungeon": false, "clearer_hints": true, @@ -370,20 +365,20 @@ "altar", "ganondorf", "warp_songs_and_owls", + "30_skulltulas", "40_skulltulas", - "50_skulltulas", - "unique_merchants" + "50_skulltulas" ], "text_shuffle": "none", "damage_multiplier": "normal", "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", - "ice_trap_appearance": "junk_only", + "ice_trap_appearance": "anything", "adult_trade_shuffle": false, "adult_trade_start": [ "Prescription", diff --git a/version.py b/version.py index 39faa26db..bc3e84a24 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -__version__ = '8.1.94' +__version__ = '8.2.1' # This is a supplemental version number for branches based off of main dev. supplementary_version = 0