Merge pull request #2862 from osse101/icecolo

Colosseum with ice

Author: osse101

region/maridia/inner-pink/Colosseum.json

@@ -757,24 +757,29 @@
       "link": [1, 3],
       "name": "Spike Platforming with Move Assist (Left to Right)",
       "requires": [
-        {"notable": "Spike Platforming with Move Assist (Left to Right)"},
+        {"notable": "Spike Platforming with Move Assist"},
         "canDash",
         "canWallJump",
+        "canSuitlessMaridia",
+        "canPlayInSand",
+        "canTrickyJump",
         "Morph",
         "canUseIFrames",
+        "canNeutralDamageBoost",
+        {"spikeHits": 3},
         {"or": [
-          "Grapple",
           {"and": [
-            "canSuitlessMaridia",
-            "canPlayInSand",
             "HiJump",
-            "canNeutralDamageBoost",
-            "canTrickySpringBallJump",
-            "canTrickyJump",
-            {"spikeHits": 2}
+            "canTrickySpringBallJump"
+          ]},
+          {"and": [
+            "canMochtroidIceClimb",
+            {"or": [
+              "canInsaneJump",
+              {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
+            ]}
           ]}
         ]},
-        {"spikeHits": 1},
         {"or": [
           {"spikeHits": 1},
           "canHorizontalDamageBoost"
@@ -785,7 +790,7 @@
       "note": [
         "Use the spikes, which are not in the water, to jump from platform to platform as a way to cross the room.",
         "Requires knowing the position of every spike in the room, and hitting the spikes while morphed can help.",
-        "The first jump is particularly tough.  A Spring Ball jump from the sand with HiJump, or Grapple can be used to get past it."
+        "The first jump is particularly tough.  A Spring Ball jump from the sand to the spike with HiJump, or a frozen Mochtroid can be used to get past it."
       ]
     },
     {
@@ -854,14 +859,14 @@
         "canMochtroidIceClimb",
         "canPlayInSand",
         "canCameraManip",
+        "canTrickyJump",
         {"or": [
           "Gravity",
           "HiJump"
         ]},
-        "canTrickyJump",
         {"or": [
           "canInsaneJump",
-          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 2}}
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 3}}
         ]},
         "h_complexToCarryFlashSuit"
       ],
@@ -886,7 +891,11 @@
         "canTrickyJump",
         {"or": [
           "canInsaneJump",
-          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 2}}
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 3}}
+        ]},
+        {"or": [
+          "canBePatient",
+          "canWallJump"
         ]},
         "h_trickyToCarryFlashSuit"
       ],
@@ -2632,18 +2641,17 @@
         "canUseIFrames",
         {"spikeHits": 1},
         "canNeutralDamageBoost",
+        "canTrickyJump",
         {"or": [
           "canHorizontalDamageBoost",
           {"spikeHits": 1}
         ]},
-        "h_underwaterMaxHeightSpringBallJump",
         {"or": [
-          "canSpringFling",
-          {"and": [
-            {"spikeHits": 1},
-            "canInsaneJump"
-          ]}
+          "canBePatient",
+          {"spikeHits": 1}
         ]},
+        "h_underwaterMaxHeightSpringBallJump",
+        "canSpringFling",
         "canBombJumpWaterEscape",
         "canJumpIntoIBJ"
       ],
@@ -2668,6 +2676,38 @@
         "FIXME: This can be possible to do while carrying a blue suit, with much greater difficulty."
       ]
     },
+    {
+      "link": [3, 1],
+      "name": "Spike Platforming with Move Assist (Right to Left)",
+      "requires": [
+        {"notable": "Spike Platforming with Move Assist"},
+        "canDash",
+        "canWallJump",
+        "canSuitlessMaridia",
+        "canPlayInSand",
+        "canTrickyJump",
+        "Morph",
+        "canUseIFrames",
+        "canNeutralDamageBoost",
+        {"spikeHits": 3},
+        "canMochtroidIceClimb",
+        {"or": [
+          "canInsaneJump",
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
+        ]},
+        {"or": [
+          {"spikeHits": 1},
+          "canHorizontalDamageBoost"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Use the spikes, which are not in the water, to jump from platform to platform as a way to cross the room.",
+        "Requires knowing the position of every spike in the room, and hitting the spikes while morphed can help.",
+        "The final jump is particularly tough so a frozen Mochtroid is used to get past it."
+      ]
+    },
     {
       "id": 65,
       "link": [3, 1],
@@ -2713,7 +2753,7 @@
         "canCameraManip",
         {"or": [
           "canInsaneJump",
-          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 2}}
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 3}}
         ]},
         "h_complexToCarryFlashSuit"
       ],
@@ -2739,7 +2779,11 @@
         "canCameraManip",
         {"or": [
           "canInsaneJump",
-          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 2}}
+          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 3}}
+        ]},
+        {"or": [
+          "canBePatient",
+          "canWallJump"
         ]},
         "h_trickyToCarryFlashSuit"
       ],
@@ -3512,11 +3556,11 @@
     },
     {
       "id": 6,
-      "name": "Spike Platforming with Move Assist (Left to Right)",
+      "name": "Spike Platforming with Move Assist",
       "note": [
         "Use the spikes, which are not in the water, to jump from platform to platform as a way to cross the room.",
         "Requires knowing the position of every spike in the room, and hitting the spikes while morphed can help.",
-        "The first jump is particularly tough.  A SpringBallJump from the sand with HiJump, or Grapple can be used to get past it."
+        "The leftmost jump is particularly tough.  Ice, or a SpringBallJump from the sand onto a spike with HiJump depending on the direction, can be used to get past it."
       ]
     },
     {