Merge pull request #2157 from blkerby/rising-tide-speedball

Refine Rising Tide speedball

Author: osse101

region/norfair/east/Rising Tide.json

@@ -189,24 +189,42 @@
     {
       "id": 8,
       "link": [1, 2],
-      "name": "Speedball Roll Under",
+      "name": "Speedball Roll Under (Come in Getting Blue Speed)",
       "entranceCondition": {
-        "comeInSpeedballing": {
-          "runway": {
-            "length": 3,
-            "openEnd": 1
-          }
+        "comeInGettingBlueSpeed": {
+          "length": 3,
+          "openEnd": 1,
+          "minExtraRunSpeed": "$0.E",
+          "maxExtraRunSpeed": "$1.B"
         }
       },
       "requires": [
         "canSpeedball",
         "canSlowShortCharge",
+        {"heatFrames": 350}
+      ],
+      "note": "Jump between the first and second floating platforms, to speedball through the room.",
+      "devNote": ["Some heat frames are implicit in the entrance condition."]
+    },
+    {
+      "link": [1, 2],
+      "name": "Speedball Roll Under (Come in Blue Spinning)",
+      "entranceCondition": {
+        "comeInBlueSpinning": {
+          "unusableTiles": 3,
+          "minExtraRunSpeed": "$0.E",
+          "maxExtraRunSpeed": "$1.9"
+        }
+      },
+      "requires": [
+        "canSpeedball",
+        "canSlowShortCharge",
+        "canInsaneJump",
         {"heatFrames": 360}
       ],
-      "devNote": [
-        "FIXME: Coming in already in speedball wouldn't work here, so this isn't the right entrance condition.",
-        "After a new entrance condition is developed which can properly represent this, it should be switched to use it.",
-        "5 Unusable tiles."
+      "note": [
+        "Jump into the room with blue speed,",
+        "and fall between the door ledge and the first floating platform, to speedball through the room."
       ]
     },
     {