Remove canSandIBJ

Author: osse101

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

@@ -552,13 +552,24 @@
     {
       "id": 24,
       "link": [4, 5],
-      "name": "IBJ",
+      "name": "SandJump into IBJ",
       "requires": [
         "Gravity",
         "Grapple",
-        "canSandIBJ"
+        "canPlayInSand",
+        "canJumpIntoIBJ",
+        {"or": [
+          {"and": [
+            "canTrickyJump",
+            "canCrouchJump"
+          ]},
+          "canStationarySpinJump"
+        ]}
       ],
-      "note": "Wait for a good jump out of the sand to begin the IBJ with.  A stationary spinjump can help."
+      "note": [
+        "Begin an IBJ by either doing a stationary spinjump on the sand, ",
+        "Or by crouch jumping in the sand while holding down."
+      ]
     },
     {
       "id": 25,

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

@@ -336,7 +336,7 @@
         "canSandfallBounce",
         "h_canUseMorphBombs",
         {"or": [
-          "canSandIBJ",
+          "canIBJ",
           {"and": [
             "HiJump",
             "can4HighMidAirMorph"

region/maridia/inner-pink/Colosseum.json

@@ -464,13 +464,23 @@
       "requires": [
         "Gravity",
         "canLongIBJ",
+        "canJumpIntoIBJ",
         {"or": [
-          "canSandIBJ",
           {"and": [
-            "h_canUseSpringBall",
-            "canJumpIntoIBJ"
-          ]}
+            "canTrickyJump",
+            "canCrouchJump",
+            "canPlayInSand"
+          ]},
+          {"and": [
+            "canStationarySpinJump",
+            "canPlayInSand"
+          ]},
+          "h_canUseSpringBall"
         ]}
+      ],
+      "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."
       ]
     },
     {
@@ -1548,8 +1558,24 @@
       "name": "IBJ",
       "requires": [
         "Gravity",
-        "canSandIBJ",
-        "canLongIBJ"
+        "canLongIBJ",
+        "canJumpIntoIBJ",
+        {"or": [
+          {"and": [
+            "canTrickyJump",
+            "canCrouchJump",
+            "canPlayInSand"
+          ]},
+          {"and": [
+            "canStationarySpinJump",
+            "canPlayInSand"
+          ]},
+          "h_canUseSpringBall"
+        ]}
+      ],
+      "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

@@ -204,17 +204,24 @@
             {"or": [
               "canMidAirMorph",
               "canCarefulJump",
-              {"ammo": {"type": "Super", "count": 1}},
+              {"and": [
+                "canDodgeWhileShooting",
+                {"ammo": {"type": "Super", "count": 1}}
+              ]},
               {"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
             ]}
           ]},
           {"and": [
             "h_canUseSpringBall",
             "canJumpIntoIBJ"
           ]},
-          "canSandIBJ"
+          {"and": [
+            "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",