diff --git a/README.md b/README.md index f79a4e52..71c3c26c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ # OoTRMapTracker -## What this is +## Content This is a pack for [EmoTracker](https://emotracker.net/) designed for the [Ocarina of Time Randomizer](https://github.com/AmazingAmpharos/OoT-Randomizer). You can easily download it from within the EmoTracker application. -## Content - This pack allows you to keep track of your current item loadout and has maps with all item locations for child and adult Link. These locations get filtered by your current item loadout to only show what you can actually reach. ### Variants @@ -14,13 +12,20 @@ This pack allows you to keep track of your current item loadout and has maps wit The pack offers 4 different variants: 1. Regular Map Tracker -2. Keysanity Map Tracker (additional space to keep track of your keys, which also get considered in the map logic) +2. Keysanity Map Tracker 3. Items Only -4. Items Only (minimal) +4. Items Only (Keysanity) +5. Items Only (minimal) + +### Vanilla vs Master Quest Dungeons + +The Randomizer has the option to switch some or all dungeons to their Master Quest equivalents. +To accomodate for this, you can click on the dungeon labels to change them from vanilla ![vanilla deku](ootrando_overworldmap_hamsda/images/deku.png) to Master Quest ![mq deku](ootrando_overworldmap_hamsda/images/deku_mq.png). You can use this in the non map variants as well as a reminder. +This also means that the key counts for the dungeons in the Keysanity variants will always go up to the maximum of vanilla and Master Quest: Forest Temple goes up to 6 small keys, because MQ Forest Temple has 6 small keys instead of 5 in vanilla; Water Temple also goes up to 6 small keys, because vanilla Water Temple has 6 small keys unlike the 2 it has in MQ. -### Settings +### Settings (for map variants) -There is also a variety of settings available to accomodate the different options that the Randomizer offers: +There is a variety of settings available to accomodate the different options that the Randomizer offers: #### Rainbow Bridge @@ -92,7 +97,7 @@ This setting determines if Gold Skulltulas are shown (especially useful for Toke There are a few special items whose purpose might not be directly obvious: -- ![Gerudo symbol](ootrando_overworldmap_hamsda/images/gerudo_symbol_colored.png "Gerudo symbol") Checking this item reflects the carpenters being rescued from Gerudo Fortress. This is separate from the Gerudo Card ![Gerudo card](ootrando_overworldmap_hamsda/images/gerudocard.png "Gerudo card") because of [various settings related to Gerudo Fortress in the randomizer](https://github.com/TestRunnerSRL/OoT-Randomizer/tree/Dev#gerudo-fortress-options). +- ![Gerudo symbol](ootrando_overworldmap_hamsda/images/gerudo_symbol_colored.png "Gerudo symbol") Checking this item reflects the carpenters being rescued from Gerudo Fortress. This is separate from the Gerudo Card ![Gerudo card](ootrando_overworldmap_hamsda/images/gerudocard.png "Gerudo card") because of [various settings related to Gerudo Fortress in the randomizer](https://github.com/TestRunnerSRL/OoT-Randomizer/tree/Dev#gerudo-fortress). - ![Stone of Agony](ootrando_overworldmap_hamsda/images/agony.png "Stone of Agony") Checking this item enables you to capture items placed at locations you received hints for by the Gossip Stones, even if you selected hints to be always on or require Mask of Truth instead of Stone of Agony. ## Questions diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index bf36b8e0..28e60c40 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 e73705a0..d5835921 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,13 @@ # Changelog +## 2.1.3.1 + +- changed scarecrow checks to be sequence breakable +- added scarecrow locations for child and adult as reminders +- moved Goron City spinning pot to not overlap with shop +- changed small key cap to be the maximum of vanilla and MQ dungeons +- changed small key requirements for MQ dungeons to be minimum instead of logically required amount + ## 2.1.3.0 - added MQ dungeons! diff --git a/ootrando_overworldmap_hamsda/images/scarecrow.png b/ootrando_overworldmap_hamsda/images/scarecrow.png index aed5cae8..c610d6b7 100644 Binary files a/ootrando_overworldmap_hamsda/images/scarecrow.png and b/ootrando_overworldmap_hamsda/images/scarecrow.png differ diff --git a/ootrando_overworldmap_hamsda/images/scarecrow_badge.png b/ootrando_overworldmap_hamsda/images/scarecrow_badge.png new file mode 100644 index 00000000..aed5cae8 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/scarecrow_badge.png differ diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json index 38c0d6e1..c19034be 100644 --- a/ootrando_overworldmap_hamsda/items/dungeons.json +++ b/ootrando_overworldmap_hamsda/items/dungeons.json @@ -59,13 +59,6 @@ } ] }, - { - "name": "Deku Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "deku_treasures", - "max_quantity": 7 - }, { "name": "Deku Prize", "type": "progressive_toggle", @@ -119,13 +112,6 @@ } ] }, - { - "name": "Dodongo Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "dodongo_treasures", - "max_quantity": 7 - }, { "name": "Dodongo Prize", "type": "progressive_toggle", @@ -179,13 +165,6 @@ } ] }, - { - "name": "Jabu Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "jabu_treasures", - "max_quantity": 4 - }, { "name": "Jabu Prize", "type": "progressive_toggle", @@ -239,19 +218,12 @@ } ] }, - { - "name": "Forest Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "forest_treasures", - "max_quantity": 8 - }, { "name": "Forest Small Keys", "type": "consumable", "img": "images/oot_small_key.png", "codes": "forest_small_keys,forestsmall,forestsk", - "max_quantity": 5 + "max_quantity": 6 }, { "name": "Forest Boss Key", @@ -312,13 +284,6 @@ } ] }, - { - "name": "Fire Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "fire_treasures", - "max_quantity": 6 - }, { "name": "Fire Small Keys", "type": "consumable", @@ -385,13 +350,6 @@ } ] }, - { - "name": "Water Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "water_treasures", - "max_quantity": 4 - }, { "name": "Water Small Keys", "type": "consumable", @@ -458,19 +416,12 @@ } ] }, - { - "name": "Spirit Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "spirit_treasures", - "max_quantity": 14 - }, { "name": "Spirit Small Keys", "type": "consumable", "img": "images/oot_small_key.png", "codes": "spirit_small_keys,spiritsmall,spiritsk", - "max_quantity": 5 + "max_quantity": 7 }, { "name": "Spirit Boss Key", @@ -531,19 +482,12 @@ } ] }, - { - "name": "Shadow Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "shadow_treasures", - "max_quantity": 12 - }, { "name": "Shadow Small Keys", "type": "consumable", "img": "images/oot_small_key.png", "codes": "shadow_small_keys,shadowsmall,shadowsk", - "max_quantity": 5 + "max_quantity": 6 }, { "name": "Shadow Boss Key", @@ -604,13 +548,6 @@ } ] }, - { - "name": "BotW Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "botw_treasures", - "max_quantity": 11 - }, { "name": "BotW Small Keys", "type": "consumable", @@ -635,13 +572,6 @@ } ] }, - { - "name": "Ice Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "ice_treasures", - "max_quantity": 4 - }, { "name": "GF Label", "type": "static", @@ -672,13 +602,6 @@ } ] }, - { - "name": "GTG Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "gtg_treasures", - "max_quantity": 13 - }, { "name": "GTG Small Keys", "type": "consumable", @@ -703,19 +626,12 @@ } ] }, - { - "name": "GC Treasures", - "type": "consumable", - "img": "images/chest_brown_closed.png", - "codes": "gc_treasures", - "max_quantity": 13 - }, { "name": "GC Small Keys", "type": "consumable", "img": "images/oot_small_key.png", "codes": "gc_small_keys,gcsmall,gcsk", - "max_quantity": 2 + "max_quantity": 3 }, { "name": "GC Boss Key", @@ -727,8 +643,7 @@ "name": "Generic Small Keys", "type": "toggle", "img": "images/oot_small_key.png", - "codes": "generic_small_key", - "max_quantity": 2 + "codes": "generic_small_key" }, { "name": "Generic Boss Key", diff --git a/ootrando_overworldmap_hamsda/items/equipment.json b/ootrando_overworldmap_hamsda/items/equipment.json index 05b5ce6e..6ccd6ee3 100644 --- a/ootrando_overworldmap_hamsda/items/equipment.json +++ b/ootrando_overworldmap_hamsda/items/equipment.json @@ -130,5 +130,37 @@ "img": "images/boots.png" } ] + }, + { + "name": "Zora Scales", + "type": "progressive", + "stages": [ + { + "img": "images/scale1.png", + "codes": "scale,silverscale,scale1,sscale" + }, + { + "img": "images/scale2.png", + "codes": "goldscale,scale2,gscale" + } + ] + }, + { + "name": "Gauntlets", + "type": "progressive", + "stages": [ + { + "img": "images/lift1.png", + "codes": "bracelet,lift1,gb,goronsbracelet" + }, + { + "img": "images/lift2.png", + "codes": "silvergauntlets,lift2,sg,silvers" + }, + { + "img": "images/lift3.png", + "codes": "goldgauntlets,lift3,gg,golds" + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/items/items.json b/ootrando_overworldmap_hamsda/items/items.json index 40754741..0e6c1ddb 100644 --- a/ootrando_overworldmap_hamsda/items/items.json +++ b/ootrando_overworldmap_hamsda/items/items.json @@ -353,7 +353,7 @@ "name": "Ocarina with Scarecrow", "type": "toggle_badged", "base_item": "ocarina", - "img": "images/scarecrow.png", + "img": "images/scarecrow_badge.png", "codes": "ocarinacrow,scarecrow,pierre" }, { diff --git a/ootrando_overworldmap_hamsda/items/quest.json b/ootrando_overworldmap_hamsda/items/quest.json index 510d6947..6870747d 100644 --- a/ootrando_overworldmap_hamsda/items/quest.json +++ b/ootrando_overworldmap_hamsda/items/quest.json @@ -24,38 +24,6 @@ "codes": "skulltula,goldskulltula,token", "max_quantity": 50 }, - { - "name": "Zora Scales", - "type": "progressive", - "stages": [ - { - "img": "images/scale1.png", - "codes": "scale,silverscale,scale1,sscale" - }, - { - "img": "images/scale2.png", - "codes": "goldscale,scale2,gscale" - } - ] - }, - { - "name": "Gauntlets", - "type": "progressive", - "stages": [ - { - "img": "images/lift1.png", - "codes": "bracelet,lift1,gb,goronsbracelet" - }, - { - "img": "images/lift2.png", - "codes": "silvergauntlets,lift2,sg,silvers" - }, - { - "img": "images/lift3.png", - "codes": "goldgauntlets,lift3,gg,golds" - } - ] - }, { "name": "Wallet Upgrades", "type": "progressive", diff --git a/ootrando_overworldmap_hamsda/items/beans.json b/ootrando_overworldmap_hamsda/items/sequences.json similarity index 85% rename from ootrando_overworldmap_hamsda/items/beans.json rename to ootrando_overworldmap_hamsda/items/sequences.json index 70d0d9f2..56c14c08 100644 --- a/ootrando_overworldmap_hamsda/items/beans.json +++ b/ootrando_overworldmap_hamsda/items/sequences.json @@ -100,5 +100,22 @@ "inherit_codes": false } ] + }, + { + "name": "Scarecrow", + "type": "progressive", + "allow_disabled": false, + "stages": [ + { + "img": "images/scarecrow.png", + "img_mods": "@disabled", + "codes": "scarecrow_kid" + }, + { + "img": "images/scarecrow.png", + "codes": "scarecrow_adult", + "inherit_codes": false + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 6fa22ce0..32048775 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -245,7 +245,7 @@ "name": "GS42 - Scarecrow Song", "short_name": "Scarecrow", "access_rules": [ - "sword2,ocarina,scarecrow,hookshot", + "sword2,ocarina,[scarecrow],hookshot", "sword2,longshot" ], "chest_unopened_img": "images/skulltula.png", @@ -707,7 +707,7 @@ { "name": "Scarecrow", "access_rules": [ - "@Fire Temple/Above Boulder Maze,ocarina,scarecrow,hookshot", + "@Fire Temple/Above Boulder Maze,ocarina,[scarecrow],hookshot", "{agony}" ], "capture_item": true, @@ -1105,7 +1105,7 @@ "name": "Bongo Bongo", "access_rules": [ "@Shadow Temple/Boss Key Room,bow", - "@Shadow Temple/Boss Key Room,longshot,ocarina,scarecrow" + "@Shadow Temple/Boss Key Room,longshot,ocarina,[scarecrow]" ], "hosted_item": "shadow", "chest_unopened_img": "images/HC.png", @@ -1404,7 +1404,7 @@ "name": "GS100 - Statue Room, Left Ledge", "short_name": "Statue Ledge", "access_rules": [ - "lift2,sword2,hookshot,ocarina,scarecrow", + "lift2,sword2,hookshot,ocarina,[scarecrow]", "lift2,sword2,longshot", "lift2,sword2,hoverboots" ], @@ -1726,7 +1726,7 @@ "name": "Open it", "access_rules": [ "hoverboots", - "ocarina,scarecrow,hookshot", + "ocarina,[scarecrow],hookshot", "longshot" ], "item_count": 1 diff --git a/ootrando_overworldmap_hamsda/locations/mq.json b/ootrando_overworldmap_hamsda/locations/mq.json index d3c43667..ceb2e977 100644 --- a/ootrando_overworldmap_hamsda/locations/mq.json +++ b/ootrando_overworldmap_hamsda/locations/mq.json @@ -939,7 +939,8 @@ "name": "Water Temple MQ", "parent": "Lake Hylia A", "access_rules": [ - "water_mq,ironboots,hookshot,[bluetunic]" + "water_mq,ironboots,hookshot,[bluetunic]", + "water_mq,scale2,hookshot,[bluetunic]" ], "sections": [ { @@ -950,10 +951,9 @@ "item_count": 1 }, { - "name": "Central Pillar Chest", + "name": "Longshot Chest", "access_rules": [ - "ironboots,bow,firearrow,magic", - "ironboots,dinsfire,magic,ocarina,time" + "ocarina,lullaby,ironboots" ], "item_count": 1 }, @@ -966,9 +966,10 @@ "item_count": 1 }, { - "name": "Longshot Chest", + "name": "Central Pillar Chest", "access_rules": [ - "ocarina,lullaby,ironboots" + "ironboots,bow,firearrow,magic", + "ironboots,dinsfire,magic,ocarina,time" ], "item_count": 1 }, @@ -985,7 +986,7 @@ "name": "Freestanding Key", "access_rules": [ "@Water Temple MQ/Boss Key Chest,hoverboots", - "@Water Temple MQ/Boss Key Chest,ocarina,scarecrow" + "@Water Temple MQ/Boss Key Chest,ocarina,[scarecrow]" ], "item_count": 1 }, @@ -1106,58 +1107,58 @@ "item_count": 1 }, { - "name": "Early Gibdos Chest", + "name": "Near Ship Invisible Chest", "access_rules": [ "@Shadow Temple MQ/Map Chest" ], "item_count": 1 }, { - "name": "Near Ship Invisible Chest", + "name": "Early Gibdos Chest", "access_rules": [ "@Shadow Temple MQ/Map Chest" ], "item_count": 1 }, { - "name": "Invisible Blades Visible Chest", + "name": "Falling Spikes Lower Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,ocarina,time" + "@Shadow Temple MQ/Map Chest,@logic/explosives" ], "item_count": 1 }, { - "name": "Invisible Blades Invisible Chest", + "name": "Falling Spikes Upper Chest", "access_rules": [ - "@Shadow Temple MQ/Invisible Blades Visible Chest" + "@Shadow Temple MQ/Falling Spikes Lower Chest,lift1" ], "item_count": 1 }, { - "name": "Beamos Silver Rupees Chest", + "name": "Falling Spikes Switch Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,longshot" + "@Shadow Temple MQ/Falling Spikes Upper Chest" ], "item_count": 1 }, { - "name": "Falling Spikes Lower Chest", + "name": "Invisible Blades Visible Chest", "access_rules": [ - "@Shadow Temple MQ/Map Chest,@logic/explosives" + "@Shadow Temple MQ/Falling Spikes Lower Chest,ocarina,time" ], "item_count": 1 }, { - "name": "Falling Spikes Upper Chest", + "name": "Invisible Blades Invisible Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,lift1" + "@Shadow Temple MQ/Invisible Blades Visible Chest" ], "item_count": 1 }, { - "name": "Falling Spikes Switch Chest", + "name": "Beamos Silver Rupees Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Upper Chest" + "@Shadow Temple MQ/Falling Spikes Lower Chest,longshot" ], "item_count": 1 }, @@ -1363,8 +1364,8 @@ "name": "Silver Block Hallway Chest", "access_rules": [ "ocarina,requiem,bombchu,sling,dinsfire,magic", - "ocarina,requiem,bombchu,sling,longshot,lift2,bow,firearrow,magic", - "ocarina,requiem,bombchu,sling,longshot,lift2,bow,[firearrow],[magic],time" + "ocarina,requiem,bombchu,sling,sword2,longshot,lift2,bow,firearrow,magic", + "ocarina,requiem,bombchu,sling,sword2,longshot,lift2,bow,[firearrow],[magic],time" ], "item_count": 1 }, @@ -1876,7 +1877,7 @@ "name": "Open it", "access_rules": [ "hoverboots", - "ocarina,scarecrow,hookshot", + "ocarina,[scarecrow],hookshot", "longshot" ], "item_count": 1 @@ -2154,7 +2155,7 @@ "name": "GS71 - Scarecrow", "short_name": "Scarecrow", "access_rules": [ - "hookshot,ocarina,scarecrow", + "hookshot,ocarina,[scarecrow]", "longshot,hoverboots" ], "chest_unopened_img": "images/skulltula.png", diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index 53796510..63970ecc 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -1040,6 +1040,25 @@ } ] }, + { + "name": "Scarecrow C", + "sections": [ + { + "name": "Play Song", + "access_rules": [ + "ocarina,scarecrow_kid" + ], + "hosted_item": "scarecrow_adult" + } + ], + "map_locations": [ + { + "map": "child", + "x": 1150, + "y": 1180 + } + ] + }, { "name": "Bean Patch", "sections": [ @@ -1997,8 +2016,8 @@ "map_locations": [ { "map": "child", - "x": 1648, - "y": 128 + "x": 1689, + "y": 115 } ] }, @@ -4606,7 +4625,7 @@ { "name": "Bite pls", "access_rules": [ - "ocarina,scarecrow,hookshot", + "ocarina,[scarecrow],hookshot", "water", "bean_lake_yes", "{agony}" @@ -4629,7 +4648,7 @@ { "name": "Shoot it", "access_rules": [ - "bow,ocarina,scarecrow,longshot", + "bow,ocarina,[scarecrow],longshot", "bow,water", "{agony}" ], @@ -4652,7 +4671,7 @@ "name": "HP", "access_rules": [ "bean_lake_yes", - "ocarina,scarecrow,hookshot" + "ocarina,[scarecrow],hookshot" ], "chest_unopened_img": "images/HP.png", "chest_opened_img": "images/HP_grey.png", @@ -4667,6 +4686,25 @@ } ] }, + { + "name": "Scarecrow A", + "sections": [ + { + "name": "Repeat Song", + "access_rules": [ + "ocarina,scarecrow_adult" + ], + "hosted_item": "scarecrow" + } + ], + "map_locations": [ + { + "map": "adult", + "x": 1150, + "y": 1180 + } + ] + }, { "name": "Top of Tree (N)", "access_rules": [ diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index f7779002..c12faee0 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.0", + "package_version": "2.1.3.1", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/scripts/init.lua b/ootrando_overworldmap_hamsda/scripts/init.lua index 7b1f746c..63cabe65 100644 --- a/ootrando_overworldmap_hamsda/scripts/init.lua +++ b/ootrando_overworldmap_hamsda/scripts/init.lua @@ -3,7 +3,7 @@ Tracker:AddItems("items/quest.json") Tracker:AddItems("items/equipment.json") Tracker:AddItems("items/items.json") Tracker:AddItems("items/dungeons.json") -Tracker:AddItems("items/beans.json") +Tracker:AddItems("items/sequences.json") Tracker:AddMaps("maps/maps.json") diff --git a/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json b/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json index aeaf9e81..37cdbb90 100644 --- a/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json @@ -5,8 +5,8 @@ "content": [ { "type": "itemgrid", - "item_margin": "1,2", "h_alignment": "left", + "item_margin": "1,2", "rows": [ [ "sticks", @@ -485,8 +485,8 @@ "content": [ { "type": "itemgrid", - "h_alignment": "left", "item_margin": "1,2", + "h_alignment": "left", "rows": [ [ "sticks", diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index 4c8d5524..3400d773 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -245,7 +245,7 @@ "name": "GS42 - Scarecrow Song", "short_name": "Scarecrow", "access_rules": [ - "sword2,ocarina,scarecrow,hookshot", + "sword2,ocarina,[scarecrow],hookshot", "sword2,longshot" ], "chest_unopened_img": "images/skulltula.png", @@ -711,7 +711,7 @@ { "name": "Scarecrow", "access_rules": [ - "@Fire Temple/Above Boulder Maze,ocarina,scarecrow,hookshot", + "@Fire Temple/Above Boulder Maze,ocarina,[scarecrow],hookshot", "{agony}" ], "capture_item": true, @@ -1119,7 +1119,7 @@ "name": "Bongo Bongo", "access_rules": [ "@Shadow Temple/Boss Key Room,shadow_boss_key,shadow_small_keys:5,bow", - "@Shadow Temple/Boss Key Room,shadow_boss_key,shadow_small_keys:5,longshot,ocarina,scarecrow" + "@Shadow Temple/Boss Key Room,shadow_boss_key,shadow_small_keys:5,longshot,ocarina,[scarecrow]" ], "hosted_item": "shadow", "chest_unopened_img": "images/HC.png", @@ -1418,7 +1418,7 @@ "name": "GS100 - Statue Room, Left Ledge", "short_name": "Statue Ledge", "access_rules": [ - "lift2,sword2,spirit_small_keys:1,hookshot,ocarina,scarecrow", + "lift2,sword2,spirit_small_keys:1,hookshot,ocarina,[scarecrow]", "lift2,sword2,spirit_small_keys:1,longshot", "lift2,sword2,spirit_small_keys:1,hoverboots" ], @@ -1760,7 +1760,7 @@ "name": "Open it", "access_rules": [ "hoverboots", - "ocarina,scarecrow,hookshot", + "ocarina,[scarecrow],hookshot", "longshot" ], "item_count": 1 diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json index 7ae8807e..5966b708 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json @@ -945,7 +945,8 @@ "name": "Water Temple MQ", "parent": "Lake Hylia A", "access_rules": [ - "water_mq,ironboots,hookshot,[bluetunic]" + "water_mq,ironboots,hookshot,[bluetunic]", + "water_mq,scale2,hookshot,[bluetunic]" ], "sections": [ { @@ -956,10 +957,9 @@ "item_count": 1 }, { - "name": "Central Pillar Chest", + "name": "Longshot Chest", "access_rules": [ - "ironboots,bow,firearrow,magic", - "ironboots,dinsfire,magic,ocarina,time" + "ocarina,lullaby,ironboots" ], "item_count": 1 }, @@ -972,9 +972,10 @@ "item_count": 1 }, { - "name": "Longshot Chest", + "name": "Central Pillar Chest", "access_rules": [ - "ocarina,lullaby,ironboots" + "ironboots,bow,firearrow,magic", + "ironboots,dinsfire,magic,ocarina,time" ], "item_count": 1 }, @@ -991,7 +992,7 @@ "name": "Freestanding Key", "access_rules": [ "@Water Temple MQ/Boss Key Chest,hoverboots", - "@Water Temple MQ/Boss Key Chest,ocarina,scarecrow" + "@Water Temple MQ/Boss Key Chest,ocarina,[scarecrow]" ], "item_count": 1 }, @@ -1034,7 +1035,7 @@ "name": "GS74 - North Basement", "short_name": "North Basement", "access_rules": [ - "@Water Temple MQ/Freestanding Key" + "@Water Temple MQ/Freestanding Key,water_small_keys:2" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1092,7 +1093,7 @@ { "name": "Compass Chest", "access_rules": [ - "@logic/explosives,shadow_small_keys:6" + "@logic/explosives,shadow_small_keys:1" ], "item_count": 1 }, @@ -1112,65 +1113,65 @@ "item_count": 1 }, { - "name": "Early Gibdos Chest", + "name": "Near Ship Invisible Chest", "access_rules": [ "@Shadow Temple MQ/Map Chest" ], "item_count": 1 }, { - "name": "Near Ship Invisible Chest", + "name": "Early Gibdos Chest", "access_rules": [ "@Shadow Temple MQ/Map Chest" ], "item_count": 1 }, { - "name": "Invisible Blades Visible Chest", + "name": "Falling Spikes Lower Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,ocarina,time" + "@Shadow Temple MQ/Map Chest,@logic/explosives,shadow_small_keys:1" ], "item_count": 1 }, { - "name": "Invisible Blades Invisible Chest", + "name": "Falling Spikes Upper Chest", "access_rules": [ - "@Shadow Temple MQ/Invisible Blades Visible Chest" + "@Shadow Temple MQ/Falling Spikes Lower Chest,lift1" ], "item_count": 1 }, { - "name": "Beamos Silver Rupees Chest", + "name": "Falling Spikes Switch Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,longshot" + "@Shadow Temple MQ/Falling Spikes Upper Chest" ], "item_count": 1 }, { - "name": "Falling Spikes Lower Chest", + "name": "Invisible Blades Visible Chest", "access_rules": [ - "@Shadow Temple MQ/Map Chest,@logic/explosives,shadow_small_keys:2" + "@Shadow Temple MQ/Falling Spikes Lower Chest,ocarina,time" ], "item_count": 1 }, { - "name": "Falling Spikes Upper Chest", + "name": "Invisible Blades Invisible Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,lift1" + "@Shadow Temple MQ/Invisible Blades Visible Chest" ], "item_count": 1 }, { - "name": "Falling Spikes Switch Chest", + "name": "Beamos Silver Rupees Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Upper Chest" + "@Shadow Temple MQ/Falling Spikes Lower Chest,longshot" ], "item_count": 1 }, { "name": "Invisible Spikes Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,shadow_small_keys:3,hoverboots" + "@Shadow Temple MQ/Falling Spikes Lower Chest,shadow_small_keys:2,hoverboots" ], "item_count": 1 }, @@ -1184,7 +1185,7 @@ { "name": "Wind Hint Chest", "access_rules": [ - "@Shadow Temple MQ/Falling Spikes Lower Chest,shadow_small_keys:4,hoverboots,hookshot" + "@Shadow Temple MQ/Falling Spikes Lower Chest,shadow_small_keys:3,hoverboots,hookshot" ], "item_count": 1 }, @@ -1205,7 +1206,7 @@ { "name": "Spike Walls Left Chest", "access_rules": [ - "@Shadow Temple MQ/Bomb Flower Chest,shadow_small_keys:6" + "@Shadow Temple MQ/Bomb Flower Chest,shadow_small_keys:5" ], "item_count": 1 }, @@ -1221,7 +1222,7 @@ { "name": "Bomb Flower Chest", "access_rules": [ - "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:5,ocarina,lullaby,bow,time,longshot" + "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:4,ocarina,lullaby,bow,time,longshot" ], "item_count": 1 }, @@ -1235,7 +1236,7 @@ { "name": "Bongo Bongo", "access_rules": [ - "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:5,ocarina,lullaby,shadow_boss_key" + "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:4,ocarina,lullaby,shadow_boss_key" ], "hosted_item": "shadow", "chest_unopened_img": "images/HC.png", @@ -1291,7 +1292,7 @@ "name": "GS84 - After Ship", "short_name": "After Ship", "access_rules": [ - "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:5,ocarina,lullaby" + "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:4,ocarina,lullaby" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1368,23 +1369,23 @@ { "name": "Silver Block Hallway Chest", "access_rules": [ - "ocarina,requiem,bombchu,spirit_small_keys:7,sling,dinsfire,magic", - "ocarina,requiem,bombchu,spirit_small_keys:7,sling,longshot,lift2,bow,firearrow,magic", - "ocarina,requiem,bombchu,spirit_small_keys:7,sling,longshot,lift2,bow,[firearrow],[magic],time" + "ocarina,requiem,bombchu,spirit_small_keys:2,sling,dinsfire,magic", + "ocarina,requiem,bombchu,spirit_small_keys:2,sling,sword2,longshot,lift2,bow,firearrow,magic", + "ocarina,requiem,bombchu,spirit_small_keys:2,sling,sword2,longshot,lift2,bow,[firearrow],[magic],time" ], "item_count": 1 }, { "name": "Child Center Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,ocarina,requiem,hammer,spirit_small_keys:7" + "sword2,lift2,longshot,bombchu,ocarina,requiem,hammer,spirit_small_keys:2" ], "item_count": 1 }, { "name": "Child Climb South Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:7" + "sword2,lift2,longshot,bombchu,spirit_small_keys:1" ], "item_count": 1 }, @@ -1405,7 +1406,7 @@ { "name": "Beamos Room Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:5" + "sword2,lift2,longshot,bombchu,spirit_small_keys:1" ], "item_count": 1 }, @@ -1428,8 +1429,8 @@ { "name": "Child Climb North Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:6", - "ocarina,requiem,bombchu,spirit_small_keys:6" + "sword2,lift2,longshot,bombchu,spirit_small_keys:1", + "ocarina,requiem,bombchu,spirit_small_keys:1" ], "item_count": 1 }, @@ -1437,7 +1438,7 @@ "name": "Compass Chest", "access_rules": [ "sword2,lift2,longshot,bombchu,bow", - "ocarina,requiem,bombchu,spirit_small_keys:7,sling" + "ocarina,requiem,bombchu,spirit_small_keys:2,sling" ], "item_count": 1 }, @@ -1458,7 +1459,7 @@ { "name": "Lower Adult Right Chest", "access_rules": [ - "@Spirit Temple MQ/Lower Adult Left Chest,spirit_small_keys:7,hammer,ocarina,time,epona,sun,storm,lullaby" + "@Spirit Temple MQ/Lower Adult Left Chest,spirit_small_keys:1,hammer,ocarina,time,epona,sun,storm,lullaby" ], "item_count": 1 }, @@ -1472,31 +1473,29 @@ { "name": "Mirror Puzzle Invisible Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:6,ocarina,lullaby,hammer,@logic/lens" + "sword2,lift2,longshot,bombchu,spirit_small_keys:2,ocarina,lullaby,hammer,@logic/lens" ], "item_count": 1 }, { "name": "Mirror Shield Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:5,ocarina,time,@logic/lens" + "sword2,lift2,longshot,bombchu,spirit_small_keys:1,ocarina,time,@logic/lens" ], "item_count": 1 }, { "name": "Silver Gauntlets Chest", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:7", - "sword2,lift2,longshot,bombchu,spirit_small_keys:4,ocarina,time,@logic/lens", - "ocarina,requiem,bombchu,spirit_small_keys:7,time", - "ocarina,requiem,bombchu,spirit_small_keys:4,time,@logic/lens" //TODO + "sword2,lift2,longshot,bombchu,spirit_small_keys:1", + "ocarina,requiem,bombchu,spirit_small_keys:3,time" ], "item_count": 1 }, { "name": "Twinrova", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:6,ocarina,lullaby,hammer,shield3,spirit_boss_key" + "sword2,lift2,longshot,bombchu,spirit_small_keys:2,ocarina,lullaby,hammer,shield3,spirit_boss_key" ], "hosted_item": "spirit", "chest_unopened_img": "images/HC.png", @@ -1563,7 +1562,7 @@ "name": "GS99 - Iron Knuckle North", "short_name": "Iron Knuckle North", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:7" + "sword2,lift2,longshot,bombchu,spirit_small_keys:3" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1573,7 +1572,7 @@ "name": "GS100 - Iron Knuckle West", "short_name": "Iron Knuckle West", "access_rules": [ - "sword2,lift2,longshot,bombchu,spirit_small_keys:7" + "sword2,lift2,longshot,bombchu,spirit_small_keys:3" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -1902,7 +1901,7 @@ "name": "Open it", "access_rules": [ "hoverboots", - "ocarina,scarecrow,hookshot", + "ocarina,[scarecrow],hookshot", "longshot" ], "item_count": 1 @@ -2183,7 +2182,7 @@ "name": "GS71 - Scarecrow", "short_name": "Scarecrow", "access_rules": [ - "hookshot,ocarina,scarecrow", + "hookshot,ocarina,[scarecrow]", "longshot,hoverboots" ], "chest_unopened_img": "images/skulltula.png", diff --git a/repository.json b/repository.json index 3432c83c..f8e2bfb4 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.1.3.0", + "version": "2.1.3.1", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [