diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index 28e60c40..2770428b 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md index d5835921..69e2ac32 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,19 @@ # Changelog +## 2.1.3.2 + +- added dungeon only to skulltula settings +- added option for bean behavior: + - `off` means just having beans will show the spots you can reach on the adult map (old behavior) + - `plant` means you have to mark them planted on the child map before the locations will show on the adult map (new behavior) +- changed beginning of MQ Water Temple: + - ironboots sequence break with longshot for map and compass chests + - ocarina and lullaby sequence break for longshot chest +- fixed MQ Forest Temple: + - BK chest and onwards should work correctly now + - moved `Chest Behind Lobby` and `NE Outdoors Lower Chest` back in the list for the tracker to work +- fixed lower DMC access with hammer + hoverboots + ## 2.1.3.1 - changed scarecrow checks to be sequence breakable diff --git a/ootrando_overworldmap_hamsda/images/bean_off.png b/ootrando_overworldmap_hamsda/images/bean_off.png new file mode 100644 index 00000000..20241bbf Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/bean_off.png differ diff --git a/ootrando_overworldmap_hamsda/images/bean_plant.png b/ootrando_overworldmap_hamsda/images/bean_plant.png new file mode 100644 index 00000000..92c1e84b Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/bean_plant.png differ diff --git a/ootrando_overworldmap_hamsda/images/gerudocard.png b/ootrando_overworldmap_hamsda/images/gerudocard.png index 6b16944b..1aeac03e 100644 Binary files a/ootrando_overworldmap_hamsda/images/gerudocard.png and b/ootrando_overworldmap_hamsda/images/gerudocard.png differ diff --git a/ootrando_overworldmap_hamsda/images/magic1.png b/ootrando_overworldmap_hamsda/images/magic1.png index b7460c3c..65572f03 100644 Binary files a/ootrando_overworldmap_hamsda/images/magic1.png and b/ootrando_overworldmap_hamsda/images/magic1.png differ diff --git a/ootrando_overworldmap_hamsda/images/magic2.png b/ootrando_overworldmap_hamsda/images/magic2.png index b3a5039a..2d4e5b3c 100644 Binary files a/ootrando_overworldmap_hamsda/images/magic2.png and b/ootrando_overworldmap_hamsda/images/magic2.png differ diff --git a/ootrando_overworldmap_hamsda/images/oot_boss_key.png b/ootrando_overworldmap_hamsda/images/oot_boss_key.png index 7ce1c3e4..5062ed5a 100644 Binary files a/ootrando_overworldmap_hamsda/images/oot_boss_key.png and b/ootrando_overworldmap_hamsda/images/oot_boss_key.png differ diff --git a/ootrando_overworldmap_hamsda/images/oot_small_key.png b/ootrando_overworldmap_hamsda/images/oot_small_key.png index 8eadce0b..48f59ac3 100644 Binary files a/ootrando_overworldmap_hamsda/images/oot_small_key.png and b/ootrando_overworldmap_hamsda/images/oot_small_key.png differ diff --git a/ootrando_overworldmap_hamsda/images/skulltula_all.png b/ootrando_overworldmap_hamsda/images/skulltula_all.png new file mode 100644 index 00000000..4f286f81 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/skulltula_all.png differ diff --git a/ootrando_overworldmap_hamsda/images/skulltula_dungeon.png b/ootrando_overworldmap_hamsda/images/skulltula_dungeon.png new file mode 100644 index 00000000..85750de6 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/skulltula_dungeon.png differ diff --git a/ootrando_overworldmap_hamsda/images/skulltula_show.png b/ootrando_overworldmap_hamsda/images/skulltula_show.png deleted file mode 100644 index e08be6c9..00000000 Binary files a/ootrando_overworldmap_hamsda/images/skulltula_show.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/items/options.json b/ootrando_overworldmap_hamsda/items/options.json index ed8cb04a..270e5813 100644 --- a/ootrando_overworldmap_hamsda/items/options.json +++ b/ootrando_overworldmap_hamsda/items/options.json @@ -126,8 +126,12 @@ "codes": "hide_skulltulas" }, { - "img": "images/skulltula_show.png", - "codes": "show_skulltulas" + "img": "images/skulltula_dungeon.png", + "codes": "dungeon_skulltulas" + }, + { + "img": "images/skulltula_all.png", + "codes": "all_skulltulas" } ] }, @@ -164,5 +168,22 @@ "inherit_codes": false } ] + }, + { + "name": "Beans", + "type": "progressive", + "allow_disabled": false, + "loop": true, + "stages": [ + { + "img": "images/bean_off.png", + "codes": "beans_plant,beans_plant_no" + }, + { + "img": "images/bean_plant.png", + "codes": "beans_plant,beans_plant_yes", + "inherit_codes": false + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/layouts/tracker.json b/ootrando_overworldmap_hamsda/layouts/tracker.json index e3600277..82e1d9d3 100644 --- a/ootrando_overworldmap_hamsda/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/layouts/tracker.json @@ -32,25 +32,17 @@ [ "type_bridge", "type_forest", - "type_door", - "", - "", - "" - ], - [ "type_kak", + "type_door", "type_lens", - "logic_chus", - "", - "", "" ], [ + "logic_chus", "scrub_shuffle", "shopsanity", - "show_skulltulas", - "", - "", + "all_skulltulas", + "beans_plant", "" ] ] @@ -142,13 +134,24 @@ [ "type_bridge", "type_forest", - "type_door", "type_kak", + "type_door", "type_lens", + "", + "", + "", + "" + ], + [ "logic_chus", "scrub_shuffle", "shopsanity", - "show_skulltulas" + "all_skulltulas", + "beans_plant", + "", + "", + "", + "" ] ] } diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 32048775..2b555508 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -48,7 +48,7 @@ { "name": "Deku Tree Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -193,7 +193,7 @@ { "name": "Dodongos Cavern Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -374,7 +374,7 @@ { "name": "Jabu Jabu Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -572,7 +572,7 @@ { "name": "Forest Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -762,7 +762,7 @@ { "name": "Fire Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -927,7 +927,7 @@ { "name": "Water Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1124,7 +1124,7 @@ { "name": "Shadow Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1355,7 +1355,7 @@ { "name": "Spirit Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1541,7 +1541,7 @@ { "name": "Bottom of the Well Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1771,7 +1771,7 @@ { "name": "Archery Range (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1795,7 +1795,7 @@ { "name": "Rooftop (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1979,7 +1979,7 @@ { "name": "Ice Cavern Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { diff --git a/ootrando_overworldmap_hamsda/locations/mq.json b/ootrando_overworldmap_hamsda/locations/mq.json index ceb2e977..619bef1f 100644 --- a/ootrando_overworldmap_hamsda/locations/mq.json +++ b/ootrando_overworldmap_hamsda/locations/mq.json @@ -79,7 +79,7 @@ { "name": "Deku Tree MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -265,7 +265,7 @@ { "name": "Dodongos Cavern MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -518,7 +518,7 @@ { "name": "Jabu Jabus Belly MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -584,21 +584,11 @@ "name": "First Chest", "item_count": 1 }, - { - "name": "Chest Behind Lobby", - "access_rules": [ - "ocarina,time", - "@Forest Temple MQ/Bow Chest" - ], - "item_count": 1 - }, { "name": "Boss Key Chest", "access_rules": [ "lift1", - "hoverboots", - "bombchu,[lift1]", - "bombchu,[hoverboots]" + "bombchu,[lift1]" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -607,7 +597,8 @@ { "name": "Redead Chest", "access_rules": [ - "@Forest Temple MQ/Boss Key Chest" + "[lift1]", + "[bombchu]" ], "item_count": 1 }, @@ -628,17 +619,17 @@ "item_count": 1 }, { - "name": "NE Outdoors Lower Chest", + "name": "Bow Chest", "access_rules": [ - "bow,longshot", - "@Forest Temple MQ/Falling Room Chest" + "@Forest Temple MQ/Boss Key Chest" ], "item_count": 1 }, { - "name": "Bow Chest", + "name": "Chest Behind Lobby", "access_rules": [ - "@Forest Temple MQ/Boss Key Chest" + "ocarina,time", + "@Forest Temple MQ/Bow Chest" ], "item_count": 1 }, @@ -659,15 +650,23 @@ { "name": "Falling Room Chest", "access_rules": [ - "bow", - "dinsfire,magic", + "@Forest Temple MQ/Bow Chest,bow", + "@Forest Temple MQ/Bow Chest,dinsfire,magic", + ], + "item_count": 1 + }, + { + "name": "NE Outdoors Lower Chest", + "access_rules": [ + "bow,longshot", + "@Forest Temple MQ/Falling Room Chest" ], "item_count": 1 }, { "name": "Near Boss Chest", "access_rules": [ - "bow" + "@Forest Temple MQ/Falling Room Chest,bow" ], "item_count": 1 }, @@ -693,7 +692,7 @@ { "name": "Forest Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -869,7 +868,7 @@ { "name": "Fire Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -946,22 +945,25 @@ { "name": "Map Chest", "access_rules": [ - "ironboots,@logic/has fire" + "ironboots,@logic/has fire", + "longshot,[ironboots],@logic/has fire" ], "item_count": 1 }, { "name": "Longshot Chest", "access_rules": [ - "ocarina,lullaby,ironboots" + "[ocarina],[lullaby],ironboots" ], "item_count": 1 }, { "name": "Compass Chest", "access_rules": [ - "@Water Temple MQ/Longshot Chest,bow", - "@Water Temple MQ/Longshot Chest,dinsfire,magic" + "ocarina,lullaby,ironboots,bow", + "ocarina,lullaby,ironboots,dinsfire,magic", + "ocarina,lullaby,longshot,[ironboots],bow", + "ocarina,lullaby,longshot,[ironboots],dinsfire,magic" ], "item_count": 1 }, @@ -1012,7 +1014,7 @@ { "name": "Water Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1249,7 +1251,7 @@ { "name": "Shadow Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1521,7 +1523,7 @@ { "name": "Spirit Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1650,7 +1652,7 @@ { "name": "Bottom of the Well MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1922,7 +1924,7 @@ { "name": "Archery Range (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1946,7 +1948,7 @@ { "name": "Rooftop (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -2138,7 +2140,7 @@ { "name": "Ice Cavern MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index 63970ecc..374092c7 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -218,7 +218,7 @@ { "name": "Know It All House (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -242,7 +242,7 @@ { "name": "Bean Patch", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -266,7 +266,7 @@ { "name": "House of Twins (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -482,7 +482,7 @@ { "name": "Bean Patch Near Bridge", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -509,14 +509,14 @@ { "name": "Plant Bean", "access_rules": [ - "beans,bean_stage_no" + "beans,beans_plant_yes,bean_stage_no" ], "hosted_item": "bean_stage_yes" }, { "name": "GS5", "access_rules": [ - "show_skulltulas,bottle" + "all_skulltulas,bottle" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -889,7 +889,7 @@ { "name": "Kakariko Tree Grotto", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -925,7 +925,7 @@ { "name": "Rock Circle Grotto", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1065,14 +1065,14 @@ { "name": "Plant Bean", "access_rules": [ - "beans,bean_lake_no" + "beans,beans_plant_yes,bean_lake_no" ], "hosted_item": "bean_lake_yes" }, { "name": "GS55", "access_rules": [ - "show_skulltulas,bottle" + "all_skulltulas,bottle" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1090,7 +1090,7 @@ { "name": "Lab Wall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1114,7 +1114,7 @@ { "name": "Island (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1249,7 +1249,7 @@ { "name": "Lone Tree", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1270,7 +1270,7 @@ { "name": "Rain Shed (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1291,7 +1291,7 @@ { "name": "House Window (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1315,7 +1315,7 @@ { "name": "Back Wall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1599,7 +1599,7 @@ { "name": "Tree (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1620,7 +1620,7 @@ { "name": "House Wall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1641,7 +1641,7 @@ { "name": "Under Construction (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1662,7 +1662,7 @@ { "name": "Bazaar Wall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1683,7 +1683,7 @@ { "name": "Watchtower (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1803,8 +1803,10 @@ { "name": "Box HP", "access_rules": [ + "sword2,beans_plant_no,beans", "sword2,bean_graveyard_yes", "sword2,longshot", + "boomerang,[sword2],[beans_plant_no],[beans]", "boomerang,[sword2],[bean_graveyard_yes]", "boomerang,[sword2],[longshot]" ], @@ -1828,6 +1830,7 @@ { "map": "adult", "visibility_rules": [ + "sword2,beans_plant_no,beans", "sword2,bean_graveyard_yes", "sword2,longshot" ], @@ -1879,7 +1882,7 @@ { "name": "Wall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -1906,14 +1909,14 @@ { "name": "Plant Bean", "access_rules": [ - "beans,bean_graveyard_no" + "beans,beans_plant_yes,bean_graveyard_no" ], "hosted_item": "bean_graveyard_yes" }, { "name": "GS29", "access_rules": [ - "show_skulltulas,bottle" + "all_skulltulas,bottle" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -2045,7 +2048,7 @@ { "name": "Boulder Maze Crate", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -2246,14 +2249,14 @@ { "name": "Plant Bean", "access_rules": [ - "beans,bean_trail_no" + "beans,beans_plant_yes,bean_trail_no" ], "hosted_item": "bean_trail_yes" }, { "name": "GS30", "access_rules": [ - "show_skulltulas,bottle" + "all_skulltulas,bottle" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -2271,7 +2274,7 @@ { "name": "Bombable Wall", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -2342,6 +2345,7 @@ "name": "Get it", "access_rules": [ "@logic/can blast", + "ocarina,bolero,beans_plant_no,beans", "ocarina,bolero,bean_crater_yes", "@Link the Goron" ], @@ -2396,7 +2400,7 @@ { "name": "Crate at Entrance", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -2426,14 +2430,14 @@ { "name": "Plant Bean", "access_rules": [ - "beans,bean_crater_no" + "beans,beans_plant_yes,bean_crater_no" ], "hosted_item": "bean_crater_yes" }, { "name": "GS37", "access_rules": [ - "show_skulltulas,bottle" + "all_skulltulas,bottle" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -2679,7 +2683,7 @@ { "name": "Guardhouse", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -2784,7 +2788,7 @@ { "name": "Tree near Malon", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -2805,7 +2809,7 @@ { "name": "Castle Storms Grotto", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -2993,7 +2997,7 @@ { "name": "In Tree", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3052,7 +3056,7 @@ { "name": "On Ladder (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3197,7 +3201,7 @@ { "name": "Tree near Fairy", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3218,7 +3222,7 @@ { "name": "Wall near Log (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3305,7 +3309,7 @@ { "name": "Waterfall Near Entrance (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3329,7 +3333,7 @@ { "name": "Bean Patch", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3388,7 +3392,7 @@ { "name": "Central Structure", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3453,6 +3457,7 @@ { "name": "Get it", "access_rules": [ + "@logic/colossus,beans_plant_no,beans,sword2", "@logic/colossus,bean_colossus_yes,sword2", "{agony}" ], @@ -3543,14 +3548,14 @@ { "name": "Plant Bean", "access_rules": [ - "beans,bean_colossus_no" + "beans,beans_plant_yes,bean_colossus_no" ], "hosted_item": "bean_colossus_yes" }, { "name": "GS93", "access_rules": [ - "show_skulltulas,bottle" + "all_skulltulas,bottle" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -3568,7 +3573,7 @@ { "name": "Tree Near Oasis (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3592,12 +3597,13 @@ { "name": "Top Of Platform (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { "name": "GS95", "access_rules": [ + "ocarina,requiem,beans_plant_no,beans,sword2", "ocarina,requiem,bean_colossus_yes,sword2", "@logic/colossus,longshot,sword2" ], @@ -3678,14 +3684,18 @@ { "name": "Above Stage (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { "name": "GS6", "access_rules": [ + "[ocarina],[saria],beans_plant_no,beans", + "[ocarina],[minuet],beans_plant_no,beans", "[ocarina],[saria],bean_stage_yes", "[ocarina],[minuet],bean_stage_yes", + "[ocarina],[saria],bombchu,longshot,[beans_plant_no,beans]", + "[ocarina],[minuet],bombchu,longshot,[beans_plant_no,beans]", "[ocarina],[saria],bombchu,longshot,[bean_stage_yes]", "[ocarina],[minuet],bombchu,longshot,[bean_stage_yes]" ], @@ -3738,7 +3748,7 @@ { "name": "Top of Maze (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -3953,7 +3963,7 @@ { "name": "Top of Roof (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4084,7 +4094,7 @@ { "name": "Back of Pedestal (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4112,6 +4122,7 @@ "access_rules": [ "@logic/can blast", "@Link the Goron", + "ocarina,bolero,beans_plant_no,beans", "ocarina,bolero,bean_trail_yes", "ocarina,bolero,hoverboots", "ocarina,bolero,hookshot" @@ -4152,7 +4163,7 @@ { "name": "Red Rock (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4176,7 +4187,7 @@ { "name": "Red Rock (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4208,9 +4219,14 @@ { "name": "Get it", "access_rules": [ + "ocarina,bolero,beans_plant_no,beans", "ocarina,bolero,bean_crater_yes", + "ocarina,bolero,hoverboots,[beans_plant_no],[beans]", "ocarina,bolero,hoverboots,[bean_crater_yes]", + "@Link the Goron,hoverboots,[ocarina],[bolero],[beans_plant_no],[beans]", "@Link the Goron,hoverboots,[ocarina],[bolero],[bean_crater_yes]", + "hammer,hoverboots,[ocarina],[bolero],[beans_plant_no],[beans]", + "hammer,hoverboots,[ocarina],[bolero],[bean_crater_yes]", "{agony}" ], "capture_item": true, @@ -4259,7 +4275,7 @@ "access_rules": [ "hammer,@Link the Goron", "hammer,ocarina,bolero,hookshot", - "hammer,ocarina,bolero,hoverboots" + "hammer,hoverboots" ], "chest_unopened_img": "images/deku_scrub.png", "chest_opened_img": "images/deku_scrub_grey.png", @@ -4278,7 +4294,8 @@ "name": "Sheik in Crater", "access_rules": [ "ocarina,bolero", - "hoverboots", + "hammer,hoverboots", + "@Link the Goron,hoverboots", "@Link the Goron,hookshot" ], "sections": [ @@ -4286,7 +4303,8 @@ "name": "Song", "access_rules": [ "ocarina,bolero", - "hoverboots", + "hammer,hoverboots", + "@Link the Goron,hoverboots", "@Link the Goron,hookshot", "{agony}" ], @@ -4374,7 +4392,7 @@ { "name": "Destroyed Bridge", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4428,7 +4446,7 @@ { "name": "Plateau Wall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4452,7 +4470,7 @@ { "name": "Wall near Bridge (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4513,7 +4531,7 @@ { "name": "Top of Waterfall (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4587,7 +4605,7 @@ { "name": "Under Silver Boulder (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4627,6 +4645,7 @@ "access_rules": [ "ocarina,[scarecrow],hookshot", "water", + "beans_plant_no,beans", "bean_lake_yes", "{agony}" ], @@ -4670,6 +4689,7 @@ { "name": "HP", "access_rules": [ + "beans_plant_no,beans", "bean_lake_yes", "ocarina,[scarecrow],hookshot" ], @@ -4708,7 +4728,7 @@ { "name": "Top of Tree (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4732,7 +4752,7 @@ { "name": "Lab Crate", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4838,7 +4858,7 @@ { "name": "Behind Carpenters Tent (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { @@ -4862,7 +4882,7 @@ { "name": "Underside Rock Arch (N)", "access_rules": [ - "show_skulltulas" + "all_skulltulas" ], "sections": [ { diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index c12faee0..28a6ed59 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.1.3.1", + "package_version": "2.1.3.2", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index 3400d773..be15c17e 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -48,7 +48,7 @@ { "name": "Deku Tree Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -193,7 +193,7 @@ { "name": "Dodongos Cavern Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -374,7 +374,7 @@ { "name": "Jabu Jabu Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -572,7 +572,7 @@ { "name": "Forest Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -767,7 +767,7 @@ { "name": "Fire Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -937,7 +937,7 @@ { "name": "Water Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1138,7 +1138,7 @@ { "name": "Shadow Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1369,7 +1369,7 @@ { "name": "Spirit Temple Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1555,7 +1555,7 @@ { "name": "Bottom of the Well Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1805,7 +1805,7 @@ { "name": "Archery Range (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1829,7 +1829,7 @@ { "name": "Rooftop (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -2033,7 +2033,7 @@ { "name": "Ice Cavern Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json index 5966b708..8f069a82 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json @@ -79,7 +79,7 @@ { "name": "Deku Tree MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -265,7 +265,7 @@ { "name": "Dodongos Cavern MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -518,7 +518,7 @@ { "name": "Jabu Jabus Belly MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -584,21 +584,11 @@ "name": "First Chest", "item_count": 1 }, - { - "name": "Chest Behind Lobby", - "access_rules": [ - "forest_small_keys:1,ocarina,time", - "@Forest Temple MQ/Bow Chest" - ], - "item_count": 1 - }, { "name": "Boss Key Chest", "access_rules": [ "forest_small_keys:2,lift1", - "forest_small_keys:2,hoverboots", - "forest_small_keys:2,bombchu,[lift1]", - "forest_small_keys:2,bombchu,[hoverboots]" + "forest_small_keys:2,bombchu,[lift1]" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -607,7 +597,9 @@ { "name": "Redead Chest", "access_rules": [ - "@Forest Temple MQ/Boss Key Chest" + "@Forest Temple MQ/Boss Key Chest", + "[@Forest Temple MQ/Boss Key Chest],[lift1],forest_small_keys:1", + "[@Forest Temple MQ/Boss Key Chest],[bombchu],forest_small_keys:1" ], "item_count": 1 }, @@ -628,17 +620,17 @@ "item_count": 1 }, { - "name": "NE Outdoors Lower Chest", + "name": "Bow Chest", "access_rules": [ - "forest_small_keys:1,bow,longshot", - "@Forest Temple MQ/Falling Room Chest" + "@Forest Temple MQ/Boss Key Chest,forest_small_keys:3" ], "item_count": 1 }, { - "name": "Bow Chest", + "name": "Chest Behind Lobby", "access_rules": [ - "@Forest Temple MQ/Boss Key Chest,forest_small_keys:3" + "forest_small_keys:1,ocarina,time", + "@Forest Temple MQ/Bow Chest" ], "item_count": 1 }, @@ -659,15 +651,23 @@ { "name": "Falling Room Chest", "access_rules": [ - "forest_small_keys:5,bow", - "forest_small_keys:5,dinsfire,magic", + "@Forest Temple MQ/Bow Chest,forest_small_keys:5,bow", + "@Forest Temple MQ/Bow Chest,forest_small_keys:5,dinsfire,magic", + ], + "item_count": 1 + }, + { + "name": "NE Outdoors Lower Chest", + "access_rules": [ + "forest_small_keys:1,bow,longshot", + "@Forest Temple MQ/Falling Room Chest" ], "item_count": 1 }, { "name": "Near Boss Chest", "access_rules": [ - "forest_small_keys:6,bow" + "@Forest Temple MQ/Falling Room Chest,forest_small_keys:6,bow" ], "item_count": 1 }, @@ -693,7 +693,7 @@ { "name": "Forest Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -875,7 +875,7 @@ { "name": "Fire Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -952,22 +952,25 @@ { "name": "Map Chest", "access_rules": [ - "ironboots,@logic/has fire" + "ironboots,@logic/has fire", + "longshot,[ironboots],@logic/has fire" ], "item_count": 1 }, { "name": "Longshot Chest", "access_rules": [ - "ocarina,lullaby,ironboots" + "[ocarina],[lullaby],ironboots" ], "item_count": 1 }, { "name": "Compass Chest", "access_rules": [ - "@Water Temple MQ/Longshot Chest,bow", - "@Water Temple MQ/Longshot Chest,dinsfire,magic" + "ocarina,lullaby,ironboots,bow", + "ocarina,lullaby,ironboots,dinsfire,magic", + "ocarina,lullaby,longshot,[ironboots],bow", + "ocarina,lullaby,longshot,[ironboots],dinsfire,magic" ], "item_count": 1 }, @@ -1018,7 +1021,7 @@ { "name": "Water Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1255,7 +1258,7 @@ { "name": "Shadow Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1525,7 +1528,7 @@ { "name": "Spirit Temple MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1654,7 +1657,7 @@ { "name": "Bottom of the Well MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1946,7 +1949,7 @@ { "name": "Archery Range (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -1970,7 +1973,7 @@ { "name": "Rooftop (N)", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { @@ -2165,7 +2168,7 @@ { "name": "Ice Cavern MQ Skulltulas", "access_rules": [ - "show_skulltulas" + "dungeon_skulltulas" ], "sections": [ { diff --git a/repository.json b/repository.json index f8e2bfb4..e5700061 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.1.3.1", + "version": "2.1.3.2", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [