crab shaft, draygon, east cac

kjbranch · Sep 16, 2024 · d94caa5 · d94caa5
1 parent 501d78d
commit d94caa5
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/region/maridia/inner-pink/Crab Shaft.json b/region/maridia/inner-pink/Crab Shaft.json
@@ -631,12 +631,6 @@
           "HiJump",
           "canSpringBallJumpMidAir"
         ]}
-      ],
-      "note": [
-        "Position Samus to where her shot can partially go through the right tile of the tunnel above.",
-        "From a crouch jump, perform a tight midair morph, unmorph, and shoot up while at the peak of the jump.",
-        "After hearing the shot block above break, move a half tile left of the opening above and diagonally spark at the top of a jump.",
-        "This is slightly more lenient with Spazer and much more lenient with Plasma."
       ]
     },
     {

diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json
@@ -940,6 +940,20 @@
         }
       ],
       "note": "Charge a shinespark in the bottom of Draygon's room, then Gravity jump up in order to shinespark out of the right door."
+    },
+    {
+      "link": [3, 2],
+      "name": "Use Flash Suit",
+      "requires": [
+        {"useFlashSuit": {}},
+        {"or": [
+          {"shinespark": {"frames": 22, "excessFrames": 5}},
+          {"and": [
+            "HiJump",
+            {"shinespark": {"frames": 19, "excessFrames": 5}}
+          ]}
+        ]}
+      ]
     }
   ],
   "nextStratId": 44,

diff --git a/region/maridia/inner-pink/East Cactus Alley Room.json b/region/maridia/inner-pink/East Cactus Alley Room.json
@@ -593,6 +593,19 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 4],
+      "name": "Speedy HiJump",
+      "requires": [
+        "Gravity",
+        "HiJump",
+        "canTrickyDashJump"
+      ],
+      "note": [
+        "The in-room runway with the door closed works but is somewhat precise.",
+        "With the door open the jump is easier, but only use a small portion of the runway that was occupied by the door."
+      ]
+    },
     {
       "id": 25,
       "link": [2, 4],
@@ -795,6 +808,14 @@
       ],
       "devNote": "Two spike hits for leniency."
     },
+    {
+      "link": [2, 4],
+      "name": "Use Flash Suit",
+      "requires": [
+        {"useFlashSuit": {}},
+        {"shinespark": {"frames": 18, "excessFrames": 7}}
+      ]
+    },
     {
       "id": 35,
       "link": [3, 1],
@@ -1040,6 +1061,14 @@
       ],
       "note": "It is recommended to do this on the left wall to the right of the two lower Cacatacs, so that Samus can avoid the spikes on a fail."
     },
+    {
+      "link": [5, 4],
+      "name": "Use Flash Suit",
+      "requires": [
+        {"useFlashSuit": {}},
+        {"shinespark": {"frames": 20, "excessFrames": 12}}
+      ]
+    },
     {
       "id": 52,
       "link": [5, 6],
@@ -1161,6 +1190,15 @@
         "because canSpringBallJumpMidAir requires canDisableEquipment."
       ]
     },
+    {
+      "link": [5, 6],
+      "name": "Use Flash Suit",
+      "requires": [
+        {"useFlashSuit": {}},
+        {"shinespark": {"frames": 10, "excessFrames": 7}}
+      ],
+      "note": "It's possible to hit the block on the right while facing left to save some Energy, but that's not expected here."
+    },
     {
       "id": 57,
       "link": [6, 3],