Merge branch 'master' into blue-suit-schema

Author: blkerby

helpers.json

@@ -1541,6 +1541,15 @@
             "Morph will not be a usable alternative to get up very constrained ledges, such as in a morph tunnel.",
             "IBJ is not usable for underwater rooms without Gravity."
           ]
+        },
+        {
+          "name": "h_RModeKnockbackSpark",
+          "requires": [
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 4}},
+            {"autoReserveTrigger": {"minReserveEnergy": 1, "maxReserveEnergy": 4}},
+            "canRModeKnockbackSpark",
+            {"shinespark": {"frames": 4, "excessFrames": 4}}
+          ]
         }
       ]
     }

logicalRequirements.md

@@ -777,4 +777,6 @@ __Example:__
 {"disableEquipment": "HiJump"}
 ```
 
-Note that while carrying a blue suit, disabling Speed Booster would result in a loss of the blue suit.
+While carrying a blue suit, disabling Speed Booster would result in a loss of the blue suit.
+
+Note that the requirement `{"disableEquipment": "ETank"}` occurs in some strats. This is not a functionality of the vanilla game but may be supported in randomizers or other modifications of the game: it means that the player has a way to control the amount of ETanks that are currently active. It is commonly required in R-mode strats where the player may need to farm non-respawning enemies in the room to put energy back into reserves.

region/crateria/east/The Moat.json

@@ -396,37 +396,62 @@
         }
       },
       "requires": [
+        {"or": [
+          {"notable": "First-Try CWJ"},
+          {"and": [
+            "h_bombThings",
+            "h_additionalBomb",
+            "h_additionalBomb"
+          ]}
+        ]},
         "canCWJ",
-        "canDisableEquipment"
+        {"disableEquipment": "HiJump"},
+        {"disableEquipment": "SpeedBooster"}
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
-        "Aligning against the closed door shell on the other side of the transition.",
+        "Align against the closed door shell on the other side of the transition.",
         "Run towards the water and jump on the last possible frame.",
         "Perform the CWJ off of the item pedestal to cross to the other side."
+      ],
+      "detailNote": [
+        "This requires running and jumping on the last possible frame before Samus would run off into the water.",
+        "If the setup is done correctly, there will then be a 2-frame window for the wall jump."
       ]
     },
     {
       "id": 13,
       "link": [1, 2],
       "name": "Continuous Walljump, Open Doorway",
       "requires": [
+        {"or": [
+          {"notable": "First-Try CWJ"},
+          {"and": [
+            "h_bombThings",
+            "h_additionalBomb",
+            "h_additionalBomb"
+          ]}
+        ]},
         "canCWJ",
-        "canDisableEquipment",
+        {"disableEquipment": "HiJump"},
+        {"disableEquipment": "SpeedBooster"},
         {"doorUnlockedAtNode": 1},
-        {"or": [
-          "canMoonwalk",
-          "Morph",
-          "canXRayTurnaround"
-        ]}
+        "h_backIntoCorner"
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
         "Stand on the farthest pixel into the door possible using moonwalk, X-Ray, or morphball turn around.",
         "Run towards the water and jump on the last possible frame.",
         "Perform the CWJ off of the item pedestal to cross to the other side."
+      ],
+      "detailNote": [
+        "This requires running and jumping on the last possible frame before Samus would run off into the water.",
+        "There is either a 1-frame or 2-frame window for the wall jump, depending on Samus' X subpixel position.",
+        "To get a 2-frame window, Samus must start in the leftmost 75% of the pixel next to the transition.",
+        "One method to guarantee that Samus gets a good subpixel is to jump and press against the overhang to align with it,",
+        "then land, turn around, and moonwalk back into position."
       ]
     },
     {
@@ -1349,8 +1374,17 @@
         "Perform a stationary spin jump with some dash speed, and do a continuous wall jump off the item pedestal.",
         "Lay a Power Bomb (or Bomb) and use it to boost to the right, with a well-timed unmorph to reset fall speed."
       ]
+    },
+    {
+      "id": 4,
+      "name": "First-Try CWJ",
+      "note": [
+        "Perform a CWJ across the Moat on the first try, where failure may result in a softlock.",
+        "Run towards the water and jump on the last possible frame.",
+        "Perform the CWJ off of the item pedestal to cross to the other side."
+      ]
     }
   ],
   "nextStratId": 66,
-  "nextNotableId": 4
+  "nextNotableId": 5
 }

region/lowernorfair/east/Fast Pillars Setup Room.json

@@ -533,7 +533,13 @@
         {"heatFrames": 250}
       ],
       "flashSuitChecked": true,
-      "note": "Spark vertically on room entry."
+      "note": "Spark vertically on room entry.",
+      "devNote": [
+        "FIXME: a flash suit shinespark could be added, in case of coming from below,",
+        "e.g. to handle the case where resetting the room through node 1 is not possible;",
+        "but if coming from below, it would be faster to spark up the right side,",
+        "which might require a new node above node 5 in order to represent it precisely."
+      ]
     },
     {
       "id": 14,
@@ -596,6 +602,7 @@
         "canCarefulJump",
         {"heatFrames": 90}
       ],
+      "flashSuitChecked": true,
       "note": [
         "Come in with blue speed, killing the lower two Pirates, with enough momentum to jump all the way up to the door."
       ],
@@ -625,6 +632,7 @@
         ]},
         {"heatFrames": 135}
       ],
+      "flashSuitChecked": true,
       "note": [
         "Come in with blue speed, with enough momentum to jump, kill the lower two Pirates, and land on the platform above.",
         "Then either quickly jump through the door before the top Pirate fires its laser, or wait for it to jump to the other side and then jump over it."
@@ -655,6 +663,7 @@
         ]},
         {"heatFrames": 210}
       ],
+      "flashSuitChecked": true,
       "note": [
         "Come in with blue speed, run through the lowest Pirate, continuing with a short jump to kill the one on the right wall.",
         "Next run a specific distance to get speed to jump onto the platform.",
@@ -676,7 +685,8 @@
         "canTrickyDodgeEnemies",
         "canInsaneJump",
         {"heatFrames": 140}
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 107,
@@ -713,6 +723,7 @@
       "requires": [
         "canTrickyDodgeEnemies"
       ],
+      "flashSuitChecked": true,
       "devNote": [
         "More difficult side platform entrances are not considered,",
         "because there is an alternative of doing a canTrickyDashJump with a 1-tile connected runway."
@@ -1009,7 +1020,8 @@
       "requires": [
         "h_heatProof",
         "canTrickyGrappleJump"
-      ]
+      ],
+      "flashSuitChecked": false
     },
     {
       "id": 94,
@@ -1030,7 +1042,8 @@
         "h_heatProof",
         "canTrickyGrappleJump",
         "canBeExtremelyPatient"
-      ]
+      ],
+      "flashSuitChecked": false
     },
     {
       "id": 96,
@@ -1170,6 +1183,7 @@
         "canEnemyStuckMoonfall",
         "canFreeFallClip"
       ],
+      "flashSuitChecked": true,
       "note": [
         "Freeze the standing Pirate and one of the wall Pirates above it, to be able to moonfall between them.",
         "While moonfalling, charge a shot to kill the bottom Pirate, hold forward to change poses and clip past the Power Bomb blocks below."
@@ -2104,6 +2118,7 @@
           "obstruction": [5, 6]
         }
       },
+      "flashSuitChecked": true,
       "devNote": ["FIXME: An option of killing the Pirate can also be possible."]
     },
     {
@@ -2221,7 +2236,8 @@
       "unlocksDoors": [
         {"types": ["super"], "requires": []},
         {"types": ["missiles", "powerbomb"], "requires": ["never"]}
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 89,
@@ -2235,7 +2251,8 @@
         {"heatFrames": 55},
         {"doorUnlockedAtNode": 4}
       ],
-      "unlocksDoors": [{"types": ["ammo"], "requires": []}]
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
     },
     {
       "id": 90,
@@ -2571,5 +2588,8 @@
   ],
   "notables": [],
   "nextStratId": 115,
-  "nextNotableId": 1
+  "nextNotableId": 1,
+  "devNote": [
+    "FIXME: add 2->3 and 3->2 leaveWithRunway strats, and open-door variants."
+  ]
 }