Merge pull request #2147 from blkerby/crumble-shaft-wj

Refine Crumble Shaft

Author: osse101

region/norfair/west/Crumble Shaft.json

@@ -207,7 +207,29 @@
       "link": [1, 2],
       "name": "Base",
       "requires": [
-        {"heatFrames": 200}
+        {"simpleHeatFrames": 120},
+        {"heatFrames": 75}
+      ],
+      "note": [
+        "Falling down the right side of the room is safe."
+      ]
+    },
+    {
+      "link": [1, 2],
+      "name": "Moonfall",
+      "requires": [
+        "canMoonfall",
+        "canTrickyJump",
+        {"simpleHeatFrames": 100},
+        {"heatFrames": 60}
+      ],
+      "note": [
+        "Move forward far enough to trigger the crumble block, then quickly moonfall before it respawns.",
+        "It can help to perform the moonfall facing left (backing up to the right),",
+        "then quickly turn back left to clear the platform.",
+        "Press against the wall, aim down, and shoot open the door while falling.",
+        "It is possible to delay the moonfall enough to land on the doorframe,",
+        "by turning around back and forth once mid-air."
       ]
     },
     {
@@ -388,27 +410,33 @@
       ],
       "note": "Shoot the shot block, then Spring Ball on the middle platform."
     },
-    {
-      "id": 11,
-      "link": [2, 1],
-      "name": "HiJump Climb",
-      "requires": [
-        "HiJump",
-        "canConsecutiveWalljump",
-        {"heatFrames": 500}
-      ],
-      "note": "Walljump up the right, then setup a walljump on the top-right crumble platform directly from the right wall."
-    },
     {
       "id": 12,
       "link": [2, 1],
-      "name": "HiJumpless Climb",
+      "name": "Wall Jump Climb",
       "requires": [
         "canPreciseWalljump",
         "canConsecutiveWalljump",
-        {"heatFrames": 500}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 270}
+          ]},
+          {"heatFrames": 340}
+        ]},
+        {"or": [
+          "canDodgeWhileShooting",
+          {"heatFrames": 300}
+        ]},
+        {"or": [
+          "canTrickyJump",
+          {"heatFrames": 300}
+        ]}
       ],
-      "note": "Walljump up the right, then walljump off the top-middle crumble platform then off the top-right one."
+      "note": [
+        "Enter with a spin jump, and wall jump up the right side;",
+        "at the end, walljump off the top-middle crumble platform then off the top-right one."
+      ]
     },
     {
       "id": 13,
@@ -417,29 +445,30 @@
       "requires": [
         "canCrumbleJump",
         "canTrickyJump",
-        {"heatFrames": 800}
-      ],
-      "note": "Do 9 successive crumble jumps up the platforms.",
-      "devNote": "This is only really useful without wall jumps."
-    },
-    {
-      "id": 14,
-      "link": [2, 1],
-      "name": "Wall Jump Climb Crumble Jump",
-      "requires": [
-        "canCrumbleJump",
-        "canConsecutiveWalljump",
-        {"heatFrames": 600}
+        "canTrickyDodgeEnemies",
+        {"or": [
+          {"and": [
+            "HiJump",
+            "canInsaneJump",
+            {"heatFrames": 370}
+          ]},
+          {"heatFrames": 630}
+        ]}
       ],
-      "note": "Walljump up the right then do one crumble jump on the top middle platform."
+      "wallJumpAvoid": true,
+      "note": [
+        "Do 9 successive crumble jumps up the platforms.",
+        "If Hi-Jump is available, then it is possible to skip 4 of the crumble platforms, using only the center platforms,",
+        "in which case it is recommended to down-grab the 3rd center platform, though doing a crumble spin jump onto it is also an option."
+      ]
     },
     {
       "id": 15,
       "link": [2, 1],
       "name": "Spring Ball",
       "requires": [
         "h_useSpringBall",
-        {"heatFrames": 800}
+        {"heatFrames": 720}
       ],
       "note": "Hold jump to easily do 9 successive spring ball bounces up the platforms."
     },
@@ -450,19 +479,35 @@
       "requires": [
         "SpaceJump",
         "canConsecutiveWalljump",
-        {"heatFrames": 500}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 270}
+          ]},
+          {"heatFrames": 340}
+        ]},
+        {"or": [
+          "canDodgeWhileShooting",
+          {"heatFrames": 300}
+        ]}
       ],
-      "note": "Walljump up the right, then use SpaceJump at the top."
+      "note": "Wall jump up the right, then use Space Jump at the top."
     },
     {
       "id": 17,
       "link": [2, 1],
       "name": "Space Jump",
       "requires": [
         "SpaceJump",
-        {"heatFrames": 1000}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 450}
+          ]},
+          {"heatFrames": 720}
+        ]}
       ],
-      "note": "Use SpaceJump to get to the top."
+      "note": "Use Space Jump to get to the top."
     },
     {
       "id": 18,
@@ -485,25 +530,15 @@
       "name": "Heatproof IBJ",
       "requires": [
         "h_heatProof",
-        "canLongIBJ"
+        "canLongIBJ",
+        "canBePatient"
       ],
       "note": [
         "Kill the Sova on the bottom-right platform, then IBJ right next to the left of the platform.",
         "Samus can align with the left side of the platform by jumping into it.",
         "Place bombs to kill the second Sova. Drop to the bottom and restart if necessary."
       ]
     },
-    {
-      "id": 20,
-      "link": [2, 1],
-      "name": "WallJump and SpringBall",
-      "requires": [
-        "h_useSpringBall",
-        "canConsecutiveWalljump",
-        {"heatFrames": 500}
-      ],
-      "note": "Walljump up the right then SpringBall bounce on top of the highest Crumble Block platform to reach the door."
-    },
     {
       "id": 21,
       "link": [2, 1],
@@ -512,23 +547,24 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 60},
+        {"shineChargeFrames": 35},
         {"shinespark": {"frames": 59}},
-        {"heatFrames": 250}
+        {"heatFrames": 220}
       ],
       "flashSuitChecked": true,
       "note": "It has to be setup really close to the left side of the right platforms, otherwise it also requires a crumble jump at the top."
     },
     {
-      "id": 22,
       "link": [2, 1],
-      "name": "Frozen Sova Climb",
+      "name": "Frozen Sova Hi-Jump Climb",
       "requires": [
+        "HiJump",
         "canTrickyUseFrozenEnemies",
-        "canConsecutiveWalljump",
-        {"heatFrames": 800}
+        {"heatFrames": 630}
       ],
-      "note": "Climb up the left, freeze the top-left Sova, and use it as a platform to reach the door."
+      "note": [
+        "Use the Sovas as platforms to climb the room."
+      ]
     },
     {
       "id": 23,
@@ -543,8 +579,7 @@
         "canBePatient"
       ],
       "flashSuitChecked": true,
-      "note": "Climb up 3 screens.",
-      "devNote": "Heat frames split into the actual climb and the setup in the adjacent room."
+      "note": "Climb up 3 screens."
     },
     {
       "id": 24,
@@ -818,7 +853,32 @@
       "name": "Base",
       "requires": [
         "canConsecutiveWalljump",
-        {"heatFrames": 550}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 320}
+          ]},
+          {"heatFrames": 395}
+        ]},
+        {"or": [
+          {"and": [
+            "canPreciseWalljump",
+            "canTrickyJump"
+          ]},
+          {"and": [
+            "canStaggeredWalljump",
+            {"heatFrames": 50}
+          ]},
+          {"heatFrames": 300}
+        ]},
+        {"or": [
+          "canDodgeWhileShooting",
+          {"heatFrames": 300}
+        ]}
+      ],
+      "note": [
+        "If entering from the bottom door, a Sova will be in the way in the top left:",
+        "either wall jump in place while waiting for it, or wall jump around it using two crumble platforms to the right."
       ]
     },
     {
@@ -838,7 +898,8 @@
       "name": "Heatproof IBJ",
       "requires": [
         "h_heatProof",
-        "canLongIBJ"
+        "canLongIBJ",
+        "canBePatient"
       ],
       "note": "IBJ against the left-most wall. Place bombs to kill the Sova. Drop to the bottom and restart if necessary."
     },
@@ -852,7 +913,7 @@
       "requires": [
         {"shineChargeFrames": 30},
         {"shinespark": {"frames": 59}},
-        {"heatFrames": 250}
+        {"heatFrames": 180}
       ],
       "flashSuitChecked": true,
       "note": "It is easiest to do a diagonal shinespark up the left wall, then hold left, angle down, and spam shoot to easily grab the item."
@@ -903,7 +964,7 @@
       "link": [3, 2],
       "name": "Base",
       "requires": [
-        {"heatFrames": 250}
+        {"heatFrames": 205}
       ]
     }
   ],