Merge pull request #2241 from blkerby/bubble-mountain-tl-tr

Refine Bubble Mountain top-left to top-right jumps

Author: osse101

region/norfair/east/Bubble Mountain.json

@@ -667,32 +667,51 @@
     {
       "id": 11,
       "link": [1, 7],
-      "name": "Open Door Full Runway Jump",
+      "name": "Jump Across",
       "requires": [
         {"doorUnlockedAtNode": 1},
+        "canTrickyJump",
+        "canCameraManip"
+      ],
+      "wallJumpAvoid": true,
+      "note": "Kill King Cac by scrolling the camera, before attempting the jump."
+    },
+    {
+      "link": [1, 7],
+      "name": "Speedy Jump Across",
+      "requires": [
+        "SpeedBooster",
+        "canCarefulJump",
         {"or": [
-          "canTrickyJump",
+          {"doorUnlockedAtNode": 1},
+          "canTrickyJump"
+        ]},
+        {"or": [
+          "canCameraManip",
           {"and": [
-            "SpeedBooster",
-            "canCarefulJump"
+            "canNeutralDamageBoost",
+            {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}}
           ]}
-        ]},
-        "canCameraManip"
+        ]}
       ],
-      "note": "Kill King Cac by scrolling the camera, before attempting the jump."
+      "note": "King Cac can be killed by scrolling the camera before jumping across."
     },
     {
       "id": 12,
       "link": [1, 7],
       "name": "Airball",
       "requires": [
         "canLateralMidAirMorph",
-        "canTrickyJump",
+        {"or": [
+          "canTrickyJump",
+          {"doorUnlockedAtNode": 1}
+        ]},
         {"or": [
           "canCameraManip",
           {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}}
         ]}
-      ]
+      ],
+      "note": "King Cac can be killed by scrolling the camera before jumping across."
     },
     {
       "id": 13,