Skip to content

Commit 7f5f9c7

Browse files
authored
Merge pull request #2696 from blkerby/flash-docs
A few flash/blue suit updates to docs
2 parents ddef518 + 04deef3 commit 7f5f9c7

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

strats.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ A `comeInStutterShinecharging` entrance condition indicates that Samus must run
10111011
- _minTiles_: The minimum amount of effective runway tiles in other room needed for this strat.
10121012

10131013
A `comeInStutterShinecharging` condition must match with a `leaveWithRunway` condition on the other side of the door, which must have an "air" environment and an effective length of at least `minTiles`. A match comes with the following implicit requirements for actions to be performed in the previous room:
1014-
- The tech `canStutterWaterShineCharge`, which includes a requirement for the `SpeedBooster` item and loss of any blue suit.
1014+
- The tech `canStutterWaterShineCharge`, which includes a requirement for the `SpeedBooster` item and loss of any flash suit or blue suit.
10151015
- If the previous room is heated, then heat frame requirements are included based on `minTiles`, in the same way as for a `comeInRunning` requirement.
10161016

10171017
#### Example
@@ -1144,7 +1144,7 @@ A `comeInWithTemporaryBlue` entrance condition must match with one of the follow
11441144
- To match with a `leaveWithTemporaryBlue`, its `direction` properties must equal that of `comeInWithTemporaryBlue`, unless one of them is unspecified or "any". It has an implicit tech requirement of `canTemporaryBlue`, including the loss of a flash suit.
11451145
- A match with `leaveWithRunway` comes with implicit requirements:
11461146
- The tech `canTemporaryBlue`.
1147-
- A `canShinecharge` requirement based on the runway length (including the `SpeedBooster` item requirement and `canDash` tech requirement, including loss of any blue suit).
1147+
- A `canShinecharge` requirement based on the runway length (including the `SpeedBooster` item requirement and `canDash` tech requirement, including loss of any flash suit or blue suit).
11481148
- If the previous room is heated, then `heatFrames` are included based on the time spent running in that room. The minimally required heat frames are calculated the same way as in `comeInShinecharging`, except here there is no second runway to combine with. An extra `{"heatFrames": 200}` is assumed for gaining temporary blue and leaving the room.
11491149
- If the previous door environment is water, then `Gravity` is required.
11501150

@@ -1376,6 +1376,7 @@ A `comeInWithRMode` object does not have any properties.
13761376
A `comeInWithRMode` entrance condition must match with a `leaveWithGModeSetup` entrance condition on the other side of the door. It comes with the following implicit requirements:
13771377
- The tech requirement `canRMode`.
13781378
- The `XRayScope` item requirement.
1379+
- A requirement `{"or": ["canBlueSuitGModeSetup", {"noBlueSuit": {}}]}`.
13791380
- A requirement to have at least 1 reserve energy.
13801381
- A requirement to damage down to 0 energy, triggering reserves (causing the reserve energy to become zero and the regular energy to become what the reserve energy was).
13811382

0 commit comments

Comments
 (0)