Merge pull request #2033 from blkerby/side-platforms-17

Blue Boulder and Early Supers side platforms, and comeInBlueSpaceJumping

Author: osse101

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],

schema/m3-room.schema.json

@@ -189,6 +189,25 @@
                 }
               }
             },
+            "comeInBlueSpaceJumping": {
+              "type": "object",
+              "title": "Come In Space Jumping",
+              "description": "Represents that Samus must come in with blue speed using Space Jump to jump through the bottom of this door.",
+              "required": [],
+              "additionalProperties": false,
+              "properties": {
+                "minExtraRunSpeed": {
+                  "type": "string",
+                  "pattern": "^\\$[0-9|A-F]\\.[0-9|A-F]+$",
+                  "description": "Minimum extra run speed (in hexadecimal) which will satisfy this condition."
+                },
+                "maxExtraRunSpeed": {
+                  "type": "string",
+                  "pattern": "^\\$[0-9|A-F]\\.[0-9|A-F]+$",
+                  "description": "Maximum extra run speed (in hexadecimal) which will satisfy this condition."
+                }
+              }
+            },
             "comeInShinecharging": {
               "type": "object",
               "title": "Come in Shinecharging",
@@ -883,6 +902,7 @@
             {"required": ["comeInRunning"]},
             {"required": ["comeInJumping"]},
             {"required": ["comeInSpaceJumping"]},
+            {"required": ["comeInBlueSpaceJumping"]},
             {"required": ["comeInShinecharging"]},
             {"required": ["comeInGettingBlueSpeed"]},
             {"required": ["comeInShinecharged"]},

strats.md

@@ -617,6 +617,7 @@ In all strats with an `entranceCondition`, the `from` node of the strat must be
 - _comeInRunning_: This indicates that Samus must run into the room, with speed in a certain range.
 - _comeInJumping_: This indicates that Samus must run and jump just before hitting the transition, with speed in a certain range.
 - _comeInSpaceJumping_: This indicates that Samus must Space Jump through the bottom of the doorway.
+- _comeInBlueSpaceJumping_: This indicates that Samus must Space Jump through the bottom of the doorway while having blue speed.
 - _comeInShinecharging_: This indicates that Samus must run into the room with enough space to complete a shinecharge.
 - _comeInShinecharged_: This indicates that Samus must enter the room with a shinecharge.
 - _comeInShinechargedJumping_: This indicates that Samus must jump into the the room with a shinecharge.
@@ -766,6 +767,30 @@ A `comeInSpaceJumping` entrance condition must match with a `leaveSpaceJumping`
 }
 ```
 
+### Come In Blue Space Jumping
+
+A `comeInBlueSpaceJumping` entrance condition indicates that Samus must come in with a Space Jump through the bottom of the doorway, while having blue speed, applicable to horizontal transitions. It has the following properties:
+
+- _minExtraRunSpeed_: The minimum extra run speed (as a hexadecimal string) needed. This only needs to be specified if something would prevent the strat from working at too low of a speed.
+- _maxExtraRunSpeed_: The maximum extra run speed (as a hexadecimal string) needed. This only needs to be specified if something would prevent the strat from working at too high of a speed.
+
+A `comeInBlueSpaceJumping` entrance condition must match with a `leaveSpaceJumping` on the other side of the door, with the following requirements:
+  - The `blue` property of the matching `leaveSpaceJumping` must be "yes" or "any".
+  - `SpeedBooster` and `SpaceJump` item requirements.
+  - There must exist a possible value of extra run speed satisfying any applicable constraints, including any `minExtraRunSpeed` or `maxExtraRunSpeed` properties in the entrance condition and/or exit condition, along with implicit constraints based on shortcharge skill and the effective runway length of the `remoteRunway` in the exit condition (see the [blue run speed table](#blue-run-speed-table)).
+
+```json
+{
+  "name": "Come In Blue Space Jumping",
+  "entranceCondtion": {
+    "comeInBlueSpinning": {
+      "maxExtraRunSpeed": "$2.1"
+    }
+  },
+  "requires": []
+}
+```
+
 ### Come In Shinecharging
 
 A `comeInShinecharging` entrance condition represents the need for Samus to run into the room with enough space to complete a shinecharge. It has the following properties describing the geometry of the runway in the current room which can be used to help complete the shinecharge (see [runway geometry](#runway-geometry) above for details):
@@ -1079,7 +1104,7 @@ A `comeInSpinning` entrance condition must match with a `leaveSpinning` or `leav
 
 ### Come In Blue Spinning
 
-A `comeInBlueSpinning` entrance condition indicates that Samus must come in with a spin jump through the doorway, possibly while having blue speed, applicable to horizontal transitions. It has the following properties:
+A `comeInBlueSpinning` entrance condition indicates that Samus must come in with a spin jump through the doorway, while having blue speed, applicable to horizontal transitions. It has the following properties:
 
 - _unusableTiles_: For a runway connected to the door, the number of tiles before the door that are unusable for gaining speed, because of needing to jump.
 - _minExtraRunSpeed_: The minimum extra run speed (as a hexadecimal string) needed. This only needs to be specified if something would prevent the strat from working at too low of a speed.

tests/asserts/keywords.py

@@ -34,6 +34,7 @@
     ("Come In Running", "comeInRunning"),
     ("Come In Jumping", "comeInJumping"),
     ("Come In Space Jumping", "comeInSpaceJumping"),
+    ("Come In Blue Space Jumping", "comeInBlueSpaceJumping"),
     ("Come In Shinecharging", "comeInShinecharging"),
     ("Come In Shinecharged Jumping", "comeInShinechargedJumping"),
     ("Come In Shinecharged", "comeInShinecharged"),
@@ -536,7 +537,8 @@ def check_speed_states(strat, err_fn):
             states = {"shinecharged"}
         elif "comeInWithSpark" in keys:
             states = {"preshinespark"}
-        elif keys.intersection(["comeInWithTemporaryBlue", "comeInGettingBlueSpeed", "comeInSpeedballing", "comeInWithBlueSpringBallBounce", "comeInBlueSpinning"]):
+        elif keys.intersection(["comeInWithTemporaryBlue", "comeInGettingBlueSpeed", "comeInSpeedballing", "comeInWithBlueSpringBallBounce", 
+                                "comeInBlueSpinning", "comeInBlueSpaceJumping"]):
             states = {"blue"}
         if strat.get("startsWithShineCharge") is True:
             err_fn("startsWithShineCharge should not be combined with an entranceCondition")