Add more tricky jumps to sand jumps

Author: osse101

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

@@ -545,6 +545,7 @@
         "Gravity",
         "Grapple",
         "canTrickySpringBallJump",
+        "canTrickyJump",
         "canPlayInSand"
       ],
       "note": "Break spin before touching the sand, and then spinjump to get a good jump off of the sand."
@@ -558,18 +559,11 @@
         "Grapple",
         "canPlayInSand",
         "canJumpIntoIBJ",
-        {"or": [
-          {"and": [
-            "canTrickyJump",
-            "canCrouchJump"
-          ]},
-          "canStationarySpinJump"
-        ]}
+        "canTrickyJump",
+        "can4HighMidAirMorph",
+        "canStationarySpinJump"
       ],
-      "note": [
-        "Begin an IBJ by either doing a stationary spinjump on the sand, ",
-        "Or by crouch jumping in the sand while holding down."
-      ]
+      "note": "Break spin before touching the sand, and then spinjump to get a good jump off of the sand."
     },
     {
       "id": 25,
@@ -592,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

@@ -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

@@ -468,14 +468,15 @@
         {"or": [
           {"and": [
             "canTrickyJump",
-            "canCrouchJump",
-            "canPlayInSand"
-          ]},
-          {"and": [
-            "canStationarySpinJump",
+            "can4HighMidAirMorph",
             "canPlayInSand"
           ]},
           "h_canUseSpringBall"
+        ]},
+        {"or": [
+          "canDoubleBombJump",
+          "canStaggeredIBJ",
+          "canBePatient"
         ]}
       ],
       "note": [
@@ -1563,14 +1564,15 @@
         {"or": [
           {"and": [
             "canTrickyJump",
-            "canCrouchJump",
-            "canPlayInSand"
-          ]},
-          {"and": [
-            "canStationarySpinJump",
+            "can4HighMidAirMorph",
             "canPlayInSand"
           ]},
           "h_canUseSpringBall"
+        ]},
+        {"or": [
+          "canDoubleBombJump",
+          "canStaggeredIBJ",
+          "canBePatient"
         ]}
       ],
       "note": [

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,24 +197,24 @@
             {"or": [
               "canWalljump",
               "canGravityJump",
-              "HiJump",
-              "canSpringBallJumpMidAir"
+              "HiJump"
             ]},
             {"or": [
               "canMidAirMorph",
-              "canCarefulJump",
-              {"and": [
-                "canDodgeWhileShooting",
-                {"ammo": {"type": "Super", "count": 1}}
-              ]},
+              "canDodgeWhileShooting",
               {"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
             ]}
           ]},
+          {"and": [
+            "canSpringBallJumpMidAir",
+            "canTrickyJump"
+          ]},
           {"and": [
             "h_canUseSpringBall",
             "canJumpIntoIBJ"
           ]},
           {"and": [
+            "canTrickyJump",
             "can4HighMidAirMorph",
             "canJumpIntoIBJ"
           ]}