Full Halfie notable; Suitless grapple added requirements

Author: osse101

region/maridia/inner-pink/Colosseum.json

@@ -69,6 +69,13 @@
         "Then use Grapple on the blocks to be pushed a precise amount into the wall above the door.",
         "From there, use grapple again to be pushed diagonally down into the transition behind the Green shell."
       ]
+    },
+    {
+      "name": "Colosseum Full Halfie Shinespark",
+      "note": [
+        "Initiate a Shinespark 1 tile below the ceiling to cross all of Colosseum.",
+        "Shinesparking too high or too low will crash and Samus will likely fall into the sand."
+      ]
     }
   ],
   "links": [
@@ -83,7 +90,10 @@
     {
       "from": 2,
       "to": [
-        {"id": 1},
+        {
+          "id": 1,
+          "devNote": "FIXME: A crossroom jump into water can be used to shinespark across to 1."
+        },
         {"id": 2},
         {"id": 3}
       ]
@@ -327,25 +337,47 @@
       "link": [1, 3],
       "name": "Space Jump",
       "requires": [
-        "SpaceJump"
+        "SpaceJump",
+        {"or": [
+          {"ammo": {"type": "Missile", "count": 3}},
+          {"ammo": {"type": "Super", "count": 3}},
+          "canUseGrapple",
+          "canTrickyJump",
+          "canDodgeWhileShooting",
+          "Spazer",
+          "Wave",
+          "Plasma",
+          "ScrewAttack",
+          {"enemyDamage": {
+            "enemy": "Mochtroid",
+            "type": "contact",
+            "hits": 2
+          }}
+        ]}
       ],
       "devNote": "No water involved here, so no need for Gravity or canSuitlessMaridia."
     },
     {
       "link": [1, 3],
-      "name": "Shinespark",
+      "name": "Colosseum Full Halfie Shinespark (Forward)",
+      "notable": true,
+      "reusableRoomwideNotable": "Colosseum Full Halfie Shinespark",
       "entranceCondition": {
         "comeInShinecharged": {
           "framesRequired": 60
         }
       },
       "requires": [
-        "canShinechargeMovement",
+        "canShinechargeMovementComplex",
         "canMidairShinespark",
-        "canCarefulJump",
+        "canTrickyJump",
         {"shinespark": {"frames": 125, "excessFrames": 6}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "Initiate a Shinespark 1 tile below the ceiling to cross all of Colosseum.",
+        "Shinesparking too high or too low will crash and Samus will likely fall into the sand."
+      ]
     },
     {
       "link": [1, 3],
@@ -376,10 +408,15 @@
       "name": "Suitless Grapple Only",
       "requires": [
         "canSuitlessMaridia",
-        "canCarefulJump",
+        "canDodgeWhileShooting",
+        "canPreciseGrapple",
+        {"or": [
+          "canInsaneJump",
+          "canPlayInSand"
+        ]},
         {"or": [
-          "canPreciseGrapple",
-          "canGrappleJump"
+          "HiJump",
+          "canTrickyJump"
         ]}
       ],
       "note": [
@@ -978,9 +1015,11 @@
       "name": "Base",
       "requires": [
         "Gravity",
-        "canWalljump",
         {"or": [
-          "HiJump",
+          {"and": [
+            "canWalljump",
+            "HiJump"
+          ]},
           "canConsecutiveWalljump",
           "Grapple"
         ]}
@@ -990,25 +1029,47 @@
       "link": [3, 1],
       "name": "Space Jump",
       "requires": [
-        "SpaceJump"
+        "SpaceJump",
+        {"or": [
+          {"ammo": {"type": "Missile", "count": 3}},
+          {"ammo": {"type": "Super", "count": 3}},
+          "canUseGrapple",
+          "canTrickyJump",
+          "canDodgeWhileShooting",
+          "Spazer",
+          "Wave",
+          "Plasma",
+          "ScrewAttack",
+          {"enemyDamage": {
+            "enemy": "Mochtroid",
+            "type": "contact",
+            "hits": 2
+          }}
+        ]}
       ],
       "devNote": "No water involved here, so no need for Gravity or canSuitlessMaridia."
     },
     {
       "link": [3, 1],
-      "name": "Shinespark",
+      "name": "Colosseum Full Halfie Shinespark (Reverse)",
+      "notable": true,
+      "reusableRoomwideNotable": "Colosseum Full Halfie Shinespark",
       "entranceCondition": {
         "comeInShinecharged": {
           "framesRequired": 60
         }
       },
       "requires": [
-        "canShinechargeMovement",
+        "canShinechargeMovementComplex",
         "canMidairShinespark",
-        "canCarefulJump",
+        "canTrickyJump",
         {"shinespark": {"frames": 125}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "Initiate a Shinespark 1 tile below the ceiling to cross all of Colosseum.",
+        "Shinesparking too high or too low will crash and Samus will likely fall into the sand."
+      ]
     },
     {
       "link": [3, 1],
@@ -1033,10 +1094,15 @@
       "name": "Suitless Grapple Only",
       "requires": [
         "canSuitlessMaridia",
-        "Grapple",
+        "canDodgeWhileShooting",
+        "canPreciseGrapple",
         {"or": [
-          "canPlayInSand",
-          "canPreciseGrapple"
+          "canInsaneJump",
+          "canPlayInSand"
+        ]},
+        {"or": [
+          "HiJump",
+          "canTrickyJump"
         ]}
       ]
     },