Merge pull request #2683 from kjbranch/colosseum

Colosseum - Add more to the Base strats

Author: osse101

region/maridia/inner-pink/Colosseum.json

@@ -486,20 +486,44 @@
         {"or": [
           {"and": [
             "HiJump",
-            "canWalljump"
+            "canWalljump",
+            {"or": [
+              "canPlayInSand",
+              "canConsecutiveWalljump"
+            ]}
           ]},
           {"and": [
-            "canPreciseWalljump",
+            "canTrickyWalljump",
             "canConsecutiveWalljump"
           ]},
           {"and": [
-            "Grapple",
+            "canPreciseGrapple",
             "canCarefulJump"
           ]}
+        ]},
+        {"or": [
+          {"ammo": {"type": "Missile", "count": 2}},
+          {"ammo": {"type": "Super", "count": 2}},
+          "canUseGrapple",
+          "canDodgeWhileShooting",
+          "Spazer",
+          "Wave",
+          "Plasma",
+          "ScrewAttack",
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
+        ]},
+        {"or": [
+          "canPlayInSand",
+          {"spikeHits": 2}
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "While that one walljump near the end is a bit precise, it does not require a delayed walljump."
+      "note": [
+        "Cross the room with Grapple or wall jumps.",
+        "Under the sand is spikes. Be sure not to turn around before landing or Samus will fall straight through the sand.",
+        "Breaking spin while midair, such as by tapping an angle button, will help Samus land less deep in the sand - a quick jump when landing will give her a much higher jump.",
+        "The last wall jump to get around the corner is tricky but it does not require a delayed wall jump, even without HiJump."
+      ]
     },
     {
       "id": 13,
@@ -2107,15 +2131,36 @@
       "requires": [
         "Gravity",
         {"or": [
+          "canConsecutiveWalljump",
+          "Grapple",
           {"and": [
             "canWalljump",
-            "HiJump"
-          ]},
-          "canConsecutiveWalljump",
-          "Grapple"
+            "HiJump",
+            "canPlayInSand"
+          ]}
+        ]},
+        {"or": [
+          {"ammo": {"type": "Missile", "count": 2}},
+          {"ammo": {"type": "Super", "count": 2}},
+          "canUseGrapple",
+          "canDodgeWhileShooting",
+          "Spazer",
+          "Wave",
+          "Plasma",
+          "ScrewAttack",
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
+        ]},
+        {"or": [
+          "canPlayInSand",
+          {"spikeHits": 1}
         ]}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "Cross the room with Grapple or wall jumps.",
+        "Under the sand is spikes. Be sure not to turn around before landing or Samus will fall straight through the sand.",
+        "Breaking spin while midair, such as by tapping an angle button, will help Samus land less deep in the sand - a quick jump when landing will give her a much higher jump."
+      ]
     },
     {
       "id": 59,