Add Yapping Maw obstacles in Yoink Room

Author: blkerby

region/maridia/inner-yellow/Yoink Room.json

@@ -69,6 +69,18 @@
       ]
     }
   ],
+  "obstacles": [
+    {
+      "id": "A",
+      "name": "Left Yapping Maw",
+      "obstacleType": "inanimate"
+    },
+    {
+      "id": "B",
+      "name": "Right Yapping Maw",
+      "obstacleType": "inanimate"
+    }
+  ],
   "enemies": [
     {
       "id": "e1",
@@ -126,7 +138,8 @@
       "to": [
         {"id": 2},
         {"id": 3},
-        {"id": 4}
+        {"id": 4},
+        {"id": 5}
       ]
     }
   ],
@@ -170,6 +183,7 @@
         "Gravity",
         {"or": [
           {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["A"]},
           "canTrickyDodgeEnemies"
         ]}
       ],
@@ -754,6 +768,8 @@
         {"or": [
           "Ice",
           {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["A"]},
+          {"obstaclesCleared": ["B"]},
           "canTrickyGMode",
           {"and": [
             "canInsaneJump",
@@ -1190,6 +1206,7 @@
         "Gravity",
         {"or": [
           {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["B"]},
           "canTrickyDodgeEnemies"
         ]}
       ],
@@ -1423,7 +1440,10 @@
       "name": "Kill Yapping Maw With Super",
       "requires": [
         "canSuitlessMaridia",
-        {"ammo": {"type": "Super", "count": 1}},
+        {"or": [
+          {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["A"]}
+        ]},
         {"or": [
           "canWalljump",
           "h_crouchJumpDownGrab",
@@ -1508,6 +1528,29 @@
         "Freeze a Yapping Maw to farm the Zoas safely."
       ]
     },
+    {
+      "link": [4, 4],
+      "name": "Kill Yapping Maw With Super",
+      "requires": [
+        {"obstaclesNotCleared": ["A"]},
+        "canSuitlessMaridia",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "clearsObstacles": ["A"]
+    },
+    {
+      "link": [4, 4],
+      "name": "Zoa Farm (Yapping Maw Killed)",
+      "requires": [
+        {"obstaclesCleared": ["A"]},
+        {"simpleCycleFrames": 200},
+        {"cycleFrames": 40}
+      ],
+      "farmCycleDrops": [{"enemy": "Zoa", "count": 1}],
+      "note": [
+        "With the Yapping Maw killed, the Zoas can be farmed safely."
+      ]
+    },
     {
       "id": 46,
       "link": [4, 5],
@@ -1552,8 +1595,12 @@
       "requires": [
         "canSuitlessMaridia",
         "canPlayInSand",
-        {"ammo": {"type": "Super", "count": 1}}
+        {"or": [
+          {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["A"]}
+        ]}
       ],
+      "clearsObstacles": ["A"],
       "devNote": "One Super to cross the room, a second is likely used before getting up to the door."
     },
     {
@@ -1625,7 +1672,10 @@
       "name": "Kill Yapping Maw With Super",
       "requires": [
         "canSuitlessMaridia",
-        {"ammo": {"type": "Super", "count": 1}},
+        {"or": [
+          {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["B"]}
+        ]},
         {"or": [
           "canWalljump",
           "h_crouchJumpDownGrab",
@@ -1692,8 +1742,12 @@
       "requires": [
         "canSuitlessMaridia",
         "canPlayInSand",
-        {"ammo": {"type": "Super", "count": 1}}
+        {"or": [
+          {"ammo": {"type": "Super", "count": 1}},
+          {"obstaclesCleared": ["B"]}
+        ]}
       ],
+      "clearsObstacles": ["B"],
       "devNote": "One Super to cross the room, a second is likely used before getting up to the door."
     },
     {
@@ -1711,6 +1765,29 @@
         "Kill the Zoa and quickly jump across the sand.",
         "Hitting the Zoas will drop Samus deep into the sand below."
       ]
+    },
+    {
+      "link": [5, 5],
+      "name": "Kill Yapping Maw With Super",
+      "requires": [
+        {"obstaclesNotCleared": ["B"]},
+        "canSuitlessMaridia",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "clearsObstacles": ["B"]
+    },
+    {
+      "link": [5, 5],
+      "name": "Zoa Farm (Yapping Maw Killed)",
+      "requires": [
+        {"obstaclesCleared": ["B"]},
+        {"simpleCycleFrames": 200},
+        {"cycleFrames": 40}
+      ],
+      "farmCycleDrops": [{"enemy": "Zoa", "count": 1}],
+      "note": [
+        "With the Yapping Maw killed, the Zoas can be farmed safely."
+      ]
     }
   ],
   "notables": [