Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update weekly preset #2284

Merged
merged 2 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions data/Hints/weekly.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "weekly",
"gui_name": "Weekly",
"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.",
"description": "Hint distribution for the weekly races: 5 Always, 6 Goal, 3 Barren (ToT), 1 Light Arrow (ToT), 2 Dual, 5 Sometimes; House of Skulltula (30/40/50).",
"add_locations": [
{ "location": "Sheik in Kakariko", "types": ["always"] },
{ "location": "Deku Theater Skull Mask", "types": ["always"] }
Expand All @@ -18,19 +18,17 @@
{ "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": "Ice Cavern Iron Boots 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"] },
{ "location": "Water Temple River Loop Chests", "types": ["dual"] },
{ "location": "Spirit Temple Colossus Hands", "types": ["dual"] },
{ "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": "Graveyard Royal Family Tomb Contents", "types": ["dual"] }
],
"add_items": [
{ "item": "Light Arrows", "types": ["named-item"] }
],
"add_items": [],
"remove_items": [
{ "item": "Zeldas Lullaby", "types": ["goal"] }
],
Expand All @@ -39,38 +37,44 @@
"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, "remove_stones": [
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 0, "remove_stones": [
"ToT (Left)",
"ToT (Left-Center)",
"ToT (Right-Center)",
"ToT (Right)"
]},
"goal": {"order": 4, "weight": 0.0, "fixed": 6, "copies": 2, "remove_stones": [
"always": {"order": 2, "weight": 0.0, "fixed": 0, "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": [
"goal": {"order": 3, "weight": 0.0, "fixed": 6, "copies": 2, "remove_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": 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},
"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": 2},
"important_check": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}
"barren": {"order": 4, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [
"ToT (Left)",
"ToT (Left-Center)",
"ToT (Right-Center)"
]},
"named-item": {"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": 5, "copies": 2},
"junk": {"order": 8, "weight": 1.0, "fixed": 0, "copies": 1},
"entrance_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"entrance": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"random": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"dual_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
"important_check": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0}
}
}
16 changes: 7 additions & 9 deletions data/presets_default.json
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,13 @@
"Claim Check"
]
},
"Standard Weekly (2024-07-05)": {
"Standard Weekly (2024-08-23)": {
"aliases": [
"Standard Weekly (Latest)",
"weekly"
],
"show_seed_info": true,
"user_message": "Standard Weekly (2024-07-05)",
"user_message": "Standard Weekly (2024-08-23)",
"world_count": 1,
"create_spoiler": true,
"password_lock": false,
Expand Down Expand Up @@ -440,7 +440,7 @@
"silver_rupee_pouches_choice": "off",
"silver_rupee_pouches": [],
"shuffle_mapcompass": "startwith",
"enhance_map_compass": true,
"enhance_map_compass": false,
"open_forest": "closed_deku",
"open_kakariko": "open",
"open_door_of_time": true,
Expand All @@ -452,12 +452,10 @@
"mq_dungeons_mode": "vanilla",
"mq_dungeons_specific": [],
"mq_dungeons_count": 0,
"empty_dungeons_mode": "rewards",
"empty_dungeons_mode": "none",
"empty_dungeons_specific": [],
"empty_dungeons_rewards": [
"Kokiri Emerald"
],
"empty_dungeons_count": 1,
"empty_dungeons_rewards": [],
"empty_dungeons_count": 2,
"shuffle_interior_entrances": "off",
"shuffle_hideout_entrances": false,
"shuffle_grotto_entrances": false,
Expand Down Expand Up @@ -544,7 +542,7 @@
"big_poe_count": 1,
"easier_fire_arrow_entry": false,
"fae_torch_count": 3,
"ruto_already_f1_jabu": true,
"ruto_already_f1_jabu": false,
"ocarina_songs": "off",
"correct_chest_appearances": "both",
"chest_textures_specific": [
Expand Down
Loading