Merge pull request #2146 from kjbranch/g-e-cac

East Cac Alley, G-Mode: Second Pass

Author: osse101

region/maridia/inner-pink/East Cactus Alley.json

@@ -361,6 +361,38 @@
       "flashSuitChecked": true,
       "note": "Hug the right wall after killing the first Cacatac in order to avoid its invisible, stationary projectiles."
     },
+    {
+      "link": [2, 1],
+      "name": "G-Mode Morph, Spring Ball Gravity Jump",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "canGravityJump",
+        "h_artificialMorphSpringFling",
+        {"or": [
+          "HiJump",
+          {"and": [
+            "h_artificialMorphJumpIntoIBJ",
+            "canInsaneJump"
+          ]},
+          {"and": [
+            "h_artificialMorphJumpIntoIBJ",
+            {"spikeHits": 1}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Pause and just before the pause fully triggers, jump and press left, and then disable Gravity and Spring Ball.",
+        "With HiJump and a good jump, it is possible to jump straight to the high ledge, but quickly pausing and turning on Spring Ball and jumping again can help as a backup.",
+        "Without HiJump, use this jump to start an IBJ directly over the spike pit, then boost horizontally to the left ledge.",
+        "Jump over the Cacatac and the spike pits with suitless Spring Flings. The final jump can be done the same way as the first, if Samus is not able to wall jump."
+      ]
+    },
     {
       "id": 8,
       "link": [2, 1],
@@ -383,6 +415,33 @@
       "flashSuitChecked": true,
       "note": "This requires multiple HBJ to get over spike pits. The first one, by the right door, must be started at the top of an IBJ."
     },
+    {
+      "link": [2, 1],
+      "name": "G-Mode Morph, Very Precise Gravity Jump Spring Ball Jump",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "canGravityJump",
+        "h_artificialMorphSpringFling",
+        "canTrickyGMode",
+        {"or": [
+          "h_artificialMorphBombThings",
+          {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Pause and on the last frame before the pause triggers, press left and jump, and then disable Gravity and Spring Ball.",
+        "On the first possible frame, repause and equip Spring Ball again then buffer the second jump out of the pause. Both of these actions are frame perfect.",
+        "If the first jump was done correctly, Samus will move upwards with very little horizontal movement until breaking the water, after which she will swing rapidly to the left.",
+        "Jump over the Cacatac and the spike pits with suitless Spring Flings. The final jump can be done the same way as the first, if Samus is not able to wall jump.",
+        "This one is more lenient, and has a 4-frame window for the second jump, if the first is performed frame-perfectly."
+      ]
+    },
     {
       "id": 9,
       "link": [2, 1],
@@ -1314,6 +1373,18 @@
         ]}
       ]
     },
+    {
+      "link": [5, 4],
+      "name": "Gravity Jump",
+      "requires": [
+        "canGravityJump",
+        "canTrickyJump"
+      ],
+      "note": [
+        "Kill the Cacatac above by standing near the edge, jumping, and shooting just before hitting the ceiling.",
+        "While near the edge, perform a Gravity jump out of the water. A running jump makes this significantly harder."
+      ]
+    },
     {
       "id": 48,
       "link": [5, 4],