Merge pull request #1921 from osse101/RemoveSand

Remove canSandIBJ

Author: osse101

region/maridia/inner-green/Pants Room.json

@@ -545,24 +545,25 @@
         "Gravity",
         "Grapple",
         "canTrickySpringBallJump",
-        "canPlayInSand",
-        {"or": [
-          "canTrickyJump",
-          "canStationarySpinJump"
-        ]}
+        "canTrickyJump",
+        "canPlayInSand"
       ],
       "note": "Break spin before touching the sand, and then spinjump to get a good jump off of the sand."
     },
     {
       "id": 24,
       "link": [4, 5],
-      "name": "IBJ",
+      "name": "SandJump into IBJ",
       "requires": [
         "Gravity",
         "Grapple",
-        "canSandIBJ"
+        "canPlayInSand",
+        "canJumpIntoIBJ",
+        "canTrickyJump",
+        "can4HighMidAirMorph",
+        "canStationarySpinJump"
       ],
-      "note": "Wait for a good jump out of the sand to begin the IBJ with.  A stationary spinjump can help."
+      "note": "Break spin before touching the sand, and then spinjump to get a good jump off of the sand."
     },
     {
       "id": 25,
@@ -585,11 +586,8 @@
         "Grapple",
         "canGravityJump",
         "canPlayInSand",
-        "canCarefulJump",
-        {"or": [
-          "canStationarySpinJump",
-          "canTrickyJump"
-        ]}
+        "canStationarySpinJump",
+        "canTrickyJump"
       ],
       "note": [
         "Gets above the grapple block by doing a well-positioned and well-timed Gravity jump following a good jump off the sand.",

region/maridia/inner-green/West Sand Hall.json

@@ -336,7 +336,7 @@
         "canSandfallBounce",
         "h_canUseMorphBombs",
         {"or": [
-          "canSandIBJ",
+          "canIBJ",
           {"and": [
             "HiJump",
             "can4HighMidAirMorph"
@@ -347,7 +347,8 @@
         "Time a bomb to hit Samus when she is morphed, 1 pixel into the sand, inside a sandfall, and moving horizontally.",
         "There is a setup using a Sand IBJ to rise up the sandfall from the floor and Sandfall Bounce with the correct timing.",
         "An alternate setup places the bomb before entering the sand and jumps into it with a very fast jump morph, using HiJump."
-      ]
+      ],
+      "devNote": "FIXME: A Power Bomb can be used with the jump morph.  Bombs are only listed for leniency in that case."
     },
     {
       "id": 13,

region/maridia/inner-pink/Colosseum.json

@@ -464,13 +464,24 @@
       "requires": [
         "Gravity",
         "canLongIBJ",
+        "canJumpIntoIBJ",
         {"or": [
-          "canSandIBJ",
           {"and": [
-            "h_canUseSpringBall",
-            "canJumpIntoIBJ"
-          ]}
+            "canTrickyJump",
+            "can4HighMidAirMorph",
+            "canPlayInSand"
+          ]},
+          "h_canUseSpringBall"
+        ]},
+        {"or": [
+          "canDoubleBombJump",
+          "canStaggeredIBJ",
+          "canBePatient"
         ]}
+      ],
+      "note": [
+        "Start an IBJ by either bouncing on the sand with SpringBall, doing a stationary spinjump on the sand, ",
+        "Or by crouch jumping in the sand while holding down."
       ]
     },
     {
@@ -1567,8 +1578,25 @@
       "name": "IBJ",
       "requires": [
         "Gravity",
-        "canSandIBJ",
-        "canLongIBJ"
+        "canLongIBJ",
+        "canJumpIntoIBJ",
+        {"or": [
+          {"and": [
+            "canTrickyJump",
+            "can4HighMidAirMorph",
+            "canPlayInSand"
+          ]},
+          "h_canUseSpringBall"
+        ]},
+        {"or": [
+          "canDoubleBombJump",
+          "canStaggeredIBJ",
+          "canBePatient"
+        ]}
+      ],
+      "note": [
+        "Start an IBJ by either bouncing on the sand with SpringBall, doing a stationary spinjump on the sand, ",
+        "Or by crouch jumping in the sand while holding down."
       ]
     },
     {

region/maridia/inner-pink/East Sand Hole.json

@@ -177,8 +177,7 @@
             "Morph",
             {"or": [
               "canMidAirMorph",
-              "canCarefulJump",
-              {"ammo": {"type": "Super", "count": 1}},
+              "canDodgeWhileShooting",
               {"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
             ]}
           ]}
@@ -198,23 +197,30 @@
             {"or": [
               "canWalljump",
               "canGravityJump",
-              "HiJump",
-              "canSpringBallJumpMidAir"
+              "HiJump"
             ]},
             {"or": [
               "canMidAirMorph",
-              "canCarefulJump",
-              {"ammo": {"type": "Super", "count": 1}},
+              "canDodgeWhileShooting",
               {"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
             ]}
           ]},
+          {"and": [
+            "canSpringBallJumpMidAir",
+            "canTrickyJump"
+          ]},
           {"and": [
             "h_canUseSpringBall",
             "canJumpIntoIBJ"
           ]},
-          "canSandIBJ"
+          {"and": [
+            "canTrickyJump",
+            "can4HighMidAirMorph",
+            "canJumpIntoIBJ"
+          ]}
         ]}
-      ]
+      ],
+      "devNote": "FIXME: WallJump + canMidAirMorph is actually a canWallJumpInstantMorph."
     },
     {
       "id": 12,

tech.json

@@ -1396,24 +1396,6 @@
               "otherRequires": [],
               "note": "The ability to IBJ with backspin which results in an IBJ with diagonal movement."
             },
-            {
-              "id": 95,
-              "name": "canSandIBJ",
-              "techRequires": [
-                "canJumpIntoIBJ",
-                "canPlayInSand"
-              ],
-              "otherRequires": [],
-              "note": [
-                "The ability to start an IBJ from sand.",
-                "Jumping from the top of sand into an IBJ takes more precision than a standard jump into IBJ.",
-                "Escaping a shallow sand fall does not require this tech, but there is a section of Maridia's West Sand Hall which would use a Sand IBJ."
-              ],
-              "devNote": [
-                "Escaping a shallow sandfall with bombs falls under canPlayInSand.",
-                "The Sandfall IBJ in West Sandhall for the bounce is specific to one section of one room because the sand depth is different there."
-              ]
-            },
             {
               "id": 96,
               "name": "canDoubleBombJump",