Merge pull request #28 from Hamsda/dev

update to version 2.1.4.1

README.md

@@ -2,7 +2,7 @@
 
 ## Content
 
-This is a pack for [EmoTracker](https://emotracker.net/) designed for the [Ocarina of Time Randomizer](https://github.com/AmazingAmpharos/OoT-Randomizer).
+This is a pack for [EmoTracker](https://emotracker.net/) designed for the [Ocarina of Time Randomizer](https://ootrandomizer.com/).
 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.
@@ -13,7 +13,7 @@ If you have any questions regarding the pack or the tracker itself, I recommend
 
 ## Variants
 
-The pack offers 4 different variants:
+The pack offers 5 different variants:
 
 1. Regular Map Tracker
 2. Keysanity Map Tracker
@@ -29,9 +29,8 @@ This also means that the key counts for the dungeons in the Keysanity variants w
 
 ## Special items
 
-There are a few special items whose purpose might not be directly obvious:
+This special items purpose might not be immediately 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)
@@ -40,7 +39,7 @@ There is a variety of settings available to accomodate the different options tha
 
 ### Rainbow Bridge
 
-This setting determines what is needed to trigger the rainbow bridge in front of Ganons castle.
+This setting determines what is needed to trigger the rainbow bridge in front of Ganons castle ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#rainbow-bridge-requirement)).
 
 - ![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
@@ -49,64 +48,72 @@ This setting determines what is needed to trigger the rainbow bridge in front of
 
 ### Forest
 
-This setting determines if you can leave the Kokiri Forest without beating the Deku Tree.
+This setting determines if you can leave the Kokiri Forest without beating the Deku Tree ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#open-forest)).
 
 - ![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.
 
 ### 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 ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#open-kakariko-gate)).
 
 - ![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.
 
 ### Door of Time
 
-This setting determines whether the Door of Time starts open or closed.
+This setting determines whether the Door of Time starts open or closed ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#open-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.
 
+### Gerudo Fortress
+
+This setting determines the state of the ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#gerudo-fortress)).
+
+- ![Normal Gerudo Fortress](ootrando_overworldmap_hamsda/images/gerudo_fortress_normal.png "Normal Gerudo Fortress") You will have to rescue all 4 carpenters.
+- ![Fast Gerudo Fortress](ootrando_overworldmap_hamsda/images/gerudo_fortress_fast.png "Fast Gerudo Fortress") You only need to free one carpenter (F1 North).
+- ![Open Gerudo Fortress](ootrando_overworldmap_hamsda/images/gerudo_fortress_open.png "Open Gerudo Fortress") The carpenters start free and the Fortress is immediately accessible.
+
+### Bombchus in logic
+
+This setting determines if Bombchus are considered by the logic ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#bombchus-are-considered-in-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.
+
 ### Lens of Truth
 
-This setting changes where the logic requires the Lens of Truth.
+This setting changes where the logic requires the Lens of Truth ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#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.
 
 ### 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).
+This setting changes where the logic requires Goron and Zora tunics ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#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
 
-This setting determines if all Deku Scrubs have randomized items.
+This setting determines if all Deku Scrubs have randomized items ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#shuffle-deku-salescrubs)).
 
 - ![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
 
-This setting determines if Shopsanity is active.
+This setting determines if Shopsanity is active ([see wiki](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#shopsanity)).
 
 - ![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 which Gold Skulltulas are shown (especially useful for Tokensanity).
+This setting determines which Gold Skulltulas are shown (especially useful for [Tokensanity](https://github.com/TestRunnerSRL/OoT-Randomizer/wiki/setting-information#tokensanity)).
 
 - ![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.

changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.1.4.1
+
+- fixed DMC wall HP display error
+- changed adult trade items to be loopable
+- fixed Forest Temple basement requires bow
+- added ice trap counter :)
+
 ## 2.1.4.0
 
 - changed horizontal tracker layout to be the same as vertical

ootrando_overworldmap_hamsda/items/items.json

@@ -279,6 +279,7 @@
   {
     "name": "Adult Trade",
     "type": "progressive",
+    "loop": true,
     "allow_disabled": false,
     "stages": [
       {

ootrando_overworldmap_hamsda/items/quest.json

@@ -68,6 +68,13 @@
     "codes": "HC",
     "max_quantity": 8
   },
+  {
+    "name": "Ice Trap",
+    "type": "consumable",
+    "img": "images/icetrap.png",
+    "codes": "icetrap",
+    "max_quantity": 99
+  },
   {
     "name": "Rupee",
     "type": "toggle",

ootrando_overworldmap_hamsda/layouts/shared.json

@@ -60,7 +60,7 @@
             "wallet1",
             "magic",
             "card",
-            "",
+            "icetrap",
             "agony",
             "skulltula"
           ],
@@ -397,7 +397,7 @@
             "nocturnecheck",
             "preludecheck",
             "card",
-            "",
+            "icetrap",
             "agony"
           ]
         ]

ootrando_overworldmap_hamsda/locations/dungeons.json

@@ -553,7 +553,7 @@
       {
         "name": "Basement",
         "access_rules": [
-          "@Forest Temple/Checkerboard"
+          "lift1,bow"
         ],
         "item_count": 1
       },

ootrando_overworldmap_hamsda/locations/overworld.json

@@ -2414,7 +2414,8 @@
                           "@logic/can blast",
                           "ocarina,bolero,beans_plant_no,beans",
                           "ocarina,bolero,bean_crater_yes",
-                          "@Link the Goron"
+                          "lift1",
+                          "bow"
                         ],
                         "chest_unopened_img": "images/HP.png",
                         "chest_opened_img": "images/HP_grey.png",
@@ -2425,7 +2426,7 @@
                       {
                         "map": "child",
                         "visibility_rules": [
-                          "@logic/explosives"
+                          "@logic/can blast"
                         ],
                         "x": 1834,
                         "y": 66

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.4.0",
+  "package_version": "2.1.4.1",
   "package_uid": "ootrando_overworldmap_hamsda",
   "author": "Hamsda",
   "variants": {

ootrando_overworldmap_hamsda/var_keysanity/layouts/shared.json

@@ -60,7 +60,7 @@
             "wallet1",
             "magic",
             "card",
-            "",
+            "icetrap",
             "agony",
             "skulltula"
           ],
@@ -560,7 +560,7 @@
             "nocturnecheck",
             "preludecheck",
             "card",
-            "",
+            "icetrap",
             "agony"
           ]
         ]

ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json

@@ -553,7 +553,7 @@
       {
         "name": "Basement",
         "access_rules": [
-          "@Forest Temple/Checkerboard"
+          "forest_small_keys:5,lift1,bow"
         ],
         "item_count": 1
       },

repository.json

@@ -10,7 +10,7 @@
         "pins",
         "chathud"
       ],
-      "version": "2.1.4.0",
+      "version": "2.1.4.1",
       "uid": "ootrando_overworldmap_hamsda",
       "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip",
       "variants": [