Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions helpers.json
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@
{
"name": "h_heatedCrystalFlash",
"requires": [
{"heatFrames": 185},
{"simpleHeatFrames": 185},
{"or": [
{"and": [
"h_heatProof",
Expand All @@ -825,7 +825,7 @@
"canHeatedCrystalFlash"
]},
"h_heatedCrystalFlashRefill",
{"heatFrames": 20}
{"simpleHeatFrames": 20}
],
"devNote": [
"These requirements are tight but include time to morph before laying the Power Bomb and to land after the Crystal Flash refill completes."
Expand All @@ -834,7 +834,7 @@
{
"name": "h_heatedLavaCrystalFlash",
"requires": [
{"heatFrames": 185},
{"simpleHeatFrames": 185},
{"lavaFrames": 185},
{"or": [
{"and": [
Expand Down Expand Up @@ -862,7 +862,7 @@
{
"name": "h_heatedAcidCrystalFlash",
"requires": [
{"heatFrames": 185},
{"simpleHeatFrames": 185},
{"acidFrames": 185},
"canHeatedCrystalFlash",
"h_heatedAcidCrystalFlashRefill",
Expand Down
10 changes: 10 additions & 0 deletions region/lowernorfair/east/Mickey Mouse Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,16 @@
],
"clearsObstacles": ["D"]
},
{
"link": [4, 6],
"name": "Cross with Crystal Flash",
"requires": [
"h_usePowerBomb",
{"heatFrames": 260},
"h_heatedCrystalFlash",
{"heatFrames": 120}
]
},
{
"id": 52,
"link": [6, 1],
Expand Down
42 changes: 37 additions & 5 deletions region/norfair/east/Single Chamber.json
Original file line number Diff line number Diff line change
Expand Up @@ -2151,7 +2151,7 @@
"requires": [
"Morph",
"ScrewAttack",
{"heatFrames": 780}
{"heatFrames": 600}
]
},
{
Expand All @@ -2160,7 +2160,7 @@
"name": "Power Bomb",
"requires": [
"h_usePowerBomb",
{"heatFrames": 850}
{"heatFrames": 660}
]
},
{
Expand All @@ -2169,7 +2169,36 @@
"name": "Bombs",
"requires": [
"h_useMorphBombs",
{"heatFrames": 1130}
{"heatFrames": 730}
]
},
{
"link": [5, 6],
"name": "Cross with Crystal Flash (Early Position)",
"requires": [
{"heatFrames": 250},
"h_heatedCrystalFlash",
{"heatFrames": 380}
]
},
{
"link": [5, 6],
"name": "Cross with Crystal Flash (Later Position)",
"requires": [
{"heatFrames": 450},
{"or": [
"ScrewAttack",
{"and": [
"h_usePowerBomb",
{"heatFrames": 40}
]},
{"and": [
"h_useMorphBombs",
{"heatFrames": 80}
]}
]},
"h_heatedCrystalFlash",
{"heatFrames": 250}
]
},
{
Expand All @@ -2180,8 +2209,11 @@
{"or": [
"canWalljump",
"HiJump",
"SpaceJump",
"h_crouchJumpDownGrab"
"h_crouchJumpDownGrab",
{"and": [
"SpaceJump",
{"heatFrames": 40}
]}
]},
{"heatFrames": 100}
],
Expand Down
47 changes: 47 additions & 0 deletions region/norfair/east/Speed Booster Hall.json
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,28 @@
],
"note": "Shoot from the middle of the second set of crumble blocks from the left."
},
{
"link": [1, 2],
"name": "Double Crystal Flash",
"requires": [
{"simpleHeatFrames": 160},
{"heatFrames": 40},
"h_heatedCrystalFlash",
{"simpleHeatFrames": 140},
{"heatFrames": 40},
"h_heatedCrystalFlash",
{"simpleHeatFrames": 240},
{"heatFrames": 30}
],
"note": [
"Use a Crystal Flash after crossing 3 crumble block bridges,",
"and a second Crystal Flash after crossing 3 more."
],
"detailNote": [
"In order to cross without tanks or Speed Booster,",
"some arm pumping is helpful but not required."
]
},
{
"id": 10,
"link": [1, 2],
Expand Down Expand Up @@ -557,6 +579,31 @@
"The obstacle being broken means Samus has run far enough to charge a shinespark."
]
},
{
"link": [2, 1],
"name": "Double Crystal Flash",
"requires": [
{"obstaclesNotCleared": ["A"]},
{"simpleHeatFrames": 135},
{"heatFrames": 40},
"h_heatedCrystalFlash",
{"simpleHeatFrames": 130},
{"heatFrames": 40},
"h_heatedCrystalFlash",
{"simpleHeatFrames": 280},
{"heatFrames": 30}
],
"note": [
"Use a Crystal Flash after crossing 4 crumble block bridges,",
"and a second Crystal Flash in the middle of the large ramp in the center of the room."
],
"detailNote": [
"This allows crossing the room without tanks or Speed Booster."
],
"devNote": [
"FIXME: this may not be possible if the lava is rising (with Speed Booster and the flag not yet set)."
]
},
{
"id": 19,
"link": [2, 1],
Expand Down
41 changes: 41 additions & 0 deletions region/norfair/east/Spiky Platforms Tunnel.json
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,27 @@
"Only one of these frames gives a normal IBJ, which shouldn't be expected (1 frame for the first Bomb, then 3 frames for the second)."
]
},
{
"link": [1, 2],
"name": "Crystal Flash and Lava Bath",
"requires": [
"canSuitlessLavaDive",
{"heatFrames": 425},
"h_heatedCrystalFlash",
{"heatFrames": 300},
{"lavaFrames": 70}
],
"note": [
"Ride the first Tripper, using Morph to avoid spike damage, then perform a Crystal Flash.",
"The second Tripper will likely either be destroyed or in a bad pattern,",
"making it necessary to jump through the lava to cross the rest of the room."
],
"detailNote": [
"It may help to use the Tripper to do a big jump past the shutter before doing the Crystal Flash;",
"otherwise the shutter might end up closed and get in the way."
]
},

{
"id": 9,
"link": [2, 1],
Expand Down Expand Up @@ -422,6 +443,26 @@
],
"note": ["Perform a bounceball to minimize lava damage.", "Ride the second Tripper."]
},
{
"link": [2, 1],
"name": "Crystal Flash and Lava Bath",
"requires": [
"canSuitlessLavaDive",
{"heatFrames": 425},
"h_heatedCrystalFlash",
{"heatFrames": 300},
{"lavaFrames": 70}
],
"note": [
"Ride the first Tripper, using Morph to avoid spike damage, then perform a Crystal Flash.",
"The second Tripper will likely either be destroyed or in a bad pattern,",
"making it necessary to jump through the lava to cross the rest of the room."
],
"detailNote": [
"It may help to use the Tripper to do a big jump past the shutter before doing the Crystal Flash;",
"otherwise the shutter might end up closed and get in the way."
]
},
{
"id": 24,
"link": [2, 1],
Expand Down
9 changes: 9 additions & 0 deletions region/norfair/east/Upper Norfair Farming Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
"to": [
{"id": 1},
{"id": 3},
{"id": 4},
{"id": 5}
]
},
Expand Down Expand Up @@ -1013,6 +1014,14 @@
}
]
},
{
"link": [4, 4],
"name": "Crystal Flash",
"requires": [
"h_heatedCrystalFlash"
],
"flashSuitChecked": true
},
{
"id": 35,
"link": [4, 5],
Expand Down
13 changes: 13 additions & 0 deletions region/norfair/east/Volcano Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,19 @@
}
]
},
{
"link": [2, 1],
"name": "Crystal Flash below Shot Blocks",
"requires": [
{"heatFrames": 180},
"h_heatedCrystalFlash",
{"heatFrames": 250}
],
"devNote": [
"FIXME: by adding a junction here, we could account for more ways of entering the room;",
"but a junction would complicate how the heated/unheated state of the room is tracked."
]
},
{
"id": 10,
"link": [2, 1],
Expand Down
8 changes: 8 additions & 0 deletions region/norfair/west/Ice Beam Snake Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1584,6 +1584,14 @@
"requires": [
{"heatFrames": 50}
]
},
{
"link": [5, 5],
"name": "Crystal Flash",
"requires": [
"h_heatedCrystalFlash"
],
"flashSuitChecked": true
}
],
"notables": [],
Expand Down