Merge branch 'master' into notable-2

Author: kjbranch

helpers.json

@@ -33,6 +33,18 @@
           "requires": [ "Gravity" ],
           "devNote": "In the original game Gravity provides full immunity, but some randomizers also require Varia."
         },
+        {
+          "name": "h_fullEnemyDamageReduction",
+          "requires": [
+            "Gravity"
+          ],
+          "note": [
+            "Suit requirements in order to have 75% damage reduction from enemies."
+          ],
+          "devNote": [
+            "In the vanilla game, Gravity alone provides 75% damage reduction, but some randomizer may require both suits."
+          ]
+        },
         {
           "name": "h_AllItemsSpawned",
           "requires": [ "never" ],

logicalRequirements.md

@@ -354,6 +354,23 @@ __Example:__
 ]}
 ```
 
+#### resourceMaxCapacity object
+A `resourceMaxCapacity` object represents the need for Samus to have a capacity that does not exceed a set amount of a specific resource. It can have the following properties:
+* _type:_ The type of resource. Can have the following values:
+  * Missile
+  * Super
+  * PowerBomb
+  * RegularEnergy
+  * ReserveEnergy
+* _count:_ The amount of capacity that Samus must not exceed.
+
+A `resourceMaxCapacity` requirement generally includes an implicit requirement of `canRiskPermanentLossOfAccess`. In some randomizer contexts, this may be unnecessary, for example if it is known that the player cannot have collected items that would exceed the expected capacity, or if it is possible for the player to disable the extra items.
+
+__Example:__
+```json
+{"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 299}]}
+```
+
 #### resourceAvailable object
 A `resourceAvailable` object represents the need for Samus to be holding at least a set amount of a specific resource. It has the following properties:
 * _type:_ The type of resource. Can have the following values:

region/brinstar/green/Brinstar Reserve Tank Room.json

@@ -362,24 +362,17 @@
     {
       "id": 16,
       "link": [3, 4],
-      "name": "Hole-in-One",
+      "name": "Screw Attack, Tunnel Crawl",
       "requires": [
-        {"notable": "Hole-in-One"},
         "Morph",
         "ScrewAttack",
-        {"or": [
-          "canTunnelCrawl",
-          {"and": [
-            "canTwoTileSqueeze",
-            "canTrickyJump"
-          ]}
-        ]}
+        "canTunnelCrawl"
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
-        "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.",
-        "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps."
+        "Tunnel crawl with Screw Attack to break the bomb blocks.",
+        "With a very precise jump and aim down, it is possible to jump deep enough into where the first block was in order to only require a turnaround jump, but it's not easier."
       ]
     },
     {
@@ -392,16 +385,7 @@
       "flashSuitChecked": true
     }
   ],
-  "notables": [
-    {
-      "id": 1,
-      "name": "Hole-in-One",
-      "note": [
-        "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.",
-        "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps."
-      ]
-    }
-  ],
+  "notables": [],
   "nextStratId": 19,
   "nextNotableId": 2
 }

region/brinstar/green/Early Supers Room.json

@@ -245,12 +245,12 @@
       "link": [1, 1],
       "name": "Leave With Spark To The Left",
       "requires": [
-        {"notable": "Leave With Spark To The Left"},
         {"obstaclesNotCleared": ["A"]},
         "h_canCrouchJumpDownGrab",
         {"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
         "canShinechargeMovementTricky",
         "canQuickDrop",
+        {"shineChargeFrames": 175},
         {"shinespark": {"frames": 1}}
       ],
       "exitCondition": {
@@ -830,15 +830,6 @@
     }
   ],
   "notables": [
-    {
-      "id": 1,
-      "name": "Leave With Spark To The Left",
-      "note": [
-        "Gain a shinecharge on the long, lower platform in the screen above, then carry it left and down.",
-        "Use crumble quick drops, land on the floor at the bottom, spin jump left into the doorway, and activate the spark.",
-        "The required movement here is very precise, as the 180 shinecharge frames is only barely enough."
-      ]
-    },
     {
       "id": 2,
       "name": "Mockball",

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1363,7 +1363,7 @@
       "name": "Beetom Tricky Dodge (Right to Left)",
       "requires": [
         {"notable": "Beetom Tricky Dodge"},
-        "canTrickyJump"
+        "canTrickyDodgeEnemies"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -1555,7 +1555,7 @@
       "name": "Beetom Tricky Dodge (Left to Right)",
       "requires": [
         {"notable": "Beetom Tricky Dodge"},
-        "canTrickyJump",
+        "canTrickyDodgeEnemies",
         {"obstaclesNotCleared": ["B"]}
       ],
       "clearsObstacles": ["A"],

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -698,7 +698,6 @@
       "link": [5, 2],
       "name": "Bottom Spark Out",
       "requires": [
-        {"notable": "Bottom Spark Out"},
         "canShinechargeMovementComplex",
         {"obstaclesCleared": ["C"]},
         {"obstaclesNotCleared": ["D"]},
@@ -856,11 +855,6 @@
     }
   ],
   "notables": [
-    {
-      "id": 2,
-      "name": "Bottom Spark Out",
-      "note": "Charge a spark, then break the shot blocks, drop through, and spark out the bottom right door."
-    },
     {
       "id": 4,
       "name": "Speedball",

region/brinstar/pink/Big Pink.json

@@ -2766,7 +2766,6 @@
       "link": [13, 7],
       "name": "Crystal Flash Standup - Super Block",
       "requires": [
-        {"notable": "Crystal Flash Standup - Super Block"},
         "h_canBombThings",
         "h_canCrystalFlash",
         {"ammo": {"type": "Super", "count": 1}}
@@ -3282,11 +3281,6 @@
         "Requires pixel precision, although there are several pixels that work. The camera must be fully scrolled to the right, which may require going far left and back."
       ]
     },
-    {
-      "id": 12,
-      "name": "Crystal Flash Standup - Super Block",
-      "note": "Crystal Flash in the morph tunnel to force a standup, making it possible to shoot the super block from the left while it's on-screen."
-    },
     {
       "id": 13,
       "name": "Wall Ice Clip X-Ray Climb",

region/brinstar/pink/Pink Brinstar Hopper Room.json

@@ -839,6 +839,144 @@
       "note": "Come in with a spring ball bounce after gaining speed on a remote runway using at least 34 tiles.",
       "devNote": "This requires extra run speed of at least $6.0."
     },
+    {
+      "link": [1, 3],
+      "name": "Side Platform Cross Room Jump",
+      "entranceCondition": {
+        "comeInWithSidePlatform": {
+          "platforms": [
+            {
+              "minHeight": 1,
+              "maxHeight": 1,
+              "minTiles": 17,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "requires": [
+                "HiJump"
+              ],
+              "note": ["This applies to Warehouse Entrance."]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 11.4375,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "requires": [
+                "HiJump"
+              ],
+              "note": ["This applies to Ridley Tank Room, Halfie Climb Room, and Dust Torizo Room."],
+              "detailNote": [
+                "This has a 2-frame window for the jump.",
+                "Getting the jump on the last frame may requiring quickly aiming down (between 1 and 3 frames after the jump)."
+              ]
+            },
+            {
+              "minHeight": 3,
+              "maxHeight": 3,
+              "minTiles": 11.4375,
+              "speedBooster": true,
+              "obstructions": [[1, 0]],
+              "requires": [
+                "HiJump",
+                "canTrickyJump"
+              ],
+              "note": ["This applies to Mickey Mouse Room."],
+              "detailNote": [
+                "Avoid backing into the corner; press towards it and turn around.",
+                "It helps to advance 4 pixels by performing 2 arm pumps (press and release of an angle button) while running.",
+                "This will give a 2-frame window for the jump, while without the arm pumps the jump would be frame perfect.",
+                "Getting the jump on the last frame requires quickly aiming down (between 1 and 5 frames after the jump)."
+              ]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 45,
+              "speedBooster": true,
+              "obstructions": [[2, 0]],
+              "requires": [
+                {"or": [
+                  "canMomentumConservingMorph",
+                  "canInsaneJump"
+                ]}
+              ],
+              "note": ["This applies to Waterway Energy Tank Room."],
+              "devNote": [
+                "This can be done most easily with a ceiling mockball through the transition:",
+                "this has a 5-frame window for the jump, and between a 1-frame and 5-frame window for the morph,",
+                "with later jumps giving the larger windows for the morph.",
+                "Without Morph, it is possible to jump directly through the door with a last-frame jump."
+              ]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 45,
+              "speedBooster": true,
+              "obstructions": [[3, 0]],
+              "requires": [
+                {"or": [
+                  "canMomentumConservingMorph",
+                  {"and": [
+                    "canInsaneJump",
+                    "canMomentumConservingTurnaround"
+                  ]}
+                ]}
+              ],
+              "note": ["This applies to Statues Hallway."],
+              "detailNote": [
+                "The momentum-conserving turnaround version requires a last-frame jump, with a 3-frame window for the turnaround;",
+                "the first of the possible frames for the turnaround requires a precise down-grab onto the Grapple block (4-frame window)."
+              ]
+            },
+            {
+              "minHeight": 3,
+              "maxHeight": 3,
+              "minTiles": 39.4375,
+              "speedBooster": true,
+              "obstructions": [[3, 0]],
+              "requires": [
+                "canMomentumConservingMorph"
+              ],
+              "note": ["This applies to Flyway."]
+            },
+            {
+              "minHeight": 2,
+              "maxHeight": 2,
+              "minTiles": 45,
+              "speedBooster": true,
+              "obstructions": [[4, 0]],
+              "requires": [
+                "canMomentumConservingMorph",
+                "canInsaneJump",
+                "canInsaneMidAirMorph"
+              ],
+              "note": ["This applies to Baby Kraid Room."]
+            },
+            {
+              "minHeight": 3,
+              "maxHeight": 3,
+              "minTiles": 39.4375,
+              "speedBooster": true,
+              "obstructions": [[3, 2]],
+              "requires": [
+                "canTrickyDashJump"
+              ],
+              "note": ["This applies to Metal Pirates Room."]
+            }
+          ]
+        }
+      },
+      "requires": [],
+      "wallJumpAvoid": true,
+      "flashSuitChecked": true,
+      "devNote": [
+        "Variations involving a spring ball jump are not included,",
+        "since a spring ball jump can be done using a 1-tile runway connected to the door.",
+        "Likewise, jumping up with HiJump and Speed Booster with a 2-tile runway is already covered."
+      ]
+    },
     {
       "id": 34,
       "link": [1, 3],
@@ -1308,6 +1446,7 @@
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
@@ -1324,6 +1463,7 @@
         {"shineChargeFrames": 45},
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
@@ -1340,6 +1480,7 @@
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"shinespark": {"frames": 15, "excessFrames": 6}}
       ],
       "clearsObstacles": ["B"],
@@ -1352,6 +1493,7 @@
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"useFlashSuit": {}},
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],