replace canStaggeredWalljump and canDelayedWalljump with canTrickyWalljump

blkerby · blkerby · commit c38cd838ad00 · 2025-07-25T21:29:18.000-06:00
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}
               ]}
             ]}
@@ -2624,7 +2624,7 @@
         {"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/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
@@ -1028,7 +1028,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
@@ -1882,7 +1882,7 @@
           {"and": [
             "HiJump",
             {"or": [
-              "canDelayedWalljump",
+              "canTrickyWalljump",
               "canSpringBallJumpMidAir",
               "SpeedBooster"
             ]}
@@ -1922,7 +1922,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"
@@ -710,7 +710,7 @@
         "canConsecutiveWalljump",
         {"or": [
           "ScrewAttack",
-          "canStaggeredWalljump",
+          "canTrickyWalljump",
           "canWalljumpWithCharge",
           {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}}
         ]}
@@ -734,7 +734,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
@@ -707,7 +707,7 @@
           "canTrivialUseFrozenEnemies",
           {"and": [
             "canPreciseWalljump",
-            "canStaggeredWalljump"
+            "canTrickyWalljump"
           ]}
         ]}
       ],
@@ -991,7 +991,7 @@
       "name": "Staggered Wall Climb",
       "requires": [
         "canPreciseWalljump",
-        "canStaggeredWalljump"
+        "canTrickyWalljump"
       ]
     },
     {
@@ -1190,7 +1190,7 @@
           "canTrivialUseFrozenEnemies",
           {"and": [
             "canPreciseWalljump",
-            "canStaggeredWalljump"
+            "canTrickyWalljump"
           ]}
         ]}
       ],
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": [
@@ -892,7 +892,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
@@ -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
@@ -495,7 +495,7 @@
             {"gravitylessLavaFrames": 125}
           ]},
           {"and": [
-            "canStaggeredWalljump",
+            "canTrickyWalljump",
             {"lavaFrames": 20},
             {"gravitylessLavaFrames": 230}
           ]}
@@ -882,7 +882,7 @@
         "canSuitlessLavaDive",
         "canUseEnemies",
         "canPreciseWalljump",
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         {"heatFrames": 270},
         {"gravitylessLavaFrames": 240}
       ],
@@ -943,7 +943,7 @@
         "canInsaneWalljump",
         "canInsaneJump",
         "canUseIFrames",
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "canFastWalljumpClimb",
         "canUseEnemies",
         "canKago",
@@ -1133,7 +1133,7 @@
       "requires": [
         "canSuitlessLavaDive",
         "canGravityJump",
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         {"heatFrames": 290},
         {"gravitylessLavaFrames": 230},
         {"lavaFrames": 20}
@@ -1173,7 +1173,7 @@
         {"notable": "HiJumpless Dive"},
         "canSuitlessLavaDive",
         "canUseIFrames",
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "canFastWalljumpClimb",
         "canUseEnemies",
         "canCameraManip",
diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json
@@ -577,7 +577,7 @@
         {"or": [
           "h_useSpringBall",
           {"and": [
-            "canStaggeredWalljump",
+            "canTrickyWalljump",
             {"heatFrames": 100}
           ]},
           {"and": [
diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json
@@ -1086,7 +1086,7 @@
       "requires": [
         {"or": [
           {"and": [
-            "canDelayedWalljump",
+            "canTrickyWalljump",
             {"acidFrames": 20}
           ]},
           {"and": [
diff --git a/tech.json b/tech.json
@@ -1168,18 +1168,22 @@
               "extensionTechs": [
                 {
                   "id": 78,
-                  "name": "canDelayedWalljump",
+                  "name": "canTrickyWalljump",
                   "techRequires": [
                     "canPreciseWalljump"
                   ],
                   "otherRequires": [],
-                  "note": "A precise wall jump that needs to done as late as possible by moving away from the wall in order for Samus to start the jump as far from the wall as possible.",
+                  "note": [
+                    "A wall jump that is tricky to perform.",
+                    "This includes 'delayed wall jumps' in which Samus must move away as far from the wall as possible before wall jumping;",
+                    "it also includes cases in which Samus must dodge enemies or other obstacles while wall jumping."
+                  ],
                   "extensionTechs": [
                     {
                       "id": 79,
                       "name": "canInsaneWalljump",
                       "techRequires": [
-                        "canDelayedWalljump"
+                        "canTrickyWalljump"
                       ],
                       "otherRequires": [],
                       "note": "A wall jump with extreme precision, in the vicinity of pixel and frame perfect precision. These jumps are typically delayed wall jumps."
@@ -1206,16 +1210,6 @@
                   "otherRequires": [],
                   "note": "Climbing a wall with consecutive wall jumps very quickly, e.g. for setting up a full halfie."
                 },
-                {
-                  "id": 82,
-                  "name": "canStaggeredWalljump",
-                  "techRequires": [
-                    "canConsecutiveWalljump"
-                  ],
-                  "otherRequires": [],
-                  "note": "Controlling wall jump height and positioning to dodge enemies or to wait for something.",
-                  "devNote": "FIXME This could be used to also set up a wall jump that needs a precise starting location."
-                },
                 {
                   "id": 83,
                   "name": "canUnderwaterWalljump",
