Merge pull request #40 from Hamsda/dev

update to version 2.2.0.7
Hamsda · Jan 19, 2019 · 181efcf · 181efcf
2 parents f72d023 + 7ae3913
commit 181efcf
Show file tree

Hide file tree

Showing 14 changed files with 880 additions and 129 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.2.0.7
+
+- added gossip stone map
+- fixed image for scrub outside Lake Hylia
+- fixed beans so they can be unmarked
+- changed scrub locations to not clear as group
+- improved scarecrow learning locations a bit
+- fixed DMC wall HP with bolero and hookshot/hoverboots
+- added Water Temple ironboots sequence break with gold scale and longshot
+
 ## 2.2.0.6
 
 - fixed Water Temple cracked wall sequence break with chus in keysanity variant

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/images/gossip_stone.png b/ootrando_overworldmap_hamsda/images/gossip_stone.png
diff --git a/ootrando_overworldmap_hamsda/items/sequences.json b/ootrando_overworldmap_hamsda/items/sequences.json
@@ -11,8 +11,7 @@
       },
       {
         "img": "images/bean.png",
-        "codes": "bean_stage_yes",
-        "inherit_codes": false
+        "codes": "bean_stage_yes"
       }
     ]
   },
@@ -28,8 +27,7 @@
       },
       {
         "img": "images/bean.png",
-        "codes": "bean_lake_yes",
-        "inherit_codes": false
+        "codes": "bean_lake_yes"
       }
     ]
   },
@@ -45,8 +43,7 @@
       },
       {
         "img": "images/bean.png",
-        "codes": "bean_graveyard_yes",
-        "inherit_codes": false
+        "codes": "bean_graveyard_yes"
       }
     ]
   },
@@ -62,8 +59,7 @@
       },
       {
         "img": "images/bean.png",
-        "codes": "bean_trail_yes",
-        "inherit_codes": false
+        "codes": "bean_trail_yes"
       }
     ]
   },
@@ -79,8 +75,7 @@
       },
       {
         "img": "images/bean.png",
-        "codes": "bean_crater_yes",
-        "inherit_codes": false
+        "codes": "bean_crater_yes"
       }
     ]
   },
@@ -96,8 +91,7 @@
       },
       {
         "img": "images/bean.png",
-        "codes": "bean_colossus_yes",
-        "inherit_codes": false
+        "codes": "bean_colossus_yes"
       }
     ]
   },

diff --git a/ootrando_overworldmap_hamsda/layouts/tracker.json b/ootrando_overworldmap_hamsda/layouts/tracker.json
@@ -76,6 +76,16 @@
                       "adult"
                     ]
                   }
+                },
+                {
+                  "title": "Gossip Stones",
+                  "icon": "images/gossip_stone.png",
+                  "content": {
+                    "type": "map",
+                    "maps": [
+                      "gossips"
+                    ]
+                  }
                 }
               ]
             },
@@ -195,6 +205,16 @@
                   "adult"
                 ]
               }
+            },
+            {
+              "title": "Gossip Stones",
+              "icon": "images/gossip_stone.png",
+              "content": {
+                "type": "map",
+                "maps": [
+                  "gossips"
+                ]
+              }
             }
           ]
         }

diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json
@@ -310,6 +310,7 @@
             ],
             "chest_unopened_img": "images/deku_scrub.png",
             "chest_opened_img": "images/deku_scrub_grey.png",
+            "clear_as_group": false,
             "item_count": 2
           }
         ],
@@ -839,53 +840,67 @@
     "name": "Water Temple",
     "parent": "Lake Hylia A",
     "access_rules": [
-      "water_reg,ironboots,hookshot,$has_zora_tunic"
+      "water_reg,ironboots,hookshot,$has_zora_tunic",
+      "water_reg,scale2,[ironboots],hookshot,$has_zora_tunic"
     ],
     "sections": [
       {
         "name": "Map Chest",
+        "access_rules": [
+          "ironboots",
+          "[ironboots],longshot"
+        ],
         "item_count": 1
       },
       {
         "name": "Compass Chest",
+        "access_rules": [
+          "ironboots",
+          "[ironboots],longshot,ocarina,lullaby"
+        ],
         "item_count": 1
       },
       {
         "name": "Torch Chest",
         "access_rules": [
-          "ocarina,lullaby,bow",
-          "ocarina,lullaby,dinsfire,magic"
+          "ironboots,ocarina,lullaby,bow",
+          "ironboots,ocarina,lullaby,dinsfire,magic",
+          "[ironboots],longshot,ocarina,lullaby,bow",
+          "[ironboots],longshot,ocarina,lullaby,dinsfire,magic"
         ],
         "item_count": 1
       },
       {
         "name": "Dragon Chest",
         "access_rules": [
-          "ocarina,lullaby,lift1",
-          "ocarina,time,bow"
+          "ironboots,ocarina,lullaby,lift1",
+          "ironboots,ocarina,time,bow"
         ],
         "item_count": 1
       },
       {
         "name": "Basement",
         "access_rules": [
-          "ocarina,lullaby,[bluetunic]"
+          "ironboots,ocarina,lullaby,[bluetunic]"
         ],
         "item_count": 1
       },
       {
         "name": "Cracked Wall",
         "access_rules": [
-          "ocarina,lullaby,$has_explosives",
-          "bombchu,[ocarina],[lullaby],[bombs]"
+          "$has_explosives,ironboots,ocarina,lullaby",
+          "$has_explosives,[ironboots],longshot,ocarina,lullaby",
+          "bombchu,[bombs],ironboots,[ocarina],[lullaby]"
         ],
         "item_count": 1
       },
       {
         "name": "Center Eye Switch",
         "access_rules": [
-          "ocarina,lullaby,bow,lift1,hoverboots",
-          "ocarina,lullaby,bow,lift1,longshot"
+          "ironboots,ocarina,lullaby,bow,lift1,hoverboots",
+          "ironboots,ocarina,lullaby,bow,lift1,longshot",
+          "[ironboots],longshot,ocarina,lullaby,bow,lift1,hoverboots",
+          "[ironboots],longshot,ocarina,lullaby,bow,lift1,longshot"
         ],
         "item_count": 1
       },
@@ -905,11 +920,15 @@
       {
         "name": "Boss Key Chest",
         "access_rules": [
-          "longshot,hoverboots",
-          "longshot,$has_explosives,lift1",
-          "hoverboots,[longshot]",
-          "longshot,[hoverboots]",
-          "longshot,[$has_explosives],[lift1]",
+          "ironboots,longshot,hoverboots",
+          "ironboots,longshot,$has_explosives,lift1",
+          "ironboots,longshot,[hoverboots]",
+          "ironboots,longshot,[$has_explosives],[lift1]",
+          "ironboots,hoverboots,[longshot]",
+          "[ironboots],longshot,ocarina,lullaby,hoverboots",
+          "[ironboots],longshot,ocarina,lullaby,$has_explosives,lift1",
+          "[ironboots],longshot,ocarina,lullaby,[hoverboots]",
+          "[ironboots],longshot,ocarina,lulla0by,[$has_explosives],[lift1]",
           "{agony}"
         ],
         "capture_item": true,
@@ -946,7 +965,8 @@
             "name": "GS73 - Bottom South, Hit Switch Spin Attack",
             "short_name": "Bottom South",
             "access_rules": [
-              "$has_explosives,ocarina,lullaby"
+              "$has_explosives,ocarina,lullaby,ironboots",
+              "$has_explosives,ocarina,lullaby,[ironboots],longshot"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -956,7 +976,7 @@
             "name": "GS74 - River After Dark Link",
             "short_name": "River",
             "access_rules": [
-              "@Water Temple/Dark Link,ocarina,time"
+              "ocarina,time"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -966,8 +986,8 @@
             "name": "GS75 - Center Pillar Inside",
             "short_name": "Center Pillar",
             "access_rules": [
-              "longshot,ocarina,lullaby",
-              "faroreswind,magic,ocarina,lullaby"
+              "[ironboots],ocarina,lullaby,longshot",
+              "ironboots,ocarina,lullaby,faroreswind,magic"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -977,8 +997,7 @@
             "name": "GS76 - Platform Room Before Dark Link",
             "short_name": "Platform Room",
             "access_rules": [
-              "longshot",
-              "hookshot,[longshot]"
+              "longshot"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -988,8 +1007,9 @@
             "name": "GS77 - Bottom Rolling Rocks Room",
             "short_name": "Rolling Rocks",
             "access_rules": [
-              "longshot,$has_explosives,lift1",
-              "longshot,hoverboots"
+              "ironboots,longshot",
+              "[ironboots],longshot,ocarina,lullaby",
+              "ironboots,[longshot],hoverboots"
             ],
             "chest_unopened_img": "images/skulltula.png",
             "chest_opened_img": "images/skulltula_token.png",
@@ -1705,6 +1725,7 @@
             "short_name": "Hidden Room",
             "chest_unopened_img": "images/deku_scrub.png",
             "chest_opened_img": "images/deku_scrub_grey.png",
+            "clear_as_group": false,
             "item_count": 4
           }
         ],

diff --git a/ootrando_overworldmap_hamsda/locations/mq.json b/ootrando_overworldmap_hamsda/locations/mq.json
@@ -363,6 +363,7 @@
             ],
             "chest_unopened_img": "images/deku_scrub.png",
             "chest_opened_img": "images/deku_scrub_grey.png",
+            "clear_as_group": false,
             "item_count": 2
           },
           {
@@ -953,7 +954,7 @@
     "parent": "Lake Hylia A",
     "access_rules": [
       "water_mq,ironboots,hookshot,$has_zora_tunic",
-      "water_mq,scale2,hookshot,$has_zora_tunic"
+      "water_mq,scale2,[ironboots],hookshot,$has_zora_tunic"
     ],
     "sections": [
       {
@@ -1877,6 +1878,7 @@
             ],
             "chest_unopened_img": "images/deku_scrub.png",
             "chest_opened_img": "images/deku_scrub_grey.png",
+            "clear_as_group": false,
             "item_count": 5
           }
         ],