diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index 650bd1d9..751d748a 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/README.md b/ootrando_overworldmap_hamsda/README.md index 062ac64b..00a82a8a 100644 --- a/ootrando_overworldmap_hamsda/README.md +++ b/ootrando_overworldmap_hamsda/README.md @@ -35,7 +35,7 @@ Some of this functionality might not be immediately obvious: - Right clicking ![Fairy Ocarina](images/fairyocarina.png "Fairy Ocarina")/![Ocarina of Time](images/ocarina.png "Ocarina of Time") will overlay it with ![Scarecrow](images/overlay_scarecrow.png "Scarecrow") indicating that you have confirmed the scarecrow song or started with free scarecrow. Locations that make use of the scarecrow will not show up unless this is turned on. The location of the scarecrow in Lake Hylia will automatically mark this when cleared first as child and then as adult. - ![Triforce Piece](images/triforce_piece.png "Triforce Piece") is used as a counter for Triforce pieces in the Triforce Hunt mode. -## Settings (for map variants) +## Settings (for non Entrance Randomizer variants with a map) There is a variety of toggles available to accomodate the different settings the randomizer offers. The settings are arranged to mimic the current GUI of the randomizer. The default for all of these should match the settings used for the weekly races (check out the OoTR discord for more info). @@ -238,7 +238,9 @@ The entrance randomizer variants are very different from the regular map tracker All locations have a capture spot, where you can mark what is at that location. If the location is useless, just mark off the icon to clean up the map. Later you can see what led where by simply hovering over the locations. -There are two variants, one for keysanity and one without, but none of the items are actually used for "logic" (to show/hide some entrances). +The settings allow you to select which pools are actually shuffled (split based on Dev-R branch, since it is the most popular for ER). If they are not shuffled, the appropriate captures are placed at (almost) all locations and certain locations are hidden since they are useless regardless of any other settings. + +There are two variants, one for keysanity and one without, but none of the items are actually used for "logic" (to show/hide entrances). Additionally there are counters for the useful indoors entrances, so you can evaluate how much focus to put on exploring more entrances: diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md index ddde3e10..a64c504a 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,13 @@ # Changelog +## 2.10.0.0 + +- removed Gossip Stone map +- changed names of most locations based on [this PR](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1021) +- improved ER map: + - added settings back in + - added default captures for non shuffled locations + ## 2.9.6.0 - added Kakariko Gate and Complete Mask Quest settings diff --git a/ootrando_overworldmap_hamsda/images/gossip_stone.png b/ootrando_overworldmap_hamsda/images/gossip_stone.png deleted file mode 100644 index 89b320a7..00000000 Binary files a/ootrando_overworldmap_hamsda/images/gossip_stone.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons.png b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons.png deleted file mode 100644 index 57e797b8..00000000 Binary files a/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_off.png new file mode 100644 index 00000000..47880704 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_off.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_shuffle.png new file mode 100644 index 00000000..36bb0a2e Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_shuffle.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_off.png new file mode 100644 index 00000000..44938b83 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_off.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_shuffle.png new file mode 100644 index 00000000..6abf517f Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_shuffle.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_indoors.png b/ootrando_overworldmap_hamsda/images/setting_entrance_indoors.png deleted file mode 100644 index 54b2049f..00000000 Binary files a/ootrando_overworldmap_hamsda/images/setting_entrance_indoors.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_all.png b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_all.png new file mode 100644 index 00000000..9ca7b658 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_all.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_off.png new file mode 100644 index 00000000..70e0d66d Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_off.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_simple.png b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_simple.png new file mode 100644 index 00000000..3858123c Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_simple.png differ diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_overworld.png b/ootrando_overworldmap_hamsda/images/setting_entrance_overworld.png deleted file mode 100644 index a5ba8a08..00000000 Binary files a/ootrando_overworldmap_hamsda/images/setting_entrance_overworld.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/items/options_entrance.json b/ootrando_overworldmap_hamsda/items/options_entrance.json new file mode 100644 index 00000000..97db3e3e --- /dev/null +++ b/ootrando_overworldmap_hamsda/items/options_entrance.json @@ -0,0 +1,60 @@ +[ + { + "name": "Shuffle Interior Entrances", + "type": "progressive", + "allow_disabled": false, + "loop": true, + "initial_stage_idx": 2, + "stages": [ + { + "img": "images/setting_entrance_interiors_off.png", + "codes": "setting_entrance_interiors,setting_entrance_interiors_off" + }, + { + "img": "images/setting_entrance_interiors_simple.png", + "codes": "setting_entrance_interiors,setting_entrance_interiors_simple", + "inherits_codes": false + }, + { + "img": "images/setting_entrance_interiors_all.png", + "codes": "setting_entrance_interiors_all" + } + ] + }, + { + "name": "Shuffle Grotto Entrances", + "type": "progressive", + "allow_disabled": false, + "loop": true, + "initial_stage_idx": 1, + "stages": [ + { + "img": "images/setting_entrance_grottos_off.png", + "codes": "setting_entrance_grottos,setting_entrance_grottos_off" + }, + { + "img": "images/setting_entrance_grottos_shuffle.png", + "codes": "setting_entrance_grottos,setting_entrance_grottos_shuffle", + "inherits_codes": false + } + ] + }, + { + "name": "Shuffle Dungeon Entrances", + "type": "progressive", + "allow_disabled": false, + "loop": true, + "initial_stage_idx": 1, + "stages": [ + { + "img": "images/setting_entrance_dungeons_off.png", + "codes": "setting_entrance_dungeons,setting_entrance_dungeons_off" + }, + { + "img": "images/setting_entrance_dungeons_shuffle.png", + "codes": "setting_entrance_dungeons,setting_entrance_dungeons_shuffle", + "inherits_codes": false + } + ] + } +] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/layouts/layouts.json b/ootrando_overworldmap_hamsda/layouts/layouts.json index 775b15d0..210f682e 100644 --- a/ootrando_overworldmap_hamsda/layouts/layouts.json +++ b/ootrando_overworldmap_hamsda/layouts/layouts.json @@ -82,16 +82,6 @@ } ] } - }, - { - "title": "Gossip Stones", - "icon": "images/gossip_stone.png", - "content": { - "type": "map", - "maps": [ - "gossips" - ] - } } ] }, @@ -202,16 +192,6 @@ "adult" ] } - }, - { - "title": "Gossip Stones", - "icon": "images/gossip_stone.png", - "content": { - "type": "map", - "maps": [ - "gossips" - ] - } } ] } diff --git a/ootrando_overworldmap_hamsda/layouts/layouts_entrance.json b/ootrando_overworldmap_hamsda/layouts/layouts_entrance.json index b37b6901..30b6c9ac 100644 --- a/ootrando_overworldmap_hamsda/layouts/layouts_entrance.json +++ b/ootrando_overworldmap_hamsda/layouts/layouts_entrance.json @@ -16,6 +16,12 @@ "type": "group", "header": "Items", "dock": "top", + "header_content": { + "type": "button_popup", + "style": "settings", + "popup_background": "#FF212121", + "layout": "options_popup" + }, "content": { "type": "layout", "key": "item_grid_tall" @@ -113,6 +119,12 @@ "type": "group", "header": "Items", "dock": "top", + "header_content": { + "type": "button_popup", + "style": "settings", + "popup_background": "#FF212121", + "layout": "options_popup" + }, "content": { "type": "layout", "key": "item_grid_wide" diff --git a/ootrando_overworldmap_hamsda/layouts/options_entrance.json b/ootrando_overworldmap_hamsda/layouts/options_entrance.json index f19d73ba..117e6c17 100644 --- a/ootrando_overworldmap_hamsda/layouts/options_entrance.json +++ b/ootrando_overworldmap_hamsda/layouts/options_entrance.json @@ -1,35 +1,22 @@ { - "options_tall": { - "type": "itemgrid", - "h_alignment": "left", - "item_margin": "1,2", - "rows": [ - [ - "setting_entrance", - "", - "", - "", - "", - "" - ] - ] - }, - "options_wide": { - "type": "itemgrid", - "h_alignment": "left", - "item_margin": "1,2", - "rows": [ - [ - "setting_entrance", - "", - "", - "", - "", - "", - "", - "", - "" - ] + "options_popup": { + "type": "tabbed", + "tabs": [ + { + "title": "Main Rules", + "content": { + "type": "itemgrid", + //"h_alignment": "left", + "item_margin": "1,2", + "rows": [ + [ + "setting_entrance_interiors", + "setting_entrance_grottos", + "setting_entrance_dungeons" + ] + ] + } + } ] } } \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq.json b/ootrando_overworldmap_hamsda/locations/dung_mq.json index f26b4ce1..a4d57e0e 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_mq.json +++ b/ootrando_overworldmap_hamsda/locations/dung_mq.json @@ -55,14 +55,14 @@ "item_count": 1 }, { - "name": "Lobby Chest", + "name": "Map Chest", "short_name": "Map", "chest_unopened_img": "images/chest_brown_map.png", "item_count": 1 }, { - "name": "GS8 - Lobby", - "short_name": "Map", + "name": "GS Lobby", + "short_name": "Lobby", "access_rules": [ "$can_child_attack" ], @@ -82,7 +82,7 @@ "item_count": 1 }, { - "name": "Slingshot Room Back", + "name": "Slingshot Room Back Chest", "short_name": "Slingshot Back", "access_rules": [ "sticks", @@ -100,7 +100,7 @@ "item_count": 1 }, { - "name": "GS9 - Compass Room", + "name": "GS Compass Room", "short_name": "Compass", "access_rules": [ "@Deku Tree MQ/Compass Room,boomerang,bombs,ocarina,time", @@ -117,7 +117,8 @@ "item_count": 1 }, { - "name": "Basement", + "name": "Basement Chest", + "short_name": "Basement", "access_rules": [ "sticks", "dinsfire,magic" @@ -143,7 +144,7 @@ "item_count": 1 }, { - "name": "GS10 - Basement Ceiling", + "name": "GS Basement Graves Room", "short_name": "Ceiling", "access_rules": [ "@Deku Tree MQ/Basement Back Room,boomerang,ocarina,time", @@ -159,7 +160,7 @@ "item_count": 1 }, { - "name": "GS11 - Basement Back Room", + "name": "GS Basement Back Room", "short_name": "Back Room", "access_rules": [ "@Deku Tree MQ/Basement Back Room,sticks,boomerang", @@ -176,8 +177,7 @@ "item_count": 1 }, { - "name": "Deku Scrub Deku Shield", - "short_name": "Basement", + "name": "Deku Scrub", "access_rules": [ "@Deku Tree MQ/Basement Ledge,nuts", "@Deku Tree MQ/Basement Ledge,shield1", @@ -290,7 +290,7 @@ "item_count": 1 }, { - "name": "GS41 - Scrub Room", + "name": "GS Scrub Room", "short_name": "Scrub", "access_rules": [ "@Dodongos Cavern MQ/Bomb Bag Area,$has_age|child,sling,boomerang,lift1", @@ -315,7 +315,7 @@ "item_count": 1 }, { - "name": "Deku Scrub Red Potion", + "name": "Deku Scrub Side Room Near Lower Lizalfos", "short_name": "East Side", "access_rules": [ "@Dodongos Cavern MQ/Lower Right Side,$can_stun_deku" @@ -341,7 +341,7 @@ "item_count": 1 }, { - "name": "GS40 - Lizalfos Room", + "name": "GS Lizalfos Room", "short_name": "Lizalfos", "access_rules": [ "@Dodongos Cavern MQ/Lobby,$can_blast" @@ -354,8 +354,8 @@ "item_count": 1 }, { - "name": "Larva Room Chest", - "short_name": "Larva", + "name": "Larvae Room Chest", + "short_name": "Larvae", "access_rules": [ "@Dodongos Cavern MQ/Lobby,$has_fire", "@Dodongos Cavern MQ/Lobby,$has_age|child,sticks,$has_explosives", @@ -364,10 +364,10 @@ "item_count": 1 }, { - "name": "GS39 - Larva Room", - "short_name": "Larva", + "name": "GS Larvae Room", + "short_name": "Larvae", "access_rules": [ - "@Dodongos Cavern MQ/Larva Room Chest" + "@Dodongos Cavern MQ/Larvae Room Chest" ], "visibility_rules": [ "setting_tokens_dungeons" @@ -388,7 +388,7 @@ "item_count": 1 }, { - "name": "Deku Scrub Deku Shield", + "name": "Deku Scrub Staircase", "short_name": "Above Stairs", "access_rules": [ "@Dodongos Cavern MQ/Lobby,$can_stun_deku" @@ -401,7 +401,7 @@ "item_count": 1 }, { - "name": "GS38 - Song of Time Block Room", + "name": "GS Song of Time Block Room", "short_name": "Song of Time", "access_rules": [ "@Dodongos Cavern MQ/Lobby,ocarina,time,$can_child_attack", @@ -415,8 +415,8 @@ "item_count": 1 }, { - "name": "Deku Sticks / Deku Seeds", - "short_name": "Main Room", + "name": "Deku Scrubs Lobby", + "short_name": "Lobby", "access_rules": [ "@Dodongos Cavern MQ/Lobby,$can_stun_deku" ], @@ -429,7 +429,7 @@ "item_count": 2 }, { - "name": "GS42 - Back Area", + "name": "GS Back Area", "short_name": "Back Area", "access_rules": [ "@Dodongos Cavern MQ/Boss Area" @@ -442,14 +442,16 @@ "item_count": 1 }, { - "name": "Under Grave", + "name": "Under Grave Chest", + "short_name": "Under Grave", "access_rules": [ "@Dodongos Cavern MQ/Boss Area" ], "item_count": 1 }, { - "name": "Above Boss", + "name": "Boss Room Chest", + "short_name": "Boss Room", "access_rules": [ "@Dodongos Cavern MQ/Boss Area" ], @@ -542,8 +544,8 @@ "item_count": 1 }, { - "name": "Entry Side Chest", - "short_name": "Entry", + "name": "First Room Side Chest", + "short_name": "First Room", "access_rules": [ "sling" ], @@ -583,7 +585,7 @@ "item_count": 2 }, { - "name": "GS51 - Boomerang Room", + "name": "GS Boomerang Chest Room", "short_name": "Boomerang", "access_rules": [ "@Jabu Jabus Belly MQ/Main,ocarina,time", @@ -605,7 +607,7 @@ "item_count": 1 }, { - "name": "GS52 - Tailpasaran Room", + "name": "GS Tailpasaran Room", "short_name": "Tailpasaran", "access_rules": [ "@Jabu Jabus Belly MQ/Depths,sticks", @@ -619,7 +621,7 @@ "item_count": 1 }, { - "name": "GS53 - Invisible Enemies Room", + "name": "GS Invisible Enemies Room", "short_name": "Invis Enemies", "access_rules": [ "@Jabu Jabus Belly MQ/Depths,[logic_lens_jabu_mq]", @@ -655,7 +657,7 @@ "item_count": 1 }, { - "name": "GS54 - Near Boss", + "name": "GS Near Boss", "short_name": "Near Boss", "access_rules": [ "@Jabu Jabus Belly MQ/Boss Area" @@ -718,7 +720,7 @@ "item_count": 1 }, { - "name": "Freestanding HP", + "name": "Freestanding PoH", "short_name": "Frozen HP", "access_rules": [ "$has_explosives", @@ -730,7 +732,7 @@ "item_count": 1 }, { - "name": "GS70 - Red Ice", + "name": "GS Red Ice", "short_name": "Red Ice", "access_rules": [ "ocarina,time" @@ -743,7 +745,7 @@ "item_count": 1 }, { - "name": "GS71 - Scarecrow", + "name": "GS Scarecrow", "short_name": "Scarecrow", "access_rules": [ "hookshot,ocarina,scarecrow", @@ -758,7 +760,7 @@ "item_count": 1 }, { - "name": "GS72 - Ice Block", + "name": "GS Ice Block", "short_name": "Ice Block", "visibility_rules": [ "setting_tokens_dungeons" @@ -774,7 +776,7 @@ }, { "name": "Sheik in Ice Cavern", - "short_name": "Sheik", + "short_name": "Song", "access_rules": [ "$has_bottle", "{$hintable}" @@ -925,7 +927,7 @@ "item_count": 1 }, { - "name": "First Chest", + "name": "First Room Chest", "short_name": "Tree", "access_rules": [ "$has_age|adult" @@ -934,7 +936,7 @@ "item_count": 1 }, { - "name": "GS60 - First Hallway", + "name": "GS First Hallway", "short_name": "First Hallway", "access_rules": [ "$has_age|adult,hookshot" @@ -947,7 +949,7 @@ "item_count": 1 }, { - "name": "Chest Behind Lobby", + "name": "Wolfos Chest", "short_name": "Wolfos", "access_rules": [ "@Forest Temple MQ/Central Area,ocarina,time", @@ -957,7 +959,7 @@ "item_count": 1 }, { - "name": "GS63 - Outdoor East", + "name": "GS Raised Island Courtyard", "short_name": "Outdoor East", "access_rules": [ "@Forest Temple MQ/NE Outdoors,hookshot" @@ -970,7 +972,7 @@ "item_count": 1 }, { - "name": "NE Outdoors Upper Chest", + "name": "Raised Island Courtyard Upper Chest", "short_name": "Balcony", "access_rules": [ "@Forest Temple MQ/Outdoors Top Ledges" @@ -988,7 +990,7 @@ "item_count": 1 }, { - "name": "GS64 - Well", + "name": "GS Well", "short_name": "Well", "access_rules": [ "@Forest Temple MQ/NE Outdoors,ironboots,hookshot", @@ -1002,7 +1004,7 @@ "item_count": 1 }, { - "name": "GS62 - Outdoor West", + "name": "GS Level Island Courtyard", "short_name": "Outdoor West", "access_rules": [ "@Forest Temple MQ/NW Outdoors" @@ -1015,7 +1017,7 @@ "item_count": 1 }, { - "name": "GS61 - Block Push Room", + "name": "GS Block Push Room", "short_name": "Block Push", "access_rules": [ "@Forest Temple MQ/Central Area" @@ -1073,7 +1075,7 @@ "item_count": 1 }, { - "name": "Falling Room Chest", + "name": "Falling Ceiling Room Chest", "short_name": "Checkerboard", "access_rules": [ "@Forest Temple MQ/Falling Room" @@ -1081,7 +1083,7 @@ "item_count": 1 }, { - "name": "NE Outdoors Lower Chest", + "name": "Raised Island Courtyard Lower Chest", "short_name": "Island", "access_rules": [ "@Forest Temple MQ/NE Outdoors Ledge" @@ -1090,7 +1092,7 @@ "item_count": 1 }, { - "name": "Near Boss Chest", + "name": "Basement Chest", "short_name": "Basement", "access_rules": [ "@Forest Temple MQ/Boss Region" @@ -1194,7 +1196,7 @@ "item_count": 1 }, { - "name": "Chest Near Boss", + "name": "Near Boss Chest", "short_name": "Near Boss", "access_rules": [ "$FTR_or_goron,$has_fire,hoverboots", @@ -1209,7 +1211,7 @@ "item_count": 1 }, { - "name": "Entrance Hallway Small Chest", + "name": "Map Room Side Chest", "short_name": "Like Like", "access_rules": [ "$has_age|adult" @@ -1234,7 +1236,7 @@ "item_count": 1 }, { - "name": "Big Lava Room Bombable Chest", + "name": "Big Lava Room Blocked Door Chest", "short_name": "Lava Room Bombable", "access_rules": [ "@Fire Temple MQ/Big Lava Room,$has_fire,$has_explosives,hookshot", @@ -1256,7 +1258,7 @@ "item_count": 1 }, { - "name": "GS65 - Big Lava Room", + "name": "GS Big Lava Room Open Door", "short_name": "Lava Room", "access_rules": [ "@Fire Temple MQ/Big Lava Room" @@ -1269,7 +1271,7 @@ "item_count": 1 }, { - "name": "Maze Lower Chest", + "name": "Lizalfos Maze Lower Chest", "short_name": "Maze Lower", "access_rules": [ "@Fire Temple MQ/Lower Maze" @@ -1277,7 +1279,7 @@ "item_count": 1 }, { - "name": "Maze Side Room", + "name": "Lizalfos Maze Side Room Chest", "short_name": "Maze Side", "access_rules": [ "@Fire Temple MQ/Lower Maze,$has_explosives,[logic_fire_mq_maze_side_room]", @@ -1287,7 +1289,7 @@ "item_count": 1 }, { - "name": "Maze Upper Chest", + "name": "Lizalfos Maze Upper Chest", "short_name": "Maze Upper", "access_rules": [ "@Fire Temple MQ/Upper Maze" @@ -1304,7 +1306,7 @@ "item_count": 1 }, { - "name": "GS66 - East Tower Top", + "name": "GS Skull On Fire", "short_name": "East Tower Top", "access_rules": [ "@Fire Temple MQ/Upper Maze,ocarina,time", @@ -1318,7 +1320,7 @@ "item_count": 1 }, { - "name": "GS67 - Fire Wall Maze Side Room", + "name": "GS Fire Wall Maze Side Room", "short_name": "Fire Maze Side", "access_rules": [ "@Fire Temple MQ/West Top,ocarina,time", @@ -1333,7 +1335,7 @@ "item_count": 1 }, { - "name": "GS69 - Fire Wall Maze Center", + "name": "GS Fire Wall Maze Center", "short_name": "Fire Maze Center", "access_rules": [ "@Fire Temple MQ/West Top,$has_explosives" @@ -1356,7 +1358,7 @@ "item_count": 1 }, { - "name": "West Tower Top Chest", + "name": "Chest On Fire", "short_name": "West Tower Top", "access_rules": [ "@Fire Temple MQ/West Top,fire_small_keys:3,[fire_small_keys:4]", @@ -1367,7 +1369,7 @@ "item_count": 1 }, { - "name": "GS68 - Above Fire Wall Maze", + "name": "GS Above Fire Wall Maze", "short_name": "Above Fire Maze", "access_rules": [ "@Fire Temple MQ/West Top,fire_small_keys:4,[fire_small_keys:5]", @@ -1481,7 +1483,7 @@ "item_count": 1 }, { - "name": "GS76 - Lizalfos Hallway", + "name": "GS Lizalfos Hallway", "short_name": "Lizalfos", "access_rules": [ "@Water Temple MQ/Lowered Water Levels,dinsfire,magic" @@ -1494,7 +1496,7 @@ "item_count": 1 }, { - "name": "GS77 - Before Upper Water Switch", + "name": "GS Before Upper Water Switch", "short_name": "Before Upper Water Switch", "access_rules": [ "@Water Temple MQ/Lowered Water Levels,longshot" @@ -1508,7 +1510,7 @@ }, { "name": "Central Pillar Chest", - "short_name": "Basement", + "short_name": "Central Pillar", "access_rules": [ "@Water Temple MQ/Dive,[bluetunic],hookshot,bow,firearrow,magic", "@Water Temple MQ/Dive,[bluetunic],hookshot,dinsfire,magic,ocarina,time" @@ -1517,7 +1519,7 @@ "item_count": 1 }, { - "name": "GS75 - Serpent River", + "name": "GS River", "short_name": "River", "access_rules": [ "@Water Temple MQ/Dark Link Region" @@ -1556,7 +1558,7 @@ "item_count": 1 }, { - "name": "GS74 - North Basement", + "name": "GS Freestanding Key Area", "short_name": "North Basement", "access_rules": [ "@Water Temple MQ/Basement Gated Areas,water_small_keys:2,hoverboots", @@ -1573,7 +1575,7 @@ "item_count": 1 }, { - "name": "GS73 - South Basement", + "name": "GS Triple Wall Torch", "short_name": "South Basement", "access_rules": [ "@Water Temple MQ/Basement Gated Areas,bow,firearrow,magic,hoverboots", @@ -1774,7 +1776,7 @@ "item_count": 1 }, { - "name": "GS81 - Crusher Room", + "name": "GS Falling Spikes Room", "short_name": "Crusher", "access_rules": [ "@Shadow Temple MQ/Lower Huge Pit,hookshot", @@ -1828,7 +1830,7 @@ "item_count": 1 }, { - "name": "GS82 - Wind Hint Room", + "name": "GS Wind Hint Room", "short_name": "Wind Hint", "access_rules": [ "@Shadow Temple MQ/Wind Tunnel" @@ -1849,7 +1851,7 @@ "item_count": 2 }, { - "name": "GS83 - After Wind", + "name": "GS After Wind", "short_name": "After Wind", "access_rules": [ "@Shadow Temple MQ/Wind Tunnel" @@ -1862,7 +1864,7 @@ "item_count": 1 }, { - "name": "GS84 - After Ship", + "name": "GS After Ship", "short_name": "After Ship", "access_rules": [ "@Shadow Temple MQ/Beyond Boat" @@ -1913,7 +1915,7 @@ "item_count": 1 }, { - "name": "GS85 - Near Boss", + "name": "GS Near Boss", "short_name": "Near Boss", "access_rules": [ "@Shadow Temple MQ/Beyond Boat,bow", @@ -2061,7 +2063,7 @@ "item_count": 1 }, { - "name": "Child Left Chest", + "name": "Map Room Enemy Chest", "short_name": "Child Left", "access_rules": [ "@Spirit Temple MQ/Child,$has_bombchus,sling,dinsfire,magic,sticks", @@ -2082,8 +2084,8 @@ "item_count": 1 }, { - "name": "Child Center Chest", - "short_name": "Child Center", + "name": "Child Hammer Switch Chest", + "short_name": "Hammer Switch", "access_rules": [ "@Spirit Temple MQ/Child,@Spirit Temple MQ/Adult,spirit_small_keys:2,[spirit_small_keys:7],hammer", "{$hintable}" @@ -2124,7 +2126,7 @@ "item_count": 1 }, { - "name": "GS96 - Sun Block Room", + "name": "GS Sun Block Room", "short_name": "Sun Block", "access_rules": [ "@Spirit Temple MQ/Shared,[logic_spirit_mq_sun_block_gs],ocarina,time,boomerang", @@ -2166,7 +2168,7 @@ "item_count": 1 }, { - "name": "Lower NE Main Room Chest", + "name": "Statue Room Lullaby Chest", "short_name": "Statue Boxes", "access_rules": [ "@Spirit Temple MQ/Adult,ocarina,lullaby" @@ -2174,7 +2176,7 @@ "item_count": 1 }, { - "name": "Upper NE Main Room Chest", + "name": "Statue Room Invisible Chest", "short_name": "Statue Ledge", "access_rules": [ "@Spirit Temple MQ/Adult,[logic_lens_spirit_mq]", @@ -2183,16 +2185,16 @@ "item_count": 1 }, { - "name": "Lower Adult Left Chest", - "short_name": "Adult Left", + "name": "Leever Room Chest", + "short_name": "Leever", "access_rules": [ "@Spirit Temple MQ/Lower Adult" ], "item_count": 1 }, { - "name": "GS97 - Lower Adult Left", - "short_name": "Adult Left", + "name": "GS Leever Room", + "short_name": "Leever", "access_rules": [ "@Spirit Temple MQ/Lower Adult" ], @@ -2204,8 +2206,8 @@ "item_count": 1 }, { - "name": "Lower Adult Right Chest", - "short_name": "Adult Right", + "name": "Symphony Room Chest", + "short_name": "Symphony", "access_rules": [ "@Spirit Temple MQ/Lower Adult,spirit_small_keys:1,[spirit_small_keys:7],hammer,ocarina,time,epona,sun,storm,lullaby", "{$hintable}" @@ -2214,8 +2216,8 @@ "item_count": 1 }, { - "name": "GS98 - Lower Adult Right", - "short_name": "Adult Right", + "name": "GS Symphony Room", + "short_name": "Symphony", "access_rules": [ "@Spirit Temple MQ/Lower Adult,spirit_small_keys:1,[spirit_small_keys:7],hammer,ocarina,time,epona,sun,storm,lullaby", "{$hintable}" @@ -2246,8 +2248,8 @@ "item_count": 1 }, { - "name": "Ice Trap Chest", - "short_name": "Ice Trap", + "name": "Chest Switch Chest", + "short_name": "Chest Switch", "access_rules": [ "@Spirit Temple MQ/Adult,spirit_small_keys:1,[spirit_small_keys:5],ocarina,time" ], @@ -2273,7 +2275,7 @@ "item_count": 1 }, { - "name": "GS99 - Iron Knuckle North", + "name": "GS Nine Thrones Room North", "short_name": "Iron Knuckle 1", "access_rules": [ "@Spirit Temple MQ/Adult,spirit_small_keys:3,[spirit_small_keys:7]" @@ -2286,7 +2288,7 @@ "item_count": 1 }, { - "name": "GS100 - Iron Knuckle West", + "name": "GS Nine Thrones Room West", "short_name": "Iron Knuckle 2", "access_rules": [ "@Spirit Temple MQ/Adult,spirit_small_keys:3,[spirit_small_keys:7]" @@ -2358,7 +2360,7 @@ "item_count": 1 }, { - "name": "GS78 - West Inner Room", + "name": "GS West Inner Room", "short_name": "West Inner", "access_rules": [ "$can_child_attack,ocarina,lullaby", @@ -2373,7 +2375,7 @@ }, { "name": "East Inner Room Freestanding Key", - "short_name": "Inner Key", + "short_name": "East Inner", "access_rules": [ "$has_explosives", "ocarina,lullaby" @@ -2406,7 +2408,7 @@ "item_count": 1 }, { - "name": "Lens Chest", + "name": "Lens of Truth Chest", "short_name": "Lens", "access_rules": [ "$has_explosives,botw_small_keys:1,[botw_small_keys:2]" @@ -2414,7 +2416,7 @@ "item_count": 1 }, { - "name": "GS79 - Basement", + "name": "GS Basement", "short_name": "Basement", "access_rules": [ "$can_child_attack" @@ -2427,7 +2429,7 @@ "item_count": 1 }, { - "name": "GS80 - Coffin Room", + "name": "GS Coffin Room", "short_name": "Coffin", "access_rules": [ "$can_child_attack,botw_small_keys:1,[botw_small_keys:2]" @@ -2477,7 +2479,7 @@ "item_count": 1 }, { - "name": "Forest Trial First Chest", + "name": "Forest Trial Eye Switch Chest", "short_name": "Forest Trial 1", "access_rules": [ "bow" @@ -2485,7 +2487,7 @@ "item_count": 1 }, { - "name": "Forest Trial Second Chest", + "name": "Forest Trial Frozen Eye Switch Chest", "short_name": "Forest Trial 2", "access_rules": [ "$has_fire" @@ -2523,7 +2525,7 @@ "hosted_item": "trial_water" }, { - "name": "Shadow Trial First Chest", + "name": "Shadow Trial Bomb Flower Chest", "short_name": "Shadow Trial 1", "access_rules": [ "bow,hookshot", @@ -2538,7 +2540,7 @@ "item_count": 1 }, { - "name": "Shadow Trial Second Chest", + "name": "Shadow Trial Eye Switch Chest", "short_name": "Shadow Trial 2", "access_rules": [ "bow,[logic_lens_castle_mq],hoverboots", @@ -2611,7 +2613,7 @@ "item_count": 1 }, { - "name": "Spirit Trial Second Chest", + "name": "Spirit Trial Invisible Chest", "short_name": "Spirit Trial 2", "access_rules": [ "@Ganons Castle MQ/Spirit Trial First Chest,$has_bombchus,[logic_lens_castle_mq]", @@ -2654,7 +2656,8 @@ "item_count": 5 }, { - "name": "Castle Tower", + "name": "Ganons Tower Boss Key Chest", + "short_name": "Boss Key", "access_rules": [ "$trials_barrier_dispelled" ], diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg.json b/ootrando_overworldmap_hamsda/locations/dung_reg.json index 97ae51b3..74414b42 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_reg.json +++ b/ootrando_overworldmap_hamsda/locations/dung_reg.json @@ -8,13 +8,13 @@ ], "sections": [ { - "name": "Lobby Chest", + "name": "Map Chest", "short_name": "Map", "chest_unopened_img": "images/chest_brown_map.png", "item_count": 1 }, { - "name": "Slingshot Room", + "name": "Slingshot Room Chests", "short_name": "Slingshot", "access_rules": [ "shield1" @@ -22,13 +22,13 @@ "item_count": 2 }, { - "name": "Compass Room", + "name": "Compass Room Chests", "short_name": "Compass", "chest_unopened_img": "images/chest_brown_compass.png", "item_count": 2 }, { - "name": "GS8 - Compass Room", + "name": "GS Compass Room", "short_name": "Compass", "access_rules": [ "$can_child_attack" @@ -50,7 +50,7 @@ "item_count": 1 }, { - "name": "GS9 - Basement Vines", + "name": "GS Basement Vines", "short_name": "Vines", "access_rules": [ "sling", @@ -68,7 +68,7 @@ "item_count": 1 }, { - "name": "GS10 - Basement Gate", + "name": "GS Basement Gate", "short_name": "Gate", "access_rules": [ "$can_child_attack" @@ -81,7 +81,7 @@ "item_count": 1 }, { - "name": "GS11 - Basement Back Room", + "name": "GS Basement Back Room", "short_name": "Back Room", "access_rules": [ "$has_explosives,boomerang,sticks,sling", @@ -195,7 +195,7 @@ "item_count": 1 }, { - "name": "GS38 - East Side Room", + "name": "GS Side Room Near Lower Lizalfos", "short_name": "East Side", "access_rules": [ "@Dodongos Cavern/Lobby,$has_explosives", @@ -213,7 +213,7 @@ "item_count": 1 }, { - "name": "GS42 - Scarecrow", + "name": "GS Scarecrow", "short_name": "Scarecrow", "access_rules": [ "@Dodongos Cavern/Lobby,$has_age|adult,ocarina,scarecrow,hookshot", @@ -230,7 +230,7 @@ "item_count": 1 }, { - "name": "Deku Scrub Deku Sticks", + "name": "Deku Scrub Side Room Near Dodongos", "short_name": "East Side", "access_rules": [ "@Dodongos Cavern/Lobby,$has_age|adult", @@ -256,7 +256,7 @@ "item_count": 1 }, { - "name": "Deku Scrub Deku Shield", + "name": "Deku Scrub Lobby", "short_name": "Lobby", "access_rules": [ "@Dodongos Cavern/Lobby" @@ -282,7 +282,7 @@ "item_count": 1 }, { - "name": "GS41 - Alcove Above Stairs", + "name": "GS Alcove Above Stairs", "short_name": "Above Stairs", "access_rules": [ "@Dodongos Cavern/Far Bridge,$has_age|child,boomerang,$has_explosives", @@ -303,7 +303,7 @@ "item_count": 1 }, { - "name": "GS39 - Vines Above Stairs", + "name": "GS Vines Above Stairs", "short_name": "Vines", "access_rules": [ "@Dodongos Cavern/Climb" @@ -316,7 +316,7 @@ "item_count": 1 }, { - "name": "Bomb Flower Platform", + "name": "Bomb Flower Platform Chest", "short_name": "Bomb Flower", "access_rules": [ "@Dodongos Cavern/Climb" @@ -324,8 +324,8 @@ "item_count": 1 }, { - "name": "Deku Scrub Deku Seeds / Deku Nuts", - "short_name": "Near Bombs", + "name": "Deku Scrubs Near Bomb Bag", + "short_name": "Near Bomb Bag", "access_rules": [ "@Dodongos Cavern/Climb,$can_blast" ], @@ -354,7 +354,7 @@ "item_count": 1 }, { - "name": "GS40 - Back Room", + "name": "GS Back Room", "short_name": "Back Room", "access_rules": [ "@Dodongos Cavern/Boss Area" @@ -367,8 +367,8 @@ "item_count": 1 }, { - "name": "Chest Above King Dodongo", - "short_name": "Above Boss", + "name": "Boss Room Chest", + "short_name": "Boss Room", "access_rules": [ "@Dodongos Cavern/Boss Area" ], @@ -454,7 +454,7 @@ "item_count": 1 }, { - "name": "GS51 - Water Switch Room", + "name": "GS Water Switch Room", "short_name": "Water Switch", "access_rules": [ "@Jabu Jabus Belly/Main" @@ -467,8 +467,7 @@ "item_count": 1 }, { - "name": "Deku Nuts", - "short_name": "B1 Dive", + "name": "Deku Scrub", "access_rules": [ "@Jabu Jabus Belly/Main" ], @@ -506,7 +505,7 @@ "item_count": 1 }, { - "name": "GS52 - Lobby Basement Lower", + "name": "GS Lobby Basement Lower", "short_name": "Basement 1", "access_rules": [ "@Jabu Jabus Belly/Main,boomerang", @@ -522,7 +521,7 @@ "item_count": 1 }, { - "name": "GS53 - Lobby Basement Upper", + "name": "GS Lobby Basement Upper", "short_name": "Basement 2", "access_rules": [ "@Jabu Jabus Belly/Main,boomerang", @@ -538,7 +537,7 @@ "item_count": 1 }, { - "name": "GS54 - Near Boss", + "name": "GS Near Boss", "short_name": "Near Boss", "access_rules": [ "@Jabu Jabus Belly/Boss Area" @@ -581,7 +580,7 @@ ], "sections": [ { - "name": "GS71 - Spinning Scythe Room", + "name": "GS Spinning Scythe Room", "short_name": "Spinning Scythe", "access_rules": [ "hookshot", @@ -616,7 +615,7 @@ "item_count": 1 }, { - "name": "GS70 - Heart Piece Room", + "name": "GS Heart Piece Room", "short_name": "Compass", "access_rules": [ "hookshot", @@ -632,7 +631,7 @@ "item_count": 1 }, { - "name": "GS72 - Push Block Room", + "name": "GS Push Block Room", "short_name": "Push Block", "access_rules": [ "hookshot", @@ -654,7 +653,7 @@ }, { "name": "Sheik in Ice Cavern", - "short_name": "Sheik", + "short_name": "Song", "access_rules": [ "$has_bottle", "{$hintable}" @@ -795,7 +794,7 @@ "item_count": 1 }, { - "name": "GS60 - First Room", + "name": "GS First Room", "short_name": "First Room", "access_rules": [ "dinsfire,magic", @@ -811,13 +810,13 @@ "item_count": 1 }, { - "name": "First Chest", + "name": "First Room Chest", "short_name": "Tree", "chest_unopened_img": "images/chest_brown_small_key.png", "item_count": 1 }, { - "name": "GS61 - Lobby", + "name": "GS Lobby", "short_name": "Lobby", "access_rules": [ "$has_age|adult,hookshot" @@ -830,7 +829,7 @@ "item_count": 1 }, { - "name": "Chest Behind Lobby", + "name": "First Stalfos Chest", "short_name": "Stalfos", "access_rules": [ "$has_age|adult" @@ -839,7 +838,7 @@ "item_count": 1 }, { - "name": "Outside Hookshot Chest", + "name": "Raised Island Courtyard Chest", "short_name": "Island", "access_rules": [ "@Forest Temple/NE Outdoors,hookshot", @@ -849,8 +848,8 @@ "item_count": 1 }, { - "name": "GS62 - Outdoor East", - "short_name": "Outdoor East", + "name": "GS Raised Island Courtyard", + "short_name": "Island", "access_rules": [ "@Forest Temple/NE Outdoors,hookshot", "@Forest Temple/Falling Room,$has_age|adult,bow", @@ -883,7 +882,7 @@ "item_count": 1 }, { - "name": "GS63 - Outdoor West", + "name": "GS Level Island Courtyard", "short_name": "Outdoor West", "access_rules": [ "@Forest Temple/NW Outdoors,longshot", @@ -899,7 +898,7 @@ "item_count": 1 }, { - "name": "Block Push Chest", + "name": "Eye Switch Chest", "short_name": "Block Push", "access_rules": [ "@Forest Temple/Block Push Room,lift1,$has_age|adult,bow" @@ -954,7 +953,7 @@ "item_count": 1 }, { - "name": "Falling Room Chest", + "name": "Falling Ceiling Room Chest", "short_name": "Checkerboard", "access_rules": [ "@Forest Temple/Falling Room" @@ -962,7 +961,7 @@ "item_count": 1 }, { - "name": "Near Boss Chest", + "name": "Basement Chest", "short_name": "Basement", "access_rules": [ "@Forest Temple/Boss Region" @@ -970,7 +969,7 @@ "item_count": 1 }, { - "name": "GS64 - Basement", + "name": "GS Basement", "short_name": "Basement", "access_rules": [ "@Forest Temple/Boss Region,$has_age|adult,hookshot" @@ -1081,7 +1080,7 @@ "item_count": 1 }, { - "name": "Chest Near Boss", + "name": "Near Boss Chest", "short_name": "Near Boss", "access_rules": [ "$FTR_or_goron" @@ -1090,8 +1089,8 @@ "item_count": 1 }, { - "name": "GS69 - Basement", - "short_name": "Basement", + "name": "GS Boss Key Loop", + "short_name": "Boss Key", "access_rules": [ "@Fire Temple/Boss Key Region" ], @@ -1103,7 +1102,7 @@ "item_count": 1 }, { - "name": "Fire Dancer Chest", + "name": "Flare Dancer Chest", "short_name": "Flare Dancer", "access_rules": [ "@Fire Temple/Boss Key Region" @@ -1121,7 +1120,7 @@ "item_count": 1 }, { - "name": "GS65 - Song of Time Room", + "name": "GS Song of Time Room", "short_name": "Time Block", "access_rules": [ "@Fire Temple/Big Lava Room,$has_age|adult,ocarina,time", @@ -1135,7 +1134,7 @@ "item_count": 1 }, { - "name": "Big Lava Room Open Chest", + "name": "Big Lava Room Lower Open Door Chest", "short_name": "Lava Room Open", "access_rules": [ "@Fire Temple/Big Lava Room" @@ -1144,7 +1143,7 @@ "item_count": 1 }, { - "name": "Big Lava Room Bombable Chest", + "name": "Big Lava Room Blocked Door Chest", "short_name": "Lava Room Bombable", "access_rules": [ "@Fire Temple/Big Lava Room,$has_age|adult,$has_explosives" @@ -1162,7 +1161,7 @@ "item_count": 1 }, { - "name": "Boulder Maze Side Room", + "name": "Boulder Maze Side Room Chest", "short_name": "Boulder Maze Side", "access_rules": [ "@Fire Temple/Maze Lower" @@ -1171,7 +1170,7 @@ "item_count": 1 }, { - "name": "GS66 - Unmarked Bomb Wall", + "name": "GS Boulder Maze", "short_name": "Boulder Maze", "access_rules": [ "@Fire Temple/Maze Lower,$has_explosives" @@ -1203,7 +1202,7 @@ "item_count": 1 }, { - "name": "Boulder Maze Bombable Pit", + "name": "Boulder Maze Shortcut Chest", "short_name": "Shortcut", "access_rules": [ "@Fire Temple/Maze Upper,$has_explosives" @@ -1212,7 +1211,7 @@ "item_count": 1 }, { - "name": "GS67 - East Tower Climb", + "name": "GS Scarecrow Climb", "short_name": "Scarecrow 1", "access_rules": [ "@Fire Temple/East Tower" @@ -1225,7 +1224,7 @@ "item_count": 1 }, { - "name": "GS68 - East Tower Top", + "name": "GS Scarecrow Top", "short_name": "Scarecrow 2", "access_rules": [ "@Fire Temple/East Tower" @@ -1431,7 +1430,7 @@ "item_count": 1 }, { - "name": "GS73 - South Basement", + "name": "GS Behind Gate", "short_name": "South Basement", "access_rules": [ "@Water Temple/Dive,hookshot,$has_explosives,ocarina,lullaby,ironboots", @@ -1468,8 +1467,8 @@ "item_count": 1 }, { - "name": "GS75 - Central Room", - "short_name": "Central Room", + "name": "GS Central Pillar", + "short_name": "Central Pillar", "access_rules": [ "@Water Temple/Middle Water Level,longshot,water_small_keys:1,[water_small_keys:5]", "@Water Temple/Middle Water Level,longshot,bow", @@ -1489,7 +1488,7 @@ }, { "name": "Central Pillar Chest", - "short_name": "Basement", + "short_name": "Central Pillar", "access_rules": [ "@Water Temple/Middle Water Level,ironboots,[bluetunic],hookshot,water_small_keys:1,[water_small_keys:5]", "@Water Temple/Middle Water Level,ironboots,[bluetunic],hookshot,bow", @@ -1499,7 +1498,7 @@ "item_count": 1 }, { - "name": "GS76 - Falling Platform Room", + "name": "GS Falling Platform Room", "short_name": "Platform Room", "access_rules": [ "@Water Temple/Falling Platforms,longshot", @@ -1515,15 +1514,15 @@ "item_count": 1 }, { - "name": "Dark Link Chest", - "short_name": "Dark Link", + "name": "Longshot Chest", + "short_name": "Longshot", "access_rules": [ "@Water Temple/Dark Link Region" ], "item_count": 1 }, { - "name": "GS74 - Serpent River", + "name": "GS River", "short_name": "River", "access_rules": [ "@Water Temple/Dark Link Region,ocarina,time,ironboots", @@ -1562,7 +1561,7 @@ "item_count": 1 }, { - "name": "GS77 - Near Boss Key Chest", + "name": "GS Near Boss Key Chest", "short_name": "Near Boss Key", "access_rules": [ "@Water Temple/North Basement" @@ -1721,7 +1720,7 @@ "item_count": 2 }, { - "name": "GS81 - Like Like Room", + "name": "GS Like Like Room", "short_name": "Like Like", "access_rules": [ "@Shadow Temple/Huge Pit" @@ -1742,7 +1741,7 @@ "item_count": 1 }, { - "name": "GS82 - Crusher Room", + "name": "GS Falling Spikes Room", "short_name": "Crusher", "access_rules": [ "@Shadow Temple/Huge Pit,hookshot", @@ -1793,7 +1792,7 @@ "item_count": 1 }, { - "name": "GS83 - Single Giant Pot", + "name": "GS Single Giant Pot", "short_name": "Single Skull", "access_rules": [ "@Shadow Temple/Huge Pit,shadow_small_keys:2,hookshot,[logic_lens_shadow_back]", @@ -1824,7 +1823,7 @@ "item_count": 2 }, { - "name": "GS84 - Near Ship", + "name": "GS Near Ship", "short_name": "Near Boat", "access_rules": [ "@Shadow Temple/Wind Tunnel,shadow_small_keys:4,longshot", @@ -1857,7 +1856,7 @@ "item_count": 1 }, { - "name": "GS85 - Triple Giant Pot", + "name": "GS Triple Giant Pot", "short_name": "Triple Skull", "access_rules": [ "@Shadow Temple/Beyond Boat" @@ -1870,7 +1869,7 @@ "item_count": 1 }, { - "name": "Hidden Floormaster Chest", + "name": "Invisible Floormaster Chest", "short_name": "Floormaster", "access_rules": [ "@Shadow Temple/Beyond Boat", @@ -2015,7 +2014,7 @@ "item_count": 1 }, { - "name": "Child Left Chest", + "name": "Child Bridge Chest", "short_name": "Child Left", "access_rules": [ "@Spirit Temple/Child Back" @@ -2023,7 +2022,7 @@ "item_count": 1 }, { - "name": "Child Right Chest", + "name": "Child Early Torches Chest", "short_name": "Child Right", "access_rules": [ "@Spirit Temple/Child Back,sticks", @@ -2033,7 +2032,7 @@ "item_count": 1 }, { - "name": "GS96 - Metal Fence", + "name": "GS Metal Fence", "short_name": "Metal Fence", "access_rules": [ "@Spirit Temple/Child Back" @@ -2057,7 +2056,7 @@ "item_count": 2 }, { - "name": "GS97 - Bomb for Light Room", + "name": "GS Sun on Floor Room", "short_name": "Child Climb", "access_rules": [ "@Spirit Temple/Child Climb,$has_projectile|both", @@ -2099,7 +2098,7 @@ "item_count": 1 }, { - "name": "GS98 - Hall to West Iron Knuckle", + "name": "GS Hall After Sun Block Room", "short_name": "Before Knuckle", "access_rules": [ "@Spirit Temple/Central Chamber,$has_explosives,boomerang,hookshot", @@ -2149,7 +2148,7 @@ "item_count": 1 }, { - "name": "GS100 - Lobby", + "name": "GS Lobby", "short_name": "Lobby", "access_rules": [ "@Spirit Temple/Central Chamber,$has_explosives,[logic_spirit_lobby_gs],boomerang,$has_age|adult,lift2,hookshot", @@ -2194,7 +2193,7 @@ "item_count": 1 }, { - "name": "GS99 - Boulder Room", + "name": "GS Boulder Room", "short_name": "Boulders", "access_rules": [ "@Spirit Temple/Early Adult Right Chest,ocarina,time", @@ -2217,7 +2216,7 @@ "item_count": 2 }, { - "name": "Statue Hand Chest", + "name": "Statue Room Hand Chest", "short_name": "Statue Hand", "access_rules": [ "@Spirit Temple/Central Chamber,[spirit_small_keys:3],$has_age|adult,lift2,ocarina,lullaby" @@ -2226,11 +2225,11 @@ "item_count": 1 }, { - "name": "NE Main Room Chest", + "name": "Statue Room Northeast Chest", "short_name": "Statue Ledge", "access_rules": [ - "@Spirit Temple/Statue Hand Chest,hookshot", - "@Spirit Temple/Statue Hand Chest,hoverboots" + "@Spirit Temple/Statue Room Hand Chest,hookshot", + "@Spirit Temple/Statue Room Hand Chest,hoverboots" ], "item_count": 1 }, @@ -2321,7 +2320,7 @@ ], "sections": [ { - "name": "Front Left Hidden Wall", + "name": "Front Left Fake Wall Chest", "short_name": "Front Hidden", "access_rules": [ "[logic_lens_botw]", @@ -2331,7 +2330,7 @@ "item_count": 1 }, { - "name": "Right Bottom Hidden Wall", + "name": "Right Bottom Fake Wall Chest", "short_name": "Right Hidden", "access_rules": [ "[logic_lens_botw]", @@ -2341,7 +2340,7 @@ "item_count": 1 }, { - "name": "Center Large Chest", + "name": "Compass Chest", "short_name": "Center Large", "access_rules": [ "[logic_lens_botw]", @@ -2351,7 +2350,7 @@ "item_count": 1 }, { - "name": "Center Small Chest", + "name": "Center Skulltula Chest", "short_name": "Center Small", "access_rules": [ "[logic_lens_botw]", @@ -2360,7 +2359,7 @@ "item_count": 1 }, { - "name": "GS79 - West Inner Room", + "name": "GS West Inner Room", "short_name": "West Inner", "access_rules": [ "botw_small_keys:1,[botw_small_keys:3],boomerang,[logic_lens_botw]", @@ -2377,7 +2376,7 @@ "item_count": 1 }, { - "name": "GS80 - East Inner Room", + "name": "GS East Inner Room", "short_name": "East Inner", "access_rules": [ "botw_small_keys:1,[botw_small_keys:3],boomerang,[logic_lens_botw]", @@ -2394,7 +2393,7 @@ "item_count": 1 }, { - "name": "Locked Pits", + "name": "Fire Keese Chest", "access_rules": [ "botw_small_keys:1,[botw_small_keys:3],[logic_lens_botw]", "botw_small_keys:1,[botw_small_keys:3],$can_use_lens" @@ -2402,19 +2401,19 @@ "item_count": 1 }, { - "name": "Behind Right Grate", + "name": "Like Like Chest", "short_name": "Like Like", "access_rules": [ - "@Bottom of the Well/Locked Pits" + "@Bottom of the Well/Fire Keese Chest" ], "item_count": 1 }, { - "name": "GS78 - Like Like Cage", + "name": "GS Like Like Cage", "short_name": "Like Like", "access_rules": [ - "@Bottom of the Well/Behind Right Grate,boomerang", - "@Bottom of the Well/Behind Right Grate,[logic_botw_cage_gs],$can_child_attack" + "@Bottom of the Well/Like Like Chest,boomerang", + "@Bottom of the Well/Like Like Chest,[logic_botw_cage_gs],$can_child_attack" ], "visibility_rules": [ "setting_tokens_dungeons" @@ -2432,7 +2431,7 @@ "item_count": 1 }, { - "name": "Front Center Bombable", + "name": "Front Center Bombable Chest", "short_name": "Front Bombable", "access_rules": [ "$has_explosives" @@ -2440,7 +2439,7 @@ "item_count": 1 }, { - "name": "Back Left Bombable", + "name": "Back Left Bombable Chest", "short_name": "Back Bombable", "access_rules": [ "$has_explosives,[logic_lens_botw]", @@ -2449,7 +2448,7 @@ "item_count": 1 }, { - "name": "Basement Chest", + "name": "Map Chest", "short_name": "Basement", "access_rules": [ "$has_explosives", @@ -2462,23 +2461,23 @@ "item_count": 1 }, { - "name": "Underwater Front Chest", - "short_name": "Underwater Front", + "name": "Underwater Left Chest", + "short_name": "Underwater Left", "access_rules": [ "ocarina,lullaby" ], "item_count": 1 }, { - "name": "Underwater Left Chest", - "short_name": "Underwater Left", + "name": "Underwater Front Chest", + "short_name": "Underwater Front", "access_rules": [ "ocarina,lullaby" ], "item_count": 1 }, { - "name": "Defeat Boss", + "name": "Lens of Truth Chest", "short_name": "Dead Hand", "access_rules": [ "ocarina,lullaby,sword1", @@ -2553,7 +2552,7 @@ "hosted_item": "trial_water" }, { - "name": "Shadow Trial First Chest", + "name": "Shadow Trial Front Chest", "short_name": "Shadow Trial 1", "access_rules": [ "hookshot", @@ -2564,7 +2563,7 @@ "item_count": 1 }, { - "name": "Shadow Trial Second Chest", + "name": "Shadow Trial Golden Gauntlets Chest", "short_name": "Shadow Trial 2", "access_rules": [ "longshot,hoverboots", @@ -2639,7 +2638,7 @@ "hosted_item": "trial_light" }, { - "name": "Spirit Trial First Chest", + "name": "Spirit Trial Crystal Switch Chest", "short_name": "Spirit Trial 1", "access_rules": [ "[logic_spirit_trial_hookshot]", @@ -2648,7 +2647,7 @@ "item_count": 1 }, { - "name": "Spirit Trial Second Chest", + "name": "Spirit Trial Invisible Chest", "short_name": "Spirit Trial 2", "access_rules": [ "$has_bombchus,[logic_lens_castle],[logic_spirit_trial_hookshot]", @@ -2685,7 +2684,8 @@ "item_count": 4 }, { - "name": "Castle Tower", + "name": "Ganons Tower Boss Key Chest", + "short_name": "Boss Key", "access_rules": [ "$trials_barrier_dispelled" ], @@ -2712,6 +2712,7 @@ "sections": [ { "name": "North F1 Carpenter", + "short_name": "North F1", "access_rules": [ "$has_age|adult" ], @@ -2720,6 +2721,7 @@ }, { "name": "North F2 Carpenter", + "short_name": "North F2", "access_rules": [ "$has_age|adult,$gerudo_card", "$has_age|adult,bow", @@ -2735,6 +2737,7 @@ }, { "name": "South F1 Carpenter", + "short_name": "South F1", "access_rules": [ "$has_age|adult" ], @@ -2746,6 +2749,7 @@ }, { "name": "South F2 Carpenter", + "short_name": "South F2", "access_rules": [ "$has_age|adult" ], @@ -2756,7 +2760,7 @@ "item_count": 1 }, { - "name": "Free the carpenters", + "name": "Gerudo Membership Card", "access_rules": [ "gerudo_fortress_normal,gf_small_keys:4,$has_age|adult,$gerudo_card", "gerudo_fortress_normal,gf_small_keys:4,$has_age|adult,bow", diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index 87ead9e8..23c3f94a 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -12,8 +12,7 @@ "name": "Kokiri Village", "children": [ { - "name": "Kokiri Sword Chest", - "short_name": "Kokiri Sword", + "name": "KF Kokiri Sword Chest", "sections": [ { "name": "Dodge Boulder", @@ -33,10 +32,10 @@ ] }, { - "name": "Mido House", + "name": "KF Midos House", "sections": [ { - "name": "Mido Chests", + "name": "KF Midos Chests", "item_count": 4 } ], @@ -54,14 +53,14 @@ ] }, { - "name": "Kokiri Forest Storms Grotto", - "short_name": "Kokiri Storms Grotto", + "name": "KF Storms Grotto", "access_rules": [ "$hidden_grotto,ocarina,storm" ], "sections": [ { - "name": "Chest", + "name": "KF Storms Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -79,7 +78,7 @@ ] }, { - "name": "Kokiri Shop", + "name": "KF Kokiri Shop", "sections": [ { "name": "Item 1", @@ -122,10 +121,10 @@ ] }, { - "name": "Links House", + "name": "KF Links House", "sections": [ { - "name": "Links House Cow", + "name": "KF Links House Cow", "short_name": "Cow", "access_rules": [ "$has_age|adult,ocarina,epona" @@ -147,10 +146,11 @@ ] }, { - "name": "Know It All House", + "name": "KF Know It All House", "sections": [ { - "name": "GS1 (N)", + "name": "KF GS Know It All House (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs,$can_child_attack,$can_leave_forest", "$has_age|child,$night_gs,$can_child_attack,ocarina,sun" @@ -172,10 +172,11 @@ ] }, { - "name": "Kokiri Bean Patch", + "name": "KF Bean Patch", "sections": [ { - "name": "GS2", + "name": "KF GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$can_child_attack" ], @@ -196,10 +197,11 @@ ] }, { - "name": "House of Twins", + "name": "KF House of Twins", "sections": [ { - "name": "GS3 (N)", + "name": "KF GS House of Twins (N)", + "short_name": "GS", "access_rules": [ "$has_age|adult,$night_gs,hookshot", "$has_age|adult,$night_gs,hoverboots,[logic_adult_kokiri_gs]", //TODO: can be done itemless, no trick yet @@ -222,97 +224,6 @@ "y": 981 } ] - }, - { - "name": "Kokiri Forest Gossip Stone", - "short_name": "Kokiri Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2090, - "y": 845 - } - ] - }, - { - "name": "Kokiri Forest Storms Grotto Gossip Stone", - "short_name": "Kokiri Storms Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "ocarina,storm" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2120, - "y": 845 - } - ] - }, - { - "name": "Deku Tree Gossip Stone (Left)", - "short_name": "DT Gossip Stone (Left)", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2390, - "y": 830 - } - ] - }, - { - "name": "Deku Tree Gossip Stone (Right)", - "short_name": "DT Gossip Stone (Right)", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2490, - "y": 900 - } - ] } ] }, @@ -320,7 +231,7 @@ "name": "Lost Woods", "children": [ { - "name": "Skull Kid", + "name": "LW Skull Kid", "sections": [ { "name": "Play Sarias Song", @@ -351,14 +262,14 @@ ] }, { - "name": "Lost Woods Generic Grotto", - "short_name": "Goron City Grotto", + "name": "LW Near Shortcuts Grotto", + "access_rules": [ + "$can_blast" + ], "sections": [ { - "name": "Blast it", - "access_rules": [ - "$can_blast" - ], + "name": "LW Near Shortcuts Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -376,11 +287,11 @@ ] }, { - "name": "Ocarina Memory Game", + "name": "LW Ocarina Memory Game", "short_name": "Ocarina Game", "sections": [ { - "name": "Repeat", + "name": "ResidentSleeper", "access_rules": [ "$has_age|child,ocarina" ], @@ -396,7 +307,7 @@ ] }, { - "name": "Target in Woods", + "name": "LW Target in Woods", "sections": [ { "name": "Shoot it", @@ -489,11 +400,10 @@ ] }, { - "name": "LW Deku Scrub Deku Stick Upgrade", - "short_name": "Scrub Below Bridge", + "name": "LW Deku Scrub Near Bridge", "sections": [ { - "name": "Pay up", + "name": "Stick upgrade", "access_rules": [ "$has_age|child,$can_child_attack", "$has_age|child,nuts", @@ -513,23 +423,22 @@ ] }, { - "name": "Lost Woods Sales Grotto", - "short_name": "Sales Grotto", + "name": "LW Scrubs Grotto", "access_rules": [ "$has_explosives", "$has_age|adult,hammer,$beyond_mido" ], "sections": [ { - "name": "LW Grotto Deku Scrub Deku Nut Upgrade", - "short_name": "Nut Capacity", + "name": "LW Deku Scrub Grotto Front", + "short_name": "Front", "chest_unopened_img": "images/deku_scrub.png", "chest_opened_img": "images/deku_scrub_grey.png", "item_count": 1 }, { - "name": "LW Grotto Deku Scrub Arrows", - "short_name": "Arrows", + "name": "LW Deku Scrub Grotto Rear", + "short_name": "Rear", "visibility_rules": [ "setting_scrub_shuffle_yes" ], @@ -552,12 +461,15 @@ ] }, { - "name": "LW Deku Scrubs", + "name": "LW Deku Scrubs Near Deku Theater", + "short_name": "LW Deku Scrubs", "sections": [ { "name": "Deku Nuts / Deku Sticks", "access_rules": [ - "$has_age|child,$can_stun_deku" + "$has_age|child,$can_child_attack", + "$has_age|child,nuts", + "$has_age|child,shield1" ], "visibility_rules": [ "setting_scrub_shuffle_yes" @@ -577,11 +489,11 @@ ] }, { - "name": "Lost Woods Bean Patch Near Bridge", - "short_name": "Bean Patch Near Bridge", + "name": "LW Bean Patch Near Bridge", "sections": [ { - "name": "GS4", + "name": "LW GS Bean Patch Near Bridge", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$can_child_attack" ], @@ -602,8 +514,7 @@ ] }, { - "name": "Lost Woods Bean Patch Near Stage", - "short_name": "Bean Patch Near Stage", + "name": "LW Bean Patch Near Theater", "sections": [ { "name": "Plant Bean", @@ -616,10 +527,11 @@ "hosted_item": "bean_stage_yes" }, { - "name": "GS5", + "name": "LW GS Bean Patch Near Theater", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$can_child_attack", - "$has_age|child,$has_bottle,shield1" + "$has_age|child,$has_bottle,shield1,setting_scrub_shuffle_no" ], "visibility_rules": [ "setting_tokens_overworld" @@ -638,14 +550,14 @@ ] }, { - "name": "Lost Woods Above Stage", - "short_name": "Above Stage", + "name": "LW Above Theater", "access_rules": [ "$night_gs,$has_age|adult,$beyond_mido" ], "sections": [ { - "name": "GS6 (N)", + "name": "LW GS Above Theater (N)", + "short_name": "GS", "access_rules": [ "setting_plant_no,beans", "bean_stage_yes", @@ -669,53 +581,6 @@ "y": 740 } ] - }, - { - "name": "Lost Woods Generic Grotto Gossip Stone", - "short_name": "Goron City Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2149, - "y": 776 - } - ] - }, - { - "name": "Lost Woods Gossip Stone", - "short_name": "LW Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2016, - "y": 927 - } - ] } ] }, @@ -723,15 +588,15 @@ "name": "Sacred Forest Meadow", "children": [ { - "name": "Front of Meadow Grotto", - "short_name": "Wolfos Grotto", + "name": "SFM Wolfos Grotto", "access_rules": [ "$hidden_grotto,$has_explosives", "$hidden_grotto,$has_age|adult,hammer,$beyond_mido" ], "sections": [ { - "name": "Kill them", + "name": "SFM Wolfos Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -775,8 +640,7 @@ ] }, { - "name": "Sheik Forest Song", - "short_name": "Sheik in Meadow", + "name": "Sheik in Forest", "sections": [ { "name": "Song", @@ -799,13 +663,14 @@ ] }, { - "name": "Meadow Storms Grotto", + "name": "SFM Storms Grotto", "access_rules": [ "$hidden_grotto,ocarina,storm" ], "sections": [ { - "name": "Deku Scrubs", + "name": "SFM Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "access_rules": [ "$has_age|adult,$beyond_mido", "$has_age|child,minuet,nuts", @@ -839,13 +704,14 @@ ] }, { - "name": "Top of Maze", + "name": "SFM Maze", "access_rules": [ "$night_gs,$has_age|adult,$beyond_mido" ], "sections": [ { - "name": "GS7 (N)", + "name": "SFM GS (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}", @@ -868,51 +734,6 @@ "y": 664 } ] - }, - { - "name": "Sacred Forest Meadow Maze Gossip Stones", - "short_name": "SFM Maze Gossip Stones", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "clear_as_group": false, - "item_count": 2 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2190, - "y": 685 - } - ] - }, - { - "name": "Sacred Forest Meadow Saria Gossip Stone", - "short_name": "SFM Saria Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2130, - "y": 635 - } - ] } ] } @@ -929,11 +750,11 @@ "color": "#09a09d", "children": [ { - "name": "Lost Woods Bridge", + "name": "LW Bridge", "color": "#18a50e", "sections": [ { - "name": "Gift from Saria", + "name": "LW Gift from Saria", "capture_item": true, "item_count": 1 } @@ -952,19 +773,21 @@ ] }, { - "name": "Ocarina of Time", + "name": "HF Ocarina of Time", "access_rules": [ "$has_age|child,stones:3", "{$hintable}" ], "sections": [ { - "name": "Item", + "name": "HF Ocarina of Time Item", + "short_name": "Item", "capture_item": true, "item_count": 1 }, { - "name": "Song", + "name": "Song from Ocarina of Time", + "short_name": "Song", "capture_item": true, "chest_unopened_img": "images/grey_note.png", "chest_opened_img": "images/grey_note_check.png", @@ -980,14 +803,14 @@ ] }, { - "name": "Field North Lon Lon Grotto", - "short_name": "Tektite Grotto", + "name": "HF Tektite Grotto", "access_rules": [ "$hidden_grotto,$can_blast" ], "sections": [ { - "name": "Dive down", + "name": "HF Tektite Grotto Freestanding PoH", + "short_name": "HP", "access_rules": [ "scale2", "$has_age|adult,ironboots", @@ -1013,14 +836,14 @@ ] }, { - "name": "Field Near Lake Inside Fence Grotto", - "short_name": "Grotto Inside Fence", + "name": "HF Inside Fence Grotto", "access_rules": [ "$hidden_grotto,$can_blast" ], "sections": [ { - "name": "Deku Scrub", + "name": "HF Deku Scrub Grotto", + "short_name": "Deku Scrub", "access_rules": [ "$can_stun_deku" ], @@ -1043,11 +866,11 @@ ] }, { - "name": "Field Near Lake Outside Fence Grotto", - "short_name": "Grotto Outside Fence", + "name": "HF Open Grotto", "sections": [ { - "name": "Chest", + "name": "HF Open Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -1065,14 +888,15 @@ ] }, { - "name": "Field West Castle Town Grotto", - "short_name": "Grotto near Bridge", + "name": "HF Near Market Grotto", + "short_name": "Boulda", + "access_rules": [ + "$can_blast" + ], "sections": [ { - "name": "Boulda", - "access_rules": [ - "$can_blast" - ], + "name": "HF Near Market Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -1090,13 +914,14 @@ ] }, { - "name": "Remote Southern Grotto", + "name": "HF Southeast Grotto", + "access_rules": [ + "$can_blast" + ], "sections": [ { - "name": "Blast it", - "access_rules": [ - "$can_blast" - ], + "name": "HF Southeast Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -1136,13 +961,14 @@ ] }, { - "name": "Field Kakariko Grotto", + "name": "HF Near Kak Grotto", "access_rules": [ "$hidden_grotto,$can_blast" ], "sections": [ { - "name": "GS12", + "name": "HF GS Near Kak Grotto", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_explosives,boomerang", "{$has_age|child,$has_explosives,sling}", @@ -1173,13 +999,14 @@ ] }, { - "name": "Field Valley Grotto", + "name": "HF Cow Grotto", "access_rules": [ "$hidden_grotto" ], "sections": [ { - "name": "GS13", + "name": "HF GS Cow Grotto", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_explosives,dinsfire,magic,boomerang", "{$has_age|child,$has_explosives,dinsfire,magic}", @@ -1196,7 +1023,7 @@ "item_count": 1 }, { - "name": "HF Grotto Cow", + "name": "HF Cow Grotto Cow", "short_name": "Cow", "access_rules": [ "$has_age|child,$has_explosives,dinsfire,magic,ocarina,epona", @@ -1223,110 +1050,12 @@ } ] }, - { - "name": "Field Near Lake Outside Fence Grotto Gossip Stone", - "short_name": "Grotto Outside Fence Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1206, - "y": 997 - } - ] - }, - { - "name": "Field West Castle Town Grotto Gossip Stone", - "short_name": "Grotto near Bridge Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1372, - "y": 440 - } - ] - }, - { - "name": "Remote Southern Grotto Gossip Stone", - "short_name": "Open Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1427, - "y": 925 - } - ] - }, - { - "name": "Field Valley Grotto Gossip Stone", - "short_name": "Field Valley Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$has_age|child,$has_explosives,dinsfire,magic", - "$has_age|adult,hammer,$has_fire" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 972, - "y": 658 - } - ] - }, { "name": "Lake Hylia", "color": "#0936a0", "children": [ { - "name": "Underwater Bottle", + "name": "LH Underwater Item", "sections": [ { "name": "Dive down", @@ -1347,7 +1076,7 @@ ] }, { - "name": "Child Fishing", + "name": "LH Child Fishing", "sections": [ { "name": "Bite pls", @@ -1367,7 +1096,7 @@ ] }, { - "name": "Adult Fishing", + "name": "LH Adult Fishing", "sections": [ { "name": "Bite pls", @@ -1391,7 +1120,7 @@ ] }, { - "name": "Lake Hylia Sun", + "name": "LH Sun", "sections": [ { "name": "Shoot it", @@ -1414,11 +1143,10 @@ ] }, { - "name": "Lake Hylia Freestanding PoH", - "short_name": "Lab Tower", + "name": "LH Lab Tower", "sections": [ { - "name": "Freestanding PoH", + "name": "LH Freestanding PoH", "short_name": "HP", "access_rules": [ "$has_age|adult,setting_plant_no,beans", @@ -1439,12 +1167,10 @@ ] }, { - "name": "Lake Hylia Lab", - "short_name": "Lakeside Lab", + "name": "LH Lab", "sections": [ { - "name": "Diving in the Lab", - "short_name": "Dive down", + "name": "LH Lab Dive", "access_rules": [ "scale2", "$has_age|adult,[logic_lab_diving],ironboots,hookshot" @@ -1460,6 +1186,19 @@ "speedfrog" ], "hosted_item": "capture_eyedrops" + }, + { + "name": "LH GS Lab Crate", + "short_name": "GS", + "access_rules": [ + "$has_age|adult,ironboots,hookshot" + ], + "visibility_rules": [ + "setting_tokens_overworld" + ], + "chest_unopened_img": "images/skulltula.png", + "chest_opened_img": "images/skulltula_token.png", + "item_count": 1 } ], "map_locations": [ @@ -1514,11 +1253,11 @@ ] }, { - "name": "Lake Hylia Grotto", - "short_name": "Under Gravestone", + "name": "LH Grotto", "sections": [ { - "name": "Deku Scrubs", + "name": "LH Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "access_rules": [ "$can_stun_deku" ], @@ -1545,7 +1284,7 @@ ] }, { - "name": "Lake Hylia Bean Patch", + "name": "LH Bean Patch", "sections": [ { "name": "Plant Bean", @@ -1558,7 +1297,8 @@ "hosted_item": "bean_lake_yes" }, { - "name": "GS55", + "name": "LH GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$can_child_attack" ], @@ -1579,13 +1319,14 @@ ] }, { - "name": "Lab Wall", + "name": "LH Lab Wall", "access_rules": [ "$has_age|child,$night_gs" ], "sections": [ { - "name": "GS56 (N)", + "name": "LH GS Lab Wall (N)", + "short_name": "GS", "access_rules": [ "boomerang", "[logic_lab_wall_gs],sticks", @@ -1611,10 +1352,11 @@ ] }, { - "name": "Small Island", + "name": "LH Small Island", "sections": [ { - "name": "GS57 (N)", + "name": "LH GS Small Island (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs,$can_child_attack" ], @@ -1635,10 +1377,11 @@ ] }, { - "name": "Giant Tree", + "name": "LH Tree", "sections": [ { - "name": "GS58 (N)", + "name": "LH GS Tree (N)", + "short_name": "GS", "access_rules": [ "$has_age|adult,$night_gs,longshot" ], @@ -1657,97 +1400,6 @@ "y": 1415 } ] - }, - { - "name": "Lab Underwater Crate", - "short_name": "Lab Crate", - "sections": [ - { - "name": "GS59", - "access_rules": [ - "$has_age|adult,ironboots,hookshot" - ], - "visibility_rules": [ - "setting_tokens_overworld" - ], - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 959, - "y": 1229 - } - ] - }, - { - "name": "Lake Hylia Lab Gossip Stone", - "short_name": "LH Lab Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 900, - "y": 1190 - } - ] - }, - { - "name": "Lake Hylia Gossip Stone (Southeast)", - "short_name": "LH Gossip Stone (SE)", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1200, - "y": 1510 - } - ] - }, - { - "name": "Lake Hylia Gossip Stone (Southwest)", - "short_name": "LH Gossip Stone (SW)", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 780, - "y": 1415 - } - ] } ] }, @@ -1778,10 +1430,10 @@ ] }, { - "name": "Talon House", + "name": "LLR Talons House", "sections": [ { - "name": "Talons Chickens", + "name": "LLR Talons Chickens", "access_rules": [ "$has_age|child,postzelda" ], @@ -1797,10 +1449,10 @@ ] }, { - "name": "Corner Tower", + "name": "LLR Tower", "sections": [ { - "name": "Freestanding PoH", + "name": "LLR Freestanding PoH", "short_name": "HP", "access_rules": [ "$has_age|child" @@ -1837,8 +1489,7 @@ ] }, { - "name": "Ingo Barn", - "short_name": "Stables", + "name": "LLR Stables", "sections": [ { "name": "LLR Stables Cows", @@ -1868,10 +1519,11 @@ ] }, { - "name": "Lon Lon Grotto", + "name": "LLR Grotto", "sections": [ { - "name": "Deku Scrubs", + "name": "LLR Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "access_rules": [ "$has_age|child,$can_child_attack", "$has_age|child,nuts", @@ -1895,11 +1547,11 @@ ] }, { - "name": "Lon Lon Ranch Tree", - "short_name": "Lone Tree", + "name": "LLR Tree", "sections": [ { - "name": "GS18", + "name": "LLR GS Tree", + "short_name": "GS", "access_rules": [ "$has_age|child" ], @@ -1920,11 +1572,11 @@ ] }, { - "name": "Lon Lon Ranch Rain Shed", - "short_name": "Rain Shed", + "name": "LLR Rain Shed", "sections": [ { - "name": "GS19 (N)", + "name": "LLR GS Rain Shed (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs" ], @@ -1945,11 +1597,11 @@ ] }, { - "name": "Lon Lon Ranch House Window", - "short_name": "House Window", + "name": "LLR House Window", "sections": [ { - "name": "GS20 (N)", + "name": "LLR GS House Window (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs,boomerang", "{$has_age|child,sling}", @@ -1973,11 +1625,11 @@ ] }, { - "name": "Lon Lon Ranch Back Wall", - "short_name": "Back Wall", + "name": "LLR Back Wall", "sections": [ { - "name": "GS21 (N)", + "name": "LLR GS Back Wall (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs,boomerang", "{$has_age|child,sling}", @@ -2010,14 +1662,14 @@ "color": "#6909a0", "children": [ { - "name": "Kakariko Bombable Grotto", - "short_name": "Center Grotto", + "name": "Kak Redead Grotto", "access_rules": [ "$hidden_grotto,$can_blast" ], "sections": [ { - "name": "Kill them", + "name": "Kak Redead Grotto Chest", + "short_name": "Chest", "access_rules": [ "$has_age|adult", "$has_age|child,sticks", @@ -2041,11 +1693,11 @@ ] }, { - "name": "Kakariko Back Grotto", - "short_name": "Back Grotto", + "name": "Kak Open Grotto", "sections": [ { - "name": "Chest", + "name": "Kak Open Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -2063,17 +1715,17 @@ ] }, { - "name": "Impa House", + "name": "Kak Impas House", "sections": [ { - "name": "Freestanding PoH", + "name": "Kak Impas House Freestanding PoH", "short_name": "HP", "chest_unopened_img": "images/HP.png", "chest_opened_img": "images/HP_grey.png", "item_count": 1 }, { - "name": "Impas House Cow", + "name": "Kak Impas House Cow", "short_name": "Cow", "access_rules": [ "ocarina,epona" @@ -2100,7 +1752,7 @@ ] }, { - "name": "Man on Roof", + "name": "Kak Man on Roof", "sections": [ { "name": "Talk to him", @@ -2125,10 +1777,11 @@ ] }, { - "name": "Kakariko Shooting Gallery", + "name": "Kak Shooting Gallery", "sections": [ { - "name": "Adult Shooting Gallery", + "name": "Kak Shooting Gallery Reward", + "short_name": "Reward", "access_rules": [ "$has_age|adult,bow", "{$hintable}" @@ -2141,47 +1794,30 @@ { "map": "adult", "x": 1837, - "y": 401 - } - ] - }, - { - "name": "Windmill", - "sections": [ - { - "name": "Freestanding PoH", - "short_name": "HP", - "access_rules": [ - "$has_age|child,boomerang", - "$has_age|adult,[logic_windmill_poh]", - "$has_age|adult,ocarina,time", - "{}" - ], - "capture_item": true, - "chest_unopened_img": "images/HP.png", - "chest_opened_img": "images/HP_grey.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "child", - "x": 1935, - "y": 346 - }, - { - "map": "adult", - "x": 1935, - "y": 346 + "y": 401 } ] }, { - "name": "Song at Windmill", - "short_name": "Guru-Guru", + "name": "Kak Windmill", "sections": [ { - "name": "Song", + "name": "Kak Windmill Freestanding PoH", + "short_name": "HP", + "access_rules": [ + "$has_age|child,boomerang", + "$has_age|adult,[logic_windmill_poh]", + "$has_age|adult,ocarina,time", + "{}" + ], + "capture_item": true, + "chest_unopened_img": "images/HP.png", + "chest_opened_img": "images/HP_grey.png", + "item_count": 1 + }, + { + "name": "Song from Windmill", + "short_name": "Guru-Guru", "access_rules": [ "$has_age|adult,ocarina", "{$hintable}" @@ -2193,10 +1829,15 @@ } ], "map_locations": [ + { + "map": "child", + "x": 1935, + "y": 346 + }, { "map": "adult", - "x": 1945, - "y": 376 + "x": 1935, + "y": 346 } ] }, @@ -2224,10 +1865,10 @@ ] }, { - "name": "Anjus Chickens", + "name": "Kak Anju as Child", "sections": [ { - "name": "Catch them", + "name": "Chickens", "access_rules": [ "$has_age|child" ], @@ -2243,7 +1884,7 @@ ] }, { - "name": "Anju as Adult", + "name": "Kak Anju as Adult", "sections": [ { "name": "Talk to her", @@ -2301,7 +1942,7 @@ ] }, { - "name": "Old Hag", + "name": "Kak Odd Medicine Building", "sections": [ { "name": "Give Mushroom", @@ -2323,17 +1964,19 @@ ] }, { - "name": "House of Skulltula", + "name": "Kak House of Skulltula", "sections": [ { - "name": "10 Skulltulas", + "name": "Kak 10 Gold Skulltula Reward", + "short_name": "10 Tokens", "access_rules": [ "skulltula:10" ], "item_count": 1 }, { - "name": "20 Skulltulas", + "name": "Kak 10 Gold Skulltula Reward", + "short_name": "20 Tokens", "access_rules": [ "skulltula:20", "{$hintable}" @@ -2342,7 +1985,8 @@ "item_count": 1 }, { - "name": "30 Skulltulas", + "name": "Kak 10 Gold Skulltula Reward", + "short_name": "30 Tokens", "access_rules": [ "skulltula:30", "{$hintable}" @@ -2351,7 +1995,8 @@ "item_count": 1 }, { - "name": "40 Skulltulas", + "name": "Kak 10 Gold Skulltula Reward", + "short_name": "40 Tokens", "access_rules": [ "skulltula:40", "{$hintable}" @@ -2360,7 +2005,8 @@ "item_count": 1 }, { - "name": "50 Skulltulas", + "name": "Kak 10 Gold Skulltula Reward", + "short_name": "50 Tokens", "access_rules": [ "skulltula:50", "{$hintable}" @@ -2383,7 +2029,7 @@ ] }, { - "name": "Kakariko Potion Shop", + "name": "Kak Potion Shop", "access_rules": [ "$has_age|adult" ], @@ -2421,7 +2067,7 @@ ] }, { - "name": "Kakariko Bazaar", + "name": "Kak Bazaar", "access_rules": [ "$has_age|adult" ], @@ -2459,11 +2105,11 @@ ] }, { - "name": "Kakariko Above Impa's House", - "short_name": "Above Impa's House", + "name": "Kak Above Impas House", "sections": [ { - "name": "GS27 (N)", + "name": "Kak GS Above Impas House (N)", + "short_name": "GS", "access_rules": [ "$has_age|adult,$night_gs,hookshot" ], @@ -2484,11 +2130,11 @@ ] }, { - "name": "Kakariko Tree", - "short_name": "Tree", + "name": "Kak Tree", "sections": [ { - "name": "GS22 (N)", + "name": "Kak GS Tree (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs" ], @@ -2509,11 +2155,11 @@ ] }, { - "name": "Kakariko Skulltula House", - "short_name": "Skulltula House", + "name": "Kak Skulltula House", "sections": [ { - "name": "GS23 (N)", + "name": "Kak GS Skulltula House (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs" ], @@ -2534,11 +2180,11 @@ ] }, { - "name": "Kakariko House Under Construction", - "short_name": "Under Construction", + "name": "Kak House Under Construction", "sections": [ { - "name": "GS24 (N)", + "name": "Kak GS House Under Construction (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs" ], @@ -2559,11 +2205,11 @@ ] }, { - "name": "Kakariko Guard's House", - "short_name": "Bazaar Wall", + "name": "Kak Guards House", "sections": [ { - "name": "GS25 (N)", + "name": "Kak GS Guards House (N)", + "short_name": "GS", "access_rules": [ "$has_age|child,$night_gs" ], @@ -2584,14 +2230,14 @@ ] }, { - "name": "Kakariko Watchtower", - "short_name": "Watchtower", + "name": "Kak Watchtower", "access_rules": [ "$has_age|child,$night_gs" ], "sections": [ { - "name": "GS26 (N)", + "name": "Kak GS Watchtower (N)", + "short_name": "GS", "access_rules": [ "sling", "$has_bombchus", @@ -2614,28 +2260,6 @@ } ] }, - { - "name": "Kakariko Back Grotto Gossip Stone", - "short_name": "Back Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1865, - "y": 326 - } - ] - }, { "name": "Graveyard", "children": [ @@ -2643,7 +2267,8 @@ "name": "Dampe", "sections": [ { - "name": "Gravedigging Tour", + "name": "Graveyard Dampe Gravedigging Tour", + "short_name": "HP", "access_rules": [ "$has_age|child" ], @@ -2661,18 +2286,19 @@ ] }, { - "name": "Dampes Grave", + "name": "Graveyard Dampes Grave", + "short_name": "Dampes Grave", "access_rules": [ "$has_age|adult" ], "sections": [ { - "name": "Hookshot Chest", - "short_name": "Hookshot", + "name": "Graveyard Hookshot Chest", + "short_name": "Chest", "item_count": 1 }, { - "name": "Freestanding PoH", + "name": "Graveyard Dampe Race Freestanding PoH", "short_name": "HP", "chest_unopened_img": "images/HP.png", "chest_opened_img": "images/HP_grey.png", @@ -2688,10 +2314,12 @@ ] }, { - "name": "Shield Grave", + "name": "Graveyard Shield Grave", + "short_name": "Shield Grave", "sections": [ { - "name": "Chest", + "name": "Graveyard Shield Grave Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -2709,11 +2337,12 @@ ] }, { - "name": "Heart Piece Grave", - "short_name": "Redead Grave", + "name": "Graveyard Heart Piece Grave", + "short_name": "HP Grave", "sections": [ { - "name": "Play Suns Song", + "name": "Graveyard Heart Piece Grave Chest", + "short_name": "Play Suns Song", "access_rules": [ "ocarina,sun", "{$hintable}" @@ -2768,7 +2397,7 @@ ] }, { - "name": "Composer Grave", + "name": "Graveyard Composers Grave", "short_name": "Royal Tomb", "access_rules": [ "ocarina,lullaby", @@ -2776,7 +2405,7 @@ ], "sections": [ { - "name": "Song from Composer Grave", + "name": "Song from Composers Grave", "short_name": "Song", "access_rules": [ "$has_age|adult", @@ -2793,8 +2422,8 @@ "item_count": 1 }, { - "name": "Composer Grave Chest", - "short_name": "Torches", + "name": "Graveyard Composers Grave Chest", + "short_name": "Chest", "access_rules": [ "$has_fire", "$has_age|child,sticks,[$has_fire]", @@ -2841,13 +2470,13 @@ }, { "name": "Graveyard Wall", - "short_name": "Wall", "access_rules": [ "$has_age|child,$night_gs" ], "sections": [ { - "name": "GS28 (N)", + "name": "Graveyard GS Wall (N)", + "short_name": "GS", "access_rules": [ "boomerang", "{sling}", @@ -2885,7 +2514,8 @@ "hosted_item": "bean_graveyard_yes" }, { - "name": "GS29", + "name": "Graveyard GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$can_child_attack" ], @@ -2904,31 +2534,6 @@ "y": 335 } ] - }, - { - "name": "Graveyard Gossip Stone", - "short_name": "Graveyard Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "ocarina,nocturne" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2144, - "y": 326 - } - ] } ] } @@ -2942,37 +2547,18 @@ "name": "Goron City", "children": [ { - "name": "Goron City Maze Right", - "short_name": "Boulder Maze Right", + "name": "GC Maze", "sections": [ { - "name": "Chests", + "name": "Right and Center Chests", "access_rules": [ "$can_blast", "$has_age|adult,lift2" ], "item_count": 2 - } - ], - "map_locations": [ - { - "map": "child", - "x": 1606, - "y": 98 }, { - "map": "adult", - "x": 1606, - "y": 98 - } - ] - }, - { - "name": "Goron City Maze Leftmost", - "short_name": "Boulder Maze Left", - "sections": [ - { - "name": "Chest", + "name": "Left Chest", "access_rules": [ "$has_age|adult,hammer", "$has_age|adult,lift2", @@ -2981,18 +2567,37 @@ ], "capture_item": true, "item_count": 1 + }, + { + "name": "GC GS Boulder Maze", + "short_name": "GS", + "access_rules": [ + "$has_age|child,$has_explosives" + ], + "visibility_rules": [ + "setting_tokens_overworld" + ], + "chest_unopened_img": "images/skulltula.png", + "chest_opened_img": "images/skulltula_token.png", + "item_count": 1 } ], "map_locations": [ + { + "map": "child", + "x": 1606, + "y": 98 + }, { "map": "adult", - "x": 1576, + "x": 1606, "y": 98 } ] }, { - "name": "Link the Goron", + "name": "GC Rolling Goron as Adult", + "short_name": "Link the Goron", "sections": [ { "name": "Stop him", @@ -3011,8 +2616,8 @@ ] }, { - "name": "Rolling Goron as Child", - "short_name": "Hot Rodder Goron", + "name": "GC Rolling Goron as Child", + "short_name": "Hot Rodder", "sections": [ { "name": "Blow him up", @@ -3032,8 +2637,7 @@ ] }, { - "name": "Goron City Pot", - "short_name": "Spinning Pot", + "name": "GC Pot", "sections": [ { "name": "Freestanding PoH", @@ -3064,7 +2668,7 @@ ] }, { - "name": "Darunias Joy", + "name": "GC Darunias Joy", "sections": [ { "name": "Play Sarias Song", @@ -3085,14 +2689,14 @@ ] }, { - "name": "Goron City Grotto", - "short_name": "Lava Room Grotto", + "name": "GC Grotto", "access_rules": [ "$has_age|adult" ], "sections": [ { - "name": "Deku Scrubs", + "name": "GC Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "access_rules": [ "ocarina,time,$damage_below_quadruple", "ocarina,time,redtunic", @@ -3119,36 +2723,11 @@ ] }, { - "name": "Goron City Boulder Maze", - "short_name": "Boulder Maze Crate", - "sections": [ - { - "name": "GS34", - "access_rules": [ - "$has_age|child,$has_explosives" - ], - "visibility_rules": [ - "setting_tokens_overworld" - ], - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "child", - "x": 1591, - "y": 68 - } - ] - }, - { - "name": "Goron City Center Platform", - "short_name": "Center Platform", + "name": "GC Center Platform", "sections": [ { - "name": "GS35", + "name": "GC GS Center Platform", + "short_name": "GS", "access_rules": [ "$has_age|adult" ], @@ -3169,7 +2748,7 @@ ] }, { - "name": "Goron Shop", + "name": "GC Shop", "access_rules": [ "$link_the_goron", "$has_age|child,$has_explosives", @@ -3217,58 +2796,6 @@ "y": 128 } ] - }, - { - "name": "Goron City Maze Gossip Stone", - "short_name": "GC Maze Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast", - "$has_age|adult,lift2" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1606, - "y": 98 - } - ] - }, - { - "name": "Goron City Medigoron Gossip Stone", - "short_name": "Medigoron Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast", - "lift1" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1655, - "y": 130 - } - ] } ] }, @@ -3279,11 +2806,16 @@ "name": "Top of DC", "sections": [ { - "name": "DM Trail Freestanding PoH", + "name": "DMT Freestanding PoH", "short_name": "HP", "access_rules": [ - "$has_age|adult", - "$child_death_mountain" + "$damage_below_ohko", + "nayrus,magic", + "$has_bottle", + "$has_age|adult,hoverboots", + "$has_age|both,setting_plant_no,beans,$has_explosives", + "$has_age|both,setting_plant_no,beans,lift1,$child_death_mountain", + "$has_age|both,bean_trail_yes" ], "chest_unopened_img": "images/HP.png", "chest_opened_img": "images/HP_grey.png", @@ -3304,11 +2836,10 @@ ] }, { - "name": "Death Mountain Bombable Chest", - "short_name": "Bombable Wall", + "name": "DMT Chest", "sections": [ { - "name": "Blast it", + "name": "Blast wall", "access_rules": [ "$can_blast", "$child_death_mountain,lift1,[logic_dmt_bombable]" @@ -3330,13 +2861,14 @@ ] }, { - "name": "Mountain Storms Grotto", + "name": "DMT Storms Grotto", "access_rules": [ "$hidden_grotto,ocarina,storm" ], "sections": [ { - "name": "Chest", + "name": "DMT Storms Grotto Chest", + "short_name": "Chest", "access_rules": [ "$has_age|adult", "$child_death_mountain" @@ -3358,12 +2890,16 @@ ] }, { - "name": "Mountain Summit Fairy", + "name": "DMT Great Fairy Fountain", + "access_rules": [ + "$can_blast" + ], "sections": [ { - "name": "Fairy Fountain", + "name": "DMT Great Fairy Reward", + "short_name": "Reward", "access_rules": [ - "ocarina,lullaby,$can_blast" + "ocarina,lullaby" ], "item_count": 1 } @@ -3382,7 +2918,7 @@ ] }, { - "name": "Biggoron", + "name": "DMT Biggoron", "access_rules": [ "$has_age|adult,$dmc_upper", "{$hintable}" @@ -3427,10 +2963,10 @@ ] }, { - "name": "Mountain Bombable Grotto", + "name": "DMT Cow Grotto", "sections": [ { - "name": "DMT Grotto Cow", + "name": "DMT Cow Grotto Cow", "short_name": "Cow", "access_rules": [ "$can_blast,ocarina,epona" @@ -3457,11 +2993,12 @@ ] }, { - "name": "Mountain Trail Above Dodongo's Cavern", + "name": "DMT Above Dodongos Cavern", "short_name": "Rock Above DC", "sections": [ { - "name": "GS32 (N)", + "name": "DMT GS Above Dodongos Cavern (N)", + "short_name": "GS", "access_rules": [ "$has_age|adult,$night_gs,hammer", "$has_age|adult,$night_gs,[logic_trail_gs_lower_hookshot],hookshot", @@ -3486,11 +3023,11 @@ ] }, { - "name": "Mountain Trail Path to Crater", - "short_name": "Path to Crater", + "name": "DMT Falling Rocks Path", "sections": [ { - "name": "GS33 (N)", + "name": "DMT GS Falling Rocks Path (N)", + "short_name": "GS", "access_rules": [ "$has_age|adult,$night_gs,hammer", "$has_age|adult,$night_gs,[logic_trail_gs_upper]" @@ -3512,7 +3049,7 @@ ] }, { - "name": "Mountain Trail Bean Patch", + "name": "DMT Bean Patch", "sections": [ { "name": "Plant Bean", @@ -3526,7 +3063,8 @@ "hosted_item": "bean_trail_yes" }, { - "name": "GS30", + "name": "DMT GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$has_explosives", "$child_death_mountain,$has_bottle,lift1", @@ -3549,10 +3087,11 @@ ] }, { - "name": "Mountain Trail Bomb Alcove", + "name": "DMT Near Kak", "sections": [ { - "name": "GS31", + "name": "DMT GS Near Kak", + "short_name": "GS", "access_rules": [ "$can_blast" ], @@ -3576,87 +3115,6 @@ "y": 285 } ] - }, - { - "name": "Mountain Storms Grotto Gossip Stone", - "short_name": "DMT Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "ocarina,storm" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1705, - "y": 158 - } - ] - }, - { - "name": "Death Mountain Trail Gossip Stone", - "short_name": "DMT Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast", - "$link_the_goron", - "ocarina,bolero,setting_plant_no,beans", - "ocarina,bolero,bean_crater_yes", - "ocarina,bolero,hoverboots", - "ocarina,bolero,hookshot" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1825, - "y": 94 - } - ] - }, - { - "name": "Dodongos Cavern Gossip Stone", - "short_name": "DC Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast", - "lift1" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1684, - "y": 220 - } - ] } ] }, @@ -3664,10 +3122,11 @@ "name": "Death Mountain Crater", "children": [ { - "name": "Top of Crater Grotto", + "name": "DMC Upper Grotto", "sections": [ { - "name": "Blast it", + "name": "DMC Upper Grotto Chest", + "short_name": "Chest", "access_rules": [ "$can_blast" ], @@ -3688,10 +3147,10 @@ ] }, { - "name": "DM Crater Wall", + "name": "DMC Wall", "sections": [ { - "name": "Freestanding PoH", + "name": "DMC Wall Freestanding PoH", "short_name": "HP", "access_rules": [ "$dmc_upper", @@ -3717,10 +3176,10 @@ ] }, { - "name": "Volcano", + "name": "DMC Volcano", "sections": [ { - "name": "Freestanding PoH", + "name": "DMC Volcano Freestanding PoH", "short_name": "HP", "access_rules": [ "$has_age|both,ocarina,bolero,setting_plant_no,beans", @@ -3748,15 +3207,16 @@ ] }, { - "name": "Crater Fairy", + "name": "DMC Great Fairy Fountain", "access_rules": [ - "ocarina,lullaby,$has_age|adult,hammer" + "$dmc_lower,$has_age|adult,hammer" ], "sections": [ { - "name": "Fairy Fountain", + "name": "DMC Great Fairy Reward", + "short_name": "Reward", "access_rules": [ - "$dmc_lower" + "ocarina,lullaby" ], "item_count": 1 } @@ -3771,16 +3231,13 @@ }, { "name": "DMC Hammer Grotto", - "short_name": "Hammer Grotto", "access_rules": [ - "$has_age|adult,hammer" + "$dmc_lower,$has_age|adult,hammer" ], "sections": [ { - "name": "Deku Scrubs", - "access_rules": [ - "$dmc_lower" - ], + "name": "DMC Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "visibility_rules": [ "setting_scrub_shuffle_yes" ], @@ -3850,11 +3307,11 @@ ] }, { - "name": "Death Mountain Crater Crate", - "short_name": "Crate at Entrance", + "name": "DMC Crate", "sections": [ { - "name": "GS36", + "name": "DMC GS Crate", + "short_name": "GS", "access_rules": [ "$can_blast,$has_age|child,$can_child_attack" ], @@ -3875,7 +3332,7 @@ ] }, { - "name": "Mountain Crater Bean Patch", + "name": "DMC Bean Patch", "access_rules": [ "$has_age|child,ocarina,bolero" ], @@ -3891,7 +3348,8 @@ "hosted_item": "bean_crater_yes" }, { - "name": "GS37", + "name": "DMC GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_bottle,$can_child_attack" ], @@ -3910,56 +3368,6 @@ "y": 66 } ] - }, - { - "name": "Top of Crater Grotto Gossip Stone", - "short_name": "DMC Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$can_blast" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1798, - "y": 42 - } - ] - }, - { - "name": "Death Mountain Crater Gossip Stone", - "short_name": "DMC Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$has_explosives" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1840, - "y": 42 - } - ] } ] } @@ -3973,10 +3381,10 @@ "name": "Market", "children": [ { - "name": "Dog Lady", + "name": "Market Dog Lady House", "sections": [ { - "name": "RichardZ", + "name": "Market Lost Dog", "access_rules": [ "$has_age|child" ], @@ -3992,11 +3400,11 @@ ] }, { - "name": "Castle Town Shooting Gallery", - "short_name": "Market Shooting Gallery", + "name": "Market Shooting Gallery", "sections": [ { - "name": "Child Shooting Gallery", + "name": "Market Shooting Gallery Reward", + "short_name": "Reward", "access_rules": [ "$has_age|child" ], @@ -4012,7 +3420,7 @@ ] }, { - "name": "Mask Shop", + "name": "Market Mask Shop", "access_rules": [ "$has_age|child" ], @@ -4069,7 +3477,7 @@ ] }, { - "name": "Bombchu Bowling", + "name": "Market Bombchu Bowling", "access_rules": [ "$has_age|child,setting_logic_chus_yes,bombchu", "$has_age|child,setting_logic_chus_no,bombs", @@ -4077,12 +3485,14 @@ ], "sections": [ { - "name": "1st round", + "name": "Market Bombchu Bowling First Prize", + "short_name": "1st prize", "capture_item": true, "item_count": 1 }, { - "name": "2nd round", + "name": "Market Bombchu Bowling Second Prize", + "short_name": "2nd prize", "capture_item": true, "item_count": 1 } @@ -4096,10 +3506,11 @@ ] }, { - "name": "Treasure Chest Game", + "name": "Market Treasure Chest Game", "sections": [ { - "name": "Cheater", + "name": "Market Treasure Chest Game Reward", + "short_name": "Reward", "access_rules": [ "$has_age|child,[$can_use_lens]", "{$hintable}" @@ -4117,7 +3528,7 @@ ] }, { - "name": "Bombchu Shop", + "name": "Market Bombchu Shop", "access_rules": [ "$has_age|child" ], @@ -4155,8 +3566,7 @@ ] }, { - "name": "Castle Town Potion Shop", - "short_name": "Market Potion Shop", + "name": "Market Potion Shop", "access_rules": [ "$has_age|child" ], @@ -4194,8 +3604,7 @@ ] }, { - "name": "Castle Town Bazaar", - "short_name": "Market Bazaar", + "name": "Market Bazaar", "access_rules": [ "$has_age|child" ], @@ -4247,7 +3656,8 @@ "item_count": 1 }, { - "name": "Zelda", + "name": "ToT Light Arrows Cutscene", + "short_name": "LACS", "access_rules": [ "$has_age|adult,lacs_meds:2" ], @@ -4257,38 +3667,28 @@ "map_locations": [ { "map": "adult", - "x": 1569, - "y": 294 - } - ] - }, - { - "name": "Big Poes", - "sections": [ - { - "name": "Happy Hunting", - "access_rules": [ - "$has_age|adult,bow,[ocarina],[epona],$has_bottle", - "{$hintable}" - ], - "capture_item": true, - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 1464, - "y": 390 + "x": 1569, + "y": 294 } ] }, { - "name": "Castle Market Guard House", - "short_name": "Guardhouse", + "name": "Market Guard House", "sections": [ { - "name": "GS14", + "name": "Market 10 Big Poes", + "short_name": "Big Poes", + "access_rules": [ + "$has_age|adult,bow,[ocarina],[epona],$has_bottle", + "$has_age|adult,[bow],ocarina,epona,$has_bottle", + "{$hintable}" + ], + "capture_item": true, + "item_count": 1 + }, + { + "name": "Market GS Guard House", + "short_name": "GS", "access_rules": [ "$has_age|child" ], @@ -4302,44 +3702,22 @@ ], "map_locations": [ { - "map": "child", + "map": "adult", "x": 1464, "y": 390 } ] - }, - { - "name": "Temple of Time Gossip Stones", - "short_name": "ToT Gossip Stones", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 4 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1539, - "y": 294 - } - ] } ] }, { - "name": "Hyrule Castle", + "name": "Hyrule Castle Grounds", "children": [ { "name": "Malon at Castle", "sections": [ { - "name": "Talk to her", + "name": "HC Malon Egg", "access_rules": [ "$has_age|child" ], @@ -4378,20 +3756,20 @@ ] }, { - "name": "Hyrule Castle Garden", + "name": "HC Garden", "access_rules": [ "$has_age|child,childcucco" ], "sections": [ { - "name": "Impa at Castle", + "name": "Song from Impa", "short_name": "Song", "chest_unopened_img": "images/grey_note.png", "chest_opened_img": "images/grey_note_check.png", "item_count": 1 }, { - "name": "Zeldas Letter", + "name": "HC Zeldas Letter", "visibility_rules": [ "childcucco" ], @@ -4407,12 +3785,16 @@ ] }, { - "name": "Hyrule Castle Fairy", + "name": "HC Great Fairy Fountain", + "access_rules": [ + "$has_age|child,$has_explosives" + ], "sections": [ { - "name": "Fairy Fountain", + "name": "HC Great Fairy Reward", + "short_name": "Reward", "access_rules": [ - "$has_age|child,ocarina,lullaby,$has_explosives" + "ocarina,lullaby" ], "item_count": 1 } @@ -4426,11 +3808,11 @@ ] }, { - "name": "Hyrule Castle Tree", - "short_name": "Tree near Malon", + "name": "HC Tree", "sections": [ { - "name": "GS15", + "name": "HC GS Tree", + "short_name": "GS", "access_rules": [ "$has_age|child,$can_child_attack" ], @@ -4451,13 +3833,14 @@ ] }, { - "name": "Castle Storms Grotto", + "name": "HC Storms Grotto", "access_rules": [ "$hidden_grotto,$has_age|child,ocarina,storm" ], "sections": [ { - "name": "GS16", + "name": "HC GS Storms Grotto", + "short_name": "GS", "access_rules": [ "boomerang,$has_explosives", "{$has_explosives}", @@ -4479,75 +3862,6 @@ "y": 206 } ] - }, - { - "name": "Hyrule Castle Malon Gossip Stone", - "short_name": "HC Malon Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1439, - "y": 246 - } - ] - }, - { - "name": "Hyrule Castle Rock Wall Gossip Stone", - "short_name": "HC Wall Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1380, - "y": 216 - } - ] - }, - { - "name": "Castle Storms Grotto Gossip Stone", - "short_name": "HC Storms Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "ocarina,storm,$has_explosives" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 1479, - "y": 206 - } - ] } ] }, @@ -4555,10 +3869,11 @@ "name": "Ganons Castle Grounds", "children": [ { - "name": "Outside Ganon's Castle", + "name": "OGC", "sections": [ { - "name": "GS17", + "name": "OGC GS", + "short_name": "GS", "access_rules": [ "$has_age|adult" ], @@ -4579,12 +3894,16 @@ ] }, { - "name": "Ganons Castle Fairy", + "name": "OGC Great Fairy Fountain", + "access_rules": [ + "$has_age|adult,lift3" + ], "sections": [ { - "name": "Fairy Fountain", + "name": "OGC Great Fairy Reward", + "short_name": "Reward", "access_rules": [ - "ocarina,lullaby,lift3,$has_age|adult" + "ocarina,lullaby" ], "item_count": 1 } @@ -4606,10 +3925,10 @@ "color": "#0936a0", "children": [ { - "name": "Zoras River", + "name": "Zora River", "children": [ { - "name": "Frogs", + "name": "ZR Frogs", "access_rules": [ "$has_age|child,$has_explosives", "$has_age|child,scale1", @@ -4617,14 +3936,14 @@ ], "sections": [ { - "name": "Frogs in the Rain", + "name": "ZR Frogs in the Rain", "access_rules": [ "$has_age|child,ocarina,storm" ], "item_count": 1 }, { - "name": "Frog Ocarina Game", + "name": "ZR Frogs Ocarina Game", "access_rules": [ "$has_age|child,ocarina,lullaby,saria,epona,sun,time,storm", "{$hintable}" @@ -4642,14 +3961,14 @@ ] }, { - "name": "Magic Bean Salesman", + "name": "ZR Magic Bean Salesman", + "access_rules": [ + "$has_age|child,$has_explosives", + "$has_age|child,scale1" + ], "sections": [ { "name": "Buy Item", - "access_rules": [ - "$has_age|child,$has_explosives", - "$has_age|child,scale1" - ], "capture_item": true, "item_count": 1 } @@ -4663,16 +3982,16 @@ ] }, { - "name": "Zora River Plateau Open Grotto", - "short_name": "Plateau Grotto", + "name": "ZR Open Grotto", + "access_rules": [ + "$has_age|child,$has_explosives", + "$has_age|child,scale1", + "$has_age|adult" + ], "sections": [ { - "name": "Jump in", - "access_rules": [ - "$has_age|child,$has_explosives", - "$has_age|child,scale1", - "$has_age|adult" - ], + "name": "ZR Open Grotto Chest", + "short_name": "Chest", "item_count": 1 } ], @@ -4690,10 +4009,10 @@ ] }, { - "name": "Zora River Lower", + "name": "ZR Near Open Grotto", "sections": [ { - "name": "Freestanding PoH", + "name": "ZR Near Open Grotto Freestanding PoH", "short_name": "HP", "access_rules": [ "$has_age|child,$has_explosives", @@ -4721,10 +4040,10 @@ ] }, { - "name": "Zora River Upper", + "name": "ZR Near Domain", "sections": [ { - "name": "Freestanding PoH", + "name": "ZR Near Domain Freestanding PoH", "short_name": "HP", "access_rules": [ "$has_age|child,$has_explosives", @@ -4752,13 +4071,14 @@ ] }, { - "name": "Zora River Storms Grotto", + "name": "ZR Storms Grotto", "access_rules": [ "$hidden_grotto,ocarina,storm" ], "sections": [ { - "name": "Deku Scrubs", + "name": "ZR Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "access_rules": [ "$has_age|child,$has_explosives,$can_stun_deku", "$has_age|child,scale1,$can_stun_deku", @@ -4787,10 +4107,11 @@ ] }, { - "name": "Zora River Tree", + "name": "ZR Tree", "sections": [ { - "name": "GS43", + "name": "ZR GS Tree", + "short_name": "GS", "access_rules": [ "$has_age|child,$can_child_attack" ], @@ -4811,13 +4132,14 @@ ] }, { - "name": "Zora River Ladder", + "name": "ZR Ladder", "access_rules": [ "$has_age|child,$night_gs" ], "sections": [ { - "name": "GS44 (N)", + "name": "ZR GS Ladder (N)", + "short_name": "GS", "access_rules": [ "$has_explosives", "scale1,$can_child_attack" @@ -4839,14 +4161,14 @@ ] }, { - "name": "Zora River Near Raised Grottos", - "short_name": "Plateau Wall", + "name": "ZR Near Raised Grottos", "access_rules": [ "$night_gs,$has_age|adult" ], "sections": [ { - "name": "GS45 (N)", + "name": "ZR GS Near Raised Grottos (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}", @@ -4871,14 +4193,14 @@ ] }, { - "name": "Zora River Above Bridge", - "short_name": "Wall Above Bridge", + "name": "ZR Above Bridge", "access_rules": [ "$night_gs,$has_age|adult" ], "sections": [ { - "name": "GS46 (N)", + "name": "ZR GS Above Bridge (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}" @@ -4899,87 +4221,6 @@ "y": 465 } ] - }, - { - "name": "Zora River Plateau Open Grotto Gossip Stone", - "short_name": "Plateau Grotto Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$has_age|adult", - "$has_age|child,$has_explosives", - "$has_age|child,scale1" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2092, - "y": 540 - } - ] - }, - { - "name": "Zoras River Plateau Gossip Stone", - "short_name": "ZR Plateau Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$has_age|adult", - "$has_age|child,$has_explosives", - "$has_age|child,scale1" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2094, - "y": 481 - } - ] - }, - { - "name": "Zoras River Waterfall Gossip Stone", - "short_name": "ZR Waterfall Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$has_age|adult", - "$has_age|child,$has_explosives", - "$has_age|child,scale1" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2360, - "y": 458 - } - ] } ] }, @@ -4992,10 +4233,10 @@ ], "children": [ { - "name": "Torch Run", + "name": "ZD Chest", "sections": [ { - "name": "Run", + "name": "Torches", "access_rules": [ "sticks" ], @@ -5011,7 +4252,7 @@ ] }, { - "name": "Diving Minigame", + "name": "ZD Diving Minigame", "sections": [ { "name": "Dive down", @@ -5048,28 +4289,6 @@ "y": 367 } ] - }, - { - "name": "Zoras Domain Gossip Stone", - "short_name": "ZD Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2624, - "y": 367 - } - ] } ] }, @@ -5083,14 +4302,11 @@ { "name": "King Zora", "access_rules": [ - "$has_bottle,[wallet2]", - "$has_bottle,$adult_fountain", - "$has_bottle,@Ganons Castle/Water Trial", - "$has_bottle,@Gerudo Training Grounds MQ/Before Heavy Block Chest" + "$has_blue_fire" ], "sections": [ { - "name": "Unfreeze him", + "name": "ZD King Zora Thawed", "access_rules": [ "$has_age|adult", "{$hintable}" @@ -5118,13 +4334,14 @@ ] }, { - "name": "Frozen Waterfall", + "name": "ZD Frozen Waterfall", "access_rules": [ "$night_gs" ], "sections": [ { - "name": "GS47 (N)", + "name": "ZD GS Frozen Waterfall (N)", + "short_name": "GS", "access_rules": [ "hookshot", "bow", @@ -5149,12 +4366,13 @@ ] }, { - "name": "Zora Shop", + "name": "ZD Shop", "access_rules": [ - "$has_age|child,$has_explosives,[ocarina],[lullaby]", "$has_age|child,scale1", - "$has_age|adult,ocarina,lullaby,$has_bottle", - "$has_age|adult,hoverboots,[ocarina],[lullaby],$has_bottle" + "$has_age|child,$has_explosives,ocarina,lullaby", + "$has_age|child,$has_explosives,[logic_zora_with_cucco]", + "$has_age|adult,$has_blue_fire,ocarina,lullaby", + "$has_age|adult,$has_blue_fire,hoverboots,[logic_zora_with_hovers]" ], "sections": [ { @@ -5201,16 +4419,17 @@ "name": "Zoras Fountain", "children": [ { - "name": "Zoras Fountain Fairy", + "name": "ZF Great Fairy Fountain", "access_rules": [ - "ocarina,lullaby,$has_explosives" + "$child_fountain,$has_explosives", + "$adult_fountain,$has_explosives" ], "sections": [ { - "name": "Fairy Fountain", + "name": "ZF Great Fairy Reward", + "short_name": "Reward", "access_rules": [ - "$child_fountain", - "$adult_fountain" + "ocarina,lullaby" ], "item_count": 1 } @@ -5229,11 +4448,10 @@ ] }, { - "name": "Zoras Fountain Bottom", - "short_name": "Under Water", + "name": "ZF Bottom", "sections": [ { - "name": "Freestanding PoH", + "name": "ZF Bottom Freestanding PoH", "short_name": "HP", "access_rules": [ "$adult_fountain,ironboots,$FTR_or_zora", @@ -5254,11 +4472,10 @@ ] }, { - "name": "Zoras Fountain Iceberg", - "short_name": "Ice Floe", + "name": "ZF Iceberg", "sections": [ { - "name": "Freestanding PoH", + "name": "ZF Iceberg Freestanding PoH", "short_name": "HP", "access_rules": [ "$adult_fountain" @@ -5277,14 +4494,14 @@ ] }, { - "name": "Zora's Fountain Hidden Cave", - "short_name": "Hidden Cave", + "name": "ZF Hidden Cave", "access_rules": [ "$night_gs" ], "sections": [ { - "name": "GS50 (N)", + "name": "ZF GS Hidden Cave (N)", + "short_name": "GS", "access_rules": [ "$adult_fountain,lift2,$can_blast,hookshot", "{$adult_fountain,lift2,$has_explosives}", @@ -5310,11 +4527,11 @@ ] }, { - "name": "Zora's Fountain Tree", - "short_name": "Tree", + "name": "ZF Tree", "sections": [ { - "name": "GS48", + "name": "ZF GS Tree", + "short_name": "GS", "access_rules": [ "$child_fountain" ], @@ -5335,14 +4552,14 @@ ] }, { - "name": "Zora's Fountain Above the Log", - "short_name": "Wall near Log", + "name": "ZF Above the Log", "access_rules": [ "$night_gs,$child_fountain" ], "sections": [ { - "name": "GS49 (N)", + "name": "ZF GS Above the Log (N)", + "short_name": "GS", "access_rules": [ "boomerang", "{sling}", @@ -5365,52 +4582,6 @@ "y": 350 } ] - }, - { - "name": "Zoras Fountain Fairy Gossip Stone", - "short_name": "ZF Fairy Gossip Stone", - "access_rules": [ - "$hintable,$child_fountain", - "$hintable,$adult_fountain" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2553, - "y": 333 - } - ] - }, - { - "name": "Zoras Fountain Jabu Gossip Stone", - "short_name": "ZF Jabu Gossip Stone", - "access_rules": [ - "$hintable,$child_fountain", - "$hintable,$adult_fountain" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 2458, - "y": 298 - } - ] } ] } @@ -5424,11 +4595,10 @@ "name": "Gerudo Valley", "children": [ { - "name": "Gerudo Valley Crate", - "short_name": "Valley Crate", + "name": "GV Crate", "sections": [ { - "name": "Freestanding PoH", + "name": "GV Crate Freestanding PoH", "short_name": "HP", "access_rules": [ "$has_age|child", @@ -5454,11 +4624,10 @@ ] }, { - "name": "Gerudo Valley Waterfall", - "short_name": "Valley Waterfall", + "name": "GV Waterfall", "sections": [ { - "name": "Freestanding PoH", + "name": "GV Waterfall Freestanding PoH", "short_name": "HP", "chest_unopened_img": "images/HP.png", "chest_opened_img": "images/HP_grey.png", @@ -5479,8 +4648,7 @@ ] }, { - "name": "Gerudo Valley Cow", - "short_name": "Valley Cow", + "name": "GV Cow", "sections": [ { "name": "Cow", @@ -5504,14 +4672,14 @@ ] }, { - "name": "Gerudo Valley Small Bridge", - "short_name": "Waterfall Near Entrance", + "name": "GV Small Bridge", "access_rules": [ "$has_age|child,$night_gs" ], "sections": [ { - "name": "GS86 (N)", + "name": "GV GS Small Bridge (N)", + "short_name": "GS", "access_rules": [ "boomerang", "{sling}", @@ -5536,10 +4704,11 @@ ] }, { - "name": "Gerudo Valley Bean Patch", + "name": "GV Bean Patch", "sections": [ { - "name": "GS87", + "name": "GV GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_age|child,$has_bottle,$can_child_attack" ], @@ -5558,39 +4727,17 @@ "y": 600 } ] - }, - { - "name": "Gerudo Valley Gossip Stone", - "short_name": "GV Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 682, - "y": 555 - } - ] } ] }, { - "name": "Bridge Crossing", + "name": "GV Fortress Side", "access_rules": [ "$gerudo_valley_far_side" ], "children": [ { - "name": "Hammer Rocks", + "name": "GV Chest", "sections": [ { "name": "Smash 'em", @@ -5631,13 +4778,14 @@ ] }, { - "name": "Gerudo Valley Storms Grotto", + "name": "GV Storms Grotto", "access_rules": [ "$hidden_grotto,ocarina,storm" ], "sections": [ { - "name": "Deku Scrubs", + "name": "GV Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "visibility_rules": [ "setting_scrub_shuffle_yes" ], @@ -5656,14 +4804,14 @@ ] }, { - "name": "Gerudo Valley Behind Tent", - "short_name": "GV Behind Tent", + "name": "GV Behind Tent", "access_rules": [ "$night_gs" ], "sections": [ { - "name": "GS88 (N)", + "name": "GV GS Behind Tent (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}", @@ -5688,14 +4836,14 @@ ] }, { - "name": "Gerudo Valley Pillar", - "short_name": "GV Pillar", + "name": "GV Pillar", "access_rules": [ "$night_gs" ], "sections": [ { - "name": "GS89 (N)", + "name": "GV GS Pillar (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}", @@ -5722,7 +4870,7 @@ "name": "Gerudo Fortress", "children": [ { - "name": "Rooftop Chest", + "name": "GF Chest", "sections": [ { "name": "Open it", @@ -5743,19 +4891,19 @@ ] }, { - "name": "Horseback Archery", + "name": "GF HBA", + "access_rules": [ + "ocarina,epona,bow,$gerudo_card" + ], "sections": [ { - "name": "1000", - "access_rules": [ - "ocarina,epona,bow,$gerudo_card" - ], + "name": "1000 Points", "item_count": 1 }, { - "name": "1500", + "name": "1500 Points", "access_rules": [ - "ocarina,epona,bow,$gerudo_card", + "bow", "{$hintable}" ], "capture_item": true, @@ -5771,13 +4919,14 @@ ] }, { - "name": "Archery Range", + "name": "GF Archery Range", "access_rules": [ "$night_gs,$gerudo_card" ], "sections": [ { - "name": "GS90 (N)", + "name": "GF GS Archery Range (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}", @@ -5801,13 +4950,14 @@ ] }, { - "name": "Top Floor", + "name": "GF Top Floor", "access_rules": [ "$night_gs" ], "sections": [ { - "name": "GS91 (N)", + "name": "GF GS Top Floor (N)", + "short_name": "GS", "access_rules": [ "$gerudo_card", "bow", @@ -5843,32 +4993,21 @@ ], "children": [ { - "name": "Haunted Wasteland Structure", - "short_name": "Central Structure", + "name": "Wasteland Structure", "sections": [ { - "name": "Torches", + "name": "Wasteland Chest", + "short_name": "Chest", "access_rules": [ "$has_fire", "{$hintable}" ], "capture_item": true, "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 360, - "y": 283 - } - ] - }, - { - "name": "Wasteland Ruins", - "sections": [ + }, { - "name": "GS92", + "name": "Wasteland GS", + "short_name": "GS", "access_rules": [ "hookshot", "[hookshot],bombs,shield2", @@ -5888,7 +5027,7 @@ { "map": "adult", "x": 360, - "y": 313 + "y": 283 } ] } @@ -5898,12 +5037,16 @@ "name": "Desert Colossus", "children": [ { - "name": "Colossus Fairy", + "name": "Colossus Great Fairy Fountain", + "access_rules": [ + "$adult_colossus,$has_explosives" + ], "sections": [ { - "name": "Fairy Fountain", + "name": "Colossus Great Fairy Reward", + "short_name": "Reward", "access_rules": [ - "$adult_colossus,ocarina,lullaby,$has_explosives" + "ocarina,lullaby" ], "item_count": 1 } @@ -5922,11 +5065,10 @@ ] }, { - "name": "Colossus Freestanding PoH", - "short_name": "Arch HP", + "name": "Colossus Arch", "sections": [ { - "name": "Freestanding PoH", + "name": "Colossus Freestanding PoH", "short_name": "HP", "access_rules": [ "$child_colossus,setting_plant_no,beans,$has_age|adult", @@ -5982,14 +5124,14 @@ ] }, { - "name": "Desert Colossus Grotto", - "short_name": "Under Silver Rock", + "name": "Colossus Grotto", + "access_rules": [ + "$adult_colossus,$has_age|adult,lift2" + ], "sections": [ { - "name": "Deku Scrubs", - "access_rules": [ - "$adult_colossus,$has_age|adult,lift2" - ], + "name": "Colossus Deku Scrubs Grotto", + "short_name": "Deku Scrubs", "visibility_rules": [ "setting_scrub_shuffle_yes" ], @@ -6008,7 +5150,7 @@ ] }, { - "name": "Desert Colossus Bean Patch", + "name": "Colossus Bean Patch", "access_rules": [ "$child_colossus" ], @@ -6024,7 +5166,8 @@ "hosted_item": "bean_colossus_yes" }, { - "name": "GS93", + "name": "Colossus GS Bean Patch", + "short_name": "GS", "access_rules": [ "$has_bottle,$can_child_attack" ], @@ -6045,14 +5188,14 @@ ] }, { - "name": "Desert Colossus Tree", - "short_name": "Tree Near Oasis", + "name": "Colossus Tree", "access_rules": [ "$adult_colossus,$has_age|adult,$night_gs" ], "sections": [ { - "name": "GS94 (N)", + "name": "Colossus GS Tree (N)", + "short_name": "GS", "access_rules": [ "hookshot", "{bow}", @@ -6077,14 +5220,14 @@ ] }, { - "name": "Desert Colossus Hill", - "short_name": "Top Of Platform", + "name": "Colossus Hill", "access_rules": [ "$has_age|adult,$night_gs" ], "sections": [ { - "name": "GS95 (N)", + "name": "Colossus GS Hill (N)", + "short_name": "GS", "access_rules": [ "$child_colossus,setting_plant_no,beans", "$child_colossus,bean_colossus_yes", @@ -6108,31 +5251,6 @@ "y": 322 } ] - }, - { - "name": "Desert Colossus Gossip Stone", - "short_name": "Colossus Gossip Stone", - "access_rules": [ - "$hintable" - ], - "sections": [ - { - "name": "Check it", - "access_rules": [ - "$adult_colossus" - ], - "chest_unopened_img": "images/gossip_stone.png", - "chest_opened_img": "images/gossip_stone.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "gossips", - "x": 50, - "y": 360 - } - ] } ] } diff --git a/ootrando_overworldmap_hamsda/locations/overworld_entrance.json b/ootrando_overworldmap_hamsda/locations/overworld_entrance.json index 373897dd..d3236a61 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld_entrance.json +++ b/ootrando_overworldmap_hamsda/locations/overworld_entrance.json @@ -9,8 +9,8 @@ "color": "#18a50e", "children": [ { - "name": "Kokiri Forest -> Kokiri Forest Storms Grotto", - "short_name": "Kokiri Storms Grotto", + "name": "Kokiri Forest -> KF Storms Grotto", + "short_name": "KF Storms Grotto", "sections": [ { "name": "Grotto", @@ -28,11 +28,14 @@ ] }, { - "name": "Kokiri Forest -> House of Twins", - "short_name": "House of Twins", + "name": "Kokiri Forest -> KF House of Twins", + "short_name": "KF House of Twins", "sections": [ { "name": "House", + "visibility_rules": [ + "setting_entrance_interiors_simple" + ], "capture_item": true, "capture_item_layout": "tracker_capture_houses", "item_count": 1 @@ -47,11 +50,14 @@ ] }, { - "name": "Kokiri Forest -> Know It All House", - "short_name": "Know It All House", + "name": "Kokiri Forest -> KF Know It All House", + "short_name": "KF Know It All House", "sections": [ { "name": "House", + "visibility_rules": [ + "setting_entrance_interiors_simple" + ], "capture_item": true, "capture_item_layout": "tracker_capture_houses", "item_count": 1 @@ -66,8 +72,8 @@ ] }, { - "name": "Kokiri Forest -> Kokiri Shop", - "short_name": "Kokiri Shop", + "name": "Kokiri Forest -> KF Kokiri Shop", + "short_name": "KF Kokiri Shop", "sections": [ { "name": "House", @@ -85,8 +91,8 @@ ] }, { - "name": "Kokiri Forest -> Links House", - "short_name": "Links House", + "name": "Kokiri Forest -> KF Links House", + "short_name": "KF Links House", "sections": [ { "name": "House", @@ -104,8 +110,8 @@ ] }, { - "name": "Kokiri Forest -> Mido House", - "short_name": "Mido House", + "name": "Kokiri Forest -> KF Midos House", + "short_name": "KF Midos House", "sections": [ { "name": "House", @@ -123,11 +129,14 @@ ] }, { - "name": "Kokiri Forest -> Saria House", - "short_name": "Saria House", + "name": "Kokiri Forest -> KF Sarias House", + "short_name": "KF Sarias House", "sections": [ { "name": "House", + "visibility_rules": [ + "setting_entrance_interiors_simple" + ], "capture_item": true, "capture_item_layout": "tracker_capture_houses", "item_count": 1 @@ -142,7 +151,7 @@ ] }, { - "name": "Outside Deku Tree -> Deku Tree Lobby", + "name": "KF Outside Deku Tree -> Deku Tree Lobby", "short_name": "Deku Tree", "sections": [ { @@ -155,6 +164,7 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 2420, "y": 875 } @@ -180,7 +190,7 @@ ] }, { - "name": "Kokiri Forest -> Lost Woods Bridge From Forest", + "name": "Kokiri Forest -> LW Bridge From Forest", "short_name": "KF -> Bridge", "sections": [ { @@ -205,8 +215,8 @@ "color": "#18a50e", "children": [ { - "name": "Lost Woods -> Lost Woods Generic Grotto", - "short_name": "LW Generic Grotto", + "name": "Lost Woods -> LW Near Shortcuts Grotto", + "short_name": "LW Near Shortcuts Grotto", "sections": [ { "name": "Grotto", @@ -224,7 +234,7 @@ ] }, { - "name": "Lost Woods Beyond Mido -> Deku Theater", + "name": "LW Beyond Mido -> Deku Theater", "short_name": "Deku Theater", "sections": [ { @@ -243,8 +253,8 @@ ] }, { - "name": "Lost Woods Beyond Mido -> Lost Woods Sales Grotto", - "short_name": "LW Sales Grotto", + "name": "LW Beyond Mido -> LW Scrubs Grotto", + "short_name": "LW Scrubs Grotto", "sections": [ { "name": "Grotto", @@ -262,7 +272,7 @@ ] }, { - "name": "Lost Woods -> Goron City Woods Warp", + "name": "Lost Woods -> GC Woods Warp", "short_name": "LW -> GC", "sections": [ { @@ -300,7 +310,7 @@ ] }, { - "name": "Lost Woods Beyond Mido -> Sacred Forest Meadow Entryway", + "name": "LW Beyond Mido -> SFM Entryway", "short_name": "LW -> SFM", "sections": [ { @@ -319,7 +329,7 @@ ] }, { - "name": "Lost Woods Forest Exit -> Kokiri Forest", + "name": "LW Forest Exit -> Kokiri Forest", "short_name": "LW -> KF", "sections": [ { @@ -338,7 +348,7 @@ ] }, { - "name": "Lost Woods Bridge -> Kokiri Forest", + "name": "LW Bridge -> Kokiri Forest", "short_name": "Bridge -> KF", "sections": [ { @@ -357,7 +367,7 @@ ] }, { - "name": "Lost Woods Bridge -> Hyrule Field", + "name": "LW Bridge -> Hyrule Field", "short_name": "Bridge -> HF", "sections": [ { @@ -382,7 +392,7 @@ "color": "#18a50e", "children": [ { - "name": "Sacred Forest Meadow -> Meadow Fairy Grotto", + "name": "Sacred Forest Meadow -> SFM Fairy Grotto", "short_name": "SFM Fairy Grotto", "sections": [ { @@ -401,7 +411,7 @@ ] }, { - "name": "Sacred Forest Meadow -> Meadow Storms Grotto", + "name": "Sacred Forest Meadow -> SFM Storms Grotto", "short_name": "SFM Storms Grotto", "sections": [ { @@ -420,8 +430,8 @@ ] }, { - "name": "Sacred Forest Meadow Entryway -> Front of Meadow Grotto", - "short_name": "Wolfos Grotto", + "name": "SFM Entryway -> SFM Wolfos Grotto", + "short_name": "SFM Wolfos Grotto", "sections": [ { "name": "Grotto", @@ -452,13 +462,14 @@ "map_locations": [ { "map": "entrances", - "x": 2150, + "size": 50, + "x": 2140, "y": 600 } ] }, { - "name": "Sacred Forest Meadow Entryway -> Lost Woods Beyond Mido", + "name": "SFM Entryway -> LW Beyond Mido", "short_name": "SFM -> LW", "sections": [ { @@ -483,7 +494,7 @@ "color": "#09a09d", "children": [ { - "name": "Hyrule Field -> Field Far West Castle Town Grotto", + "name": "Hyrule Field -> HF Fairy Grotto", "short_name": "HF Fairy Grotto", "sections": [ { @@ -502,8 +513,8 @@ ] }, { - "name": "Hyrule Field -> Field Kakariko Grotto", - "short_name": "HF Kakariko Grotto", + "name": "Hyrule Field -> HF Near Kak Grotto", + "short_name": "HF Near Kak Grotto", "sections": [ { "name": "Grotto", @@ -521,7 +532,7 @@ ] }, { - "name": "Hyrule Field -> Field Near Lake Inside Fence Grotto", + "name": "Hyrule Field -> HF Inside Fence Grotto", "short_name": "HF Inside Fence Grotto", "sections": [ { @@ -540,8 +551,8 @@ ] }, { - "name": "Hyrule Field -> Field Near Lake Outside Fence Grotto", - "short_name": "HF Outside Fence Grotto", + "name": "Hyrule Field -> HF Open Grotto", + "short_name": "HF Open Grotto", "sections": [ { "name": "Grotto", @@ -559,7 +570,7 @@ ] }, { - "name": "Hyrule Field -> Field North Lon Lon Grotto", + "name": "Hyrule Field -> HF Tektite Grotto", "short_name": "HF Tektite Grotto", "sections": [ { @@ -578,8 +589,8 @@ ] }, { - "name": "Hyrule Field -> Field Valley Grotto", - "short_name": "HF Valley Grotto", + "name": "Hyrule Field -> HF Cow Grotto", + "short_name": "HF Cow Grotto", "sections": [ { "name": "Grotto", @@ -597,8 +608,8 @@ ] }, { - "name": "Hyrule Field -> Field West Castle Town Grotto", - "short_name": "HF Near Bridge Grotto", + "name": "Hyrule Field -> HF Near Market Grotto", + "short_name": "HF Near Market Grotto", "sections": [ { "name": "Grotto", @@ -616,8 +627,8 @@ ] }, { - "name": "Hyrule Field -> Remote Southern Grotto", - "short_name": "Remote Southern Grotto", + "name": "Hyrule Field -> HF Southeast Grotto", + "short_name": "HF Southeast Grotto", "sections": [ { "name": "Grotto", @@ -635,7 +646,7 @@ ] }, { - "name": "Hyrule Field -> Castle Town Entrance", + "name": "Hyrule Field -> Market Entrance", "short_name": "HF -> CTE", "sections": [ { @@ -730,7 +741,7 @@ ] }, { - "name": "Hyrule Field -> Lost Woods Bridge", + "name": "Hyrule Field -> LW Bridge", "short_name": "HF -> Bridge", "sections": [ { @@ -749,7 +760,7 @@ ] }, { - "name": "Hyrule Field -> Zora River Front", + "name": "Hyrule Field -> ZR Front", "short_name": "HF -> ZR", "sections": [ { @@ -774,7 +785,7 @@ "color": "#09a09d", "children": [ { - "name": "Lon Lon Ranch -> Lon Lon Grotto", + "name": "Lon Lon Ranch -> LLR Grotto", "short_name": "LLR Grotto", "sections": [ { @@ -793,8 +804,8 @@ ] }, { - "name": "Lon Lon Ranch -> Ingo Barn", - "short_name": "Ingo Barn", + "name": "Lon Lon Ranch -> LLR Stables", + "short_name": "LLR Stables", "sections": [ { "name": "House", @@ -812,7 +823,7 @@ ] }, { - "name": "Lon Lon Ranch -> Lon Lon Corner Tower", + "name": "Lon Lon Ranch -> LLR Tower", "short_name": "LLR Tower", "sections": [ { @@ -831,8 +842,8 @@ ] }, { - "name": "Lon Lon Ranch -> Talon House", - "short_name": "Talon House", + "name": "Lon Lon Ranch -> LLR Talons House", + "short_name": "LLR Talons House", "sections": [ { "name": "House", @@ -875,8 +886,8 @@ "color": "#6909a0", "children": [ { - "name": "Kakariko Village -> Kakariko Bombable Grotto", - "short_name": "Kakariko Bombable Grotto", + "name": "Kakariko Village -> Kak Redead Grotto", + "short_name": "Kak Redead Grotto", "sections": [ { "name": "Grotto", @@ -894,8 +905,8 @@ ] }, { - "name": "Kakariko Village Backyard -> Kakariko Back Grotto", - "short_name": "Kakariko Back Grotto", + "name": "Kak Backyard -> Kak Open Grotto", + "short_name": "Kak Open Grotto", "sections": [ { "name": "Grotto", @@ -913,8 +924,8 @@ ] }, { - "name": "Kakariko Village -> Carpenter Boss House", - "short_name": "Carpenter Boss House", + "name": "Kakariko Village -> Kak Carpenter Boss House", + "short_name": "Kak Carpenter Boss House", "sections": [ { "name": "House", @@ -932,8 +943,8 @@ ] }, { - "name": "Kakariko Village -> House of Skulltula", - "short_name": "House of Skulltula", + "name": "Kakariko Village -> Kak House of Skulltula", + "short_name": "Kak House of Skulltula", "sections": [ { "name": "House", @@ -951,8 +962,8 @@ ] }, { - "name": "Kakariko Village -> Impas House", - "short_name": "Impas House", + "name": "Kakariko Village -> Kak Impas House", + "short_name": "Kak Impas House", "sections": [ { "name": "House", @@ -970,8 +981,8 @@ ] }, { - "name": "Kakariko Village -> Impas House Back", - "short_name": "Impas House Back", + "name": "Kak Impas Ledge -> Kak Impas House Back", + "short_name": "Kak Impas House Back", "sections": [ { "name": "House", @@ -989,8 +1000,8 @@ ] }, { - "name": "Kakariko Village -> Kakariko Bazaar", - "short_name": "Kakariko Bazaar", + "name": "Kakariko Village -> Kak Bazaar", + "short_name": "Kak Bazaar", "sections": [ { "name": "House", @@ -1008,8 +1019,8 @@ ] }, { - "name": "Kakariko Village -> Kakariko Potion Shop Front", - "short_name": "Kakariko Potion Shop Front", + "name": "Kakariko Village -> Kak Potion Shop Front", + "short_name": "Kak Potion Shop Front", "sections": [ { "name": "House", @@ -1027,8 +1038,8 @@ ] }, { - "name": "Kakariko Village -> Kakariko Shooting Gallery", - "short_name": "Kakariko Shooting Gallery", + "name": "Kakariko Village -> Kak Shooting Gallery", + "short_name": "Kak Shooting Gallery", "sections": [ { "name": "House", @@ -1046,8 +1057,8 @@ ] }, { - "name": "Kakariko Village -> Windmill", - "short_name": "Windmill", + "name": "Kakariko Village -> Kak Windmill", + "short_name": "Kak Windmill", "sections": [ { "name": "House", @@ -1065,8 +1076,8 @@ ] }, { - "name": "Kakariko Village Backyard -> Kakariko Potion Shop Back", - "short_name": "Kakariko Potion Shop Back", + "name": "Kak Backyard -> Kak Potion Shop Back", + "short_name": "Kak Potion Shop Back", "sections": [ { "name": "House", @@ -1084,8 +1095,8 @@ ] }, { - "name": "Kakariko Village Backyard -> Odd Medicine Building", - "short_name": "Odd Medicine Building", + "name": "Kak Backyard -> Kak Odd Medicine Building", + "short_name": "Kak Odd Medicine Building", "sections": [ { "name": "House", @@ -1116,8 +1127,9 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 1885, - "y": 395 + "y": 405 } ] }, @@ -1160,7 +1172,7 @@ ] }, { - "name": "Kakariko Village Behind Gate -> Death Mountain", + "name": "Kak Behind Gate -> Death Mountain", "short_name": "Kak -> DMT", "sections": [ { @@ -1185,7 +1197,7 @@ "color": "#6909a0", "children": [ { - "name": "Graveyard -> Composer Grave", + "name": "Graveyard -> Graveyard Composers Grave", "short_name": "Composer Grave", "sections": [ { @@ -1204,7 +1216,7 @@ ] }, { - "name": "Graveyard -> Dampes Grave", + "name": "Graveyard -> Graveyard Dampes Grave", "short_name": "Dampes Grave", "sections": [ { @@ -1223,7 +1235,7 @@ ] }, { - "name": "Graveyard -> Heart Piece Grave", + "name": "Graveyard -> Graveyard Heart Piece Grave", "short_name": "Heart Piece Grave", "sections": [ { @@ -1242,7 +1254,7 @@ ] }, { - "name": "Graveyard -> Shield Grave", + "name": "Graveyard -> Graveyard Shield Grave", "short_name": "Shield Grave", "sections": [ { @@ -1261,11 +1273,14 @@ ] }, { - "name": "Graveyard -> Dampes House", + "name": "Graveyard -> Graveyard Dampes House", "short_name": "Dampes House", "sections": [ { "name": "House", + "visibility_rules": [ + "setting_entrance_interiors_simple" + ], "capture_item": true, "capture_item_layout": "tracker_capture_houses", "item_count": 1 @@ -1280,7 +1295,7 @@ ] }, { - "name": "Shadow Temple Warp Region -> Shadow Temple Entryway", + "name": "Graveyard Warp Pad Region -> Shadow Temple Entryway", "short_name": "Shadow Temple", "sections": [ { @@ -1293,6 +1308,7 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 2145, "y": 325 } @@ -1320,12 +1336,12 @@ ] }, { - "name": "Castle Town", + "name": "Market", "color": "#09a09d", "children": [ { - "name": "Castle Town -> Castle Town Bazaar", - "short_name": "Castle Town Bazaar", + "name": "Market -> Market Bazaar", + "short_name": "Market Bazaar", "sections": [ { "name": "House", @@ -1343,8 +1359,8 @@ ] }, { - "name": "Castle Town -> Castle Town Bombchu Bowling", - "short_name": "Bombchu Bowling", + "name": "Market -> Market Bombchu Bowling", + "short_name": "Market Bombchu Bowling", "sections": [ { "name": "House", @@ -1362,8 +1378,8 @@ ] }, { - "name": "Castle Town -> Castle Town Bombchu Shop", - "short_name": "Bombchu Shop", + "name": "Market -> Market Bombchu Shop", + "short_name": "Market Bombchu Shop", "sections": [ { "name": "House", @@ -1381,11 +1397,14 @@ ] }, { - "name": "Castle Town -> Castle Town Man in Green House", - "short_name": "Man in Green House", + "name": "Market -> Market Man in Green House", + "short_name": "Market Man in Green House", "sections": [ { "name": "House", + "visibility_rules": [ + "setting_entrance_interiors_simple" + ], "capture_item": true, "capture_item_layout": "tracker_capture_houses", "item_count": 1 @@ -1400,8 +1419,8 @@ ] }, { - "name": "Castle Town -> Castle Town Mask Shop", - "short_name": "Mask Shop", + "name": "Market -> Market Mask Shop", + "short_name": "Market Mask Shop", "sections": [ { "name": "House", @@ -1419,8 +1438,8 @@ ] }, { - "name": "Castle Town -> Castle Town Potion Shop", - "short_name": "Potion Shop", + "name": "Market -> Market Potion Shop", + "short_name": "Market Potion Shop", "sections": [ { "name": "House", @@ -1438,8 +1457,8 @@ ] }, { - "name": "Castle Town -> Castle Town Shooting Gallery", - "short_name": "Castle Town Shooting Gallery", + "name": "Market -> Market Shooting Gallery", + "short_name": "Market Shooting Gallery", "sections": [ { "name": "House", @@ -1457,8 +1476,8 @@ ] }, { - "name": "Castle Town -> Castle Town Treasure Chest Game", - "short_name": "Treasure Chest Game", + "name": "Market -> Market Treasure Chest Game", + "short_name": "Market Treasure Chest Game", "sections": [ { "name": "House", @@ -1476,8 +1495,8 @@ ] }, { - "name": "Castle Town Entrance -> Castle Town Rupee Room", - "short_name": "Castle Town Rupee Room", + "name": "Market Entrance -> Market Guard House", + "short_name": "Market Guard House", "sections": [ { "name": "House", @@ -1495,7 +1514,7 @@ ] }, { - "name": "Temple of Time Exterior -> Temple of Time", + "name": "ToT Entrance -> Temple of Time", "short_name": "Temple of Time", "sections": [ { @@ -1514,7 +1533,7 @@ ] }, { - "name": "Castle Town -> Castle Grounds", + "name": "Market -> Castle Grounds", "short_name": "CT -> CG", "sections": [ { @@ -1533,7 +1552,7 @@ ] }, { - "name": "Castle Town -> Castle Town Entrance", + "name": "Market -> Market Entrance", "short_name": "CT -> CTE", "sections": [ { @@ -1552,7 +1571,7 @@ ] }, { - "name": "Castle Town -> Temple of Time Exterior", + "name": "Market -> ToT Entrance", "short_name": "CT -> ToT", "sections": [ { @@ -1571,7 +1590,7 @@ ] }, { - "name": "Castle Town Entrance -> Castle Town", + "name": "Market Entrance -> Market", "short_name": "CTE -> CT", "sections": [ { @@ -1590,7 +1609,7 @@ ] }, { - "name": "Castle Town Entrance -> Hyrule Field", + "name": "Market Entrance -> Hyrule Field", "short_name": "CTE -> HF", "sections": [ { @@ -1609,7 +1628,7 @@ ] }, { - "name": "Temple of Time Exterior -> Castle Town", + "name": "ToT Entrance -> Market", "short_name": "ToT -> CT", "sections": [ { @@ -1634,8 +1653,8 @@ "color": "#09a09d", "children": [ { - "name": "Hyrule Castle Grounds -> Castle Storms Grotto", - "short_name": "Castle Storms Grotto", + "name": "Hyrule Castle Grounds -> HC Storms Grotto", + "short_name": "HC Storms Grotto", "sections": [ { "name": "Grotto", @@ -1653,8 +1672,8 @@ ] }, { - "name": "Ganons Castle Grounds -> Ganons Castle Fairy", - "short_name": "Ganons Castle Fairy", + "name": "Ganons Castle Grounds -> OGC Great Fairy Fountain", + "short_name": "OGC Great Fairy Fountain", "sections": [ { "name": "House", @@ -1672,8 +1691,8 @@ ] }, { - "name": "Hyrule Castle Grounds -> Hyrule Castle Fairy", - "short_name": "Hyrule Castle Fairy", + "name": "Hyrule Castle Grounds -> HC Great Fairy Fountain", + "short_name": "HC Great Fairy Fountain", "sections": [ { "name": "House", @@ -1691,7 +1710,7 @@ ] }, { - "name": "Castle Grounds -> Castle Town", + "name": "Castle Grounds -> Market", "short_name": "CG -> CT", "sections": [ { @@ -1716,8 +1735,8 @@ "color": "#a01009", "children": [ { - "name": "Death Mountain -> Mountain Bombable Grotto", - "short_name": "DMT Bombable Grotto", + "name": "Death Mountain Summit -> DMT Cow Grotto", + "short_name": "DMT Cow Grotto", "sections": [ { "name": "Grotto", @@ -1735,7 +1754,7 @@ ] }, { - "name": "Death Mountain -> Mountain Storms Grotto", + "name": "Death Mountain -> DMT Storms Grotto", "short_name": "DMT Storms Grotto", "sections": [ { @@ -1754,8 +1773,8 @@ ] }, { - "name": "Death Mountain Summit -> Mountain Summit Fairy", - "short_name": "DMT Fairy", + "name": "Death Mountain Summit -> DMT Great Fairy Fountain", + "short_name": "DMT Great Fairy Fountain", "sections": [ { "name": "House", @@ -1786,6 +1805,7 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 1685, "y": 220 } @@ -1811,7 +1831,7 @@ ] }, { - "name": "Death Mountain -> Kakariko Village Behind Gate", + "name": "Death Mountain -> Kak Behind Gate", "short_name": "DMT -> Kak", "sections": [ { @@ -1830,7 +1850,7 @@ ] }, { - "name": "Death Mountain Summit -> Death Mountain Crater Upper", + "name": "Death Mountain Summit -> DMC Upper Local", "short_name": "DMT -> DMC", "sections": [ { @@ -1849,8 +1869,8 @@ ] }, { - "name": "Death Mountain Summit Owl Flight -> Kakariko Village", - "short_name": "DMT Owl", + "name": "DMT Owl Flight -> Kak Impas Ledge", + "short_name": "DMT Owl Flight", "sections": [ { "name": "Overworld", @@ -1874,8 +1894,8 @@ "color": "#a01009", "children": [ { - "name": "Death Mountain Crater Upper -> Top of Crater Grotto", - "short_name": "Top of DMC Grotto", + "name": "DMC Upper Nearby -> DMC Upper Grotto", + "short_name": "DMC Upper Grotto", "sections": [ { "name": "Grotto", @@ -1893,7 +1913,7 @@ ] }, { - "name": "Death Mountain Crater Lower -> DMC Hammer Grotto", + "name": "DMC Lower Nearby -> DMC Hammer Grotto", "short_name": "DMC Hammer Grotto", "sections": [ { @@ -1912,8 +1932,8 @@ ] }, { - "name": "Death Mountain Crater Lower -> Crater Fairy", - "short_name": "DMC Fairy", + "name": "DMC Lower Nearby -> DMC Great Fairy Fountain", + "short_name": "DMC Great Fairy Fountain", "sections": [ { "name": "House", @@ -1931,7 +1951,7 @@ ] }, { - "name": "Death Mountain Crater Central -> Fire Temple Lower", + "name": "Fire Temple Entrance -> Fire Temple Lower", "short_name": "Fire Temple", "sections": [ { @@ -1944,13 +1964,14 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 1910, "y": 80 } ] }, { - "name": "Death Mountain Crater Lower -> Darunias Chamber", + "name": "DMC Lower Nearby -> GC Darunias Chamber", "short_name": "DMC -> GC", "sections": [ { @@ -1969,7 +1990,7 @@ ] }, { - "name": "Death Mountain Crater Upper -> Death Mountain Summit", + "name": "DMC Upper Nearby -> Death Mountain Summit", "short_name": "DMC -> DMT", "sections": [ { @@ -1994,8 +2015,8 @@ "color": "#a01009", "children": [ { - "name": "Goron City -> Goron City Grotto", - "short_name": "Goron City Grotto", + "name": "Goron City -> GC Grotto", + "short_name": "GC Grotto", "sections": [ { "name": "Grotto", @@ -2013,8 +2034,8 @@ ] }, { - "name": "Goron City -> Goron Shop", - "short_name": "Goron Shop", + "name": "Goron City -> GC Shop", + "short_name": "GC Shop", "sections": [ { "name": "House", @@ -2032,7 +2053,7 @@ ] }, { - "name": "Darunias Chamber -> Death Mountain Crater Lower", + "name": "GC Darunias Chamber -> DMC Lower Local", "short_name": "GC -> DMC", "sections": [ { @@ -2070,7 +2091,7 @@ ] }, { - "name": "Goron City Woods Warp -> Lost Woods", + "name": "GC Woods Warp -> Lost Woods", "short_name": "GC -> LW", "sections": [ { @@ -2095,8 +2116,8 @@ "color": "#0936a0", "children": [ { - "name": "Lake Hylia -> Lake Hylia Grotto", - "short_name": "Lake Hylia Grotto", + "name": "Lake Hylia -> LH Grotto", + "short_name": "LH Grotto", "sections": [ { "name": "Grotto", @@ -2114,8 +2135,8 @@ ] }, { - "name": "Lake Hylia -> Fishing Hole", - "short_name": "Fishing Hole", + "name": "Lake Hylia -> LH Fishing Hole", + "short_name": "LH Fishing Hole", "sections": [ { "name": "House", @@ -2133,8 +2154,8 @@ ] }, { - "name": "Lake Hylia -> Lake Hylia Lab", - "short_name": "Lake Hylia Lab", + "name": "Lake Hylia -> LH Lab", + "short_name": "LH Lab", "sections": [ { "name": "House", @@ -2165,6 +2186,7 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 1015, "y": 1380 } @@ -2209,8 +2231,8 @@ ] }, { - "name": "Lake Hylia Owl Flight -> Hyrule Field", - "short_name": "LH Owl", + "name": "LH Owl Flight -> Hyrule Field", + "short_name": "LH Owl Flight", "sections": [ { "name": "Overworld", @@ -2234,8 +2256,8 @@ "color": "#0936a0", "children": [ { - "name": "Zora River -> Zora River Plateau Bombable Grotto", - "short_name": "ZR Plateau Bombable Grotto", + "name": "Zora River -> ZR Fairy Grotto", + "short_name": "ZR Fairy Grotto", "sections": [ { "name": "Grotto", @@ -2253,8 +2275,8 @@ ] }, { - "name": "Zora River -> Zora River Plateau Open Grotto", - "short_name": "ZR Plateau Open Grotto", + "name": "Zora River -> ZR Open Grotto", + "short_name": "ZR Open Grotto", "sections": [ { "name": "Grotto", @@ -2272,7 +2294,7 @@ ] }, { - "name": "Zora River -> Zora River Storms Grotto", + "name": "Zora River -> ZR Storms Grotto", "short_name": "ZR Storms Grotto", "sections": [ { @@ -2310,7 +2332,7 @@ ] }, { - "name": "Zora River Behind Waterfall -> Zoras Domain", + "name": "ZR Behind Waterfall -> Zoras Domain", "short_name": "ZR -> ZD", "sections": [ { @@ -2329,7 +2351,7 @@ ] }, { - "name": "Zora River Front -> Hyrule Field", + "name": "ZR Front -> Hyrule Field", "short_name": "ZR -> HF", "sections": [ { @@ -2354,7 +2376,7 @@ "color": "#0936a0", "children": [ { - "name": "Zoras Domain -> Zoras Domain Storms Grotto", + "name": "Zoras Domain -> ZD Storms Grotto", "short_name": "ZD Storms Grotto", "sections": [ { @@ -2373,8 +2395,8 @@ ] }, { - "name": "Zoras Domain -> Zora Shop", - "short_name": "Zora Shop", + "name": "Zoras Domain -> ZD Shop", + "short_name": "ZD Shop", "sections": [ { "name": "House", @@ -2411,7 +2433,7 @@ ] }, { - "name": "Zoras Domain -> Zora River Behind Waterfall", + "name": "Zoras Domain -> ZR Behind Waterfall", "short_name": "ZD -> ZR", "sections": [ { @@ -2430,7 +2452,7 @@ ] }, { - "name": "Zoras Domain Behind King Zora -> Zoras Fountain", + "name": "ZD Behind King Zora -> Zoras Fountain", "short_name": "ZD -> ZF", "sections": [ { @@ -2455,8 +2477,8 @@ "color": "#0936a0", "children": [ { - "name": "Zoras Fountain -> Zoras Fountain Fairy", - "short_name": "ZF Fairy", + "name": "Zoras Fountain -> ZF Great Fairy Fountain", + "short_name": "ZF Great Fairy Fountain", "sections": [ { "name": "House", @@ -2487,6 +2509,7 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 2490, "y": 330 } @@ -2506,13 +2529,14 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 2500, "y": 275 } ] }, { - "name": "Zoras Fountain -> Zoras Domain Behind King Zora", + "name": "Zoras Fountain -> ZD Behind King Zora", "short_name": "ZF -> ZD", "sections": [ { @@ -2537,11 +2561,14 @@ "color": "#a09509", "children": [ { - "name": "Gerudo Valley -> Gerudo Valley Octorok Grotto", - "short_name": "Octorok Grotto", + "name": "Gerudo Valley -> GV Octorok Grotto", + "short_name": "GV Octorok Grotto", "sections": [ { "name": "Grotto", + "visibility_rules": [ + "setting_entrance_grottos_shuffle" + ], "capture_item": true, "capture_item_layout": "tracker_capture_grottos", "item_count": 1 @@ -2556,7 +2583,7 @@ ] }, { - "name": "Gerudo Valley Far Side -> Gerudo Valley Storms Grotto", + "name": "GV Fortress Side -> GV Storms Grotto", "short_name": "GV Storms Grotto", "sections": [ { @@ -2575,11 +2602,14 @@ ] }, { - "name": "Gerudo Valley Far Side -> Carpenter Tent", - "short_name": "Carpenter Tent", + "name": "GV Fortress Side -> GV Carpenter Tent", + "short_name": "GV Carpenter Tent", "sections": [ { "name": "House", + "visibility_rules": [ + "setting_entrance_interiors_simple" + ], "capture_item": true, "capture_item_layout": "tracker_capture_houses", "item_count": 1 @@ -2613,7 +2643,7 @@ ] }, { - "name": "Gerudo Valley Far Side -> Gerudo Fortress", + "name": "GV Fortress Side -> Gerudo Fortress", "short_name": "GV -> GF", "sections": [ { @@ -2638,7 +2668,7 @@ "color": "#a09509", "children": [ { - "name": "Gerudo Fortress -> Gerudo Fortress Storms Grotto", + "name": "Gerudo Fortress -> GF Storms Grotto", "short_name": "GF Storms Grotto", "sections": [ { @@ -2670,13 +2700,14 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 485, "y": 435 } ] }, { - "name": "Gerudo Fortress -> Gerudo Valley Far Side", + "name": "Gerudo Fortress -> GV Fortress Side", "short_name": "GF -> GV", "sections": [ { @@ -2695,7 +2726,7 @@ ] }, { - "name": "Gerudo Fortress Outside Gate -> Haunted Wasteland Near Fortress", + "name": "GF Outside Gate -> Wasteland Near Fortress", "short_name": "GF -> WL", "sections": [ { @@ -2720,7 +2751,7 @@ "color": "#a09509", "children": [ { - "name": "Haunted Wasteland Near Colossus -> Desert Colossus", + "name": "Wasteland Near Colossus -> Desert Colossus", "short_name": "WL -> Col", "sections": [ { @@ -2739,7 +2770,7 @@ ] }, { - "name": "Haunted Wasteland Near Fortress -> Gerudo Fortress Outside Gate", + "name": "Wasteland Near Fortress -> GF Outside Gate", "short_name": "WL -> GF", "sections": [ { @@ -2764,7 +2795,7 @@ "color": "#a09509", "children": [ { - "name": "Desert Colossus -> Desert Colossus Grotto", + "name": "Desert Colossus -> Colossus Grotto", "short_name": "Colossus Grotto", "sections": [ { @@ -2783,8 +2814,8 @@ ] }, { - "name": "Desert Colossus -> Colossus Fairy", - "short_name": "Colossus Fairy", + "name": "Desert Colossus -> Colossus Great Fairy Fountain", + "short_name": "Colossus Great Fairy Fountain", "sections": [ { "name": "House", @@ -2815,13 +2846,14 @@ "map_locations": [ { "map": "entrances", + "size": 50, "x": 95, "y": 315 } ] }, { - "name": "Desert Colossus -> Haunted Wasteland Near Colossus", + "name": "Desert Colossus -> Wasteland Near Colossus", "short_name": "Col -> WL", "sections": [ { diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index adbb24f9..07590aa5 100644 --- a/ootrando_overworldmap_hamsda/manifest.json +++ b/ootrando_overworldmap_hamsda/manifest.json @@ -1,7 +1,7 @@ { "name": "OoT Randomizer - Map and Item Tracker", "game_name": "Ocarina of Time Randomizer", - "package_version": "2.9.6.0", + "package_version": "2.10.0.0", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/maps/maps.json b/ootrando_overworldmap_hamsda/maps/maps.json index a8284ff6..04c60260 100644 --- a/ootrando_overworldmap_hamsda/maps/maps.json +++ b/ootrando_overworldmap_hamsda/maps/maps.json @@ -10,11 +10,5 @@ "location_size": 35, "location_border_thickness": 5, "img": "images/overworld_map.png" - }, - { - "name": "gossips", - "location_size": 35, - "location_border_thickness": 5, - "img": "images/overworld_map.png" } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/scripts/init.lua b/ootrando_overworldmap_hamsda/scripts/init.lua index 237e1b59..c1e071fb 100644 --- a/ootrando_overworldmap_hamsda/scripts/init.lua +++ b/ootrando_overworldmap_hamsda/scripts/init.lua @@ -1,7 +1,74 @@ -local variant = Tracker.ActiveVariantUID -local has_map = variant ~= "var_minimalist" and (not variant:find("itemsonly")) -local has_keys = variant:find("keysanity") -local is_er = variant:find("entrance") +object_cache = {} +function get_object(name) + if object_cache[name] then + return object_cache[name] + end + local object = Tracker:FindObjectForCode(name) + if object then + object_cache[name] = object + return object + end +end + + + +settings_cache = {} +queued_changes = {} +function not_like_cache(setting, current) + if settings_cache[setting] == nil or settings_cache[setting] ~= current then + queued_changes[setting] = current + return true + end + return false +end +function apply_queued_changes() + for setting,value in pairs(queued_changes) do + settings_cache[setting] = value + end + queued_changes = {} +end + + + +dungeons = { + "forest", + "fire", + "water", + "spirit", + "shadow", + "botw", + "gtg", + "gc" +} +key_counts = { + vanilla = { + forest = 5, + fire = 8, + water = 6, + spirit = 5, + shadow = 5, + botw = 3, + gtg = 9, + gc = 2, + }, + mq = { + forest = 6, + fire = 5, + water = 2, + spirit = 7, + shadow = 6, + botw = 2, + gtg = 3, + gc = 3, + } +} + + + +variant = Tracker.ActiveVariantUID +has_map = variant ~= "var_minimalist" and (not variant:find("itemsonly")) +has_keys = variant:find("keysanity") +is_er = variant:find("entrance") @@ -11,14 +78,15 @@ if has_map then Tracker:AddItems("items/cap_houses.json") Tracker:AddItems("items/cap_dungeons.json") Tracker:AddItems("items/cap_overworld.json") + Tracker:AddItems("items/options_entrance.json") else Tracker:AddItems("items/tricks.json") Tracker:AddItems("items/sequences.json") + Tracker:AddItems("items/cap_items.json") + Tracker:AddItems("items/options.json") end end -Tracker:AddItems("items/cap_items.json") Tracker:AddItems("items/counters.json") -Tracker:AddItems("items/options.json") Tracker:AddItems("items/quest.json") Tracker:AddItems("items/equipment.json") Tracker:AddItems("items/items.json") @@ -30,6 +98,7 @@ if has_map then if is_er then Tracker:AddMaps("maps/maps_entrance.json") Tracker:AddLocations("locations/overworld_entrance.json") + Tracker:AddLayouts("layouts/options_entrance.json") else Tracker:AddMaps("maps/maps.json") Tracker:AddLocations("locations/overworld.json") @@ -67,7 +136,7 @@ Tracker:AddLayouts("layouts/broadcast.json") --change GF key counter in this variant only going to 1 because of the default settings for GF if variant == "var_itemsonly_keysanity" then - local gf = Tracker:FindObjectForCode("setting_gerudo") + local gf = get_object("setting_gerudo") if gf then gf.CurrentStage = 0 end diff --git a/ootrando_overworldmap_hamsda/scripts/logic.lua b/ootrando_overworldmap_hamsda/scripts/logic.lua index 204a9ea5..33257c4b 100644 --- a/ootrando_overworldmap_hamsda/scripts/logic.lua +++ b/ootrando_overworldmap_hamsda/scripts/logic.lua @@ -203,7 +203,7 @@ end function can_leave_forest() if has("setting_forest_open") or has("setting_forest_deku") - --or has_age("adult") + or has("setting_age_adult") then return 1, AccessibilityLevel.Normal end @@ -714,6 +714,41 @@ function has_bottle() return usable_bottles, level end +blue_fire_locations = { + "@Ganons Castle/Water Trial Chests", + "@Ganons Castle MQ/Water Trial Chest", + "@Gerudo Training Grounds MQ/Before Heavy Block Chest" +} +function has_blue_fire() + local bottle_count, bottle_level = has_bottle() + + if bottle_count == 0 then + return 0, AccessibilityLevel.None + end + + if has("wallet2") then + return 1, bottle_level + end + + local zf_count, zf_level = adult_fountain() + if zf_count > 0 and zf_level == AccessibilityLevel.Normal then + return 1, bottle_level + end + + for _,location in ipairs(blue_fire_locations) do + local location_object = get_object(location) + if location_object + and location_object.AccessibilityLevel + and location_object.AccessibilityLevel == AccessibilityLevel.Normal + then + --TODO: trigger dummy update + return 1, bottle_level + end + end + + return 1, AccessibilityLevel.SequenceBreak +end + function has_projectile(age) local explo = has_explosives() > 0 local sling = has("sling") @@ -803,7 +838,7 @@ end function trials_barrier_dispelled() local trials_cleared = Tracker:ProviderCountForCode("trial_cleared") - local setting_trials = Tracker:FindObjectForCode("setting_trials").AcquiredCount + local setting_trials = get_object("setting_trials") and get_object("setting_trials").AcquiredCount or 0 if setting_trials == 0 or trials_cleared >= setting_trials diff --git a/ootrando_overworldmap_hamsda/scripts/update.lua b/ootrando_overworldmap_hamsda/scripts/update.lua index 25b51b3c..ef067a7b 100644 --- a/ootrando_overworldmap_hamsda/scripts/update.lua +++ b/ootrando_overworldmap_hamsda/scripts/update.lua @@ -1,58 +1,6 @@ -settings_cache = {} -queued_changes = {} -function not_like_cache(setting, current) - if settings_cache[setting] == nil or settings_cache[setting] ~= current then - queued_changes[setting] = current - return true - end - return false -end -function apply_queued_changes() - for setting,value in pairs(queued_changes) do - settings_cache[setting] = value - end - queued_changes = {} -end - - -has_keys = Tracker.ActiveVariantUID:find("keysanity") - - -dungeons = { - "forest", - "fire", - "water", - "spirit", - "shadow", - "botw", - "gtg", - "gc" -} -key_counts = { - vanilla = { - forest = 5, - fire = 8, - water = 6, - spirit = 5, - shadow = 5, - botw = 3, - gtg = 9, - gc = 2, - }, - mq = { - forest = 6, - fire = 5, - water = 2, - spirit = 7, - shadow = 6, - botw = 2, - gtg = 3, - gc = 3, - } -} function update_smallkeys() for _,dungeon in ipairs(dungeons) do - local key_object = Tracker:FindObjectForCode(dungeon.."_small_keys") + local key_object = get_object(dungeon.."_small_keys") if key_object then if has(dungeon.."_reg") then key_object.MaxCount = key_counts["vanilla"][dungeon] @@ -61,7 +9,7 @@ function update_smallkeys() end if not has_keys then key_object.AcquiredCount = key_object.MaxCount - local bk = Tracker:FindObjectForCode(dungeon.."_boss_key") + local bk = get_object(dungeon.."_boss_key") if bk then bk.Active = true end @@ -78,8 +26,8 @@ function update_fortress() local setting_fast = has("gerudo_fortress_fast") local setting_open = has("gerudo_fortress_open") - local item_card = Tracker:FindObjectForCode("gerudocard") - local item_gf_keys = Tracker:FindObjectForCode("gf_small_keys") + local item_card = get_object("gerudocard") + local item_gf_keys = get_object("gf_small_keys") if item_gf_keys then if setting_open then @@ -108,20 +56,20 @@ end vanilla_captures = { ["setting_shuffle_sword1_yes"] = { - ["@Kokiri Sword Chest/Dodge Boulder"] = "sword1" + ["@KF Kokiri Sword Chest/Dodge Boulder"] = "sword1" }, ["setting_shuffle_ocarinas_yes"] = { - ["@Lost Woods Bridge/Gift from Saria"] = "ocarina", - ["@Ocarina of Time/Item"] = "ocarina" + ["@LW Bridge/LW Gift from Saria"] = "ocarina", + ["@HF Ocarina of Time/HF Ocarina of Time Item"] = "ocarina" }, ["setting_shuffle_egg_yes"] = { - ["@Malon at Castle/Talk to her"] = "capture_childegg" + ["@Malon at Castle/HC Malon Egg"] = "capture_childegg" }, ["setting_shuffle_card_yes"] = { - ["@Carpenter Rescue/Free the carpenters"] = "gerudocard" + ["@Carpenter Rescue/Gerudo Membership Card"] = "gerudocard" }, ["setting_shuffle_beans_yes"] = { - ["@Magic Bean Salesman/Buy Item"] = "beans" + ["@ZR Magic Bean Salesman/Buy Item"] = "beans" } } function update_vanilla_captures() @@ -129,8 +77,8 @@ function update_vanilla_captures() local has_setting = has(setting) if not_like_cache(setting, has_setting) then for location,item in pairs(captures) do - local location_object = Tracker:FindObjectForCode(location) - local item_object = Tracker:FindObjectForCode(item) + local location_object = get_object(location) + local item_object = get_object(item) if location_object and item_object then if has_setting then location_object.CapturedItem = nil @@ -149,7 +97,7 @@ end function get_first_free_bottle() for i=1,4 do - local bottle = Tracker:FindObjectForCode("bottle"..i) + local bottle = get_object("bottle"..i) if bottle and bottle.CurrentStage == 0 then return bottle end @@ -157,14 +105,14 @@ function get_first_free_bottle() return nil end function get_kid_trade() - local trade = Tracker:FindObjectForCode("kidtrade") + local trade = get_object("kidtrade") if trade then return trade end return nil end function get_adult_trade() - local trade = Tracker:FindObjectForCode("adulttrade") + local trade = get_object("adulttrade") if trade then return trade end @@ -276,9 +224,9 @@ capture_mappings = { get_adult_trade } } -function update_capture_items() +function update_collected_capture() for code,data in pairs(capture_mappings) do - local capture = Tracker:FindObjectForCode(code) + local capture = get_object(code) if capture and capture.Active then capture.Active = false local item = data[2]() @@ -293,152 +241,152 @@ end skulltula_locations = { --overworld - "@Know It All House/GS1 (N)", - "@Kokiri Bean Patch/GS2", - "@House of Twins/GS3 (N)", - "@Lost Woods Bean Patch Near Bridge/GS4", - "@Lost Woods Bean Patch Near Stage/GS5", - "@Lost Woods Above Stage/GS6 (N)", - "@Top of Maze/GS7 (N)", - "@Field Kakariko Grotto/GS12", - "@Field Valley Grotto/GS13", - "@Castle Market Guard House/GS14", - "@Hyrule Castle Tree/GS15", - "@Castle Storms Grotto/GS16", - "@Outside Ganon's Castle/GS17", - "@Lon Lon Ranch Tree/GS18", - "@Lon Lon Ranch Rain Shed/GS19 (N)", - "@Lon Lon Ranch House Window/GS20 (N)", - "@Lon Lon Ranch Back Wall/GS21 (N)", - "@Kakariko Tree/GS22 (N)", - "@Kakariko Skulltula House/GS23 (N)", - "@Kakariko House Under Construction/GS24 (N)", - "@Kakariko Guard's House/GS25 (N)", - "@Kakariko Watchtower/GS26 (N)", - "@Kakariko Above Impa's House/GS27 (N)", - "@Graveyard Wall/GS28 (N)", - "@Graveyard Bean Patch/GS29", - "@Mountain Trail Bean Patch/GS30", - "@Mountain Trail Bomb Alcove/GS31", - "@Mountain Trail Above Dodongo's Cavern/GS32 (N)", - "@Mountain Trail Path to Crater/GS33 (N)", - "@Goron City Boulder Maze/GS34", - "@Goron City Center Platform/GS35", - "@Death Mountain Crater Crate/GS36", - "@Mountain Crater Bean Patch/GS37", - "@Zora River Tree/GS43", - "@Zora River Ladder/GS44 (N)", - "@Zora River Near Raised Grottos/GS45 (N)", - "@Zora River Above Bridge/GS46 (N)", - "@Frozen Waterfall/GS47 (N)", - "@Zora's Fountain Tree/GS48", - "@Zora's Fountain Above the Log/GS49 (N)", - "@Zora's Fountain Hidden Cave/GS50 (N)", - "@Lake Hylia Bean Patch/GS55", - "@Lab Wall/GS56 (N)", - "@Small Island/GS57 (N)", - "@Giant Tree/GS58 (N)", - "@Lab Underwater Crate/GS59", - "@Gerudo Valley Small Bridge/GS86 (N)", - "@Gerudo Valley Bean Patch/GS87", - "@Gerudo Valley Behind Tent/GS88 (N)", - "@Gerudo Valley Pillar/GS89 (N)", - "@Archery Range/GS90 (N)", - "@Top Floor/GS91 (N)", - "@Wasteland Ruins/GS92", - "@Desert Colossus Bean Patch/GS93", - "@Desert Colossus Tree/GS94 (N)", - "@Desert Colossus Hill/GS95 (N)", + "@KF Know It All House/KF GS Know It All House (N)", + "@KF Bean Patch/KF GS Bean Patch", + "@KF House of Twins/KF GS House of Twins (N)", + "@LW Bean Patch Near Bridge/LW GS Bean Patch Near Bridge", + "@LW Bean Patch Near Theater/LW GS Bean Patch Near Theater", + "@LW Above Theater/LW GS Above Theater (N)", + "@SFM Maze/SFM GS (N)", + "@HF Near Kak Grotto/HF GS Near Kak Grotto", + "@HF Cow Grotto/HF GS Cow Grotto", + "@LH Lab/LH GS Lab Crate", + "@LH Bean Patch/LH GS Bean Patch", + "@LH Lab Wall/LH GS Lab Wall (N)", + "@LH Small Island/LH GS Small Island (N)", + "@LH Tree/LH GS Tree (N)", + "@LLR Tree/LLR GS Tree", + "@LLR Rain Shed/LLR GS Rain Shed (N)", + "@LLR House Window/LLR GS House Window (N)", + "@LLR Back Wall/LLR GS Back Wall (N)", + "@Kak Above Impas House/Kak GS Above Impas House (N)", + "@Kak Tree/Kak GS Tree (N)", + "@Kak Skulltula House/Kak GS Skulltula House (N)", + "@Kak House Under Construction/Kak GS House Under Construction (N)", + "@Kak Guards House/Kak GS Guards House (N)", + "@Kak Watchtower/Kak GS Watchtower (N)", + "@Graveyard Wall/Graveyard GS Wall (N)", + "@Graveyard Bean Patch/Graveyard GS Bean Patch", + "@GC Maze/GC GS Boulder Maze", + "@GC Center Platform/GC GS Center Platform", + "@DMT Above Dodongos Cavern/DMT GS Above Dodongos Cavern (N)", + "@DMT Falling Rocks Path/DMT GS Falling Rocks Path (N)", + "@DMT Bean Patch/DMT GS Bean Patch", + "@DMT Near Kak/DMT GS Near Kak", + "@DMC Crate/DMC GS Crate", + "@DMC Bean Patch/DMC GS Bean Patch", + "@Market Guard House/Market GS Guard House", + "@HC Tree/HC GS Tree", + "@HC Storms Grotto/HC GS Storms Grotto", + "@OGC/OGC GS", + "@ZR Tree/ZR GS Tree", + "@ZR Ladder/ZR GS Ladder (N)", + "@ZR Near Raised Grottos/ZR GS Near Raised Grottos (N)", + "@ZR Above Bridge/ZR GS Above Bridge (N)", + "@ZD Frozen Waterfall/ZD GS Frozen Waterfall (N)", + "@ZF Hidden Cave/ZF GS Hidden Cave (N)", + "@ZF Tree/ZF GS Tree", + "@ZF Above the Log/ZF GS Above the Log (N)", + "@GV Small Bridge/GV GS Small Bridge (N)", + "@GV Bean Patch/GV GS Bean Patch", + "@GV Behind Tent/GV GS Behind Tent (N)", + "@GV Pillar/GV GS Pillar (N)", + "@GF Archery Range/GF GS Archery Range (N)", + "@GF Top Floor/GF GS Top Floor (N)", + "@Wasteland Structure/Wasteland GS", + "@Colossus Bean Patch/Colossus GS Bean Patch", + "@Colossus Tree/Colossus GS Tree (N)", + "@Colossus Hill/Colossus GS Hill (N)", --regular dungeons - "@Deku Tree/GS8 - Compass Room", - "@Deku Tree/GS9 - Basement Vines", - "@Deku Tree/GS10 - Basement Gate", - "@Deku Tree/GS11 - Basement Back Room", - "@Dodongos Cavern/GS38 - East Side Room", - "@Dodongos Cavern/GS39 - Vines Above Stairs", - "@Dodongos Cavern/GS40 - Back Room", - "@Dodongos Cavern/GS41 - Alcove Above Stairs", - "@Dodongos Cavern/GS42 - Scarecrow", - "@Jabu Jabus Belly/GS51 - Water Switch Room", - "@Jabu Jabus Belly/GS52 - Lobby Basement Lower", - "@Jabu Jabus Belly/GS53 - Lobby Basement Upper", - "@Jabu Jabus Belly/GS54 - Near Boss", - "@Forest Temple/GS60 - First Room", - "@Forest Temple/GS61 - Lobby", - "@Forest Temple/GS62 - Outdoor East", - "@Forest Temple/GS63 - Outdoor West", - "@Forest Temple/GS64 - Basement", - "@Fire Temple/GS65 - Song of Time Room", - "@Fire Temple/GS66 - Unmarked Bomb Wall", - "@Fire Temple/GS67 - East Tower Climb", - "@Fire Temple/GS68 - East Tower Top", - "@Fire Temple/GS69 - Basement", - "@Ice Cavern/GS70 - Heart Piece Room", - "@Ice Cavern/GS71 - Spinning Scythe Room", - "@Ice Cavern/GS72 - Push Block Room", - "@Water Temple/GS73 - South Basement", - "@Water Temple/GS74 - Serpent River", - "@Water Temple/GS75 - Central Room", - "@Water Temple/GS76 - Falling Platform Room", - "@Water Temple/GS77 - Near Boss Key Chest", - "@Bottom of the Well/GS78 - Like Like Cage", - "@Bottom of the Well/GS79 - West Inner Room", - "@Bottom of the Well/GS80 - East Inner Room", - "@Shadow Temple/GS81 - Like Like Room", - "@Shadow Temple/GS82 - Crusher Room", - "@Shadow Temple/GS83 - Single Giant Pot", - "@Shadow Temple/GS84 - Near Ship", - "@Shadow Temple/GS85 - Triple Giant Pot", - "@Spirit Temple/GS96 - Metal Fence", - "@Spirit Temple/GS97 - Bomb for Light Room", - "@Spirit Temple/GS98 - Hall to West Iron Knuckle", - "@Spirit Temple/GS99 - Boulder Room", - "@Spirit Temple/GS100 - Lobby", + "@Deku Tree/GS Compass Room", + "@Deku Tree/GS Basement Vines", + "@Deku Tree/GS Basement Gate", + "@Deku Tree/GS Basement Back Room", + "@Dodongos Cavern/GS Side Room Near Lower Lizalfos", + "@Dodongos Cavern/GS Scarecrow", + "@Dodongos Cavern/GS Alcove Above Stairs", + "@Dodongos Cavern/GS Vines Above Stairs", + "@Dodongos Cavern/GS Back Room", + "@Jabu Jabus Belly/GS Water Switch Room", + "@Jabu Jabus Belly/GS Lobby Basement Lower", + "@Jabu Jabus Belly/GS Lobby Basement Upper", + "@Jabu Jabus Belly/GS Near Boss", + "@Ice Cavern/GS Spinning Scythe Room", + "@Ice Cavern/GS Heart Piece Room", + "@Ice Cavern/GS Push Block Room", + "@Forest Temple/GS First Room", + "@Forest Temple/GS Lobby", + "@Forest Temple/GS Raised Island Courtyard", + "@Forest Temple/GS Level Island Courtyard", + "@Forest Temple/GS Basement", + "@Fire Temple/GS Boss Key Loop", + "@Fire Temple/GS Song of Time Room", + "@Fire Temple/GS Boulder Maze", + "@Fire Temple/GS Scarecrow Climb", + "@Fire Temple/GS Scarecrow Top", + "@Water Temple/GS Behind Gate", + "@Water Temple/GS Central Pillar", + "@Water Temple/GS Falling Platform Room", + "@Water Temple/GS River", + "@Water Temple/GS Near Boss Key Chest", + "@Shadow Temple/GS Like Like Room", + "@Shadow Temple/GS Falling Spikes Room", + "@Shadow Temple/GS Single Giant Pot", + "@Shadow Temple/GS Near Ship", + "@Shadow Temple/GS Triple Giant Pot", + "@Spirit Temple/GS Metal Fence", + "@Spirit Temple/GS Sun on Floor Room", + "@Spirit Temple/GS Hall After Sun Block Room", + "@Spirit Temple/GS Lobby", + "@Spirit Temple/GS Boulder Room", + "@Bottom of the Well/GS West Inner Room", + "@Bottom of the Well/GS East Inner Room", + "@Bottom of the Well/GS Like Like Cage", --MQ dungeons - "@Deku Tree MQ/GS8 - Lobby", - "@Deku Tree MQ/GS9 - Compass Room", - "@Deku Tree MQ/GS10 - Basement Ceiling", - "@Deku Tree MQ/GS11 - Basement Back Room", - "@Dodongos Cavern MQ/GS38 - Song of Time Block Room", - "@Dodongos Cavern MQ/GS39 - Larva Room", - "@Dodongos Cavern MQ/GS40 - Lizalfos Room", - "@Dodongos Cavern MQ/GS41 - Scrub Room", - "@Dodongos Cavern MQ/GS42 - Back Area", - "@Jabu Jabus Belly MQ/GS51 - Boomerang Room", - "@Jabu Jabus Belly MQ/GS52 - Tailpasaran Room", - "@Jabu Jabus Belly MQ/GS53 - Invisible Enemies Room", - "@Jabu Jabus Belly MQ/GS54 - Near Boss", - "@Forest Temple MQ/GS60 - First Hallway", - "@Forest Temple MQ/GS61 - Block Push Room", - "@Forest Temple MQ/GS62 - Outdoor West", - "@Forest Temple MQ/GS63 - Outdoor East", - "@Forest Temple MQ/GS64 - Well", - "@Fire Temple MQ/GS65 - Big Lava Room", - "@Fire Temple MQ/GS66 - East Tower Top", - "@Fire Temple MQ/GS67 - Fire Wall Maze Side Room", - "@Fire Temple MQ/GS68 - Above Fire Wall Maze", - "@Fire Temple MQ/GS69 - Fire Wall Maze Center", - "@Ice Cavern MQ/GS70 - Red Ice", - "@Ice Cavern MQ/GS71 - Scarecrow", - "@Ice Cavern MQ/GS72 - Ice Block", - "@Water Temple MQ/GS73 - South Basement", - "@Water Temple MQ/GS74 - North Basement", - "@Water Temple MQ/GS75 - Serpent River", - "@Water Temple MQ/GS76 - Lizalfos Hallway", - "@Water Temple MQ/GS77 - Before Upper Water Switch", - "@Bottom of the Well MQ/GS78 - West Inner Room", - "@Bottom of the Well MQ/GS79 - Basement", - "@Bottom of the Well MQ/GS80 - Coffin Room", - "@Shadow Temple MQ/GS81 - Crusher Room", - "@Shadow Temple MQ/GS82 - Wind Hint Room", - "@Shadow Temple MQ/GS83 - After Wind", - "@Shadow Temple MQ/GS84 - After Ship", - "@Shadow Temple MQ/GS85 - Near Boss", - "@Spirit Temple MQ/GS96 - Sun Block Room", - "@Spirit Temple MQ/GS97 - Lower Adult Left", - "@Spirit Temple MQ/GS98 - Lower Adult Right", - "@Spirit Temple MQ/GS99 - Iron Knuckle North", - "@Spirit Temple MQ/GS100 - Iron Knuckle West", + "@Deku Tree MQ/GS Lobby", + "@Deku Tree MQ/GS Compass Room", + "@Deku Tree MQ/GS Basement Graves Room", + "@Deku Tree MQ/GS Basement Back Room", + "@Dodongos Cavern MQ/GS Scrub Room", + "@Dodongos Cavern MQ/GS Lizalfos Room", + "@Dodongos Cavern MQ/GS Larvae Room", + "@Dodongos Cavern MQ/GS Song of Time Block Room", + "@Dodongos Cavern MQ/GS Back Area", + "@Jabu Jabus Belly MQ/GS Boomerang Chest Room", + "@Jabu Jabus Belly MQ/GS Tailpasaran Room", + "@Jabu Jabus Belly MQ/GS Invisible Enemies Room", + "@Jabu Jabus Belly MQ/GS Near Boss", + "@Ice Cavern MQ/GS Red Ice", + "@Ice Cavern MQ/GS Scarecrow", + "@Ice Cavern MQ/GS Ice Block", + "@Forest Temple MQ/GS First Hallway", + "@Forest Temple MQ/GS Raised Island Courtyard", + "@Forest Temple MQ/GS Well", + "@Forest Temple MQ/GS Level Island Courtyard", + "@Forest Temple MQ/GS Block Push Room", + "@Fire Temple MQ/GS Big Lava Room Open Door", + "@Fire Temple MQ/GS Skull On Fire", + "@Fire Temple MQ/GS Fire Wall Maze Side Room", + "@Fire Temple MQ/GS Fire Wall Maze Center", + "@Fire Temple MQ/GS Above Fire Wall Maze", + "@Water Temple MQ/GS Lizalfos Hallway", + "@Water Temple MQ/GS Before Upper Water Switch", + "@Water Temple MQ/GS River", + "@Water Temple MQ/GS Freestanding Key Area", + "@Water Temple MQ/GS Triple Wall Torch", + "@Shadow Temple MQ/GS Falling Spikes Room", + "@Shadow Temple MQ/GS Wind Hint Room", + "@Shadow Temple MQ/GS After Wind", + "@Shadow Temple MQ/GS After Ship", + "@Shadow Temple MQ/GS Near Boss", + "@Spirit Temple MQ/GS Sun Block Room", + "@Spirit Temple MQ/GS Leever Room", + "@Spirit Temple MQ/GS Symphony Room", + "@Spirit Temple MQ/GS Nine Thrones Room North", + "@Spirit Temple MQ/GS Nine Thrones Room West", + "@Bottom of the Well MQ/GS West Inner Room", + "@Bottom of the Well MQ/GS Basement", + "@Bottom of the Well MQ/GS Coffin Room", } function count_skulltulas() local total = 0 @@ -446,7 +394,7 @@ function count_skulltulas() local in_logic = 0 for _, location in ipairs(skulltula_locations) do - local location_object = Tracker:FindObjectForCode(location) + local location_object = get_object(location) if location_object and location_object.AccessibilityLevel then --location_object.AvailableChestCount total = total + 1 @@ -460,8 +408,8 @@ function count_skulltulas() end end - local available_object = Tracker:FindObjectForCode("counter_gs_available") - local in_logic_object = Tracker:FindObjectForCode("counter_gs_logic") + local available_object = get_object("counter_gs_available") + local in_logic_object = get_object("counter_gs_logic") if available_object then available_object.AcquiredCount = available end @@ -476,7 +424,8 @@ function tracker_on_accessibility_updated() update_smallkeys() update_fortress() update_vanilla_captures() - update_capture_items() + update_collected_capture() count_skulltulas() + apply_queued_changes() end \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/scripts/update_entrance.lua b/ootrando_overworldmap_hamsda/scripts/update_entrance.lua index 2713c2bd..6245be29 100644 --- a/ootrando_overworldmap_hamsda/scripts/update_entrance.lua +++ b/ootrando_overworldmap_hamsda/scripts/update_entrance.lua @@ -1,38 +1,6 @@ -dungeons = { - "forest", - "fire", - "water", - "spirit", - "shadow", - "botw", - "gtg", - "gc" -} -key_counts = { - vanilla = { - forest = 5, - fire = 8, - water = 6, - spirit = 5, - shadow = 5, - botw = 3, - gtg = 9, - gc = 2, - }, - mq = { - forest = 6, - fire = 5, - water = 2, - spirit = 7, - shadow = 6, - botw = 2, - gtg = 3, - gc = 3, - } -} function update_smallkeys() for _,dungeon in ipairs(dungeons) do - local key_object = Tracker:FindObjectForCode(dungeon.."_small_keys") + local key_object = get_object(dungeon.."_small_keys") if key_object then if has(dungeon.."_reg") then key_object.MaxCount = key_counts["vanilla"][dungeon] @@ -42,7 +10,7 @@ function update_smallkeys() end end - local gf_keys = Tracker:FindObjectForCode("gf_small_keys") + local gf_keys = get_object("gf_small_keys") if gf_keys then gf_keys.MaxCount = 4 end @@ -50,148 +18,190 @@ end -capture_badge_locations = { - ["@Death Mountain -> Mountain Bombable Grotto"] = "@Death Mountain -> Mountain Bombable Grotto/Grotto", - ["@Death Mountain -> Mountain Storms Grotto"] = "@Death Mountain -> Mountain Storms Grotto/Grotto", - ["@Death Mountain Crater Lower -> DMC Hammer Grotto"] = "@Death Mountain Crater Lower -> DMC Hammer Grotto/Grotto", - ["@Death Mountain Crater Upper -> Top of Crater Grotto"] = "@Death Mountain Crater Upper -> Top of Crater Grotto/Grotto", - ["@Desert Colossus -> Desert Colossus Grotto"] = "@Desert Colossus -> Desert Colossus Grotto/Grotto", - ["@Gerudo Fortress -> Gerudo Fortress Storms Grotto"] = "@Gerudo Fortress -> Gerudo Fortress Storms Grotto/Grotto", - ["@Gerudo Valley -> Gerudo Valley Octorok Grotto"] = "@Gerudo Valley -> Gerudo Valley Octorok Grotto/Grotto", - ["@Gerudo Valley Far Side -> Gerudo Valley Storms Grotto"] = "@Gerudo Valley Far Side -> Gerudo Valley Storms Grotto/Grotto", - ["@Goron City -> Goron City Grotto"] = "@Goron City -> Goron City Grotto/Grotto", - ["@Hyrule Castle Grounds -> Castle Storms Grotto"] = "@Hyrule Castle Grounds -> Castle Storms Grotto/Grotto", - ["@Hyrule Field -> Field Far West Castle Town Grotto"] = "@Hyrule Field -> Field Far West Castle Town Grotto/Grotto", - ["@Hyrule Field -> Field Kakariko Grotto"] = "@Hyrule Field -> Field Kakariko Grotto/Grotto", - ["@Hyrule Field -> Field Near Lake Inside Fence Grotto"] = "@Hyrule Field -> Field Near Lake Inside Fence Grotto/Grotto", - ["@Hyrule Field -> Field Near Lake Outside Fence Grotto"] = "@Hyrule Field -> Field Near Lake Outside Fence Grotto/Grotto", - ["@Hyrule Field -> Field North Lon Lon Grotto"] = "@Hyrule Field -> Field North Lon Lon Grotto/Grotto", - ["@Hyrule Field -> Field Valley Grotto"] = "@Hyrule Field -> Field Valley Grotto/Grotto", - ["@Hyrule Field -> Field West Castle Town Grotto"] = "@Hyrule Field -> Field West Castle Town Grotto/Grotto", - ["@Hyrule Field -> Remote Southern Grotto"] = "@Hyrule Field -> Remote Southern Grotto/Grotto", - ["@Kakariko Village -> Kakariko Back Grotto"] = "@Kakariko Village -> Kakariko Back Grotto/Grotto", - ["@Kakariko Village -> Kakariko Bombable Grotto"] = "@Kakariko Village -> Kakariko Bombable Grotto/Grotto", - ["@Kokiri Forest -> Kokiri Forest Storms Grotto"] = "@Kokiri Forest -> Kokiri Forest Storms Grotto/Grotto", - ["@Lake Hylia -> Lake Hylia Grotto"] = "@Lake Hylia -> Lake Hylia Grotto/Grotto", - ["@Lon Lon Ranch -> Lon Lon Grotto"] = "@Lon Lon Ranch -> Lon Lon Grotto/Grotto", - ["@Lost Woods -> Lost Woods Generic Grotto"] = "@Lost Woods -> Lost Woods Generic Grotto/Grotto", - ["@Lost Woods Beyond Mido -> Deku Theater"] = "@Lost Woods Beyond Mido -> Deku Theater/Grotto", - ["@Lost Woods Beyond Mido -> Lost Woods Sales Grotto"] = "@Lost Woods Beyond Mido -> Lost Woods Sales Grotto/Grotto", - ["@Sacred Forest Meadow -> Meadow Fairy Grotto"] = "@Sacred Forest Meadow -> Meadow Fairy Grotto/Grotto", - ["@Sacred Forest Meadow -> Meadow Storms Grotto"] = "@Sacred Forest Meadow -> Meadow Storms Grotto/Grotto", - ["@Sacred Forest Meadow Entryway -> Front of Meadow Grotto"] = "@Sacred Forest Meadow Entryway -> Front of Meadow Grotto/Grotto", - ["@Zora River -> Zora River Plateau Bombable Grotto"] = "@Zora River -> Zora River Plateau Bombable Grotto/Grotto", - ["@Zora River -> Zora River Plateau Open Grotto"] = "@Zora River -> Zora River Plateau Open Grotto/Grotto", - ["@Zora River -> Zora River Storms Grotto"] = "@Zora River -> Zora River Storms Grotto/Grotto", - ["@Zoras Domain -> Zoras Domain Storms Grotto"] = "@Zoras Domain -> Zoras Domain Storms Grotto/Grotto", - ["@Castle Town -> Castle Town Bazaar"] = "@Castle Town -> Castle Town Bazaar/House", - ["@Castle Town -> Castle Town Bombchu Bowling"] = "@Castle Town -> Castle Town Bombchu Bowling/House", - ["@Castle Town -> Castle Town Bombchu Shop"] = "@Castle Town -> Castle Town Bombchu Shop/House", - ["@Castle Town -> Castle Town Man in Green House"] = "@Castle Town -> Castle Town Man in Green House/House", - ["@Castle Town -> Castle Town Mask Shop"] = "@Castle Town -> Castle Town Mask Shop/House", - ["@Castle Town -> Castle Town Potion Shop"] = "@Castle Town -> Castle Town Potion Shop/House", - ["@Castle Town -> Castle Town Shooting Gallery"] = "@Castle Town -> Castle Town Shooting Gallery/House", - ["@Castle Town -> Castle Town Treasure Chest Game"] = "@Castle Town -> Castle Town Treasure Chest Game/House", - ["@Castle Town Entrance -> Castle Town Rupee Room"] = "@Castle Town Entrance -> Castle Town Rupee Room/House", - ["@Death Mountain Crater Lower -> Crater Fairy"] = "@Death Mountain Crater Lower -> Crater Fairy/House", - ["@Death Mountain Summit -> Mountain Summit Fairy"] = "@Death Mountain Summit -> Mountain Summit Fairy/House", - ["@Desert Colossus -> Colossus Fairy"] = "@Desert Colossus -> Colossus Fairy/House", - ["@Ganons Castle Grounds -> Ganons Castle Fairy"] = "@Ganons Castle Grounds -> Ganons Castle Fairy/House", - ["@Gerudo Valley Far Side -> Carpenter Tent"] = "@Gerudo Valley Far Side -> Carpenter Tent/House", - ["@Goron City -> Goron Shop"] = "@Goron City -> Goron Shop/House", - ["@Graveyard -> Dampes House"] = "@Graveyard -> Dampes House/House", - ["@Hyrule Castle Grounds -> Hyrule Castle Fairy"] = "@Hyrule Castle Grounds -> Hyrule Castle Fairy/House", - ["@Kakariko Village -> Carpenter Boss House"] = "@Kakariko Village -> Carpenter Boss House/House", - ["@Kakariko Village -> House of Skulltula"] = "@Kakariko Village -> House of Skulltula/House", - ["@Kakariko Village -> Impas House"] = "@Kakariko Village -> Impas House/House", - ["@Kakariko Village -> Impas House Back"] = "@Kakariko Village -> Impas House Back/House", - ["@Kakariko Village -> Kakariko Bazaar"] = "@Kakariko Village -> Kakariko Bazaar/House", - ["@Kakariko Village -> Kakariko Shooting Gallery"] = "@Kakariko Village -> Kakariko Shooting Gallery/House", - ["@Kakariko Village -> Odd Medicine Building"] = "@Kakariko Village -> Odd Medicine Building/House", - ["@Kakariko Village -> Windmill"] = "@Kakariko Village -> Windmill/House", - ["@Kokiri Forest -> House of Twins"] = "@Kokiri Forest -> House of Twins/House", - ["@Kokiri Forest -> Know It All House"] = "@Kokiri Forest -> Know It All House/House", - ["@Kokiri Forest -> Kokiri Shop"] = "@Kokiri Forest -> Kokiri Shop/House", - ["@Kokiri Forest -> Links House"] = "@Kokiri Forest -> Links House/House", - ["@Kokiri Forest -> Mido House"] = "@Kokiri Forest -> Mido House/House", - ["@Kokiri Forest -> Saria House"] = "@Kokiri Forest -> Saria House/House", - ["@Lake Hylia -> Fishing Hole"] = "@Lake Hylia -> Fishing Hole/House", - ["@Lake Hylia -> Lake Hylia Lab"] = "@Lake Hylia -> Lake Hylia Lab/House", - ["@Lon Lon Ranch -> Ingo Barn"] = "@Lon Lon Ranch -> Ingo Barn/House", - ["@Lon Lon Ranch -> Lon Lon Corner Tower"] = "@Lon Lon Ranch -> Lon Lon Corner Tower/House", - ["@Lon Lon Ranch -> Talon House"] = "@Lon Lon Ranch -> Talon House/House", - ["@Zoras Domain -> Zora Shop"] = "@Zoras Domain -> Zora Shop/House", - ["@Zoras Fountain -> Zoras Fountain Fairy"] = "@Zoras Fountain -> Zoras Fountain Fairy/House", - ["@Death Mountain Crater Central -> Fire Temple Lower"] = "@Death Mountain Crater Central -> Fire Temple Lower/Dungeon", - ["@Desert Colossus -> Spirit Temple Lobby"] = "@Desert Colossus -> Spirit Temple Lobby/Dungeon", - ["@Dodongos Cavern Entryway -> Dodongos Cavern Beginning"] = "@Dodongos Cavern Entryway -> Dodongos Cavern Beginning/Dungeon", - ["@Gerudo Fortress -> Gerudo Training Grounds Lobby"] = "@Gerudo Fortress -> Gerudo Training Grounds Lobby/Dungeon", - ["@Kakariko Village -> Bottom of the Well"] = "@Kakariko Village -> Bottom of the Well/Dungeon", - ["@Lake Hylia -> Water Temple Lobby"] = "@Lake Hylia -> Water Temple Lobby/Dungeon", - ["@Outside Deku Tree -> Deku Tree Lobby"] = "@Outside Deku Tree -> Deku Tree Lobby/Dungeon", - ["@Sacred Forest Meadow -> Forest Temple Lobby"] = "@Sacred Forest Meadow -> Forest Temple Lobby/Dungeon", - ["@Shadow Temple Warp Region -> Shadow Temple Entryway"] = "@Shadow Temple Warp Region -> Shadow Temple Entryway/Dungeon", - ["@Zoras Fountain -> Ice Cavern Beginning"] = "@Zoras Fountain -> Ice Cavern Beginning/Dungeon", - ["@Zoras Fountain -> Jabu Jabus Belly Beginning"] = "@Zoras Fountain -> Jabu Jabus Belly Beginning/Dungeon", - ["@Castle Grounds -> Castle Town"] = "@Castle Grounds -> Castle Town/Overworld", - ["@Castle Town -> Castle Grounds"] = "@Castle Town -> Castle Grounds/Overworld", - ["@Castle Town -> Castle Town Entrance"] = "@Castle Town -> Castle Town Entrance/Overworld", - ["@Castle Town -> Temple of Time Exterior"] = "@Castle Town -> Temple of Time Exterior/Overworld", - ["@Castle Town Entrance -> Castle Town"] = "@Castle Town Entrance -> Castle Town/Overworld", - ["@Castle Town Entrance -> Hyrule Field"] = "@Castle Town Entrance -> Hyrule Field/Overworld", - ["@Darunias Chamber -> Death Mountain Crater Lower"] = "@Darunias Chamber -> Death Mountain Crater Lower/Overworld", - ["@Death Mountain -> Goron City"] = "@Death Mountain -> Goron City/Overworld", - ["@Death Mountain -> Kakariko Village Behind Gate"] = "@Death Mountain -> Kakariko Village Behind Gate/Overworld", - ["@Death Mountain Crater Lower -> Darunias Chamber"] = "@Death Mountain Crater Lower -> Darunias Chamber/Overworld", - ["@Death Mountain Crater Upper -> Death Mountain Summit"] = "@Death Mountain Crater Upper -> Death Mountain Summit/Overworld", - ["@Death Mountain Summit -> Death Mountain Crater Upper"] = "@Death Mountain Summit -> Death Mountain Crater Upper/Overworld", - ["@Desert Colossus -> Haunted Wasteland Near Colossus"] = "@Desert Colossus -> Haunted Wasteland Near Colossus/Overworld", - ["@Gerudo Fortress -> Gerudo Valley Far Side"] = "@Gerudo Fortress -> Gerudo Valley Far Side/Overworld", - ["@Gerudo Fortress Outside Gate -> Haunted Wasteland Near Fortress"] = "@Gerudo Fortress Outside Gate -> Haunted Wasteland Near Fortress/Overworld", - ["@Gerudo Valley -> Hyrule Field"] = "@Gerudo Valley -> Hyrule Field/Overworld", - ["@Gerudo Valley Far Side -> Gerudo Fortress"] = "@Gerudo Valley Far Side -> Gerudo Fortress/Overworld", - ["@Goron City -> Death Mountain"] = "@Goron City -> Death Mountain/Overworld", - ["@Goron City Woods Warp -> Lost Woods"] = "@Goron City Woods Warp -> Lost Woods/Overworld", - ["@Graveyard -> Kakariko Village"] = "@Graveyard -> Kakariko Village/Overworld", - ["@Haunted Wasteland Near Colossus -> Desert Colossus"] = "@Haunted Wasteland Near Colossus -> Desert Colossus/Overworld", - ["@Haunted Wasteland Near Fortress -> Gerudo Fortress Outside Gate"] = "@Haunted Wasteland Near Fortress -> Gerudo Fortress Outside Gate/Overworld", - ["@Hyrule Field -> Castle Town Entrance"] = "@Hyrule Field -> Castle Town Entrance/Overworld", - ["@Hyrule Field -> Gerudo Valley"] = "@Hyrule Field -> Gerudo Valley/Overworld", - ["@Hyrule Field -> Kakariko Village"] = "@Hyrule Field -> Kakariko Village/Overworld", - ["@Hyrule Field -> Lake Hylia"] = "@Hyrule Field -> Lake Hylia/Overworld", - ["@Hyrule Field -> Lon Lon Ranch"] = "@Hyrule Field -> Lon Lon Ranch/Overworld", - ["@Hyrule Field -> Lost Woods Bridge"] = "@Hyrule Field -> Lost Woods Bridge/Overworld", - ["@Hyrule Field -> Zora River Front"] = "@Hyrule Field -> Zora River Front/Overworld", - ["@Kakariko Village -> Graveyard"] = "@Kakariko Village -> Graveyard/Overworld", - ["@Kakariko Village -> Hyrule Field"] = "@Kakariko Village -> Hyrule Field/Overworld", - ["@Kakariko Village Behind Gate -> Death Mountain"] = "@Kakariko Village Behind Gate -> Death Mountain/Overworld", - ["@Kokiri Forest -> Lost Woods"] = "@Kokiri Forest -> Lost Woods/Overworld", - ["@Kokiri Forest -> Lost Woods Bridge From Forest"] = "@Kokiri Forest -> Lost Woods Bridge From Forest/Overworld", - ["@Lake Hylia -> Hyrule Field"] = "@Lake Hylia -> Hyrule Field/Overworld", - ["@Lake Hylia -> Zoras Domain"] = "@Lake Hylia -> Zoras Domain/Overworld", - ["@Lon Lon Ranch -> Hyrule Field"] = "@Lon Lon Ranch -> Hyrule Field/Overworld", - ["@Lost Woods -> Goron City Woods Warp"] = "@Lost Woods -> Goron City Woods Warp/Overworld", - ["@Lost Woods -> Zora River"] = "@Lost Woods -> Zora River/Overworld", - ["@Lost Woods Beyond Mido -> Sacred Forest Meadow Entryway"] = "@Lost Woods Beyond Mido -> Sacred Forest Meadow Entryway/Overworld", - ["@Lost Woods Bridge -> Hyrule Field"] = "@Lost Woods Bridge -> Hyrule Field/Overworld", - ["@Lost Woods Bridge -> Kokiri Forest"] = "@Lost Woods Bridge -> Kokiri Forest/Overworld", - ["@Lost Woods Forest Exit -> Kokiri Forest"] = "@Lost Woods Forest Exit -> Kokiri Forest/Overworld", - ["@Sacred Forest Meadow Entryway -> Lost Woods Beyond Mido"] = "@Sacred Forest Meadow Entryway -> Lost Woods Beyond Mido/Overworld", - ["@Zora River -> Lost Woods"] = "@Zora River -> Lost Woods/Overworld", - ["@Zora River Behind Waterfall -> Zoras Domain"] = "@Zora River Behind Waterfall -> Zoras Domain/Overworld", - ["@Zora River Front -> Hyrule Field"] = "@Zora River Front -> Hyrule Field/Overworld", - ["@Zoras Domain -> Lake Hylia"] = "@Zoras Domain -> Lake Hylia/Overworld", - ["@Zoras Domain -> Zora River Behind Waterfall"] = "@Zoras Domain -> Zora River Behind Waterfall/Overworld", - ["@Zoras Domain Behind King Zora -> Zoras Fountain"] = "@Zoras Domain Behind King Zora -> Zoras Fountain/Overworld", - ["@Zoras Fountain -> Zoras Domain Behind King Zora"] = "@Zoras Fountain -> Zoras Domain Behind King Zora/Overworld", - ["@Death Mountain Summit Owl Flight -> Kakariko Village"] = "@Death Mountain Summit Owl Flight -> Kakariko Village/Overworld", - ["@Lake Hylia Owl Flight -> Hyrule Field"] = "@Lake Hylia Owl Flight -> Hyrule Field/Overworld", +vanilla_captures = { + ["setting_entrance_grottos_shuffle"] = { + ["@Kokiri Forest -> KF Storms Grotto/Grotto"] = "entrance_grotto_generic", + ["@Lost Woods -> LW Near Shortcuts Grotto/Grotto"] = "entrance_grotto_generic", + ["@LW Beyond Mido -> Deku Theater/Grotto"] = "entrance_grotto_theater", + ["@LW Beyond Mido -> LW Scrubs Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Sacred Forest Meadow -> SFM Fairy Grotto/Grotto"] = "entrance_grotto_fairy", + ["@Sacred Forest Meadow -> SFM Storms Grotto/Grotto"] = "entrance_grotto_scrub", + ["@SFM Entryway -> SFM Wolfos Grotto/Grotto"] = "entrance_grotto_enemy", + ["@Hyrule Field -> HF Fairy Grotto/Grotto"] = "entrance_grotto_fairy", + ["@Hyrule Field -> HF Near Kak Grotto/Grotto"] = "entrance_grotto_field_kak", + ["@Hyrule Field -> HF Inside Fence Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Hyrule Field -> HF Open Grotto/Grotto"] = "entrance_grotto_generic", + ["@Hyrule Field -> HF Tektite Grotto/Grotto"] = "entrance_grotto_tektite", + ["@Hyrule Field -> HF Cow Grotto/Grotto"] = "entrance_grotto_field_valley", + ["@Hyrule Field -> HF Near Market Grotto/Grotto"] = "entrance_grotto_generic", + ["@Hyrule Field -> HF Southeast Grotto/Grotto"] = "entrance_grotto_generic", + ["@Lon Lon Ranch -> LLR Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Kakariko Village -> Kak Redead Grotto/Grotto"] = "entrance_grotto_enemy", + ["@Kak Backyard -> Kak Open Grotto/Grotto"] = "entrance_grotto_generic", + ["@Graveyard -> Graveyard Composers Grave/Grotto"] = "entrance_grotto_comp", + ["@Graveyard -> Graveyard Dampes Grave/Grotto"] = "entrance_grotto_dampe", + ["@Graveyard -> Graveyard Heart Piece Grave/Grotto"] = "entrance_grotto_hp", + ["@Graveyard -> Graveyard Shield Grave/Grotto"] = "", --TODO: new captures? + ["@Hyrule Castle Grounds -> HC Storms Grotto/Grotto"] = "entrance_grotto_castle_storms", + ["@Death Mountain Summit -> DMT Cow Grotto/Grotto"] = "entrance_grotto_cow", + ["@Death Mountain -> DMT Storms Grotto/Grotto"] = "entrance_grotto_generic", + ["@DMC Upper Nearby -> DMC Upper Grotto/Grotto"] = "entrance_grotto_generic", + ["@DMC Lower Nearby -> DMC Hammer Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Goron City -> GC Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Lake Hylia -> LH Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Zora River -> ZR Fairy Grotto/Grotto"] = "entrance_grotto_fairy", + ["@Zora River -> ZR Open Grotto/Grotto"] = "entrance_grotto_generic", + ["@Zora River -> ZR Storms Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Zoras Domain -> ZD Storms Grotto/Grotto"] = "entrance_grotto_fairy", + ["@Gerudo Valley -> GV Octorok Grotto/Grotto"] = "", --visibility_rules to hide + ["@GV Fortress Side -> GV Storms Grotto/Grotto"] = "entrance_grotto_scrub", + ["@Gerudo Fortress -> GF Storms Grotto/Grotto"] = "entrance_grotto_fairy", + ["@Desert Colossus -> Colossus Grotto/Grotto"] = "entrance_grotto_scrub", + }, + ["setting_entrance_interiors_simple"] = { + ["@Kokiri Forest -> KF House of Twins/House"] = "", --visibility_rules to hide + ["@Kokiri Forest -> KF Know It All House/House"] = "", --visibility_rules to hide + ["@Kokiri Forest -> KF Kokiri Shop/House"] = "entrance_house_shop", + ["@Kokiri Forest -> KF Midos House/House"] = "", --TODO: new captures? + ["@Kokiri Forest -> KF Sarias House/House"] = "", --visibility_rules to hide + ["@Lon Lon Ranch -> LLR Stables/House"] = "entrance_house_cow", + ["@Lon Lon Ranch -> LLR Tower/House"] = "entrance_house_cow", + ["@Lon Lon Ranch -> LLR Talons House/House"] = "entrance_house_talon_child", + ["@Kakariko Village -> Kak Carpenter Boss House/House"] = "entrance_house_talon_adult", + ["@Kakariko Village -> Kak House of Skulltula/House"] = "entrance_house_skull", + ["@Kakariko Village -> Kak Impas House/House"] = "entrance_house_cow", + ["@Kak Impas Ledge -> Kak Impas House Back/House"] = "entrance_house_cow", + ["@Kakariko Village -> Kak Bazaar/House"] = "entrance_house_shop", + ["@Kakariko Village -> Kak Shooting Gallery/House"] = "entrance_house_shoot_adult", + ["@Kak Backyard -> Kak Odd Medicine Building/House"] = "entrance_house_hag", + ["@Graveyard -> Graveyard Dampes House/House"] = "", --visibility_rules to hide + ["@Market -> Market Bazaar/House"] = "entrance_house_shop", + ["@Market -> Market Bombchu Bowling/House"] = "entrance_house_bowling", + ["@Market -> Market Bombchu Shop/House"] = "entrance_house_shop", + ["@Market -> Market Man in Green House/House"] = "", --visibility_rules to hide + ["@Market -> Market Mask Shop/House"] = "entrance_house_masks", + ["@Market -> Market Potion Shop/House"] = "entrance_house_shop", + ["@Market -> Market Shooting Gallery/House"] = "entrance_house_shoot_child", + ["@Market -> Market Treasure Chest Game/House"] = "entrance_house_chest", + ["@Market Entrance -> Market Guard House/House"] = "entrance_house_pot", + ["@Ganons Castle Grounds -> OGC Great Fairy Fountain/House"] = "entrance_house_fairy", + ["@Hyrule Castle Grounds -> HC Great Fairy Fountain/House"] = "entrance_house_fairy", + ["@Death Mountain Summit -> DMT Great Fairy Fountain/House"] = "entrance_house_fairy", + ["@DMC Lower Nearby -> DMC Great Fairy Fountain/House"] = "entrance_house_fairy", + ["@Goron City -> GC Shop/House"] = "entrance_house_shop", + ["@Lake Hylia -> LH Fishing Hole/House"] = "entrance_house_fishing", + ["@Lake Hylia -> LH Lab/House"] = "entrance_house_lab", + ["@Zoras Domain -> ZD Shop/House"] = "entrance_house_shop", + ["@Zoras Fountain -> ZF Great Fairy Fountain/House"] = "entrance_house_fairy", + ["@GV Fortress Side -> GV Carpenter Tent/House"] = "", --visibility_rules to hide + ["@Desert Colossus -> Colossus Great Fairy Fountain/House"] = "entrance_house_fairy", + }, + ["setting_entrance_interiors_all"] = { + ["@Kokiri Forest -> KF Links House/House"] = "entrance_house_link", + ["@Kakariko Village -> Kak Potion Shop Front/House"] = "entrance_house_shop", + ["@Kakariko Village -> Kak Windmill/House"] = "entrance_house_windmill", + ["@Kak Backyard -> Kak Potion Shop Back/House"] = "entrance_house_shop", + ["@ToT Entrance -> Temple of Time/House"] = "entrance_house_tot", + }, + ["setting_entrance_dungeons_shuffle"] = { + ["@KF Outside Deku Tree -> Deku Tree Lobby/Dungeon"] = "entrance_dungeon_deku", + ["@Sacred Forest Meadow -> Forest Temple Lobby/Dungeon"] = "entrance_dungeon_forest", + ["@Kakariko Village -> Bottom of the Well/Dungeon"] = "entrance_dungeon_botw", + ["@Graveyard Warp Pad Region -> Shadow Temple Entryway/Dungeon"] = "entrance_dungeon_shadow", + ["@Dodongos Cavern Entryway -> Dodongos Cavern Beginning/Dungeon"] = "entrance_dungeon_dodongo", + ["@Fire Temple Entrance -> Fire Temple Lower/Dungeon"] = "entrance_dungeon_fire", + ["@Lake Hylia -> Water Temple Lobby/Dungeon"] = "entrance_dungeon_water", + ["@Zoras Fountain -> Jabu Jabus Belly Beginning/Dungeon"] = "entrance_dungeon_jabu", + ["@Zoras Fountain -> Ice Cavern Beginning/Dungeon"] = "entrance_dungeon_ice", + ["@Gerudo Fortress -> Gerudo Training Grounds Lobby/Dungeon"] = "entrance_dungeon_gtg", + ["@Desert Colossus -> Spirit Temple Lobby/Dungeon"] = "entrance_dungeon_spirit", + }, + ["Overworld"] = { + ["@Kokiri Forest -> Lost Woods/Overworld"] = "entrance_overworld_lw", + ["@Kokiri Forest -> LW Bridge From Forest/Overworld"] = "entrance_overworld_bridge", + ["@Lost Woods -> GC Woods Warp/Overworld"] = "entrance_overworld_gc", + ["@Lost Woods -> Zora River/Overworld"] = "entrance_overworld_zr", + ["@LW Beyond Mido -> SFM Entryway/Overworld"] = "entrance_overworld_sfm", + ["@LW Forest Exit -> Kokiri Forest/Overworld"] = "entrance_overworld_kf", + ["@LW Bridge -> Kokiri Forest/Overworld"] = "entrance_overworld_kf", + ["@LW Bridge -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@SFM Entryway -> LW Beyond Mido/Overworld"] = "entrance_overworld_lw", + ["@Hyrule Field -> Market Entrance/Overworld"] = "entrance_overworld_cte", + ["@Hyrule Field -> Gerudo Valley/Overworld"] = "entrance_overworld_gv", + ["@Hyrule Field -> Kakariko Village/Overworld"] = "entrance_overworld_kak", + ["@Hyrule Field -> Lake Hylia/Overworld"] = "entrance_overworld_lh", + ["@Hyrule Field -> Lon Lon Ranch/Overworld"] = "entrance_overworld_llr", + ["@Hyrule Field -> LW Bridge/Overworld"] = "entrance_overworld_bridge", + ["@Hyrule Field -> ZR Front/Overworld"] = "entrance_overworld_zr", + ["@Lon Lon Ranch -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@Kakariko Village -> Graveyard/Overworld"] = "entrance_overworld_gy", + ["@Kakariko Village -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@Kak Behind Gate -> Death Mountain/Overworld"] = "entrance_overworld_dmt", + ["@Graveyard -> Kakariko Village/Overworld"] = "entrance_overworld_kak", + ["@Market -> Castle Grounds/Overworld"] = "entrance_overworld_cg", + ["@Market -> Market Entrance/Overworld"] = "entrance_overworld_cte", + ["@Market -> ToT Entrance/Overworld"] = "entrance_overworld_tot", + ["@Market Entrance -> Market/Overworld"] = "entrance_overworld_ct", + ["@Market Entrance -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@ToT Entrance -> Market/Overworld"] = "entrance_overworld_ct", + ["@Castle Grounds -> Market/Overworld"] = "entrance_overworld_ct", + ["@Death Mountain -> Goron City/Overworld"] = "entrance_overworld_gc", + ["@Death Mountain -> Kak Behind Gate/Overworld"] = "entrance_overworld_kak", + ["@Death Mountain Summit -> DMC Upper Local/Overworld"] = "entrance_overworld_dmc", + ["@DMT Owl Flight -> Kak Impas Ledge/Overworld"] = "entrance_overworld_kak", + ["@DMC Lower Nearby -> GC Darunias Chamber/Overworld"] = "entrance_overworld_gc", + ["@DMC Upper Nearby -> Death Mountain Summit/Overworld"] = "entrance_overworld_dmt", + ["@GC Darunias Chamber -> DMC Lower Local/Overworld"] = "entrance_overworld_dmc", + ["@Goron City -> Death Mountain/Overworld"] = "entrance_overworld_dmt", + ["@GC Woods Warp -> Lost Woods/Overworld"] = "entrance_overworld_lw", + ["@Lake Hylia -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@Lake Hylia -> Zoras Domain/Overworld"] = "entrance_overworld_zd", + ["@LH Owl Flight -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@Zora River -> Lost Woods/Overworld"] = "entrance_overworld_lw", + ["@ZR Behind Waterfall -> Zoras Domain/Overworld"] = "entrance_overworld_zd", + ["@ZR Front -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@Zoras Domain -> Lake Hylia/Overworld"] = "entrance_overworld_lh", + ["@Zoras Domain -> ZR Behind Waterfall/Overworld"] = "entrance_overworld_zr", + ["@ZD Behind King Zora -> Zoras Fountain/Overworld"] = "entrance_overworld_zf", + ["@Zoras Fountain -> ZD Behind King Zora/Overworld"] = "entrance_overworld_zd", + ["@Gerudo Valley -> Hyrule Field/Overworld"] = "entrance_overworld_hf", + ["@GV Fortress Side -> Gerudo Fortress/Overworld"] = "entrance_overworld_gf", + ["@Gerudo Fortress -> GV Fortress Side/Overworld"] = "entrance_overworld_gv", + ["@GF Outside Gate -> Wasteland Near Fortress/Overworld"] = "entrance_overworld_wl", + ["@Wasteland Near Colossus -> Desert Colossus/Overworld"] = "entrance_overworld_col", + ["@Wasteland Near Fortress -> GF Outside Gate/Overworld"] = "entrance_overworld_gf", + ["@Desert Colossus -> Wasteland Near Colossus/Overworld"] = "entrance_overworld_wl", + } } +function update_vanilla_captures() + for setting,captures in pairs(vanilla_captures) do + if setting ~= "Overworld" then + local has_setting = has(setting) + if not_like_cache(setting, has_setting) then + for location,item in pairs(captures) do + local location_object = get_object(location) + local item_object = get_object(item) + if location_object and item_object then + if has_setting then + location_object.CapturedItem = nil + else + location_object.CapturedItem = item_object + end + end + end + end + end + end +end + + + +capture_badge_locations = {} capture_badge_cache = {} function badge_locations() for location,section in pairs(capture_badge_locations) do - local target = Tracker:FindObjectForCode(location) - local source = Tracker:FindObjectForCode(section) + local target = get_object(location) + local source = get_object(section) if target and source then -- Has the captured item changed since last update if source.CapturedItem ~= capture_badge_cache[source] then @@ -215,5 +225,8 @@ end function tracker_on_accessibility_updated() update_smallkeys() + update_vanilla_captures() --badge_locations() + + apply_queued_changes() end \ No newline at end of file diff --git a/repository.json b/repository.json index c48af88b..3158b68d 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.9.6.0", + "version": "2.10.0.0", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/EmoTrackerPacks/ootrando_overworldmap_hamsda.zip", "documentation_url": "https://github.com/Hamsda/EmoTrackerPacks/blob/master/ootrando_overworldmap_hamsda/README.md",