Merge pull request #75 from Hamsda:dev

update to version 2.6.0.3
Hamsda · Oct 16, 2019 · 207ed9c · 207ed9c
2 parents 6bce340 + 4d18249
commit 207ed9c
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 145 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.6.0.3
+
+- fixed Gerudo Fortress guard behavior around card
+- fixed visibility after latest EmoTracker update
+
 ## 2.6.0.2
 
 - removed visibility restrictions based on items

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/items/quest.json b/ootrando_overworldmap_hamsda/items/quest.json
@@ -11,42 +11,6 @@
     "img": "images/gerudocard.png",
     "codes": "gerudocard,card"
   },
-  {
-    "name": "Carpenter Rescue",
-    "type": "toggle",
-    "img": "images/gerudosymbol.png",
-    "codes": "carpenter_rescue"
-  },
-  {
-    "name": "Gerudo Card and Carpenter Rescue",
-    "type": "composite_toggle",
-    "codes": "fortress",
-    "item_left": "card",
-    "item_right": "carpenter_rescue",
-    "images": [
-      {
-        "left": false,
-        "right": false,
-        "img": "images/gerudofortress.png",
-        "img_mods": "@disabled"
-      },
-      {
-        "left": true,
-        "right": false,
-        "img": "images/gerudocard.png"
-      },
-      {
-        "left": false,
-        "right": true,
-        "img": "images/gerudosymbol.png"
-      },
-      {
-        "left": true,
-        "right": true,
-        "img": "images/gerudofortress.png"
-      }
-    ]
-  },
   {
     "name": "Gold Skulltula Tokens",
     "type": "consumable",

diff --git a/ootrando_overworldmap_hamsda/layouts/item_grids.json b/ootrando_overworldmap_hamsda/layouts/item_grids.json
@@ -59,7 +59,7 @@
           [
             "wallet1",
             "magic",
-            "fortress",
+            "card",
             "agony",
             "icetrap",
             "skulltula"
@@ -159,7 +159,7 @@
             "requiemcheck",
             "nocturnecheck",
             "preludecheck",
-            "fortress",
+            "card",
             "agony",
             "icetrap"
           ]

diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq.json b/ootrando_overworldmap_hamsda/locations/dung_mq.json
@@ -151,7 +151,7 @@
     "map_locations": [
       {
         "map": "child",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "deku_reg"
         ],
         "x": 2426,
@@ -370,15 +370,15 @@
     "map_locations": [
       {
         "map": "child",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "dodongo_reg"
         ],
         "x": 1684,
         "y": 250
       },
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "dodongo_reg"
         ],
         "x": 1684,
@@ -564,7 +564,7 @@
     "map_locations": [
       {
         "map": "child",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "jabu_reg"
         ],
         "x": 2458,
@@ -659,7 +659,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "ice_reg"
         ],
         "x": 2471,
@@ -869,7 +869,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "forest_reg"
         ],
         "x": 2178,
@@ -1070,7 +1070,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "fire_reg"
         ],
         "x": 1912,
@@ -1227,7 +1227,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "water_reg"
         ],
         "x": 985,
@@ -1472,7 +1472,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "shadow_reg"
         ],
         "x": 2144,
@@ -1763,15 +1763,15 @@
     "map_locations": [
       {
         "map": "child",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "spirit_reg"
         ],
         "x": 55,
         "y": 301
       },
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "spirit_reg"
         ],
         "x": 55,
@@ -1880,7 +1880,7 @@
     "map_locations": [
       {
         "map": "child",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "botw_reg"
         ],
         "x": 1920,
@@ -2016,7 +2016,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "gc_reg"
         ],
         "x": 1409,
@@ -2028,8 +2028,7 @@
     "name": "Gerudo Training Grounds MQ",
     "parent": "Gerudo Fortress",
     "access_rules": [
-      "[carpenter_rescue],$gtg_card",
-      "gerudo_fortress_open,$gtg_card"
+      "$gerudo_card"
     ],
     "sections": [
       {
@@ -2161,7 +2160,7 @@
     "map_locations": [
       {
         "map": "adult",
-        "restrict_visibility_rules": [
+        "force_invisibility_rules": [
           "gtg_reg"
         ],
         "x": 481,