Merge pull request #2063 from blkerby/spiky-platforms-bounceball-fix

Refine spiky platform bounceball strats

Author: osse101

region/norfair/east/Spiky Platforms Tunnel.json

@@ -165,7 +165,7 @@
     {
       "id": 7,
       "link": [1, 2],
-      "name": "Bounceball Double Lava Bath (Longer Runway)",
+      "name": "Bounceball Lava Bath (3-tile runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": false,
@@ -187,7 +187,7 @@
     {
       "id": 8,
       "link": [1, 2],
-      "name": "Bounceball Double Lava Bath (Short Runway)",
+      "name": "Bounceball Lava Bath (1-tile runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": false,
@@ -198,7 +198,23 @@
         "canBounceBall",
         "canWalljump",
         {"heatFrames": 600},
-        {"lavaFrames": 85}
+        {"lavaFrames": 70}
+      ],
+      "note": [
+        "Perform a bounceball to minimize lava damage.",
+        "Move quickly to reach the second Tripper on its first cycle.",
+        "Ride it, morph to avoid spike damage, shoot open the door, and run off of the Tripper (rather than jumping off)."
+      ]
+    },
+    {
+      "link": [1, 2],
+      "name": "Bounceball Lava Bath (No runway)",
+      "requires": [
+        "canBounceBall",
+        "canInsaneJump",
+        "canWalljump",
+        {"heatFrames": 600},
+        {"lavaFrames": 80}
       ],
       "note": [
         "Perform a bounceball to minimize lava damage.",
@@ -359,7 +375,7 @@
     {
       "id": 14,
       "link": [2, 1],
-      "name": "Bounceball Double Lava Bath (Longer Runway)",
+      "name": "Bounceball Lava Bath (3-tile runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": false,
@@ -369,26 +385,38 @@
       "requires": [
         "canBounceBall",
         "canWalljump",
-        {"heatFrames": 600},
+        {"heatFrames": 590},
         {"lavaFrames": 60}
       ],
       "note": ["Perform a bounceball to minimize lava damage.", "Ride the second Tripper."]
     },
     {
       "id": 15,
       "link": [2, 1],
-      "name": "Bounceball Double Lava Bath (Shorter Runway)",
+      "name": "Bounceball Lava Bath (1-tile runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": false,
-          "minTiles": 3
+          "minTiles": 1
         }
       },
       "requires": [
         "canBounceBall",
         "canWalljump",
-        {"heatFrames": 600},
-        {"lavaFrames": 85}
+        {"heatFrames": 590},
+        {"lavaFrames": 70}
+      ],
+      "note": ["Perform a bounceball to minimize lava damage.", "Ride the second Tripper."]
+    },
+    {
+      "link": [2, 1],
+      "name": "Bounceball Lava Bath (No runway)",
+      "requires": [
+        "canInsaneJump",
+        "canBounceBall",
+        "canWalljump",
+        {"heatFrames": 590},
+        {"lavaFrames": 80}
       ],
       "note": ["Perform a bounceball to minimize lava damage.", "Ride the second Tripper."]
     },