Merge remote-tracking branch 'upstream/master' into side-platforms-14

Author: blkerby

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -488,6 +488,64 @@
         "If sparking early, a down-back can help with reaching the platform."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Side Platform Cross Room Jump",
+      "entranceCondition": {
+        "comeInWithSidePlatform": {
+          "platforms": [
+            {
+              "minHeight": 1,
+              "maxHeight": 1,
+              "minTiles": 4,
+              "speedBooster": "any",
+              "obstructions": [[1, 0]],
+              "note": ["This applies to Skree Boost Room, Screw Attack Room, and Lava Dive."]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 2,
+              "speedBooster": "any",
+              "obstructions": [[1, 0]],
+              "requires": [
+                "canTrickyJump"
+              ],
+              "note": ["This applies to Metal Pirates Room (Small Ledge)."],
+              "detailNote": [
+                "With this short of runway, a frame-perfect jump is required."
+              ]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 4,
+              "speedBooster": "any",
+              "obstructions": [[1, 0]],
+              "note": ["This applies to Early Supers Room, Shaktool Room, Blue Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."],
+              "detailNote": [
+                "With this longer amount of runway, the jump has a 2-frame window."
+              ]
+            },
+            {
+              "minHeight": 3,
+              "maxHeight": 3,
+              "minTiles": 9.4375,
+              "speedBooster": "any",
+              "obstructions": [[1, 0]],
+              "note": ["This applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, and Double Chamber."]
+            }
+          ]
+        }
+      },
+      "requires": [],
+      "devNote": [
+        "Setups having more than a 1-tile runway at the door are not considered here,",
+        "because in that case a regular cross-room jump is possible.",
+        "Likewise, doing a ceiling mockball through the transition is not considered,",
+        "since if Morph is available then an airball can be done with just 1 tile of door runway."
+      ]
+    },
     {
       "id": 24,
       "link": [2, 1],

region/brinstar/green/Early Supers Room.json

@@ -556,11 +556,86 @@
       "devNote": [
         "Slightly higher run speeds can work but with greater difficulty.",
         "FIXME: comeInGettingBlueSpeed is not technically the right entrance condition, since the jump needs to happen in the other room;",
-        "we ignore this for now since it makes less than a tile of difference to the runway in the other room.",
-        "At some point we should support entrance conditions for entering spinning with upward momentum (possibly from disconnected runways like in Dust Torizo Room);",
-        "coming in with a blue Space Jump could also work."
+        "we ignore this for now since it makes less than a tile of difference to the runway in the other room."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Blue Space Jump Speedball, Leave With Temporary Blue",
+      "entranceCondition": {
+        "comeInBlueSpaceJumping": {
+          "minExtraRunSpeed": "$0.E",
+          "maxExtraRunSpeed": "$2.1"
+        }
+      },
+      "requires": [
+        "canSpeedball",
+        "canChainTemporaryBlue",
+        "canInsaneJump"
+      ],
+      "exitCondition": {
+        "leaveWithTemporaryBlue": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "note": "Gain blue speed in the other room, Space Jump through the transition, then speedball under the shutters."
+    },
+    {
+      "link": [2, 1],
+      "name": "Side Platform Speedball, Leave With Temporary Blue",
+      "entranceCondition": {
+        "comeInWithSidePlatform": {
+          "platforms": [
+            {
+              "minHeight": 1,
+              "maxHeight": 1,
+              "minTiles": 16,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "note": ["This applies to Lava Dive."]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 27.4375,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "note": ["This applies to Dust Torizo Room and Noob Bridge."]
+            },
+            {
+              "minHeight": 3,
+              "maxHeight": 3,
+              "minTiles": 15.4375,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "requires": [
+                "HiJump",
+                {"getBlueSpeed": {"usedTiles": 14, "openEnd": 1}}
+              ],
+              "note": ["This applies to Botwoon's Room."]
+            },
+            {
+              "minHeight": 3,
+              "maxHeight": 3,
+              "minTiles": 28.2472,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "note": ["This applies to Double Chamber."]
+            }
+          ]
+        }
+      },
+      "requires": [
+        {"getBlueSpeed": {"usedTiles": 15, "openEnd": 1}},
+        "canSpeedball",
+        "canChainTemporaryBlue",
+        "canInsaneJump"
+      ],
+      "exitCondition": {
+        "leaveWithTemporaryBlue": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "note": "Gain blue speed in the other room, jump through the transition, then speedball under the shutters."
+    },
     {
       "id": 22,
       "link": [2, 1],

region/brinstar/pink/Waterway Energy Tank Room.json

@@ -141,6 +141,10 @@
           "obstruction": [2, 0]
         }
       },
+      "note": [
+        "If using the full runway, back into the corner against the Speed blocks,",
+        "then perform 4 arm pumps to advance 8 pixels while running."
+      ],
       "devNote": "Max extra run speed $7.0."
     },
     {
@@ -303,12 +307,15 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 40},
+        {"shineChargeFrames": 20},
         "canHorizontalShinespark",
-        {"shinespark": {"frames": 155, "excessFrames": 10}}
+        {"shinespark": {"frames": 152, "excessFrames": 10}}
       ],
       "clearsObstacles": ["A"],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "If coming from a water environment, this assumes entering with a small spin jump."
+      ]
     },
     {
       "id": 14,