Miscellaneous grapple teleport updates

helpers.json

@@ -1267,6 +1267,22 @@
             ]}
           ],
           "note": "There is a delay after using X-Ray before shooting, but the shot cannot be buffered, as it instantly despawns. Grapple can bypass this cooldown."
+        },
+        {
+          "name": "h_heatedGrappleTeleportWallEscape",
+          "requires": [
+            {"tech": "canGrappleTeleportWallEscape"},
+            {"or": [
+              {"and": [
+                "Morph",
+                {"heatFrames": 90}
+              ]},
+              {"and": [
+                "canXRayClimb",
+                {"heatFrames": 120}
+              ]}
+            ]}
+          ]
         }
       ]
     },

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -659,6 +659,23 @@
         "since you could just do a running jump through the door and airball."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 27,
       "link": [2, 1],

region/brinstar/blue/Construction Zone.json

@@ -866,6 +866,23 @@
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 2],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[12, 12], [12, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 2}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 34,
       "link": [3, 2],

region/brinstar/green/Brinstar Pre-Map Room.json

@@ -314,6 +314,23 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 15,
       "link": [2, 1],

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -443,6 +443,23 @@
         "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 10,
       "link": [2, 1],
@@ -1245,6 +1262,23 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 39,
       "link": [4, 1],

region/brinstar/green/Green Hill Zone.json

@@ -1262,6 +1262,23 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 51,
       "link": [3, 1],

region/brinstar/kraid/Warehouse Entrance.json

@@ -472,6 +472,23 @@
       },
       "requires": []
     },
+    {
+      "link": [3, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 22,
       "link": [3, 1],

region/brinstar/pink/Dachora Room.json

@@ -474,6 +474,23 @@
       "flashSuitChecked": true,
       "note": "Use a Power Bomb to destroy the bomb block wall."
     },
+    {
+      "link": [1, 3],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[108, 12], [108, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 3}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 18,
       "link": [1, 3],
@@ -745,6 +762,23 @@
         "A single IBJ is slow enough at the top to overload them before Samus can hit the blocks."
       ]
     },
+    {
+      "link": [2, 3],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[108, 12], [108, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 3}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 35,
       "link": [2, 3],
@@ -919,6 +953,23 @@
       },
       "requires": []
     },
+    {
+      "link": [3, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 45,
       "link": [3, 1],

region/brinstar/pink/Mission Impossible Room.json

@@ -671,6 +671,9 @@
         "Then hold right to release Grapple while standing.",
         "Samus should get pushed up onto the floor.",
         "Run to the right and reach the door, taking just one hit from a Hopper."
+      ],
+      "devNote": [
+        "This doesn't require `canGrappleTeleportWallEscape` tech, because the lower floor height makes it easier."
       ]
     },
     {

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

@@ -1961,7 +1961,7 @@
         "after just one pixel of Samus' feet are visible while crouching facing left, perform exactly 7 more X-Ray stand-ups.",
         "Use X-ray to face left, then run and jump to barely make it onto the ledge."
       ],
-      "devNote": ["3 pixels stuck in the door is X position 478 (0x1DE)."]
+      "devNote": ["3 pixels stuck in the door is X position $1DE."]
     },
     {
       "id": 65,
@@ -1987,9 +1987,9 @@
         "Use X-ray to face left, then run and jump to barely make it onto the ledge."
       ],
       "devNote": [
-        "9 pixels stuck in the door is X position 484 (0x1E4).",
-        "The correct Y positions for the jump are 193 (0xC1), 188 (0xBC), and 187 (0xBB)",
-        "FIXME: Some of the X position to the left (482, 483) could also work; maybe investigate which vertical positions work for them?"
+        "9 pixels stuck in the door is X position $1E4.",
+        "The correct Y positions for the jump are $C1, $BC, and $BB",
+        "FIXME: Some of the X position to the left ($1E2, $1E3) could also work; maybe investigate which vertical positions work for them?"
       ]
     },
     {

region/brinstar/pink/Waterway Energy Tank Room.json

@@ -470,6 +470,7 @@
         "Samus should get pushed up onto the floor."
       ],
       "devNote": [
+        "This doesn't require `canGrappleTeleportWallEscape` tech, because the lower floor height makes it easier.",
         "This strat has limited usefulness since you will be stuck behind the speed blocks.",
         "Potentially it could be useful if you could use a flash suit to get out (though this is not yet logic);",
         "for example, the item could be an Energy Tank and you could need its refill in order to spark out (rather than sparking in).",

region/brinstar/red/Red Brinstar Fireflea Room.json

@@ -599,6 +599,23 @@
       },
       "requires": []
     },
+    {
+      "link": [2, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 28,
       "link": [2, 1],