diff --git a/README.md b/README.md index 71c3c26c..242ee8bd 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,11 @@ You can easily download it from within the EmoTracker application. 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 +## Questions + +If you have any questions regarding the pack or the tracker itself, I recommend joining the [EmoTracker discord](https://emotracker.net/community/) and asking in there. Or you can just send me a DM on Discord to __Hamsda#4585__ or open an issue on Github. + +## Variants The pack offers 4 different variants: @@ -17,17 +21,24 @@ The pack offers 4 different variants: 4. Items Only (Keysanity) 5. Items Only (minimal) -### Vanilla vs Master Quest Dungeons +## 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 (for map variants) +## Special items + +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). +- ![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. + +## Settings (for map variants) There is a variety of settings available to accomodate the different options that the Randomizer offers: -#### Rainbow Bridge +### Rainbow Bridge This setting determines what is needed to trigger the rainbow bridge in front of Ganons castle. @@ -36,28 +47,28 @@ This setting determines what is needed to trigger the rainbow bridge in front of - ![All Dungeons](ootrando_overworldmap_hamsda/images/rainbow_dungeons.png "All Dungeons") All 6 medallions and 3 stones required - ![Open](ootrando_overworldmap_hamsda/images/rainbow_open.png "Open") Nothing required, bridge is always open -#### Forest +### Forest This setting determines if you can leave the Kokiri Forest without beating the Deku Tree. - ![Closed Forest](ootrando_overworldmap_hamsda/images/mido_closed.png "Closed Forest") You will find the Kokiri Sword and Slingshot early on to beat the Deku Tree before leaving the Kokiri Forest. - ![Open Forest](ootrando_overworldmap_hamsda/images/mido_open.png "Open Forest") You can immediately leave the Kokiri Forest. -#### Door of Time - -This setting determines whether the Door of Time starts open or closed. - -- ![Closed Door](ootrando_overworldmap_hamsda/images/dot_closed.png "Closed Door") You will find the Song of Time as a child to open the Door of Time. -- ![Open Door](ootrando_overworldmap_hamsda/images/dot_open.png "Open Door") The Door of Time starts open and you can immediately go adult. - -#### Kakariko Gate +### Kakariko Gate This setting determines whether the Kakariko Gate starts open or closed as a child. - ![Closed Kakariko](ootrando_overworldmap_hamsda/images/kak_closed.png "Closed Kakariko") You will need to show Zeldas Letter to the guard in front of the gate to open it. - ![Open Kakariko](ootrando_overworldmap_hamsda/images/kak_open.png "Open Kakariko") The Kakariko Gate starts open and you can go to Death Mountain Trail. -#### Lens of Truth +### Door of Time + +This setting determines whether the Door of Time starts open or closed. + +- ![Closed Door](ootrando_overworldmap_hamsda/images/dot_closed.png "Closed Door") You will find the Song of Time as a child to open the Door of Time. +- ![Open Door](ootrando_overworldmap_hamsda/images/dot_open.png "Open Door") The Door of Time starts open and you can immediately go adult. + +### Lens of Truth This setting changes where the logic requires the Lens of Truth. @@ -65,41 +76,45 @@ This setting changes where the logic requires the Lens of Truth. - ![Wasteland and Chest Minigame](ootrando_overworldmap_hamsda/images/lens_wasteland.png "Wasteland and Chest Minigame") Required to cross the Haunted Wasteland and to win the Treasure Chest minigame. - ![Only Chest Minigame](ootrando_overworldmap_hamsda/images/lens_chest.png "Only Chest Minigame") Required only to win the Treasure Chest minigame. -#### Bombchus in logic +### Fewer Tunic Requirements + +This setting changes where the [logic requires Goron and Zora tunics](https://github.com/TestRunnerSRL/OoT-Randomizer/tree/Dev#fewer-tunic-requirements). + +- ![Required everywhere](ootrando_overworldmap_hamsda/images/fewer_tunics_no.png "Required everywhere") Required basically everywhere a heat/breath timer shows up. +- ![Fewer requirements](ootrando_overworldmap_hamsda/images/fewer_tunics_yes.png "Fewer requirements") Required for fewer locations. + +### Bombchus in logic This setting determines if Bombchus are considered by the logic. - ![Bombchus not in logic](ootrando_overworldmap_hamsda/images/logic_chus_no.png "Bombchus not in logic") Bombchus will never be considered by the logic and can be used to sequence break bomb locations. - ![Bombchus in logic](ootrando_overworldmap_hamsda/images/logic_chus_yes.png "Bombchus in logic") Bombchus can be used as regular explosives like bombs in logic. -#### Shuffle Deku Scrubs +### Shuffle Deku Scrubs This setting determines if all Deku Scrubs have randomized items. - ![Scrubs not shuffled](ootrando_overworldmap_hamsda/images/scrub_shuffle_no.png "Scrubs not shuffled") Only the three Deku Scrubs that give actual items in the vanilla game can have random items. - ![Scrubs shuffled](ootrando_overworldmap_hamsda/images/scrub_shuffle_yes.png "Scrubs shuffled") All Deku Scrubs can have random items. -#### Shopsanity +### Shopsanity This setting determines if Shopsanity is active. - ![Shopsanity off](ootrando_overworldmap_hamsda/images/shopsanity_no.png "Shopsanity off") The shops have their regular items. - ![Shopsanity on](ootrando_overworldmap_hamsda/images/shopsanity_yes.png "Shopsanity on") A varying amount of items in the shops is randomized. -#### Gold Skulltulas - -This setting determines if Gold Skulltulas are shown (especially useful for Tokensanity). +### Gold Skulltulas -- ![Skulltulas hidden](ootrando_overworldmap_hamsda/images/skulltula_hide.png "Skulltulas hidden") The Gold Skulltulas will be hidden. -- ![Skulltulas shown](ootrando_overworldmap_hamsda/images/skulltula_show.png "Skulltulas shown") The Gold Skulltulas will be displayed. +This setting determines which Gold Skulltulas are shown (especially useful for Tokensanity). -### Special items +- ![Skulltulas hidden](ootrando_overworldmap_hamsda/images/skulltula_hide.png "Skulltulas hidden") Gold Skulltulas will be hidden. +- ![Skulltulas in dungeons](ootrando_overworldmap_hamsda/images/skulltula_dungeon.png "Skulltulas in dungeons") The Gold Skulltulas in dungeons will be displayed. +- ![Skulltulas everywhere](ootrando_overworldmap_hamsda/images/skulltula_all.png "Skulltulas everywhere") All Gold Skulltulas will be displayed. -There are a few special items whose purpose might not be directly obvious: +### Magic Beans -- ![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 +This setting determines how the Magic Beans will be handled on the map. -If you have any questions regarding the pack or the tracker itself, I recommend joining the [EmoTracker discord](https://emotracker.net/community/) and asking in there. Or you can just send me a DM on Discord to __Hamsda#4585__. \ No newline at end of file +- ![Beans off](ootrando_overworldmap_hamsda/images/bean_off.png "Beans off") The bean patches won't show up on the child map and adult locations will just show up once you have the bean item. +- ![Plant Beans](ootrando_overworldmap_hamsda/images/bean_plant.png "Plant Beans") The bean patches will show up on the child map and adult locations require those to be checked off (meaning the bean has actually been planted there). \ No newline at end of file diff --git a/TODO b/TODO new file mode 100644 index 00000000..e69de29b diff --git a/ootrando_overworldmap_hamsda/changelog.md b/changelog.md similarity index 95% rename from ootrando_overworldmap_hamsda/changelog.md rename to changelog.md index 69e2ac32..78a6ae4c 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/changelog.md @@ -1,5 +1,19 @@ # Changelog +## 2.1.3.3 + +- changed Biggoron to be visible with just Stone of Agony (so you can mark him off without access) +- added Jabu Jabu GS51 sequence break with boomerang +- added MQ Forest Temple well chest sequence break with ironboots +- fixed Gerudo Fortress location duplicates +- fixed Gerudo Fortress GS are not in dungeons +- added fewer tunic requirements option and logic +- changed layouts: + - added a few items to capture layout and rearranged it + - changed dungeon label font + - added free label back in and rearranged layouts to fit it + - changed the dungeon labels to be separate from medallions for minimalist variant (so one can cycle both ways through it) + ## 2.1.3.2 - added dungeon only to skulltula settings diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index 2770428b..cdf435b9 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png b/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png index 2f70ba54..53229011 100644 Binary files a/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png and b/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png differ diff --git a/ootrando_overworldmap_hamsda/images/botw.png b/ootrando_overworldmap_hamsda/images/botw.png deleted file mode 100644 index 3f9ab883..00000000 Binary files a/ootrando_overworldmap_hamsda/images/botw.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/botw_mq.png b/ootrando_overworldmap_hamsda/images/botw_mq.png deleted file mode 100644 index 67da8adf..00000000 Binary files a/ootrando_overworldmap_hamsda/images/botw_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/check.png b/ootrando_overworldmap_hamsda/images/check.png index 8229d769..082a7a6d 100644 Binary files a/ootrando_overworldmap_hamsda/images/check.png and b/ootrando_overworldmap_hamsda/images/check.png differ diff --git a/ootrando_overworldmap_hamsda/images/deku.png b/ootrando_overworldmap_hamsda/images/deku.png deleted file mode 100644 index bc0c953a..00000000 Binary files a/ootrando_overworldmap_hamsda/images/deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/deku_mq.png b/ootrando_overworldmap_hamsda/images/deku_mq.png deleted file mode 100644 index 0b433b35..00000000 Binary files a/ootrando_overworldmap_hamsda/images/deku_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/dodongo.png b/ootrando_overworldmap_hamsda/images/dodongo.png deleted file mode 100644 index 149af81e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/dodongo.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/dodongo_mq.png b/ootrando_overworldmap_hamsda/images/dodongo_mq.png deleted file mode 100644 index 8cb1fac3..00000000 Binary files a/ootrando_overworldmap_hamsda/images/dodongo_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/fewer_tunics_no.png b/ootrando_overworldmap_hamsda/images/fewer_tunics_no.png new file mode 100644 index 00000000..9fa69df4 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/fewer_tunics_no.png differ diff --git a/ootrando_overworldmap_hamsda/images/fewer_tunics_yes.png b/ootrando_overworldmap_hamsda/images/fewer_tunics_yes.png new file mode 100644 index 00000000..ab9895d0 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/fewer_tunics_yes.png differ diff --git a/ootrando_overworldmap_hamsda/images/fire.png b/ootrando_overworldmap_hamsda/images/fire.png deleted file mode 100644 index af7a412b..00000000 Binary files a/ootrando_overworldmap_hamsda/images/fire.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/fire_mq.png b/ootrando_overworldmap_hamsda/images/fire_mq.png deleted file mode 100644 index 8c53b976..00000000 Binary files a/ootrando_overworldmap_hamsda/images/fire_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forest.png b/ootrando_overworldmap_hamsda/images/forest.png deleted file mode 100644 index d36eb142..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forest.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forest_mq.png b/ootrando_overworldmap_hamsda/images/forest_mq.png deleted file mode 100644 index 2d63bfbe..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forest_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/free.png b/ootrando_overworldmap_hamsda/images/free.png deleted file mode 100644 index 17860ca5..00000000 Binary files a/ootrando_overworldmap_hamsda/images/free.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/gc.png b/ootrando_overworldmap_hamsda/images/gc.png deleted file mode 100644 index da2c26c9..00000000 Binary files a/ootrando_overworldmap_hamsda/images/gc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/gc_mq.png b/ootrando_overworldmap_hamsda/images/gc_mq.png deleted file mode 100644 index 7ad32323..00000000 Binary files a/ootrando_overworldmap_hamsda/images/gc_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/gf.png b/ootrando_overworldmap_hamsda/images/gf.png deleted file mode 100644 index c8c64610..00000000 Binary files a/ootrando_overworldmap_hamsda/images/gf.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/gtg.png b/ootrando_overworldmap_hamsda/images/gtg.png deleted file mode 100644 index 876df128..00000000 Binary files a/ootrando_overworldmap_hamsda/images/gtg.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/gtg_mq.png b/ootrando_overworldmap_hamsda/images/gtg_mq.png deleted file mode 100644 index 4f57c4bc..00000000 Binary files a/ootrando_overworldmap_hamsda/images/gtg_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/ice.png b/ootrando_overworldmap_hamsda/images/ice.png deleted file mode 100644 index 1f9c6d4a..00000000 Binary files a/ootrando_overworldmap_hamsda/images/ice.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/ice_mq.png b/ootrando_overworldmap_hamsda/images/ice_mq.png deleted file mode 100644 index 6fd8d9d7..00000000 Binary files a/ootrando_overworldmap_hamsda/images/ice_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/jabu.png b/ootrando_overworldmap_hamsda/images/jabu.png deleted file mode 100644 index b001d8d5..00000000 Binary files a/ootrando_overworldmap_hamsda/images/jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/jabu_mq.png b/ootrando_overworldmap_hamsda/images/jabu_mq.png deleted file mode 100644 index 1594de8c..00000000 Binary files a/ootrando_overworldmap_hamsda/images/jabu_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/label_botw.png b/ootrando_overworldmap_hamsda/images/label_botw.png new file mode 100644 index 00000000..48490d00 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_botw.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_botw_mq.png b/ootrando_overworldmap_hamsda/images/label_botw_mq.png new file mode 100644 index 00000000..00a8abb3 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_botw_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_deku.png b/ootrando_overworldmap_hamsda/images/label_deku.png new file mode 100644 index 00000000..a1f2b0a7 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_deku.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_deku_mq.png b/ootrando_overworldmap_hamsda/images/label_deku_mq.png new file mode 100644 index 00000000..7e09fc8a Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_deku_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_dodongo.png b/ootrando_overworldmap_hamsda/images/label_dodongo.png new file mode 100644 index 00000000..6c6aed11 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_dodongo.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_dodongo_mq.png b/ootrando_overworldmap_hamsda/images/label_dodongo_mq.png new file mode 100644 index 00000000..13519c67 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_dodongo_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_fire.png b/ootrando_overworldmap_hamsda/images/label_fire.png new file mode 100644 index 00000000..62a7aced Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_fire.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_fire_mq.png b/ootrando_overworldmap_hamsda/images/label_fire_mq.png new file mode 100644 index 00000000..303a6e97 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_fire_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_forest.png b/ootrando_overworldmap_hamsda/images/label_forest.png new file mode 100644 index 00000000..7f235ddc Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_forest.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_forest_mq.png b/ootrando_overworldmap_hamsda/images/label_forest_mq.png new file mode 100644 index 00000000..daad4f41 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_forest_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_free.png b/ootrando_overworldmap_hamsda/images/label_free.png new file mode 100644 index 00000000..7fe9fff5 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_free.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_gc.png b/ootrando_overworldmap_hamsda/images/label_gc.png new file mode 100644 index 00000000..dcaf1e92 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_gc.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_gc_mq.png b/ootrando_overworldmap_hamsda/images/label_gc_mq.png new file mode 100644 index 00000000..bb22ba9f Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_gc_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_gf.png b/ootrando_overworldmap_hamsda/images/label_gf.png new file mode 100644 index 00000000..4f87208c Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_gf.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_gtg.png b/ootrando_overworldmap_hamsda/images/label_gtg.png new file mode 100644 index 00000000..b097c84f Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_gtg.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_gtg_mq.png b/ootrando_overworldmap_hamsda/images/label_gtg_mq.png new file mode 100644 index 00000000..7fb0b9f8 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_gtg_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_ice.png b/ootrando_overworldmap_hamsda/images/label_ice.png new file mode 100644 index 00000000..2215e6c3 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_ice.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_ice_mq.png b/ootrando_overworldmap_hamsda/images/label_ice_mq.png new file mode 100644 index 00000000..1ffedb6c Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_ice_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_jabu.png b/ootrando_overworldmap_hamsda/images/label_jabu.png new file mode 100644 index 00000000..c222d48e Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_jabu.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_jabu_mq.png b/ootrando_overworldmap_hamsda/images/label_jabu_mq.png new file mode 100644 index 00000000..aeba40b9 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_jabu_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_shadow.png b/ootrando_overworldmap_hamsda/images/label_shadow.png new file mode 100644 index 00000000..dc89ab93 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_shadow.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_shadow_mq.png b/ootrando_overworldmap_hamsda/images/label_shadow_mq.png new file mode 100644 index 00000000..825987d4 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_shadow_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_spirit.png b/ootrando_overworldmap_hamsda/images/label_spirit.png new file mode 100644 index 00000000..c808c0f9 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_spirit.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_spirit_mq.png b/ootrando_overworldmap_hamsda/images/label_spirit_mq.png new file mode 100644 index 00000000..a1275e23 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_spirit_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_unknown.png b/ootrando_overworldmap_hamsda/images/label_unknown.png new file mode 100644 index 00000000..b4269661 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_unknown.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_water.png b/ootrando_overworldmap_hamsda/images/label_water.png new file mode 100644 index 00000000..1f557037 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_water.png differ diff --git a/ootrando_overworldmap_hamsda/images/label_water_mq.png b/ootrando_overworldmap_hamsda/images/label_water_mq.png new file mode 100644 index 00000000..a55c18a1 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/label_water_mq.png differ diff --git a/ootrando_overworldmap_hamsda/images/redbluetunic.png b/ootrando_overworldmap_hamsda/images/redbluetunic.png deleted file mode 100644 index 3f55c893..00000000 Binary files a/ootrando_overworldmap_hamsda/images/redbluetunic.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/redtunic-disabled.png b/ootrando_overworldmap_hamsda/images/redtunic-disabled.png index b8795e1d..e9e292c5 100644 Binary files a/ootrando_overworldmap_hamsda/images/redtunic-disabled.png and b/ootrando_overworldmap_hamsda/images/redtunic-disabled.png differ diff --git a/ootrando_overworldmap_hamsda/images/shadow.png b/ootrando_overworldmap_hamsda/images/shadow.png deleted file mode 100644 index 4c0a3f7a..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadow.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadow_mq.png b/ootrando_overworldmap_hamsda/images/shadow_mq.png deleted file mode 100644 index 5f77b688..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadow_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spirit.png b/ootrando_overworldmap_hamsda/images/spirit.png deleted file mode 100644 index 098fa33e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spirit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spirit_mq.png b/ootrando_overworldmap_hamsda/images/spirit_mq.png deleted file mode 100644 index a00764e2..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spirit_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/tunics.png b/ootrando_overworldmap_hamsda/images/tunics.png new file mode 100644 index 00000000..35b0d2c1 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/tunics.png differ diff --git a/ootrando_overworldmap_hamsda/images/water.png b/ootrando_overworldmap_hamsda/images/water.png deleted file mode 100644 index 1a2c1132..00000000 Binary files a/ootrando_overworldmap_hamsda/images/water.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/water_mq.png b/ootrando_overworldmap_hamsda/images/water_mq.png deleted file mode 100644 index f668391d..00000000 Binary files a/ootrando_overworldmap_hamsda/images/water_mq.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json index c19034be..619958ce 100644 --- a/ootrando_overworldmap_hamsda/items/dungeons.json +++ b/ootrando_overworldmap_hamsda/items/dungeons.json @@ -2,7 +2,7 @@ { "name": "Freebie Label", "type": "static", - "img": "images/free.png", + "img": "images/label_free.png", "codes": "free_label" }, { @@ -49,11 +49,11 @@ "loop": true, "stages": [ { - "img": "images/deku.png", + "img": "images/label_deku.png", "codes": "deku_label,deku_reg" }, { - "img": "images/deku_mq.png", + "img": "images/label_deku_mq.png", "codes": "deku_label,deku_mq", "inherit_codes": false } @@ -102,11 +102,11 @@ "loop": true, "stages": [ { - "img": "images/dodongo.png", + "img": "images/label_dodongo.png", "codes": "dodongo_label,dodongo_reg" }, { - "img": "images/dodongo_mq.png", + "img": "images/label_dodongo_mq.png", "codes": "dodongo_label,dodongo_mq", "inherit_codes": false } @@ -155,11 +155,11 @@ "loop": true, "stages": [ { - "img": "images/jabu.png", + "img": "images/label_jabu.png", "codes": "jabu_label,jabu_reg" }, { - "img": "images/jabu_mq.png", + "img": "images/label_jabu_mq.png", "codes": "jabu_label,jabu_mq", "inherit_codes": false } @@ -208,11 +208,11 @@ "loop": true, "stages": [ { - "img": "images/forest.png", + "img": "images/label_forest.png", "codes": "forest_label,forest_reg" }, { - "img": "images/forest_mq.png", + "img": "images/label_forest_mq.png", "codes": "forest_label,forest_mq", "inherit_codes": false } @@ -274,11 +274,11 @@ "loop": true, "stages": [ { - "img": "images/fire.png", + "img": "images/label_fire.png", "codes": "fire_label,fire_reg" }, { - "img": "images/fire_mq.png", + "img": "images/label_fire_mq.png", "codes": "fire_label,fire_mq", "inherit_codes": false } @@ -340,11 +340,11 @@ "loop": true, "stages": [ { - "img": "images/water.png", + "img": "images/label_water.png", "codes": "water_label,water_reg" }, { - "img": "images/water_mq.png", + "img": "images/label_water_mq.png", "codes": "water_label,water_mq", "inherit_codes": false } @@ -406,11 +406,11 @@ "loop": true, "stages": [ { - "img": "images/spirit.png", + "img": "images/label_spirit.png", "codes": "spirit_label,spirit_reg" }, { - "img": "images/spirit_mq.png", + "img": "images/label_spirit_mq.png", "codes": "spirit_label,spirit_mq", "inherit_codes": false } @@ -472,11 +472,11 @@ "loop": true, "stages": [ { - "img": "images/shadow.png", + "img": "images/label_shadow.png", "codes": "shadow_label,shadow_reg" }, { - "img": "images/shadow_mq.png", + "img": "images/label_shadow_mq.png", "codes": "shadow_label,shadow_mq", "inherit_codes": false } @@ -538,11 +538,11 @@ "loop": true, "stages": [ { - "img": "images/botw.png", + "img": "images/label_botw.png", "codes": "botw_label,botw_reg" }, { - "img": "images/botw_mq.png", + "img": "images/label_botw_mq.png", "codes": "botw_label,botw_mq", "inherit_codes": false } @@ -562,11 +562,11 @@ "loop": true, "stages": [ { - "img": "images/ice.png", + "img": "images/label_ice.png", "codes": "ice_label,ice_reg" }, { - "img": "images/ice_mq.png", + "img": "images/label_ice_mq.png", "codes": "ice_label,ice_mq", "inherit_codes": false } @@ -575,7 +575,7 @@ { "name": "GF Label", "type": "static", - "img": "images/gf.png", + "img": "images/label_gf.png", "codes": "gf_label" }, { @@ -592,11 +592,11 @@ "loop": true, "stages": [ { - "img": "images/gtg.png", + "img": "images/label_gtg.png", "codes": "gtg_label,gtg_reg" }, { - "img": "images/gtg_mq.png", + "img": "images/label_gtg_mq.png", "codes": "gtg_label,gtg_mq", "inherit_codes": false } @@ -616,11 +616,11 @@ "loop": true, "stages": [ { - "img": "images/gc.png", + "img": "images/label_gc.png", "codes": "gc_label,gc_reg" }, { - "img": "images/gc_mq.png", + "img": "images/label_gc_mq.png", "codes": "gc_label,gc_mq", "inherit_codes": false } diff --git a/ootrando_overworldmap_hamsda/items/equipment.json b/ootrando_overworldmap_hamsda/items/equipment.json index 6ccd6ee3..91123f34 100644 --- a/ootrando_overworldmap_hamsda/items/equipment.json +++ b/ootrando_overworldmap_hamsda/items/equipment.json @@ -57,29 +57,29 @@ "name": "Red and Blue Tunics", "type": "composite_toggle", "codes": "tunics", - "item_left": "bluetunic", - "item_right": "redtunic", + "item_left": "redtunic", + "item_right": "bluetunic", "images": [ { "left": false, "right": false, - "img": "images/redbluetunic.png", + "img": "images/tunics.png", "img_mods": "@disabled" }, { "left": true, "right": false, - "img": "images/bluetunic-disabled.png" + "img": "images/redtunic-disabled.png" }, { "left": false, "right": true, - "img": "images/redtunic-disabled.png" + "img": "images/bluetunic-disabled.png" }, { "left": true, "right": true, - "img": "images/redbluetunic.png" + "img": "images/tunics.png" } ] }, diff --git a/ootrando_overworldmap_hamsda/items/options.json b/ootrando_overworldmap_hamsda/items/options.json index 270e5813..b10d8eff 100644 --- a/ootrando_overworldmap_hamsda/items/options.json +++ b/ootrando_overworldmap_hamsda/items/options.json @@ -185,5 +185,22 @@ "inherit_codes": false } ] + }, + { + "name": "Fewer Tunic Requirements", + "type": "progressive", + "allow_disabled": false, + "loop": true, + "stages": [ + { + "img": "images/fewer_tunics_no.png", + "codes": "fewer_tunics,fewer_tunics_no" + }, + { + "img": "images/fewer_tunics_yes.png", + "codes": "fewer_tunics,fewer_tunics_yes", + "inherit_codes": false + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/items/quest.json b/ootrando_overworldmap_hamsda/items/quest.json index 6870747d..da61f3d3 100644 --- a/ootrando_overworldmap_hamsda/items/quest.json +++ b/ootrando_overworldmap_hamsda/items/quest.json @@ -303,212 +303,218 @@ "codes": "sapphire" }, { - "name": "Forest Medallion with Label", - "type": "progressive_toggle", + "name": "Forest Medallion Label", + "type": "progressive", + "allow_disabled": false, "loop": true, "stages": [ { - "img": "images/forestmedallion.png", + "img": "images/label_unknown.png", "codes": "forestmedlabel" }, { - "img": "images/forestmedallion_deku.png", + "img": "images/label_deku.png", }, { - "img": "images/forestmedallion_dc.png", + "img": "images/label_dodongo.png", }, { - "img": "images/forestmedallion_jabu.png", + "img": "images/label_jabu.png", }, { - "img": "images/forestmedallion_ft.png", + "img": "images/label_forest.png", }, { - "img": "images/forestmedallion_fit.png", + "img": "images/label_fire.png", }, { - "img": "images/forestmedallion_wt.png", + "img": "images/label_water.png", }, { - "img": "images/forestmedallion_st.png", + "img": "images/label_spirit.png", }, { - "img": "images/forestmedallion_sht.png", + "img": "images/label_shadow.png", } ] }, { - "name": "Fire Medallion with Label", - "type": "progressive_toggle", + "name": "Fire Medallion Label", + "type": "progressive", + "allow_disabled": false, "loop": true, "stages": [ { - "img": "images/firemedallion.png", + "img": "images/label_unknown.png", "codes": "firemedlabel" }, { - "img": "images/firemedallion_deku.png", + "img": "images/label_deku.png", }, { - "img": "images/firemedallion_dc.png", + "img": "images/label_dodongo.png", }, { - "img": "images/firemedallion_jabu.png", + "img": "images/label_jabu.png", }, { - "img": "images/firemedallion_ft.png", + "img": "images/label_forest.png", }, { - "img": "images/firemedallion_fit.png", + "img": "images/label_fire.png", }, { - "img": "images/firemedallion_wt.png", + "img": "images/label_water.png", }, { - "img": "images/firemedallion_st.png", + "img": "images/label_spirit.png", }, { - "img": "images/firemedallion_sht.png", + "img": "images/label_shadow.png", } ] }, { - "name": "Water Medallion with Label", - "type": "progressive_toggle", + "name": "Water Medallion Label", + "type": "progressive", + "allow_disabled": false, "loop": true, "stages": [ { - "img": "images/watermedallion.png", + "img": "images/label_unknown.png", "codes": "watermedlabel" }, { - "img": "images/watermedallion_deku.png", + "img": "images/label_deku.png", }, { - "img": "images/watermedallion_dc.png", + "img": "images/label_dodongo.png", }, { - "img": "images/watermedallion_jabu.png", + "img": "images/label_jabu.png", }, { - "img": "images/watermedallion_ft.png", + "img": "images/label_forest.png", }, { - "img": "images/watermedallion_fit.png", + "img": "images/label_fire.png", }, { - "img": "images/watermedallion_wt.png", + "img": "images/label_water.png", }, { - "img": "images/watermedallion_st.png", + "img": "images/label_spirit.png", }, { - "img": "images/watermedallion_sht.png", + "img": "images/label_shadow.png", } ] }, { - "name": "Spirit Medallion with Label", - "type": "progressive_toggle", + "name": "Spirit Medallion Label", + "type": "progressive", + "allow_disabled": false, "loop": true, "stages": [ { - "img": "images/spiritmedallion.png", + "img": "images/label_unknown.png", "codes": "spiritmedlabel" }, { - "img": "images/spiritmedallion_deku.png", + "img": "images/label_deku.png", }, { - "img": "images/spiritmedallion_dc.png", + "img": "images/label_dodongo.png", }, { - "img": "images/spiritmedallion_jabu.png", + "img": "images/label_jabu.png", }, { - "img": "images/spiritmedallion_ft.png", + "img": "images/label_forest.png", }, { - "img": "images/spiritmedallion_fit.png", + "img": "images/label_fire.png", }, { - "img": "images/spiritmedallion_wt.png", + "img": "images/label_water.png", }, { - "img": "images/spiritmedallion_st.png", + "img": "images/label_spirit.png", }, { - "img": "images/spiritmedallion_sht.png", + "img": "images/label_shadow.png", } ] }, { - "name": "Shadow Medallion with Label", - "type": "progressive_toggle", + "name": "Shadow Medallion Label", + "type": "progressive", + "allow_disabled": false, "loop": true, "stages": [ { - "img": "images/shadowmedallion.png", + "img": "images/label_unknown.png", "codes": "shadowmedlabel" }, { - "img": "images/shadowmedallion_deku.png", + "img": "images/label_deku.png", }, { - "img": "images/shadowmedallion_dc.png", + "img": "images/label_dodongo.png", }, { - "img": "images/shadowmedallion_jabu.png", + "img": "images/label_jabu.png", }, { - "img": "images/shadowmedallion_ft.png", + "img": "images/label_forest.png", }, { - "img": "images/shadowmedallion_fit.png", + "img": "images/label_fire.png", }, { - "img": "images/shadowmedallion_wt.png", + "img": "images/label_water.png", }, { - "img": "images/shadowmedallion_st.png", + "img": "images/label_spirit.png", }, { - "img": "images/shadowmedallion_sht.png", + "img": "images/label_shadow.png", } ] }, { - "name": "Light Medallion with Label", - "type": "progressive_toggle", + "name": "Light Medallion Label", + "type": "progressive", + "allow_disabled": false, "loop": true, "stages": [ { - "img": "images/lightmedallion.png", + "img": "images/label_unknown.png", "codes": "lightmedlabel" }, { - "img": "images/lightmedallion_deku.png", + "img": "images/label_deku.png", }, { - "img": "images/lightmedallion_dc.png", + "img": "images/label_dodongo.png", }, { - "img": "images/lightmedallion_jabu.png", + "img": "images/label_jabu.png", }, { - "img": "images/lightmedallion_ft.png", + "img": "images/label_forest.png", }, { - "img": "images/lightmedallion_fit.png", + "img": "images/label_fire.png", }, { - "img": "images/lightmedallion_wt.png", + "img": "images/label_water.png", }, { - "img": "images/lightmedallion_st.png", + "img": "images/label_spirit.png", }, { - "img": "images/lightmedallion_sht.png", + "img": "images/label_shadow.png", } ] }, diff --git a/ootrando_overworldmap_hamsda/layouts/capture.json b/ootrando_overworldmap_hamsda/layouts/capture.json index 12cae8fa..c29bd8bb 100644 --- a/ootrando_overworldmap_hamsda/layouts/capture.json +++ b/ootrando_overworldmap_hamsda/layouts/capture.json @@ -31,7 +31,7 @@ [ "boomerang", "lens", - "beans", + "", "hammer", "lightarrow", "nayruslove", @@ -40,10 +40,10 @@ "bluetunic" ], [ - "bottle1", - "", - "", - "", + "HP", + "HC", + "rupee", + "bottle4", "adulttrade", "kidtrade", "scale1", @@ -59,7 +59,7 @@ "storm", "wallet1", "magic", - "generic_small_key" + "token" ], [ "minuet", @@ -68,8 +68,8 @@ "requiem", "nocturne", "prelude", - "carpenter", "card", + "generic_small_key", "generic_boss_key" ] ] diff --git a/ootrando_overworldmap_hamsda/layouts/shared.json b/ootrando_overworldmap_hamsda/layouts/shared.json index 2bb8ae72..ceb9822a 100644 --- a/ootrando_overworldmap_hamsda/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/layouts/shared.json @@ -59,8 +59,8 @@ [ "wallet1", "magic", - "carpenter", "card", + "carpenter", "agony", "skulltula" ], @@ -268,7 +268,7 @@ "content": [ { "type": "item", - "item": "gc_label", + "item": "free_label", "canvas_depth": 1, "width": 32, "height": 12 @@ -311,6 +311,13 @@ "margin": "1,2", "width": 32, "height": 32 + }, + { + "type": "item", + "item": "gc_label", + "margin": "1,2", + "width": 32, + "height": 12 } ] } @@ -389,8 +396,8 @@ "requiemcheck", "nocturnecheck", "preludecheck", - "carpenter", "card", + "carpenter", "agony" ] ] @@ -516,6 +523,15 @@ "canvas_depth": 1, "width": 32, "height": 12 + }, + { + "type": "item", + "item": "ice_label", + "canvas_depth": 1, + "canvas_left": 0, + "canvas_top": 20, + "width": 32, + "height": 12 } ] }, @@ -575,14 +591,14 @@ "content": [ { "type": "item", - "item": "gc_label", + "item": "free_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "ice_label", + "item": "gc_label", "canvas_depth": 1, "canvas_left": 0, "canvas_top": 20, diff --git a/ootrando_overworldmap_hamsda/layouts/tracker.json b/ootrando_overworldmap_hamsda/layouts/tracker.json index 82e1d9d3..3563b4b7 100644 --- a/ootrando_overworldmap_hamsda/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/layouts/tracker.json @@ -35,7 +35,7 @@ "type_kak", "type_door", "type_lens", - "" + "fewer_tunics" ], [ "logic_chus", @@ -137,7 +137,7 @@ "type_kak", "type_door", "type_lens", - "", + "fewer_tunics", "", "", "" diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 2b555508..509123b4 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -156,7 +156,6 @@ "@Dodongos Cavern/Bomb Bag Chest,@logic/explosives", "{agony}" ], - "capture_item": true, "item_count": 1 }, { @@ -635,7 +634,7 @@ "name": "Fire Temple", "parent": "Death Mountain Crater A", "access_rules": [ - "fire_reg,@Sheik in Crater,[redtunic]" + "fire_reg,@Sheik in Crater,@logic/redtunic" ], "sections": [ { @@ -672,7 +671,7 @@ { "name": "South Boulder Maze", "access_rules": [ - "[lift1]" + "[lift1],[redtunic]" ], "item_count": 1 }, @@ -726,7 +725,6 @@ "@Fire Temple/Compass Chest,hammer,ocarina,time", "@Fire Temple/Compass Chest,hammer,hoverboots,[ocarina],[time]", "@Fire Temple/Compass Chest,hammer,@logic/explosives,[ocarina],[time]", - ], "item_count": 1 }, @@ -743,7 +741,7 @@ "name": "Volvagia", "access_rules": [ "@Fire Temple/Compass Chest,@logic/explosives,hammer", - "hoverboots,hammer" + "hoverboots,hammer,[redtunic]" ], "hosted_item": "fire", "chest_unopened_img": "images/HC.png", @@ -830,7 +828,7 @@ "name": "Water Temple", "parent": "Lake Hylia A", "access_rules": [ - "water_reg,ironboots,hookshot,[bluetunic]" + "water_reg,ironboots,hookshot,@logic/bluetunic" ], "sections": [ { @@ -860,7 +858,7 @@ { "name": "Basement", "access_rules": [ - "ocarina,lullaby" + "ocarina,lullaby,[bluetunic]" ], "item_count": 1 }, @@ -1044,7 +1042,6 @@ "access_rules": [ "@Shadow Temple/Like-Like Room,lift1" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1211,7 +1208,6 @@ "@Spirit Temple/Lower Child", "@Spirit Temple/Mirror Room" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1254,7 +1250,6 @@ "access_rules": [ "sword2,lift2" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1294,7 +1289,6 @@ "access_rules": [ "@Spirit Temple/Mirror Room,@logic/explosives,@logic/lens" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1468,10 +1462,10 @@ }, { "name": "Locked Pits", - "clear_as_group": false, "access_rules": [ "@logic/lens" ], + "clear_as_group": false, "item_count": 2 }, { @@ -1520,6 +1514,7 @@ "access_rules": [ "ocarina,lullaby,[sword1]" ], + "capture_item": true, "item_count": 1 }, { @@ -1653,8 +1648,8 @@ { "name": "Castle Tower", "access_rules": [ - "@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,@logic/lens,[redtunic]", - "@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,hoverboots,[redtunic]" + "@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,@logic/lens,@logic/redtunic", + "@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,hoverboots,@logic/redtunic" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -1693,244 +1688,6 @@ } ] }, - { - "name": "Gerudo Fortress", - "parent": "Bridge Crossing", - "access_rules": [ - "[bow]", - "[hookshot]", - "[hoverboots]" - ], - "children": [ - { - "name": "Carpenter Rescue", - "sections": [ - { - "name": "Free the carpenters", - "hosted_item": "carpenter", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 503, - "y": 392 - } - ] - }, - { - "name": "Rooftop Chest", - "sections": [ - { - "name": "Open it", - "access_rules": [ - "hoverboots", - "ocarina,[scarecrow],hookshot", - "longshot" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 358 - } - ] - }, - { - "name": "Horseback Archery", - "sections": [ - { - "name": "1000", - "access_rules": [ - "ocarina,epona,bow,carpenter" - ], - "item_count": 1 - }, - { - "name": "1500", - "access_rules": [ - "ocarina,epona,bow,carpenter", - "{agony}" - ], - "capture_item": true, - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 620, - "y": 438 - } - ] - }, - { - "name": "Archery Range (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS90", - "access_rules": [ - "hookshot,carpenter" - ], - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 660, - "y": 306 - } - ] - }, - { - "name": "Rooftop (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS91", - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 390 - } - ] - }, - { - "name": "Gerudo Training Grounds", - "access_rules": [ - "gtg_reg,carpenter,card" - ], - "sections": [ - { - "name": "Lobby", - "access_rules": [ - "bow" - ], - "item_count": 2 - }, - { - "name": "Stalfos", - "item_count": 1 - }, - { - "name": "Wolfos", - "access_rules": [ - "hookshot" - ], - "item_count": 1 - }, - { - "name": "Like-Like", - "access_rules": [ - "hookshot,lift2,@logic/lens" - ], - "item_count": 4 - }, - { - "name": "Eye Statue", - "access_rules": [ - "hookshot,bow,@logic/lens", - "hookshot,hammer,bow" - ], - "item_count": 1 - }, - { - "name": "Near Scarecrow", - "access_rules": [ - "hookshot,bow,@logic/lens" - ], - "item_count": 1 - }, - { - "name": "Flaming Enemies", - "access_rules": [ - "hookshot" - ], - "item_count": 1 - }, - { - "name": "Hammer Pillar", - "access_rules": [ - "hookshot,[hammer]" - ], - "item_count": 1 - }, - { - "name": "Lava Pit Ledge", - "access_rules": [ - "[hookshot],[ocarina],[time]", - "@logic/explosives,ocarina,time" - ], - "item_count": 3 - }, - { - "name": "Under Water", - "access_rules": [ - "hookshot,ocarina,time,ironboots,[bluetunic]", - "{agony}" - ], - "capture_item": true, - "item_count": 1 - }, - { - "name": "Beamos", - "access_rules": [ - "@logic/explosives" - ], - "item_count": 1 - }, - { - "name": "Above Maze", - "access_rules": [ - "@logic/lens" - ], - "item_count": 1 - }, - { - "name": "Maze 1", - "item_count": 1 - }, - { - "name": "Maze 2", - "item_count": 1 - }, - { - "name": "Maze 3", - "item_count": 1 - }, - { - "name": "Ice Arrow Chest", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 481, - "y": 444 - } - ] - } - ] - }, { "name": "Ice Cavern", "parent": "Zoras Fountain A", @@ -2022,5 +1779,141 @@ ] } ] + }, + { + "name": "Carpenter Rescue", + "parent": "Gerudo Fortress", + "sections": [ + { + "name": "Free the carpenters", + "hosted_item": "carpenter", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 503, + "y": 392 + } + ] + }, + { + "name": "Gerudo Training Grounds", + "parent": "Gerudo Fortress", + "access_rules": [ + "gtg_reg,carpenter,card" + ], + "sections": [ + { + "name": "Lobby", + "access_rules": [ + "bow" + ], + "item_count": 2 + }, + { + "name": "Stalfos", + "item_count": 1 + }, + { + "name": "Wolfos", + "access_rules": [ + "hookshot" + ], + "item_count": 1 + }, + { + "name": "Like-Like", + "access_rules": [ + "hookshot,lift2,@logic/lens" + ], + "item_count": 4 + }, + { + "name": "Eye Statue", + "access_rules": [ + "hookshot,bow,@logic/lens", + "hookshot,hammer,bow" + ], + "item_count": 1 + }, + { + "name": "Near Scarecrow", + "access_rules": [ + "hookshot,bow,@logic/lens" + ], + "item_count": 1 + }, + { + "name": "Flaming Enemies", + "access_rules": [ + "hookshot" + ], + "item_count": 1 + }, + { + "name": "Hammer Pillar", + "access_rules": [ + "hookshot,[hammer]" + ], + "item_count": 1 + }, + { + "name": "Lava Pit Ledge", + "access_rules": [ + "[hookshot],[ocarina],[time]", + "@logic/explosives,ocarina,time" + ], + "item_count": 3 + }, + { + "name": "Under Water", + "access_rules": [ + "hookshot,ocarina,time,ironboots,@logic/bluetunic", + "{agony}" + ], + "capture_item": true, + "item_count": 1 + }, + { + "name": "Beamos", + "access_rules": [ + "@logic/explosives" + ], + "item_count": 1 + }, + { + "name": "Above Maze", + "access_rules": [ + "@logic/lens" + ], + "item_count": 1 + }, + { + "name": "Maze 1", + "item_count": 1 + }, + { + "name": "Maze 2", + "item_count": 1 + }, + { + "name": "Maze 3", + "item_count": 1 + }, + { + "name": "Ice Arrow Chest", + "capture_item": true, + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 481, + "y": 444 + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/locations/mq.json b/ootrando_overworldmap_hamsda/locations/mq.json index 619bef1f..c834a8cf 100644 --- a/ootrando_overworldmap_hamsda/locations/mq.json +++ b/ootrando_overworldmap_hamsda/locations/mq.json @@ -54,6 +54,7 @@ "access_rules": [ "@Deku Tree MQ/Compass Chest,ocarina,time" ], + "capture_item": true, "item_count": 1 }, { @@ -223,7 +224,6 @@ "@Dodongos Cavern MQ/Under Grave", "{agony}" ], - "capture_item": true, "item_count": 1 }, { @@ -525,7 +525,8 @@ "name": "GS51 - Boomerang Room", "short_name": "Boomerang Room", "access_rules": [ - "@Jabu Jabus Belly MQ/Boomerang Chest,ocarina,time" + "@Jabu Jabus Belly MQ/Boomerang Chest,ocarina,time", + "@Jabu Jabus Belly MQ/Boomerang Chest,boomerang,[ocarina],[time]" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -548,6 +549,7 @@ "access_rules": [ "@Jabu Jabus Belly MQ/Falling Like Like Room Chest,@logic/lens" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -605,7 +607,8 @@ { "name": "Well Chest", "access_rules": [ - "bow" + "bow", + "@Forest Temple MQ/Redead Chest,ironboots,[bow]" ], "item_count": 1 }, @@ -758,7 +761,7 @@ "name": "Fire Temple MQ", "parent": "Death Mountain Crater A", "access_rules": [ - "fire_mq,@Sheik in Crater,[redtunic]" + "fire_mq,@Sheik in Crater,@logic/redtunic" ], "sections": [ { @@ -770,9 +773,7 @@ "access_rules": [ "hoverboots,@logic/has fire", "hookshot,bow,firearrow,magic", - "hookshot,dinsfire,magic,bow", - "hookshot,dinsfire,magic,redtunic", - "longshot,dinsfire,magic" + "hookshot,dinsfire,magic" ], "item_count": 1 }, @@ -806,7 +807,7 @@ { "name": "Maze Lower Chest", "access_rules": [ - "hammer,@logic/has fire" + "hammer,@logic/has fire,[redtunic]" ], "item_count": 1 }, @@ -843,13 +844,14 @@ "access_rules": [ "@Fire Temple MQ/Freestanding Key" ], + "capture_item": true, "item_count": 1 }, { "name": "Volvagia", "access_rules": [ "@Fire Temple MQ/Freestanding Key,hammer,@logic/has fire", - "hoverboots,hammer,@logic/has fire" + "hoverboots,hammer,@logic/has fire,[redtunic]" ], "hosted_item": "fire", "chest_unopened_img": "images/HC.png", @@ -938,8 +940,8 @@ "name": "Water Temple MQ", "parent": "Lake Hylia A", "access_rules": [ - "water_mq,ironboots,hookshot,[bluetunic]", - "water_mq,scale2,hookshot,[bluetunic]" + "water_mq,ironboots,hookshot,@logic/bluetunic", + "water_mq,scale2,hookshot,@logic/bluetunic" ], "sections": [ { @@ -970,8 +972,8 @@ { "name": "Central Pillar Chest", "access_rules": [ - "ironboots,bow,firearrow,magic", - "ironboots,dinsfire,magic,ocarina,time" + "ironboots,bow,firearrow,magic,[bluetunic]", + "ironboots,dinsfire,magic,ocarina,time,[bluetunic]" ], "item_count": 1 }, @@ -980,6 +982,7 @@ "access_rules": [ "longshot,ironboots,dinsfire,magic" ], + "capture_item": true, "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", "item_count": 1 @@ -990,6 +993,7 @@ "@Water Temple MQ/Boss Key Chest,hoverboots", "@Water Temple MQ/Boss Key Chest,ocarina,[scarecrow]" ], + "capture_item": true, "item_count": 1 }, { @@ -1033,6 +1037,7 @@ "access_rules": [ "@Water Temple MQ/Freestanding Key" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -1200,33 +1205,34 @@ "item_count": 1 }, { - "name": "Spike Walls Left Chest", + "name": "Bomb Flower Chest", "access_rules": [ - "@Shadow Temple MQ/Bomb Flower Chest" + "@Shadow Temple MQ/Wind Hint Chest,ocarina,lullaby,bow,time,longshot" ], + "capture_item": true, "item_count": 1 }, { - "name": "Boss Key Chest", + "name": "Freestanding Key", "access_rules": [ - "@Shadow Temple MQ/Spike Walls Left Chest" + "@Shadow Temple MQ/Bomb Flower Chest" ], - "chest_unopened_img": "images/chest_golden_closed.png", - "chest_opened_img": "images/chest_golden_open.png", "item_count": 1 }, { - "name": "Bomb Flower Chest", + "name": "Spike Walls Left Chest", "access_rules": [ - "@Shadow Temple MQ/Wind Hint Chest,ocarina,lullaby,bow,time,longshot" + "@Shadow Temple MQ/Bomb Flower Chest" ], "item_count": 1 }, { - "name": "Freestanding Key", + "name": "Boss Key Chest", "access_rules": [ - "@Shadow Temple MQ/Bomb Flower Chest" + "@Shadow Temple MQ/Spike Walls Left Chest" ], + "chest_unopened_img": "images/chest_golden_closed.png", + "chest_opened_img": "images/chest_golden_open.png", "item_count": 1 }, { @@ -1376,6 +1382,7 @@ "access_rules": [ "sword2,lift2,longshot,bombchu,ocarina,requiem,hammer" ], + "capture_item": true, "item_count": 1 }, { @@ -1457,6 +1464,7 @@ "access_rules": [ "@Spirit Temple MQ/Lower Adult Left Chest,hammer,ocarina,time,epona,sun,storm,lullaby" ], + "capture_item": true, "item_count": 1 }, { @@ -1552,6 +1560,7 @@ "access_rules": [ "@Spirit Temple MQ/Lower Adult Right Chest" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -1608,6 +1617,7 @@ "sword1", "sticks,[sword1]" ], + "capture_item": true, "item_count": 1 }, { @@ -1806,8 +1816,8 @@ { "name": "Castle Tower", "access_rules": [ - "@logic/can LA,lift3,ocarina,time,[redtunic],bottle,@logic/lens,hammer,bombchu,shield3,firearrow,longshot", - "@logic/can LA,lift3,ocarina,time,[redtunic],bottle,@logic/lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots" + "@logic/can LA,lift3,ocarina,time,@logic/redtunic,bottle,@logic/lens,hammer,bombchu,shield3,firearrow,longshot", + "@logic/can LA,lift3,ocarina,time,@logic/redtunic,bottle,@logic/lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -1846,249 +1856,6 @@ } ] }, - { - "name": "Gerudo Fortress", - "parent": "Bridge Crossing", - "access_rules": [ - "[bow]", - "[hookshot]", - "[hoverboots]" - ], - "children": [ - { - "name": "Carpenter Rescue", - "sections": [ - { - "name": "Free the carpenters", - "hosted_item": "carpenter", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 503, - "y": 392 - } - ] - }, - { - "name": "Rooftop Chest", - "sections": [ - { - "name": "Open it", - "access_rules": [ - "hoverboots", - "ocarina,[scarecrow],hookshot", - "longshot" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 358 - } - ] - }, - { - "name": "Horseback Archery", - "sections": [ - { - "name": "1000", - "access_rules": [ - "ocarina,epona,bow,carpenter" - ], - "item_count": 1 - }, - { - "name": "1500", - "access_rules": [ - "ocarina,epona,bow,carpenter", - "{agony}" - ], - "capture_item": true, - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 620, - "y": 438 - } - ] - }, - { - "name": "Archery Range (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS90", - "access_rules": [ - "hookshot,carpenter" - ], - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 660, - "y": 306 - } - ] - }, - { - "name": "Rooftop (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS91", - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 390 - } - ] - }, - { - "name": "Gerudo Training Grounds MQ", - "access_rules": [ - "gtg_mq,carpenter,card" - ], - "sections": [ - { - "name": "Lobby Left Chest", - "item_count": 1 - }, - { - "name": "Lobby Right Chest", - "item_count": 1 - }, - { - "name": "Hidden Ceiling Chest", - "access_rules": [ - "@logic/lens" - ], - "item_count": 1 - }, - { - "name": "Maze Path First Chest", - "item_count": 1 - }, - { - "name": "Maze Path Second Chest", - "item_count": 1 - }, - { - "name": "Maze Path Third Chest", - "item_count": 1 - }, - { - "name": "Dinolfos Chest", - "access_rules": [ - "bow", - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" - ], - "item_count": 1 - }, - { - "name": "Underwater Silver Rupee Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Dinolfos Chest,hoverboots,@logic/has fire,ironboots,[bluetunic]", - "@Gerudo Training Grounds MQ/Maze Right Central Chest,@logic/has fire,ironboots,[bluetunic]" - ], - "item_count": 1 - }, - { - "name": "First Iron Knuckle Chest", - "access_rules": [ - "@logic/has fire" - ], - "item_count": 1 - }, - { - "name": "Before Heavy Block Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/First Iron Knuckle Chest,longshot" - ], - "item_count": 1 - }, - { - "name": "Heavy Block Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Before Heavy Block Chest,lift2" - ], - "item_count": 1 - }, - { - "name": "Eye Statue Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,bow" - ], - "item_count": 1 - }, - { - "name": "Second Iron Knuckle Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle" - ], - "item_count": 1 - }, - { - "name": "Flame Circle Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" - ], - "item_count": 1 - }, - { - "name": "Maze Right Central Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,hammer" - ], - "item_count": 1 - }, - { - "name": "Maze Right Side Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Maze Right Central Chest" - ], - "item_count": 1 - }, - { - "name": "Ice Arrows Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Maze Right Central Chest" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 481, - "y": 444 - } - ] - } - ] - }, { "name": "Ice Cavern MQ", "parent": "Zoras Fountain A", @@ -2181,5 +1948,129 @@ ] } ] + }, + { + "name": "Gerudo Training Grounds MQ", + "parent": "Gerudo Fortress", + "access_rules": [ + "gtg_mq,carpenter,card" + ], + "sections": [ + { + "name": "Lobby Left Chest", + "item_count": 1 + }, + { + "name": "Lobby Right Chest", + "item_count": 1 + }, + { + "name": "Hidden Ceiling Chest", + "access_rules": [ + "@logic/lens" + ], + "item_count": 1 + }, + { + "name": "Maze Path First Chest", + "item_count": 1 + }, + { + "name": "Maze Path Second Chest", + "item_count": 1 + }, + { + "name": "Maze Path Third Chest", + "item_count": 1 + }, + { + "name": "Dinolfos Chest", + "access_rules": [ + "bow", + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" + ], + "item_count": 1 + }, + { + "name": "Underwater Silver Rupee Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Dinolfos Chest,hoverboots,@logic/has fire,ironboots,@logic/bluetunic", + "@Gerudo Training Grounds MQ/Maze Right Central Chest,@logic/has fire,ironboots,@logic/bluetunic" + ], + "capture_item": true, + "item_count": 1 + }, + { + "name": "First Iron Knuckle Chest", + "access_rules": [ + "@logic/has fire" + ], + "item_count": 1 + }, + { + "name": "Before Heavy Block Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/First Iron Knuckle Chest,longshot" + ], + "item_count": 1 + }, + { + "name": "Heavy Block Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Before Heavy Block Chest,lift2" + ], + "item_count": 1 + }, + { + "name": "Eye Statue Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,bow" + ], + "item_count": 1 + }, + { + "name": "Second Iron Knuckle Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle" + ], + "item_count": 1 + }, + { + "name": "Flame Circle Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" + ], + "item_count": 1 + }, + { + "name": "Maze Right Central Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,hammer" + ], + "item_count": 1 + }, + { + "name": "Maze Right Side Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Maze Right Central Chest" + ], + "item_count": 1 + }, + { + "name": "Ice Arrows Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Maze Right Central Chest" + ], + "capture_item": true, + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 481, + "y": 444 + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index 374092c7..3ec5ad37 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -72,6 +72,22 @@ ], "item_count": 1 }, + { + "name": "redtunic", + "access_rules": [ + "fewer_tunics_yes", + "fewer_tunics_no,[redtunic]" + ], + "item_count": 1 + }, + { + "name": "bluetunic", + "access_rules": [ + "fewer_tunics_yes", + "fewer_tunics_no,[bluetunic]" + ], + "item_count": 1 + }, { "name": "can leave forest", "access_rules": [ @@ -849,6 +865,7 @@ "sections": [ { "name": "Item", + "capture_item": true, "item_count": 1 }, { @@ -934,6 +951,7 @@ "@logic/explosives,dinsfire,magic,boomerang", "sword2,hammer,@logic/has fire,hookshot" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -2817,6 +2835,7 @@ "access_rules": [ "boomerang,ocarina,storm,@logic/explosives" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -4125,7 +4144,8 @@ "ocarina,bolero,beans_plant_no,beans", "ocarina,bolero,bean_trail_yes", "ocarina,bolero,hoverboots", - "ocarina,bolero,hookshot" + "ocarina,bolero,hookshot", + "{agony}" ], "sections": [ { @@ -4567,7 +4587,7 @@ { "name": "Get it", "access_rules": [ - "ironboots,[bluetunic]", + "ironboots,@logic/bluetunic", "{agony}" ], "capture_item": true, @@ -4613,6 +4633,7 @@ "access_rules": [ "lift2,@logic/can blast,hookshot" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -4902,6 +4923,110 @@ "y": 581 } ] + }, + { + "name": "Gerudo Fortress", + "access_rules": [ + "[bow]", + "[hookshot]", + "[hoverboots]" + ], + "children": [ + { + "name": "Rooftop Chest", + "sections": [ + { + "name": "Open it", + "access_rules": [ + "hoverboots", + "ocarina,[scarecrow],hookshot", + "longshot" + ], + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 544, + "y": 358 + } + ] + }, + { + "name": "Horseback Archery", + "sections": [ + { + "name": "1000", + "access_rules": [ + "ocarina,epona,bow,carpenter" + ], + "item_count": 1 + }, + { + "name": "1500", + "access_rules": [ + "ocarina,epona,bow,carpenter", + "{agony}" + ], + "capture_item": true, + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 620, + "y": 438 + } + ] + }, + { + "name": "Archery Range (N)", + "access_rules": [ + "all_skulltulas" + ], + "sections": [ + { + "name": "GS90", + "access_rules": [ + "hookshot,carpenter" + ], + "chest_unopened_img": "images/skulltula.png", + "chest_opened_img": "images/skulltula_token.png", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 660, + "y": 306 + } + ] + }, + { + "name": "Rooftop (N)", + "access_rules": [ + "all_skulltulas" + ], + "sections": [ + { + "name": "GS91", + "chest_unopened_img": "images/skulltula.png", + "chest_opened_img": "images/skulltula_token.png", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 544, + "y": 390 + } + ] + } + ] } ] } diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 28a6ed59..754096ef 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.2", + "package_version": "2.1.3.3", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json b/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json index 37cdbb90..fea6c238 100644 --- a/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/var_itemsonlykeysanity/layouts/shared.json @@ -59,8 +59,8 @@ [ "wallet1", "magic", - "carpenter", "card", + "carpenter", "agony", "skulltula" ], @@ -306,37 +306,11 @@ ] }, { - "type": "canvas", - "width": 32, - "height": 32, + "type": "item", + "item": "free_label", "margin": "1,2", - "content": [ - { - "type": "item", - "item": "gc_label", - "canvas_depth": 1, - "width": 32, - "height": 12 - }, - { - "type": "item", - "item": "gc_small_keys", - "canvas_depth": 1, - "canvas_left": 0, - "canvas_top": 16, - "width": 16, - "height": 16 - }, - { - "type": "item", - "item": "gc_boss_key", - "canvas_depth": 1, - "canvas_left": 16, - "canvas_top": 16, - "width": 16, - "height": 16 - } - ] + "width": 32, + "height": 32 } ] }, @@ -374,19 +348,28 @@ "content": [ { "type": "item", - "item": "gtg_label", + "item": "gc_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "gtg_small_keys", + "item": "gc_small_keys", "canvas_depth": 1, "canvas_left": 0, "canvas_top": 16, "width": 16, "height": 16 + }, + { + "type": "item", + "item": "gc_boss_key", + "canvas_depth": 1, + "canvas_left": 16, + "canvas_top": 16, + "width": 16, + "height": 16 } ] }, @@ -398,14 +381,14 @@ "content": [ { "type": "item", - "item": "botw_label", + "item": "gtg_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "botw_small_keys", + "item": "gtg_small_keys", "canvas_depth": 1, "canvas_left": 0, "canvas_top": 16, @@ -472,6 +455,32 @@ "margin": "1,2", "width": 32, "height": 12 + }, + { + "type": "canvas", + "width": 66, + "height": 16, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "botw_label", + "canvas_depth": 1, + "canvas_left": 0, + "canvas_top": 2, + "width": 32, + "height": 12 + }, + { + "type": "item", + "item": "botw_small_keys", + "canvas_depth": 1, + "canvas_left": 34, + "canvas_top": 0, + "width": 16, + "height": 16 + } + ] } ] } @@ -550,8 +559,8 @@ "requiemcheck", "nocturnecheck", "preludecheck", - "carpenter", "card", + "carpenter", "agony" ] ] @@ -808,28 +817,10 @@ "content": [ { "type": "item", - "item": "gc_label", + "item": "free_label", "canvas_depth": 1, "width": 32, "height": 12 - }, - { - "type": "item", - "item": "gc_small_keys", - "canvas_depth": 1, - "canvas_left": 0, - "canvas_top": 16, - "width": 16, - "height": 16 - }, - { - "type": "item", - "item": "gc_boss_key", - "canvas_depth": 1, - "canvas_left": 16, - "canvas_top": 16, - "width": 16, - "height": 16 } ] }, @@ -893,19 +884,43 @@ "content": [ { "type": "item", - "item": "botw_label", + "item": "gc_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "botw_small_keys", + "item": "gc_small_keys", "canvas_depth": 1, "canvas_left": 34, "canvas_top": 0, "width": 16, "height": 16 + }, + { + "type": "item", + "item": "gc_boss_key", + "canvas_depth": 1, + "canvas_left": 50, + "canvas_top": 0, + "width": 16, + "height": 16 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 16, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "ice_label", + "canvas_depth": 1, + "width": 32, + "height": 12 } ] }, @@ -917,14 +932,14 @@ "content": [ { "type": "item", - "item": "gf_label", + "item": "botw_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "gf_small_keys", + "item": "botw_small_keys", "canvas_depth": 1, "canvas_left": 34, "canvas_top": 0, @@ -941,14 +956,14 @@ "content": [ { "type": "item", - "item": "gtg_label", + "item": "gf_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "gtg_small_keys", + "item": "gf_small_keys", "canvas_depth": 1, "canvas_left": 34, "canvas_top": 0, @@ -959,16 +974,25 @@ }, { "type": "canvas", - "width": 32, + "width": 66, "height": 16, "margin": "1,2", "content": [ { "type": "item", - "item": "ice_label", + "item": "gtg_label", "canvas_depth": 1, "width": 32, "height": 12 + }, + { + "type": "item", + "item": "gtg_small_keys", + "canvas_depth": 1, + "canvas_left": 34, + "canvas_top": 0, + "width": 16, + "height": 16 } ] } diff --git a/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json b/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json index 37cdbb90..fea6c238 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json @@ -59,8 +59,8 @@ [ "wallet1", "magic", - "carpenter", "card", + "carpenter", "agony", "skulltula" ], @@ -306,37 +306,11 @@ ] }, { - "type": "canvas", - "width": 32, - "height": 32, + "type": "item", + "item": "free_label", "margin": "1,2", - "content": [ - { - "type": "item", - "item": "gc_label", - "canvas_depth": 1, - "width": 32, - "height": 12 - }, - { - "type": "item", - "item": "gc_small_keys", - "canvas_depth": 1, - "canvas_left": 0, - "canvas_top": 16, - "width": 16, - "height": 16 - }, - { - "type": "item", - "item": "gc_boss_key", - "canvas_depth": 1, - "canvas_left": 16, - "canvas_top": 16, - "width": 16, - "height": 16 - } - ] + "width": 32, + "height": 32 } ] }, @@ -374,19 +348,28 @@ "content": [ { "type": "item", - "item": "gtg_label", + "item": "gc_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "gtg_small_keys", + "item": "gc_small_keys", "canvas_depth": 1, "canvas_left": 0, "canvas_top": 16, "width": 16, "height": 16 + }, + { + "type": "item", + "item": "gc_boss_key", + "canvas_depth": 1, + "canvas_left": 16, + "canvas_top": 16, + "width": 16, + "height": 16 } ] }, @@ -398,14 +381,14 @@ "content": [ { "type": "item", - "item": "botw_label", + "item": "gtg_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "botw_small_keys", + "item": "gtg_small_keys", "canvas_depth": 1, "canvas_left": 0, "canvas_top": 16, @@ -472,6 +455,32 @@ "margin": "1,2", "width": 32, "height": 12 + }, + { + "type": "canvas", + "width": 66, + "height": 16, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "botw_label", + "canvas_depth": 1, + "canvas_left": 0, + "canvas_top": 2, + "width": 32, + "height": 12 + }, + { + "type": "item", + "item": "botw_small_keys", + "canvas_depth": 1, + "canvas_left": 34, + "canvas_top": 0, + "width": 16, + "height": 16 + } + ] } ] } @@ -550,8 +559,8 @@ "requiemcheck", "nocturnecheck", "preludecheck", - "carpenter", "card", + "carpenter", "agony" ] ] @@ -808,28 +817,10 @@ "content": [ { "type": "item", - "item": "gc_label", + "item": "free_label", "canvas_depth": 1, "width": 32, "height": 12 - }, - { - "type": "item", - "item": "gc_small_keys", - "canvas_depth": 1, - "canvas_left": 0, - "canvas_top": 16, - "width": 16, - "height": 16 - }, - { - "type": "item", - "item": "gc_boss_key", - "canvas_depth": 1, - "canvas_left": 16, - "canvas_top": 16, - "width": 16, - "height": 16 } ] }, @@ -893,19 +884,43 @@ "content": [ { "type": "item", - "item": "botw_label", + "item": "gc_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "botw_small_keys", + "item": "gc_small_keys", "canvas_depth": 1, "canvas_left": 34, "canvas_top": 0, "width": 16, "height": 16 + }, + { + "type": "item", + "item": "gc_boss_key", + "canvas_depth": 1, + "canvas_left": 50, + "canvas_top": 0, + "width": 16, + "height": 16 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 16, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "ice_label", + "canvas_depth": 1, + "width": 32, + "height": 12 } ] }, @@ -917,14 +932,14 @@ "content": [ { "type": "item", - "item": "gf_label", + "item": "botw_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "gf_small_keys", + "item": "botw_small_keys", "canvas_depth": 1, "canvas_left": 34, "canvas_top": 0, @@ -941,14 +956,14 @@ "content": [ { "type": "item", - "item": "gtg_label", + "item": "gf_label", "canvas_depth": 1, "width": 32, "height": 12 }, { "type": "item", - "item": "gtg_small_keys", + "item": "gf_small_keys", "canvas_depth": 1, "canvas_left": 34, "canvas_top": 0, @@ -959,16 +974,25 @@ }, { "type": "canvas", - "width": 32, + "width": 66, "height": 16, "margin": "1,2", "content": [ { "type": "item", - "item": "ice_label", + "item": "gtg_label", "canvas_depth": 1, "width": 32, "height": 12 + }, + { + "type": "item", + "item": "gtg_small_keys", + "canvas_depth": 1, + "canvas_left": 34, + "canvas_top": 0, + "width": 16, + "height": 16 } ] } diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index be15c17e..87fcf6ed 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -156,7 +156,6 @@ "@Dodongos Cavern/Bomb Bag Chest,@logic/explosives", "{agony}" ], - "capture_item": true, "item_count": 1 }, { @@ -635,7 +634,7 @@ "name": "Fire Temple", "parent": "Death Mountain Crater A", "access_rules": [ - "fire_reg,@Sheik in Crater,[redtunic]" + "fire_reg,@Sheik in Crater,@logic/redtunic" ], "sections": [ { @@ -675,7 +674,7 @@ { "name": "South Boulder Maze", "access_rules": [ - "fire_small_keys:3,[lift1]" + "fire_small_keys:3,[lift1],[redtunic]" ], "item_count": 1 }, @@ -730,7 +729,6 @@ "@Fire Temple/Compass Chest,fire_small_keys:7,hammer,ocarina,time", "@Fire Temple/Compass Chest,fire_small_keys:7,@logic/explosives,hammer,[ocarina],[time]", "@Fire Temple/Compass Chest,hammer,hoverboots,[ocarina],[time]", - ], "item_count": 1 }, @@ -748,7 +746,7 @@ "name": "Volvagia", "access_rules": [ "@Fire Temple/Compass Chest,fire_small_keys:7,@logic/explosives,fire_boss_key,hammer", - "hoverboots,fire_boss_key,hammer" + "hoverboots,fire_boss_key,hammer,[redtunic]" ], "hosted_item": "fire", "chest_unopened_img": "images/HC.png", @@ -835,7 +833,7 @@ "name": "Water Temple", "parent": "Lake Hylia A", "access_rules": [ - "water_reg,ironboots,hookshot,[bluetunic]" + "water_reg,ironboots,hookshot,@logic/bluetunic" ], "sections": [ { @@ -865,9 +863,9 @@ { "name": "Basement", "access_rules": [ - "water_small_keys:1,ocarina,lullaby", - "ocarina,lullaby,bow", - "ocarina,lullaby,dinsfire,magic" + "water_small_keys:1,ocarina,lullaby,[bluetunic]", + "ocarina,lullaby,bow,[bluetunic]", + "ocarina,lullaby,dinsfire,magic,[bluetunic]" ], "item_count": 1 }, @@ -1058,7 +1056,6 @@ "access_rules": [ "@Shadow Temple/Like-Like Room,lift1" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1225,7 +1222,6 @@ "@Spirit Temple/Lower Child,spirit_small_keys:1", "@Spirit Temple/Mirror Room" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1268,7 +1264,6 @@ "access_rules": [ "sword2,lift2,spirit_small_keys:1" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1308,7 +1303,6 @@ "access_rules": [ "@Spirit Temple/Mirror Room,spirit_small_keys:2,@logic/explosives,@logic/lens" ], - "clear_as_group": false, "item_count": 2 }, { @@ -1482,10 +1476,10 @@ }, { "name": "Locked Pits", - "clear_as_group": false, "access_rules": [ "botw_small_keys:1,@logic/lens" ], + "clear_as_group": false, "item_count": 2 }, { @@ -1534,6 +1528,7 @@ "access_rules": [ "ocarina,lullaby,[sword1]" ], + "capture_item": true, "item_count": 1 }, { @@ -1667,8 +1662,8 @@ { "name": "Castle Tower", "access_rules": [ - "gc_small_keys:2,@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,@logic/lens,[redtunic]", - "gc_small_keys:2,@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,hoverboots,[redtunic]" + "gc_small_keys:2,@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,@logic/lens,@logic/redtunic", + "gc_small_keys:2,@logic/can LA,longshot,bombchu,shield3,lift3,bottle,hammer,@logic/has fire,hoverboots,@logic/redtunic" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -1707,284 +1702,6 @@ } ] }, - { - "name": "Gerudo Fortress", - "parent": "Bridge Crossing", - "access_rules": [ - "[bow]", - "[hookshot]", - "[hoverboots]" - ], - "children": [ - { - "name": "Carpenter Rescue", - "sections": [ - { - "name": "1st key", - "item_count": 1 - }, - { - "name": "2nd key", - "item_count": 1 - }, - { - "name": "3rd key", - "item_count": 1 - }, - { - "name": "4th key", - "item_count": 1 - }, - { - "name": "Free the carpenters", - "access_rules": [ - "gf_small_keys:4", - "gf_small_keys:1,[gf_small_keys:4]" - ], - "hosted_item": "carpenter", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 503, - "y": 392 - } - ] - }, - { - "name": "Rooftop Chest", - "sections": [ - { - "name": "Open it", - "access_rules": [ - "hoverboots", - "ocarina,[scarecrow],hookshot", - "longshot" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 358 - } - ] - }, - { - "name": "Horseback Archery", - "sections": [ - { - "name": "1000", - "access_rules": [ - "ocarina,epona,bow,carpenter" - ], - "item_count": 1 - }, - { - "name": "1500", - "access_rules": [ - "ocarina,epona,bow,carpenter", - "{agony}" - ], - "capture_item": true, - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 620, - "y": 438 - } - ] - }, - { - "name": "Archery Range (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS90", - "access_rules": [ - "hookshot,carpenter" - ], - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 660, - "y": 306 - } - ] - }, - { - "name": "Rooftop (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS91", - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 390 - } - ] - }, - { - "name": "Gerudo Training Grounds", - "access_rules": [ - "gtg_reg,carpenter,card" - ], - "sections": [ - { - "name": "Lobby", - "access_rules": [ - "bow" - ], - "item_count": 2 - }, - { - "name": "Stalfos", - "item_count": 1 - }, - { - "name": "Wolfos", - "access_rules": [ - "hookshot" - ], - "item_count": 1 - }, - { - "name": "Like-Like", - "access_rules": [ - "hookshot,lift2,@logic/lens" - ], - "item_count": 4 - }, - { - "name": "Eye Statue", - "access_rules": [ - "hookshot,bow,@logic/lens", - "@logic/explosives,hookshot,hammer,bow", - "gtg_small_keys:2,hookshot,hammer,bow" - ], - "item_count": 1 - }, - { - "name": "Near Scarecrow", - "access_rules": [ - "hookshot,bow,@logic/lens" - ], - "item_count": 1 - }, - { - "name": "Flaming Enemies", - "access_rules": [ - "hookshot,@logic/lens", - "@logic/explosives,hookshot", - "gtg_small_keys:2,hookshot" - ], - "item_count": 1 - }, - { - "name": "Hammer Pillar", - "access_rules": [ - "hookshot,@logic/lens,[hammer]", - "@logic/explosives,hookshot,[hammer]", - "gtg_small_keys:2,hookshot,[hammer]" - ], - "item_count": 1 - }, - { - "name": "Lava Pit Ledge", - "access_rules": [ - "hookshot,@logic/lens,ocarina,time", - "@logic/explosives,ocarina,time", - "gtg_small_keys:2" - ], - "item_count": 3 - }, - { - "name": "Under Water", - "access_rules": [ - "hookshot,@logic/lens,ocarina,time,ironboots,[bluetunic]", - "@logic/explosives,hookshot,ocarina,time,ironboots,[bluetunic]", - "gtg_small_keys:2,hookshot,ocarina,time,ironboots,[bluetunic]", - "{agony}" - ], - "capture_item": true, - "item_count": 1 - }, - { - "name": "Beamos", - "access_rules": [ - "@logic/explosives" - ], - "item_count": 1 - }, - { - "name": "Above Maze", - "access_rules": [ - "gtg_small_keys:1,@logic/lens" - ], - "item_count": 1 - }, - { - "name": "Maze 1", - "access_rules": [ - "gtg_small_keys:2" - ], - "item_count": 1 - }, - { - "name": "Maze 2", - "access_rules": [ - "gtg_small_keys:4" - ], - "item_count": 1 - }, - { - "name": "Maze 3", - "access_rules": [ - "gtg_small_keys:5" - ], - "item_count": 1 - }, - { - "name": "Ice Arrow Chest", - "access_rules": [ - "gtg_small_keys:7" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 481, - "y": 444 - } - ] - } - ] - }, { "name": "Ice Cavern", "parent": "Zoras Fountain A", @@ -2076,5 +1793,181 @@ ] } ] + }, + { + "name": "Carpenter Rescue", + "parent": "Gerudo Fortress", + "sections": [ + { + "name": "1st key", + "item_count": 1 + }, + { + "name": "2nd key", + "item_count": 1 + }, + { + "name": "3rd key", + "item_count": 1 + }, + { + "name": "4th key", + "item_count": 1 + }, + { + "name": "Free the carpenters", + "access_rules": [ + "gf_small_keys:4", + "gf_small_keys:1,[gf_small_keys:4]" + ], + "hosted_item": "carpenter", + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 503, + "y": 392 + } + ] + }, + { + "name": "Gerudo Training Grounds", + "parent": "Gerudo Fortress", + "access_rules": [ + "gtg_reg,carpenter,card" + ], + "sections": [ + { + "name": "Lobby", + "access_rules": [ + "bow" + ], + "item_count": 2 + }, + { + "name": "Stalfos", + "item_count": 1 + }, + { + "name": "Wolfos", + "access_rules": [ + "hookshot" + ], + "item_count": 1 + }, + { + "name": "Like-Like", + "access_rules": [ + "hookshot,lift2,@logic/lens" + ], + "item_count": 4 + }, + { + "name": "Eye Statue", + "access_rules": [ + "hookshot,bow,@logic/lens", + "@logic/explosives,hookshot,hammer,bow", + "gtg_small_keys:2,hookshot,hammer,bow" + ], + "item_count": 1 + }, + { + "name": "Near Scarecrow", + "access_rules": [ + "hookshot,bow,@logic/lens" + ], + "item_count": 1 + }, + { + "name": "Flaming Enemies", + "access_rules": [ + "hookshot,@logic/lens", + "@logic/explosives,hookshot", + "gtg_small_keys:2,hookshot" + ], + "item_count": 1 + }, + { + "name": "Hammer Pillar", + "access_rules": [ + "hookshot,@logic/lens,[hammer]", + "@logic/explosives,hookshot,[hammer]", + "gtg_small_keys:2,hookshot,[hammer]" + ], + "item_count": 1 + }, + { + "name": "Lava Pit Ledge", + "access_rules": [ + "hookshot,@logic/lens,ocarina,time", + "@logic/explosives,ocarina,time", + "gtg_small_keys:2" + ], + "item_count": 3 + }, + { + "name": "Under Water", + "access_rules": [ + "hookshot,@logic/lens,ocarina,time,ironboots,@logic/bluetunic", + "@logic/explosives,hookshot,ocarina,time,ironboots,@logic/bluetunic", + "gtg_small_keys:2,hookshot,ocarina,time,ironboots,@logic/bluetunic", + "{agony}" + ], + "capture_item": true, + "item_count": 1 + }, + { + "name": "Beamos", + "access_rules": [ + "@logic/explosives" + ], + "item_count": 1 + }, + { + "name": "Above Maze", + "access_rules": [ + "gtg_small_keys:1,@logic/lens" + ], + "item_count": 1 + }, + { + "name": "Maze 1", + "access_rules": [ + "gtg_small_keys:2" + ], + "item_count": 1 + }, + { + "name": "Maze 2", + "access_rules": [ + "gtg_small_keys:4" + ], + "item_count": 1 + }, + { + "name": "Maze 3", + "access_rules": [ + "gtg_small_keys:5" + ], + "item_count": 1 + }, + { + "name": "Ice Arrow Chest", + "access_rules": [ + "gtg_small_keys:7" + ], + "capture_item": true, + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 481, + "y": 444 + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json index 8f069a82..90504f7e 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/mq.json @@ -54,6 +54,7 @@ "access_rules": [ "@Deku Tree MQ/Compass Chest,ocarina,time" ], + "capture_item": true, "item_count": 1 }, { @@ -223,7 +224,6 @@ "@Dodongos Cavern MQ/Under Grave", "{agony}" ], - "capture_item": true, "item_count": 1 }, { @@ -525,7 +525,8 @@ "name": "GS51 - Boomerang Room", "short_name": "Boomerang Room", "access_rules": [ - "@Jabu Jabus Belly MQ/Boomerang Chest,ocarina,time" + "@Jabu Jabus Belly MQ/Boomerang Chest,ocarina,time", + "@Jabu Jabus Belly MQ/Boomerang Chest,boomerang,[ocarina],[time]" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", @@ -548,6 +549,7 @@ "access_rules": [ "@Jabu Jabus Belly MQ/Falling Like Like Room Chest,@logic/lens" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -606,7 +608,8 @@ { "name": "Well Chest", "access_rules": [ - "forest_small_keys:1,bow" + "forest_small_keys:1,bow", + "@Forest Temple MQ/Redead Chest,ironboots,[bow]" ], "item_count": 1 }, @@ -762,7 +765,7 @@ "name": "Fire Temple MQ", "parent": "Death Mountain Crater A", "access_rules": [ - "fire_mq,@Sheik in Crater,[redtunic]" + "fire_mq,@Sheik in Crater,@logic/redtunic" ], "sections": [ { @@ -774,9 +777,7 @@ "access_rules": [ "hoverboots,@logic/has fire", "hookshot,bow,firearrow,magic", - "hookshot,dinsfire,magic,bow", - "hookshot,dinsfire,magic,redtunic", - "longshot,dinsfire,magic" + "hookshot,dinsfire,magic" ], "item_count": 1 }, @@ -813,7 +814,7 @@ { "name": "Maze Lower Chest", "access_rules": [ - "hammer,fire_small_keys:1,@logic/has fire" + "hammer,fire_small_keys:1,@logic/has fire,[redtunic]" ], "item_count": 1 }, @@ -850,13 +851,14 @@ "access_rules": [ "@Fire Temple MQ/Freestanding Key,fire_small_keys:3" ], + "capture_item": true, "item_count": 1 }, { "name": "Volvagia", "access_rules": [ "@Fire Temple MQ/Freestanding Key,hammer,fire_boss_key,@logic/has fire", - "hoverboots,hammer,fire_boss_key,@logic/has fire" + "hoverboots,hammer,fire_boss_key,@logic/has fire,[redtunic]" ], "hosted_item": "fire", "chest_unopened_img": "images/HC.png", @@ -945,8 +947,8 @@ "name": "Water Temple MQ", "parent": "Lake Hylia A", "access_rules": [ - "water_mq,ironboots,hookshot,[bluetunic]", - "water_mq,scale2,hookshot,[bluetunic]" + "water_mq,ironboots,hookshot,@logic/bluetunic", + "water_mq,scale2,hookshot,@logic/bluetunic" ], "sections": [ { @@ -977,8 +979,8 @@ { "name": "Central Pillar Chest", "access_rules": [ - "ironboots,bow,firearrow,magic", - "ironboots,dinsfire,magic,ocarina,time" + "ironboots,bow,firearrow,magic,[bluetunic]", + "ironboots,dinsfire,magic,ocarina,time,[bluetunic]" ], "item_count": 1 }, @@ -987,6 +989,7 @@ "access_rules": [ "water_small_keys:1,longshot,ironboots,dinsfire,magic" ], + "capture_item": true, "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", "item_count": 1 @@ -997,6 +1000,7 @@ "@Water Temple MQ/Boss Key Chest,hoverboots", "@Water Temple MQ/Boss Key Chest,ocarina,[scarecrow]" ], + "capture_item": true, "item_count": 1 }, { @@ -1040,6 +1044,7 @@ "access_rules": [ "@Water Temple MQ/Freestanding Key,water_small_keys:2" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -1207,33 +1212,34 @@ "item_count": 1 }, { - "name": "Spike Walls Left Chest", + "name": "Bomb Flower Chest", "access_rules": [ - "@Shadow Temple MQ/Bomb Flower Chest,shadow_small_keys:5" + "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:4,ocarina,lullaby,bow,time,longshot" ], + "capture_item": true, "item_count": 1 }, { - "name": "Boss Key Chest", + "name": "Freestanding Key", "access_rules": [ - "@Shadow Temple MQ/Spike Walls Left Chest" + "@Shadow Temple MQ/Bomb Flower Chest" ], - "chest_unopened_img": "images/chest_golden_closed.png", - "chest_opened_img": "images/chest_golden_open.png", "item_count": 1 }, { - "name": "Bomb Flower Chest", + "name": "Spike Walls Left Chest", "access_rules": [ - "@Shadow Temple MQ/Wind Hint Chest,shadow_small_keys:4,ocarina,lullaby,bow,time,longshot" + "@Shadow Temple MQ/Bomb Flower Chest,shadow_small_keys:5" ], "item_count": 1 }, { - "name": "Freestanding Key", + "name": "Boss Key Chest", "access_rules": [ - "@Shadow Temple MQ/Bomb Flower Chest" + "@Shadow Temple MQ/Spike Walls Left Chest" ], + "chest_unopened_img": "images/chest_golden_closed.png", + "chest_opened_img": "images/chest_golden_open.png", "item_count": 1 }, { @@ -1383,6 +1389,7 @@ "access_rules": [ "sword2,lift2,longshot,bombchu,ocarina,requiem,hammer,spirit_small_keys:2" ], + "capture_item": true, "item_count": 1 }, { @@ -1464,6 +1471,7 @@ "access_rules": [ "@Spirit Temple MQ/Lower Adult Left Chest,spirit_small_keys:1,hammer,ocarina,time,epona,sun,storm,lullaby" ], + "capture_item": true, "item_count": 1 }, { @@ -1557,6 +1565,7 @@ "access_rules": [ "@Spirit Temple MQ/Lower Adult Right Chest" ], + "capture_item": true, "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", "item_count": 1 @@ -1613,6 +1622,7 @@ "sword1", "sticks,[sword1]" ], + "capture_item": true, "item_count": 1 }, { @@ -1811,8 +1821,8 @@ { "name": "Castle Tower", "access_rules": [ - "gc_small_keys:3,@logic/can LA,lift3,ocarina,time,[redtunic],bottle,@logic/lens,hammer,bombchu,shield3,firearrow,longshot", - "gc_small_keys:3,@logic/can LA,lift3,ocarina,time,[redtunic],bottle,@logic/lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots" + "gc_small_keys:3,@logic/can LA,lift3,ocarina,time,@logic/redtunic,bottle,@logic/lens,hammer,bombchu,shield3,firearrow,longshot", + "gc_small_keys:3,@logic/can LA,lift3,ocarina,time,@logic/redtunic,bottle,@logic/lens,hammer,bombchu,shield3,firearrow,hookshot,hoverboots" ], "chest_unopened_img": "images/chest_golden_closed.png", "chest_opened_img": "images/chest_golden_open.png", @@ -1851,272 +1861,6 @@ } ] }, - { - "name": "Gerudo Fortress", - "parent": "Bridge Crossing", - "access_rules": [ - "[bow]", - "[hookshot]", - "[hoverboots]" - ], - "children": [ - { - "name": "Carpenter Rescue", - "sections": [ - { - "name": "1st key", - "item_count": 1 - }, - { - "name": "2nd key", - "item_count": 1 - }, - { - "name": "3rd key", - "item_count": 1 - }, - { - "name": "4th key", - "item_count": 1 - }, - { - "name": "Free the carpenters", - "access_rules": [ - "gf_small_keys:4", - "gf_small_keys:1,[gf_small_keys:4]" - ], - "hosted_item": "carpenter", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 503, - "y": 392 - } - ] - }, - { - "name": "Rooftop Chest", - "sections": [ - { - "name": "Open it", - "access_rules": [ - "hoverboots", - "ocarina,[scarecrow],hookshot", - "longshot" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 358 - } - ] - }, - { - "name": "Horseback Archery", - "sections": [ - { - "name": "1000", - "access_rules": [ - "ocarina,epona,bow,carpenter" - ], - "item_count": 1 - }, - { - "name": "1500", - "access_rules": [ - "ocarina,epona,bow,carpenter", - "{agony}" - ], - "capture_item": true, - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 620, - "y": 438 - } - ] - }, - { - "name": "Archery Range (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS90", - "access_rules": [ - "hookshot,carpenter" - ], - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 660, - "y": 306 - } - ] - }, - { - "name": "Rooftop (N)", - "access_rules": [ - "dungeon_skulltulas" - ], - "sections": [ - { - "name": "GS91", - "chest_unopened_img": "images/skulltula.png", - "chest_opened_img": "images/skulltula_token.png", - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 544, - "y": 390 - } - ] - }, - { - "name": "Gerudo Training Grounds MQ", - "access_rules": [ - "gtg_mq,carpenter,card" - ], - "sections": [ - { - "name": "Lobby Left Chest", - "item_count": 1 - }, - { - "name": "Lobby Right Chest", - "item_count": 1 - }, - { - "name": "Hidden Ceiling Chest", - "access_rules": [ - "@logic/lens" - ], - "item_count": 1 - }, - { - "name": "Maze Path First Chest", - "item_count": 1 - }, - { - "name": "Maze Path Second Chest", - "item_count": 1 - }, - { - "name": "Maze Path Third Chest", - "access_rules": [ - "gtg_small_keys:1" - ], - "item_count": 1 - }, - { - "name": "Dinolfos Chest", - "access_rules": [ - "bow", - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" - ], - "item_count": 1 - }, - { - "name": "Underwater Silver Rupee Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Dinolfos Chest,hoverboots,@logic/has fire,ironboots,[bluetunic]", - "@Gerudo Training Grounds MQ/Maze Right Central Chest,@logic/has fire,ironboots,[bluetunic]" - ], - "item_count": 1 - }, - { - "name": "First Iron Knuckle Chest", - "access_rules": [ - "@logic/has fire" - ], - "item_count": 1 - }, - { - "name": "Before Heavy Block Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/First Iron Knuckle Chest,longshot" - ], - "item_count": 1 - }, - { - "name": "Heavy Block Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Before Heavy Block Chest,lift2" - ], - "item_count": 1 - }, - { - "name": "Eye Statue Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,bow" - ], - "item_count": 1 - }, - { - "name": "Second Iron Knuckle Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle" - ], - "item_count": 1 - }, - { - "name": "Flame Circle Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" - ], - "item_count": 1 - }, - { - "name": "Maze Right Central Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,hammer" - ], - "item_count": 1 - }, - { - "name": "Maze Right Side Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Maze Right Central Chest" - ], - "item_count": 1 - }, - { - "name": "Ice Arrows Chest", - "access_rules": [ - "@Gerudo Training Grounds MQ/Maze Right Central Chest,gtg_small_keys:3" - ], - "item_count": 1 - } - ], - "map_locations": [ - { - "map": "adult", - "x": 481, - "y": 444 - } - ] - } - ] - }, { "name": "Ice Cavern MQ", "parent": "Zoras Fountain A", @@ -2209,5 +1953,132 @@ ] } ] + }, + { + "name": "Gerudo Training Grounds MQ", + "parent": "Gerudo Fortress", + "access_rules": [ + "gtg_mq,carpenter,card" + ], + "sections": [ + { + "name": "Lobby Left Chest", + "item_count": 1 + }, + { + "name": "Lobby Right Chest", + "item_count": 1 + }, + { + "name": "Hidden Ceiling Chest", + "access_rules": [ + "@logic/lens" + ], + "item_count": 1 + }, + { + "name": "Maze Path First Chest", + "item_count": 1 + }, + { + "name": "Maze Path Second Chest", + "item_count": 1 + }, + { + "name": "Maze Path Third Chest", + "access_rules": [ + "gtg_small_keys:1" + ], + "item_count": 1 + }, + { + "name": "Dinolfos Chest", + "access_rules": [ + "bow", + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" + ], + "item_count": 1 + }, + { + "name": "Underwater Silver Rupee Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Dinolfos Chest,hoverboots,@logic/has fire,ironboots,@logic/bluetunic", + "@Gerudo Training Grounds MQ/Maze Right Central Chest,@logic/has fire,ironboots,@logic/bluetunic" + ], + "capture_item": true, + "item_count": 1 + }, + { + "name": "First Iron Knuckle Chest", + "access_rules": [ + "@logic/has fire" + ], + "item_count": 1 + }, + { + "name": "Before Heavy Block Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/First Iron Knuckle Chest,longshot" + ], + "item_count": 1 + }, + { + "name": "Heavy Block Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Before Heavy Block Chest,lift2" + ], + "item_count": 1 + }, + { + "name": "Eye Statue Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,bow" + ], + "item_count": 1 + }, + { + "name": "Second Iron Knuckle Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Before Heavy Block Chest,ocarina,time,@logic/lens,bottle" + ], + "item_count": 1 + }, + { + "name": "Flame Circle Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest" + ], + "item_count": 1 + }, + { + "name": "Maze Right Central Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Second Iron Knuckle Chest,hammer" + ], + "item_count": 1 + }, + { + "name": "Maze Right Side Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Maze Right Central Chest" + ], + "item_count": 1 + }, + { + "name": "Ice Arrows Chest", + "access_rules": [ + "@Gerudo Training Grounds MQ/Maze Right Central Chest,gtg_small_keys:3" + ], + "capture_item": true, + "item_count": 1 + } + ], + "map_locations": [ + { + "map": "adult", + "x": 481, + "y": 444 + } + ] } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json b/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json index f17d06b6..73227a67 100644 --- a/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json @@ -1,57 +1,208 @@ { "item_grid_mini": { - "type": "itemgrid", - "h_alignment": "left", - "item_margin": "1,2", - "rows": [ - [ - "forestmedlabel", - "firemedlabel", - "watermedlabel", - "spiritmedlabel", - "shadowmedlabel", - "lightmedlabel" - ], - [ - "minuetcheck", - "bolerocheck", - "serenadecheck", - "requiemcheck", - "nocturnecheck", - "preludecheck" - ], - [ - "lullabycheck", - "eponacheck", - "sariacheck", - "suncheck", - "timecheck", - "stormcheck" - ], - [ - "bombs", - "bombchu", - "slingshot", - "bow", - "firearrow", - "lightarrow" - ], - [ - "lift1", - "hammer", - "boomerang", - "hookshot", - "dinsfire", - "bottle1" - ], - [ - "scale1", - "shield3", - "ironboots", - "hoverboots", - "adulttrade", - "kidtrade" - ] + "type": "array", + "orientation": "vertical", + "margin": "0,10", + "content": [ + { + "type": "array", + "orientation": "vertical", + "content": [ + { + "type": "array", + "orientation": "horizontal", + "margin": "5,0", + "content": [ + { + "type": "canvas", + "width": 32, + "height": 12, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "forestmedlabel", + "canvas_depth": 1, + "width": 32, + "height": 12 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 12, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "firemedlabel", + "canvas_depth": 1, + "width": 32, + "height": 12 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 12, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "watermedlabel", + "canvas_depth": 1, + "width": 32, + "height": 12 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 12, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "spiritmedlabel", + "canvas_depth": 1, + "width": 32, + "height": 12 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 12, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "shadowmedlabel", + "canvas_depth": 1, + "width": 32, + "height": 12 + } + ] + }, + { + "type": "canvas", + "width": 32, + "height": 12, + "margin": "1,2", + "content": [ + { + "type": "item", + "item": "lightmedlabel", + "canvas_depth": 1, + "width": 32, + "height": 12 + } + ] + } + ] + }, + { + "type": "array", + "orientation": "horizontal", + "margin": "5,0", + "content": [ + { + "type": "item", + "item": "forestmed", + "margin": "1,2", + "width": 32, + "height": 32 + }, + { + "type": "item", + "item": "firemed", + "margin": "1,2", + "width": 32, + "height": 32 + }, + { + "type": "item", + "item": "watermed", + "margin": "1,2", + "width": 32, + "height": 32 + }, + { + "type": "item", + "item": "spiritmed", + "margin": "1,2", + "width": 32, + "height": 32 + }, + { + "type": "item", + "item": "shadowmed", + "margin": "1,2", + "width": 32, + "height": 32 + }, + { + "type": "item", + "item": "lightmed", + "margin": "1,2", + "width": 32, + "height": 32 + } + ] + } + ] + }, + { + "type": "itemgrid", + "h_alignment": "left", + "item_margin": "1,2", + "rows": [ + [ + "minuetcheck", + "bolerocheck", + "serenadecheck", + "requiemcheck", + "nocturnecheck", + "preludecheck" + ], + [ + "lullabycheck", + "eponacheck", + "sariacheck", + "suncheck", + "timecheck", + "stormcheck" + ], + [ + "bombs", + "bombchu", + "slingshot", + "bow", + "firearrow", + "lightarrow" + ], + [ + "lift1", + "hammer", + "boomerang", + "hookshot", + "dinsfire", + "bottle1" + ], + [ + "scale1", + "shield3", + "ironboots", + "hoverboots", + "adulttrade", + "kidtrade" + ] + ] + } ] } } \ No newline at end of file diff --git a/repository.json b/repository.json index e5700061..ad469f24 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.1.3.2", + "version": "2.1.3.3", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [