Merge pull request #18 from Hamsda/dev

update to version 2.1.3.0

README.md

@@ -9,84 +9,92 @@ 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.
 
-It offers two different variants for the different playmodes of the randomizer:
+### Variants
+
+The pack offers 4 different variants:
 
 1. Regular Map Tracker
 2. Keysanity Map Tracker (additional space to keep track of your keys, which also get considered in the map logic)
+3. Items Only
+4. Items Only (minimal)
 
 ### Settings
 
-- Rainbow Bridge:
+There is also a variety of settings available to accomodate the different options that the Randomizer offers:
+
+#### Rainbow Bridge
+
+This setting determines what is needed to trigger the rainbow bridge in front of Ganons castle.
+
+- ![All Medallions](ootrando_overworldmap_hamsda/images/rainbow_medallions.png "All Medallions") All 6 medallions required
+- ![Vanilla](ootrando_overworldmap_hamsda/images/rainbow_vanilla.png "Vanilla") Light arrows, shadow medallion, and spirit medallion required
+- ![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
+
+This setting determines if you can leave the Kokiri Forest without beating the Deku Tree.
 
-  This setting determines what is needed to trigger the rainbow bridge in front of Ganons castle.
-
-  - ![All Medallions](/ootrando_overworldmap_hamsda/images/rainbow_medallions.png "All Medallions") All 6 medallions required
-  - ![Vanilla](/ootrando_overworldmap_hamsda/images/rainbow_vanilla.png "Vanilla") Light arrows, shadow medallion, and spirit medallion required
-  - ![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
+- ![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.
 
-- Forest:
+#### Door of Time
 
-  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.
+This setting determines whether the Door of Time starts open or closed.
 
-- Door of Time:
+- ![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.
 
-  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.
 
-  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.
+- ![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:
+#### Lens of Truth
 
-  This setting changes where the logic requires the Lens of Truth.
-
-  - ![Required everywhere](/ootrando_overworldmap_hamsda/images/lens_all.png "Required everywhere") Required to see all invisible things.
-  - ![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.
+This setting changes where the logic requires the Lens of Truth.
 
-- Bombchus in logic:
+- ![Required everywhere](ootrando_overworldmap_hamsda/images/lens_all.png "Required everywhere") Required to see all invisible things.
+- ![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.
 
-  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.
+#### Bombchus in logic
 
-- Shuffle Deku Scrubs:
+This setting determines if Bombchus are considered by the logic.
 
-  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.
+- ![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.
 
-- Shopsanity:
+#### Shuffle Deku Scrubs
 
-  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.
+This setting determines if all Deku Scrubs have randomized items.
 
-- Gold Skulltulas:
+- ![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.
 
-  This setting determines if Gold Skulltulas are shown (especially useful for Tokensanity).
-
-  - ![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.
+#### 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).
+
+- ![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.
 
 ### Special items
 
-- ![Gerudo symbol](/ootrando_overworldmap_hamsda/images/gerudo_symbol_colored.png "Gerudo symbol") Checking this item reflects the carpenters being rescued from Gerudo Fortress. This is separate from the Gerudo Card ![Gerudo card](/ootrando_overworldmap_hamsda/images/gerudocard.png "Gerudo card") because of [various settings related to Gerudo Fortress in the randomizer](https://github.com/TestRunnerSRL/OoT-Randomizer/tree/Dev#gerudo-fortress-options).
-- ![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.
+There are a few special items whose purpose might not be directly obvious:
+
+- ![Gerudo symbol](ootrando_overworldmap_hamsda/images/gerudo_symbol_colored.png "Gerudo symbol") Checking this item reflects the carpenters being rescued from Gerudo Fortress. This is separate from the Gerudo Card ![Gerudo card](ootrando_overworldmap_hamsda/images/gerudocard.png "Gerudo card") because of [various settings related to Gerudo Fortress in the randomizer](https://github.com/TestRunnerSRL/OoT-Randomizer/tree/Dev#gerudo-fortress-options).
+- ![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
 
-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.
+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__.

ootrando_overworldmap_hamsda/changelog.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.1.3.0
+
+- added MQ dungeons!
+- added new variant `Items Only (Keysanity)`
+- added scarecrow toggle to ocarina and checks for it
+- added relevant bean locations to child patches and checks to adult for those
+- changed graveyard box hp to be a sequence break with boomerang
+- changed DMC volcano hp to be a sequence break with hovers
+- fixed deku scrubs near LW forest stage are child only
+- fixed GC BK chest doesn't require BK, derp
+- added GS3 twins house sequence break with hoverboots
+- added DMT bomb wall sequence break with bomb flower and lift1
+- added Deku Tree GS9 sequence break with sword1/sticks
+- changed Fire Temple SoT room as sequence break without SoT
+
 ## 2.1.2.0
 
 - added new item only variants

ootrando_overworldmap_hamsda/items/beans.json

@@ -0,0 +1,104 @@
+[
+  {
+    "name": "Forest Stage Bean",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/bean.png",
+        "img_mods": "@disabled",
+        "codes": "bean_stage_no"
+      },
+      {
+        "img": "images/bean.png",
+        "codes": "bean_stage_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "Lake Hylia Bean",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/bean.png",
+        "img_mods": "@disabled",
+        "codes": "bean_lake_no"
+      },
+      {
+        "img": "images/bean.png",
+        "codes": "bean_lake_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "Graveyard Bean",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/bean.png",
+        "img_mods": "@disabled",
+        "codes": "bean_graveyard_no"
+      },
+      {
+        "img": "images/bean.png",
+        "codes": "bean_graveyard_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "DMT Bean",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/bean.png",
+        "img_mods": "@disabled",
+        "codes": "bean_trail_no"
+      },
+      {
+        "img": "images/bean.png",
+        "codes": "bean_trail_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "DMC Bean",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/bean.png",
+        "img_mods": "@disabled",
+        "codes": "bean_crater_no"
+      },
+      {
+        "img": "images/bean.png",
+        "codes": "bean_crater_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "Colossus Bean",
+    "type": "progressive",
+    "allow_disabled": false,
+    "stages": [
+      {
+        "img": "images/bean.png",
+        "img_mods": "@disabled",
+        "codes": "bean_colossus_no"
+      },
+      {
+        "img": "images/bean.png",
+        "codes": "bean_colossus_yes",
+        "inherit_codes": false
+      }
+    ]
+  }
+]