Skip to content

Commit a420832

Browse files
osse101osse101
authored
Merge pull request #1973 from blkerby/west-norfair-temp-blue
Most of rest of West Norfair temp blue
2 parents 513921a + ee14f39 commit a420832

5 files changed

Lines changed: 266 additions & 5 deletions

File tree

‎region/norfair/west/Crocomire Escape.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,27 @@
656656
],
657657
"flashSuitChecked": true
658658
},
659+
{
660+
"link": [2, 2],
661+
"name": "Leave With Temporary Blue",
662+
"requires": [
663+
{"heatFrames": 1180},
664+
{"canShineCharge": {
665+
"usedTiles": 15,
666+
"openEnd": 2
667+
}},
668+
"canLongChainTemporaryBlue",
669+
"canXRayTurnaround",
670+
{"or": [
671+
"canXRayCancelShinecharge",
672+
{"heatFrames": 160}
673+
]}
674+
],
675+
"exitCondition": {
676+
"leaveWithTemporaryBlue": {}
677+
},
678+
"note": ["Use the platform at the top-right of the room to gain temporary blue, then chain it through the door."]
679+
},
659680
{
660681
"id": 53,
661682
"link": [2, 2],

‎region/norfair/west/Crumble Shaft.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,36 @@
156156
"flashSuitChecked": true,
157157
"note": "Fall into the room and land on the bottom right crumble platform to bring the Sova to the door."
158158
},
159+
{
160+
"link": [1, 2],
161+
"name": "Come in Shinecharging, Leave With Temporary Blue",
162+
"entranceCondition": {
163+
"comeInShinecharging": {
164+
"length": 1,
165+
"openEnd": 0
166+
}
167+
},
168+
"requires": [
169+
"canChainTemporaryBlue",
170+
"canXRayTurnaround",
171+
{"heatFrames": 375},
172+
{"or": [
173+
"canXRayCancelShinecharge",
174+
{"heatFrames": 160}
175+
]}
176+
],
177+
"exitCondition": {
178+
"leaveWithTemporaryBlue": {}
179+
},
180+
"unlocksDoors": [
181+
{"types": ["super"], "requires": []},
182+
{"types": ["powerbomb"], "requires": ["canInsaneJump"]},
183+
{
184+
"types": ["missiles"],
185+
"requires": [{"heatFrames": 50}]
186+
}
187+
]
188+
},
159189
{
160190
"id": 45,
161191
"link": [1, 2],

‎region/norfair/west/Hi Jump Energy Tank Room.json‎

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,19 @@
324324
"Then crouch jump from the slope on the left, and morph into a neutral damage boost."
325325
]
326326
},
327+
{
328+
"link": [1, 4],
329+
"name": "Temporary Blue Bounce",
330+
"entranceCondition": {
331+
"comeInWithTemporaryBlue": {}
332+
},
333+
"requires": [
334+
"canLongChainTemporaryBlue",
335+
"canXRayTurnaround",
336+
"canTrickySpringBallBounce"
337+
],
338+
"clearsObstacles": ["C"]
339+
},
327340
{
328341
"id": 9,
329342
"link": [1, 4],
@@ -553,17 +566,31 @@
553566
{
554567
"id": 20,
555568
"link": [2, 2],
556-
"name": "Leave with Runway",
557-
"requires": [],
569+
"name": "Leave with Runway (Bomb Blocks Intact)",
570+
"requires": [
571+
{"obstaclesNotCleared": ["B"]}
572+
],
558573
"exitCondition": {
559574
"leaveWithRunway": {
560575
"length": 7,
561576
"openEnd": 0
562577
}
578+
}
579+
},
580+
{
581+
"link": [2, 2],
582+
"name": "Leave with Runway (Bomb Blocks Broken)",
583+
"requires": [
584+
{"obstaclesCleared": ["B"]}
585+
],
586+
"exitCondition": {
587+
"leaveWithRunway": {
588+
"length": 3,
589+
"openEnd": 1
590+
}
563591
},
564592
"devNote": [
565-
"The bomb blocks have to be intact, but it's always possible to get to this node without breaking them.",
566-
"If the bomb blocks were broken, this runway could be extended with a frozen Sova."
593+
"This runway could be extended with a frozen Sova."
567594
]
568595
},
569596
{
@@ -597,6 +624,35 @@
597624
"name": "Base",
598625
"requires": []
599626
},
627+
{
628+
"link": [2, 4],
629+
"name": "Temporary Blue Bounce (Come In Shinecharging)",
630+
"entranceCondition": {
631+
"comeInShinecharging": {
632+
"length": 2,
633+
"openEnd": 0
634+
}
635+
},
636+
"requires": [
637+
"canChainTemporaryBlue",
638+
"can4HighMidAirMorph",
639+
"canSpringBallBounce"
640+
],
641+
"clearsObstacles": ["B", "C"]
642+
},
643+
{
644+
"link": [2, 4],
645+
"name": "Temporary Blue Bounce (Come In With Temporary Blue)",
646+
"entranceCondition": {
647+
"comeInWithTemporaryBlue": {}
648+
},
649+
"requires": [
650+
"canChainTemporaryBlue",
651+
"can4HighMidAirMorph",
652+
"canSpringBallBounce"
653+
],
654+
"clearsObstacles": ["C"]
655+
},
600656
{
601657
"id": 24,
602658
"link": [2, 4],

‎region/norfair/west/Ice Beam Acid Room.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,44 @@
246246
],
247247
"flashSuitChecked": true
248248
},
249+
{
250+
"link": [1, 2],
251+
"name": "Come in Getting Blue Speed, Leave With Temporary Blue",
252+
"entranceCondition": {
253+
"comeInGettingBlueSpeed": {
254+
"length": 2,
255+
"openEnd": 1,
256+
"minExtraRunSpeed": "$1.D",
257+
"maxExtraRunSpeed": "$2.F"
258+
}
259+
},
260+
"requires": [
261+
{"or": [
262+
{"and": [
263+
"canBlueSpaceJump",
264+
{"heatFrames": 215}
265+
]},
266+
{"and": [
267+
"canTrickySpringBallBounce",
268+
{"heatFrames": 215}
269+
]},
270+
{"and": [
271+
"canLongChainTemporaryBlue",
272+
{"heatFrames": 370}
273+
]}
274+
]}
275+
],
276+
"exitCondition": {
277+
"leaveWithTemporaryBlue": {}
278+
},
279+
"unlocksDoors": [
280+
{"types": ["super", "powerbomb"], "requires": []},
281+
{
282+
"types": ["missiles"],
283+
"requires": [{"heatFrames": 50}]
284+
}
285+
]
286+
},
249287
{
250288
"id": 24,
251289
"link": [1, 2],
@@ -377,6 +415,46 @@
377415
],
378416
"flashSuitChecked": true
379417
},
418+
{
419+
"link": [2, 1],
420+
"name": "Come in Getting Blue Speed, Leave With Temporary Blue",
421+
"entranceCondition": {
422+
"comeInGettingBlueSpeed": {
423+
"length": 2,
424+
"openEnd": 1,
425+
"minExtraRunSpeed": "$1.9",
426+
"maxExtraRunSpeed": "$2.F"
427+
}
428+
},
429+
"requires": [
430+
"canChainTemporaryBlue",
431+
{"or": [
432+
{"and": [
433+
"canBlueSpaceJump",
434+
{"heatFrames": 215}
435+
]},
436+
{"and": [
437+
"canTrickySpringBallBounce",
438+
{"heatFrames": 215}
439+
]},
440+
{"and": [
441+
"canLongChainTemporaryBlue",
442+
"canInsaneJump",
443+
{"heatFrames": 380}
444+
]}
445+
]}
446+
],
447+
"exitCondition": {
448+
"leaveWithTemporaryBlue": {}
449+
},
450+
"unlocksDoors": [
451+
{"types": ["super", "powerbomb"], "requires": []},
452+
{
453+
"types": ["missiles"],
454+
"requires": [{"heatFrames": 50}]
455+
}
456+
]
457+
},
380458
{
381459
"id": 13,
382460
"link": [2, 1],

‎region/norfair/west/Ice Beam Gate Room.json‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,83 @@
558558
"requires": [
559559
"canInsaneJump"
560560
],
561-
"devNote": "FIXME: This can be done with 8 tiles (technically even 7.4375 tiles) but would require higher movement tech."
561+
"devNote": "Theoretically this can be done with 8 tiles (technically even 7.4375 tiles) but would require higher movement tech."
562+
},
563+
{
564+
"link": [2, 4],
565+
"name": "Insane Speedy Mockball",
566+
"entranceCondition": {
567+
"comeInRunning": {
568+
"speedBooster": true,
569+
"minTiles": 5
570+
}
571+
},
572+
"requires": [
573+
"canInsaneJump",
574+
"canMockball"
575+
],
576+
"note": [
577+
"Run into the room, and perform a very low short-hop mockball, delaying it so that Samus morphs right before the gate."
578+
],
579+
"devNote": "Theoretically this can be done with 4 tiles (technically even 3.4375 tiles) but would require higher movement tech."
580+
},
581+
{
582+
"link": [2, 4],
583+
"name": "Come In Getting Blue Speed, Speedball, Leave With Temporary Blue",
584+
"entranceCondition": {
585+
"comeInGettingBlueSpeed": {
586+
"length": 5,
587+
"openEnd": 1,
588+
"minExtraRunSpeed": "$3.8"
589+
}
590+
},
591+
"requires": [
592+
"canSpeedball",
593+
"canChainTemporaryBlue"
594+
],
595+
"exitCondition": {
596+
"leaveWithTemporaryBlue": {}
597+
},
598+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
599+
"devNote": ["Extra run speeds as low as $2.F can work, but with greater difficulty."]
600+
},
601+
{
602+
"link": [2, 4],
603+
"name": "Come In Blue Spinning, Speedball, Leave With Temporary Blue",
604+
"entranceCondition": {
605+
"comeInBlueSpinning": {
606+
"unusableTiles": 0,
607+
"minExtraRunSpeed": "$3.8"
608+
}
609+
},
610+
"requires": [
611+
"canSpeedball",
612+
"canChainTemporaryBlue"
613+
],
614+
"exitCondition": {
615+
"leaveWithTemporaryBlue": {}
616+
},
617+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
618+
"devNote": ["Extra run speeds as low as $3.6 can work."]
619+
},
620+
{
621+
"link": [2, 4],
622+
"name": "Come In With Blue Spring Ball Bounce, Leave With Temporary Blue",
623+
"entranceCondition": {
624+
"comeInWithBlueSpringBallBounce": {
625+
"movementType": "controlled",
626+
"minExtraRunSpeed": "$4.4"
627+
}
628+
},
629+
"requires": [
630+
"canTrickySpringBallBounce",
631+
"canInsaneJump",
632+
"canChainTemporaryBlue"
633+
],
634+
"exitCondition": {
635+
"leaveWithTemporaryBlue": {}
636+
},
637+
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
562638
},
563639
{
564640
"id": 19,

0 commit comments

Comments
 (0)