Merge branch 'master' into g-main-st-2

Author: kjbranch

helpers.json

@@ -1085,6 +1085,14 @@
             "SpringBall"
           ]
         },
+        {
+          "name": "h_canArtificialMorphDoubleSpringBallJump",
+          "requires": [
+            {"tech": "canDoubleSpringBallJumpMidAir"},
+            "HiJump",
+            "SpringBall"
+          ]
+        },
         {
           "name": "h_canArtificialMorphBombThings",
           "requires": [

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -2910,6 +2910,23 @@
       },
       "requires": []
     },
+    {
+      "id": 249,
+      "link": [5, 13],
+      "name": "Samus Eater Teleport",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [[12, 13], [14, 13], [15, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "requires": [
+        "Morph"
+      ],
+      "note": [
+        "Land in the last Samus Eater of Alpha Power Bomb Room, or the second Samus Eater from the right of Hellway."
+      ]
+    },
     {
       "id": 121,
       "link": [6, 2],
@@ -3477,6 +3494,21 @@
       },
       "requires": []
     },
+    {
+      "id": 250,
+      "link": [6, 13],
+      "name": "Samus Eater Teleport",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [[15, 13], [1, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "requires": [
+        "Morph"
+      ],
+      "note": ["Land in the right side of the third Samus Eater on the floor of Hellway."]
+    },
     {
       "id": 152,
       "link": [7, 2],
@@ -5058,6 +5090,6 @@
       ]
     }
   ],
-  "nextStratId": 249,
+  "nextStratId": 251,
   "nextNotableId": 5
 }

region/brinstar/pink/Big Pink.json

@@ -408,6 +408,7 @@
     {
       "from": 3,
       "to": [
+        {"id": 1},
         {"id": 3},
         {"id": 4},
         {"id": 10},
@@ -418,6 +419,7 @@
     {
       "from": 4,
       "to": [
+        {"id": 1},
         {"id": 4},
         {"id": 10},
         {"id": 13}
@@ -426,6 +428,7 @@
     {
       "from": 5,
       "to": [
+        {"id": 1},
         {"id": 4},
         {"id": 5},
         {"id": 13}
@@ -463,6 +466,7 @@
         {"id": 2},
         {"id": 4},
         {"id": 6},
+        {"id": 7},
         {"id": 8},
         {"id": 11},
         {"id": 12},
@@ -957,6 +961,26 @@
       "flashSuitChecked": true,
       "note": "Avoiding the hoppers can be tricky."
     },
+    {
+      "id": 141,
+      "link": [3, 1],
+      "name": "Samus Eater Teleport, X-Ray Climb",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [[1, 13], [2, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "requires": [
+        "canXRayClimb"
+      ],
+      "note": [
+        "Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
+        "After teleporting and passing through the transition, X-Ray climb to reach the space above, to the left of the morph tunnel and bomb block.",
+        "Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
+      ],
+      "devNote": ["Other Samus Eaters can also probably work."]
+    },
     {
       "id": 23,
       "link": [3, 3],
@@ -1038,6 +1062,27 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "id": 142,
+      "link": [4, 1],
+      "name": "Samus Eater Teleport, X-Ray Climb",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [[1, 13], [2, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "requires": [
+        "canXRayClimb",
+        "canBePatient"
+      ],
+      "note": [
+        "Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
+        "After teleporting and passing through the transition, X-Ray climb to reach the space above, to the left of the morph tunnel and bomb block.",
+        "Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
+      ],
+      "devNote": ["Other Samus Eaters can also probably work."]
+    },
     {
       "id": 136,
       "link": [4, 4],
@@ -1273,6 +1318,27 @@
         "A Power Bomb also works, but will clear B, Samus can just go 4->10->13."
       ]
     },
+    {
+      "id": 143,
+      "link": [5, 1],
+      "name": "Samus Eater Teleport, X-Ray Climb",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [[1, 13], [2, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "requires": [
+        "canXRayClimb",
+        "canBePatient"
+      ],
+      "note": [
+        "Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
+        "After teleporting and passing through the transition, X-Ray climb to reach the space above, to the left of the morph tunnel and bomb block.",
+        "Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
+      ],
+      "devNote": ["Other Samus Eaters can also probably work."]
+    },
     {
       "id": 40,
       "link": [5, 4],
@@ -1832,6 +1898,28 @@
         "Climb up 2 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door."
       ]
     },
+    {
+      "id": 144,
+      "link": [8, 7],
+      "name": "Samus Eater Teleport, X-Ray Climb",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [],
+          "ceilingPositions": [[10, 3]]
+        }
+      },
+      "requires": [
+        "canXRayClimb",
+        "canBePatient"
+      ],
+      "note": [
+        "Jump into the second Samus Eater in the ceiling of Hellway.",
+        "After teleporting and passing through the transition, X-Ray climb to reach the space above, to the right of the morph tunnel and Super block.",
+        "Samus will be off-camera, so it may be hard to tell when the climb is done;",
+        "moving left and right is a safe way to test, as it will cause the camera to scroll if Samus is at the top."
+      ],
+      "devNote": ["Other Samus Eaters can also probably work."]
+    },
     {
       "id": 72,
       "link": [8, 8],
@@ -1844,6 +1932,26 @@
         }
       }
     },
+    {
+      "id": 145,
+      "link": [8, 8],
+      "name": "G-Mode Setup - Get Hit By Reo",
+      "requires": [
+        "Morph"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "To manipulate the Reo into a suitable position, lure it to the left and crouch at the edge of the platform;",
+        "jump as needed to bring it back on camera when it goes off;",
+        "it should perform 4 big swoops down to the left, 2 small swoops (hitting the overhang above), then 5 more big swoops,",
+        "after which it will enter a slow hover moving directly towards Samus.",
+        "Then lure it down and to the right, making it pass through the morph tunnel.",
+        "Samus' vertical position must stay below that of the Reo, in order to keep the Reo in its hover state."
+      ]
+    },
     {
       "id": 73,
       "link": [8, 11],
@@ -2578,6 +2686,35 @@
         "Refreeze it below the crumble blocks, perform a very precise ledge grab onto it, then jump through the crumble block to reach the door, all while carefully avoiding losing the flash suit."
       ]
     },
+    {
+      "id": 146,
+      "link": [13, 5],
+      "name": "G-Mode Setup - Get Hit By Reo",
+      "requires": [
+        "h_canPreciseIceClip",
+        {"notable": "Reo Ice Clip Without Morph and X-Ray"}
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
+      "note": [
+        "Lure the Reo (Bee) to the left to use it as a platform for ice clipping up through the crumbles.",
+        "Watch the Reo bounce against the left wall until it does a slow hover towards Samus.",
+        "There is a very small timing of when its right claw is above the small pale spore next to the big red spore, when Samus should jump to be above the Reo.",
+        "Crouching with Samus' front toe beneath this spore (facing left) will cause the bee to fly with the correct timing after Samus takes knockback damage, with a 3 pixel window.",
+        "This will cause it to fly left and into the two tile gap below the crumble blocks.",
+        "Freeze it once to get above it, and then again for the ice clip.",
+        "After clipping up, stand hanging slightly off the edge of the door frame to continue breaking the crumble blocks,",
+        "allowing the Reo to pass up through them when it thaws.",
+        "When the Reo is about to come up, after breaking the crumbles for the final time, move slightly left to the safety of the door frame,",
+        "and crouch for a moment before pressing left to enter the door transition."
+      ],
+      "devNote": [
+        "Morph could help with this trick, but we use the morphless notable for difficulty placement."
+      ]
+    },
     {
       "id": 106,
       "link": [13, 6],
@@ -3157,6 +3294,6 @@
       ]
     }
   ],
-  "nextStratId": 141,
+  "nextStratId": 147,
   "nextNotableId": 14
 }

region/brinstar/red/Alpha Power Bomb Room.json

@@ -295,6 +295,25 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "id": 26,
+      "link": [1, 1],
+      "name": "Leave with Samus Eater Teleport",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [],
+      "exitCondition": {
+        "leaveWithSamusEaterTeleport": {
+          "floorPositions": [[12, 13], [2, 13], [8, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "bypassesDoorShell": true
+    },
     {
       "id": 10,
       "link": [1, 2],
@@ -641,6 +660,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 26,
+  "nextStratId": 27,
   "nextNotableId": 1
 }

region/brinstar/red/Beta Power Bomb Room.json

@@ -415,6 +415,41 @@
         "Other weapon combinations are possible, but not reliable due to movement being limited."
       ]
     },
+    {
+      "id": 28,
+      "link": [1, 2],
+      "name": "Samus Eater Teleport",
+      "entranceCondition": {
+        "comeInWithSamusEaterTeleport": {
+          "floorPositions": [[15, 13], [1, 13]],
+          "ceilingPositions": []
+        }
+      },
+      "requires": [
+        {"or": [
+          {"and": [
+            {"ammo": {"type": "Super", "count": 1}},
+            "h_canUseSpringBall",
+            {"thornHits": 4}
+          ]},
+          {"and": [
+            "h_canUseMorphBombs",
+            {"thornHits": 3},
+            {"samusEaterFrames": 320}
+          ]}
+        ]},
+        {"or": [
+          "canInsaneJump",
+          {"thornHits": 1}
+        ]}
+      ],
+      "note": [
+        "Land in the right side of the third Samus Eater on the floor of Hellway.",
+        "The Samus Eater teleport will result in Samus being placed below the Power Bombs blocks, below the door.",
+        "Use Spring Ball or Bombs to navigate past the thorns, Samus Eaters, and Yapping Maws.",
+        "It can be helpful to use a Super to kill the first Yapping Maw."
+      ]
+    },
     {
       "id": 19,
       "link": [2, 1],
@@ -517,6 +552,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 28,
+  "nextStratId": 29,
   "nextNotableId": 1
 }