Merge pull request #2167 from blkerby/tricky-wall-jump

osse101 · web-flow · commit e1c2f0933b65 · 2025-07-26T08:23:48.000-05:00
Wall jump tech adjustments
diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json
@@ -3228,7 +3228,7 @@
       "name": "Zeb Ice Clip",
       "requires": [
         {"notable": "Zeb Ice Clip"},
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "canCameraManip",
         {"or": [
           "Wave",
@@ -3253,7 +3253,7 @@
       "name": "Blind Zeb Ice Clip (Preserve Flash Suit)",
       "requires": [
         {"notable": "Blind Zeb Ice Clip (Preserve Flash Suit)"},
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "canCameraManip",
         "canOffScreenMovement",
         {"or": [
@@ -3281,7 +3281,7 @@
         {"notable": "Zeb Ice Clip"},
         "canSpecialBeamAttack",
         {"ammo": {"type": "PowerBomb", "count": 1}},
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "h_preciseIceClip",
         {"disableEquipment": "Ice"}
       ],
diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json
@@ -370,7 +370,7 @@
                 {"cycleFrames": 1080}
               ]},
               {"and": [
-                "canStaggeredWalljump",
+                "canTrickyWalljump",
                 {"cycleFrames": 1770}
               ]}
             ]}
@@ -2623,8 +2623,7 @@
       "requires": [
         {"notable": "Hero Shot"},
         "canHeroShot",
-        "canPreciseWalljump",
-        "canStaggeredWalljump"
+        "canTrickyWalljump"
       ],
       "note": "Wall jump between the Rippers. Either shoot the block, fall, and quickly climb again, or shoot from the bottom and follow Samus's shot up the tower."
     },
diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json
@@ -489,7 +489,7 @@
             "HiJump",
             "canSpringBallJumpMidAir"
           ]},
-          "canDelayedWalljump",
+          "canTrickyWalljump",
           {"and": [
             "SpeedBooster",
             "HiJump"
@@ -1631,7 +1631,7 @@
       "link": [5, 7],
       "name": "Gauntlet Walljumps",
       "requires": [
-        "canDelayedWalljump",
+        "canTrickyWalljump",
         {"or": [
           "HiJump",
           "canConsecutiveWalljump"
diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
@@ -2492,9 +2492,15 @@
       "requires": [
         "canUseEnemies",
         {"or": [
-          "canCarefulJump",
-          "canUseFrozenEnemies",
-          "canPreciseWalljump"
+          {"and": [
+            "canUseFrozenEnemies",
+            "canPreciseWalljump"  
+          ]},
+          "canTrickyWalljump",
+          {"and": [
+            "canCameraManip",
+            "canCarefulJump"
+          ]}
         ]}
       ],
       "note": [
diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json
@@ -1126,7 +1126,7 @@
         {"or": [
           {"and": [
             "canTrickyJump",
-            "canStaggeredWalljump"
+            "canTrickyWalljump"
           ]},
           {"and": [
             "canCarefulJump",
diff --git a/region/crateria/west/Gauntlet Entrance.json b/region/crateria/west/Gauntlet Entrance.json
@@ -491,7 +491,7 @@
         "canChainTemporaryBlue",
         {"acidFrames": 10},
         {"or": [
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           {"acidFrames": 30}
         ]}
       ],
diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json
@@ -1071,7 +1071,7 @@
       "link": [5, 7],
       "name": "Walljump Damage Boost",
       "requires": [
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "canCarefulJump",
         "canHorizontalDamageBoost",
         {"enemyDamage": {"enemy": "Fireflea", "type": "contact", "hits": 1}}
diff --git a/region/lowernorfair/east/The Worst Room In The Game.json b/region/lowernorfair/east/The Worst Room In The Game.json
@@ -804,7 +804,7 @@
         "canDodgeWhileShooting",
         "Charge",
         "h_heatProof",
-        "canDelayedWalljump",
+        "canTrickyWalljump",
         {"or": [
           "ScrewAttack",
           {"and": [
@@ -1965,7 +1965,7 @@
             {"heatFrames": 200}
           ]},
           {"and": [
-            "canDelayedWalljump",
+            "canTrickyWalljump",
             "canWallJumpInstantMorph",
             "h_useMorphBombs",
             {"heatFrames": 520}
diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json
@@ -1031,7 +1031,7 @@
       "requires": [
         "h_navigateHeatRooms",
         "Morph",
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         {"heatFrames": 660}
       ],
       "note": "Walljump in place while the acid goes away."
diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json
@@ -1883,7 +1883,7 @@
           {"and": [
             "HiJump",
             {"or": [
-              "canDelayedWalljump",
+              "canTrickyWalljump",
               "canSpringBallJumpMidAir",
               "SpeedBooster"
             ]}
@@ -1928,7 +1928,7 @@
           {"and": [
             "HiJump",
             {"or": [
-              "canDelayedWalljump",
+              "canTrickyWalljump",
               "canSpringBallJumpMidAir",
               "SpeedBooster"
             ]}
diff --git a/region/maridia/inner-green/Pants Room.json b/region/maridia/inner-green/Pants Room.json
@@ -465,7 +465,7 @@
             "canConsecutiveWalljump",
             {"or": [
               "ScrewAttack",
-              "canStaggeredWalljump"
+              "canTrickyWalljump"
             ]}
           ]},
           "h_pauseAbuseMinimalReserveRefill",
@@ -711,7 +711,7 @@
         "canConsecutiveWalljump",
         {"or": [
           "ScrewAttack",
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           "canWalljumpWithCharge",
           {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}}
         ]}
@@ -735,7 +735,7 @@
         {"or": [
           {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}},
           "ScrewAttack",
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           "canPseudoScrew",
           "h_pauseAbuseMinimalReserveRefill"
         ]}
diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json
@@ -1265,7 +1265,7 @@
         ]},
         {"or": [
           "canConsecutiveWalljump",
-          "canDelayedWalljump"
+          "canTrickyWalljump"
         ]}
       ]
     },
diff --git a/region/maridia/inner-pink/The Precious Room.json b/region/maridia/inner-pink/The Precious Room.json
@@ -200,7 +200,7 @@
       "name": "Delayed Wall Jump",
       "requires": [
         "Gravity",
-        "canDelayedWalljump"
+        "canTrickyWalljump"
       ]
     },
     {
diff --git a/region/maridia/inner-yellow/Maridia Elevator Room.json b/region/maridia/inner-yellow/Maridia Elevator Room.json
@@ -705,10 +705,7 @@
       "requires": [
         {"or": [
           "canTrivialUseFrozenEnemies",
-          {"and": [
-            "canPreciseWalljump",
-            "canStaggeredWalljump"
-          ]}
+          "canTrickyWalljump"
         ]}
       ],
       "flashSuitChecked": true
@@ -990,8 +987,11 @@
       "link": [2, 3],
       "name": "Staggered Wall Climb",
       "requires": [
-        "canPreciseWalljump",
-        "canStaggeredWalljump"
+        "canTrickyWalljump",
+        {"or": [
+          "canTrickyJump",
+          {"enemyDamage": {"enemy": "Ripper", "type": "contact", "hits": 2}}
+        ]}
       ]
     },
     {
@@ -1188,10 +1188,7 @@
       "requires": [
         {"or": [
           "canTrivialUseFrozenEnemies",
-          {"and": [
-            "canPreciseWalljump",
-            "canStaggeredWalljump"
-          ]}
+          "canTrickyWalljump"
         ]}
       ],
       "flashSuitChecked": true
diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json
@@ -1435,15 +1435,25 @@
         "h_crouchJumpDownGrab",
         "canTrickyJump"
       ],
-      "note": "Crouch jump + down grab only works as a way out of the water on the right side."
+      "note": [
+        "Crouch jump just before the water reaches its maximum.",
+        "Wait until Samus reaches the peak of the jump;",
+        "then in quick succession press down and then forward (or diagonal down-forward).",
+        "This only works as a way out of the water on the right side."
+      ],
+      "detailNote": [
+        "The problem with pressing down pre-maturely is that it shrinks Samus' hitbox vertically,",
+        "causing Samus to escape the water, which results in a shortened jump height",
+        "because of the larger vertical acceleration that applies when Samus is in air physics."
+      ]
     },
     {
       "id": 63,
       "link": [4, 1],
       "name": "Wall Jump Escape",
       "requires": [
         "canSuitlessMaridia",
-        "canPreciseWalljump"
+        "canTrickyWalljump"
       ],
       "note": "Perform a precise wall jump as the water is lowering.  Climbing up the right side of the room is slightly easier."
     },
diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json
@@ -4728,7 +4728,7 @@
       "requires": [
         "Gravity",
         {"or": [
-          "canDelayedWalljump",
+          "canTrickyWalljump",
           {"and": [
             "HiJump",
             "canPreciseWalljump"
diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json
@@ -272,7 +272,7 @@
           ]},
           {"and": [
             "Gravity",
-            "canStaggeredWalljump",
+            "canTrickyWalljump",
             "canInsaneJump"
           ]},
           {"and": [
@@ -893,7 +893,7 @@
           ]},
           {"and": [
             "Gravity",
-            "canStaggeredWalljump"
+            "canTrickyWalljump"
           ]}
         ]}
       ],
diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
@@ -616,7 +616,7 @@
         "canCarefulJump",
         {"or": [
           "canCameraManip",
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           {"and": [
             "canNeutralDamageBoost",
             {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}}
@@ -1608,7 +1608,7 @@
         "canConsecutiveWalljump",
         "canPreciseWalljump",
         {"or": [
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           "ScrewAttack",
           "canWalljumpWithCharge",
           {"and": [
@@ -1632,7 +1632,7 @@
         "canCarefulJump",
         "canConsecutiveWalljump",
         {"or": [
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           "ScrewAttack",
           "canWalljumpWithCharge",
           {"and": [
@@ -1656,7 +1656,7 @@
         "canCarefulJump",
         "canConsecutiveWalljump",
         {"or": [
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           "ScrewAttack",
           "canWalljumpWithCharge",
           {"and": [
@@ -4126,7 +4126,7 @@
       "name": "Right Side Delayed Walljumps",
       "requires": [
         {"notable": "Right Side Delayed Walljumps"},
-        "canDelayedWalljump",
+        "canTrickyWalljump",
         "canConsecutiveWalljump"
       ],
       "note": "A tricky, delayed walljump makes it possible to climb to top right in-room, with nothing."
diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json
@@ -560,7 +560,7 @@
         {"or": [
           {"heatFrames": 560},
           {"and": [
-            "canCarefulJump",
+            "canTrickyWalljump",
             {"heatFrames": 360}
           ]},
           {"and": [
@@ -613,7 +613,7 @@
       "link": [2, 1],
       "name": "Delayed Walljump",
       "requires": [
-        "canDelayedWalljump",
+        "canTrickyWalljump",
         "canConsecutiveWalljump",
         "canTrickyJump",
         "canUseEnemies",
diff --git a/region/norfair/east/Lava Dive Room.json b/region/norfair/east/Lava Dive Room.json
diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json
diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json
diff --git a/tech.json b/tech.json
