Skip to content

Commit 3fee6e7

Browse files
osse101osse101
authored
Merge pull request #1942 from blkerby/norfair-temp-blue-1
Rest of East Upper Norfair temp blue
2 parents 039ef6b + aa8a4fb commit 3fee6e7

File tree

4 files changed

+303
-7
lines changed

4 files changed

+303
-7
lines changed

‎region/norfair/east/Spiky Acid Snakes Tunnel.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,34 @@
328328
]}
329329
]
330330
},
331+
{
332+
"link": [1, 2],
333+
"name": "Come In Getting Blue, Leave With Temporary Blue (Space Jump)",
334+
"entranceCondition": {
335+
"comeInGettingBlueSpeed": {
336+
"length": 3,
337+
"openEnd": 1,
338+
"minExtraRunSpeed": "$1.A"
339+
}
340+
},
341+
"requires": [
342+
"SpaceJump",
343+
"canChainTemporaryBlue",
344+
{"heatFrames": 330}
345+
],
346+
"exitCondition": {
347+
"leaveWithTemporaryBlue": {}
348+
},
349+
"unlocksDoors": [
350+
{"types": ["super"], "requires": []},
351+
{"types": ["missiles"], "requires": [{"heatFrames": 90}]},
352+
{"types": ["powerbomb"], "requires": [{"heatFrames": 90}]}
353+
],
354+
"devNote": [
355+
"The minimum speed $1.A is arbitrary; lower speeds could work with larger heatFrames.",
356+
"FIXME: set up a mechanism to automate heat frames required in cases like this."
357+
]
358+
},
331359
{
332360
"id": 16,
333361
"link": [1, 2],
@@ -633,6 +661,34 @@
633661
"Delay the damage boost from the spikes slightly in order to rise above the lava before moving."
634662
]
635663
},
664+
{
665+
"link": [2, 1],
666+
"name": "Come In Getting Blue, Leave With Temporary Blue (Space Jump)",
667+
"entranceCondition": {
668+
"comeInGettingBlueSpeed": {
669+
"length": 3,
670+
"openEnd": 1,
671+
"minExtraRunSpeed": "$1.A"
672+
}
673+
},
674+
"requires": [
675+
"SpaceJump",
676+
"canChainTemporaryBlue",
677+
{"heatFrames": 330}
678+
],
679+
"exitCondition": {
680+
"leaveWithTemporaryBlue": {}
681+
},
682+
"unlocksDoors": [
683+
{"types": ["super"], "requires": []},
684+
{"types": ["missiles"], "requires": [{"heatFrames": 90}]},
685+
{"types": ["powerbomb"], "requires": [{"heatFrames": 90}]}
686+
],
687+
"devNote": [
688+
"The minimum speed $1.A is arbitrary; lower speeds could work with larger heatFrames.",
689+
"FIXME: set up a mechanism to automate heat frames required in cases like this."
690+
]
691+
},
636692
{
637693
"id": 31,
638694
"link": [2, 1],

‎region/norfair/east/Upper Norfair Farming Room.json‎

Lines changed: 173 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@
109109
{
110110
"from": 2,
111111
"to": [
112+
{"id": 1},
112113
{"id": 2},
114+
{"id": 3},
113115
{"id": 5}
114116
]
115117
},
@@ -176,7 +178,7 @@
176178
"requires": [
177179
"Wave",
178180
"canShinechargeMovementTricky",
179-
{"heatFrames": 200},
181+
{"heatFrames": 160},
180182
{"shineChargeFrames": 160}
181183
],
182184
"exitCondition": {
@@ -218,6 +220,33 @@
218220
],
219221
"flashSuitChecked": true
220222
},
223+
{
224+
"link": [1, 2],
225+
"name": "Come In Shinecharging, Leave With Temporary Blue",
226+
"entranceCondition": {
227+
"comeInShinecharging": {
228+
"length": 12,
229+
"openEnd": 0
230+
}
231+
},
232+
"requires": [
233+
"Wave",
234+
{"or": [
235+
"canXRayCancelShinecharge",
236+
{"heatFrames": 160}
237+
]},
238+
"canXRayTurnaround",
239+
"canLongChainTemporaryBlue",
240+
{"heatFrames": 560}
241+
],
242+
"exitCondition": {
243+
"leaveWithTemporaryBlue": {}
244+
},
245+
"unlocksDoors": [
246+
{"types": ["super", "powerbomb"], "requires": []},
247+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]}
248+
]
249+
},
221250
{
222251
"id": 5,
223252
"link": [1, 3],
@@ -308,6 +337,28 @@
308337
],
309338
"flashSuitChecked": true
310339
},
340+
{
341+
"link": [1, 3],
342+
"name": "Come In Getting Blue Speed, Leave With Temporary Blue",
343+
"entranceCondition": {
344+
"comeInGettingBlueSpeed": {
345+
"length": 12,
346+
"openEnd": 1
347+
}
348+
},
349+
"requires": [
350+
"canChainTemporaryBlue",
351+
{"heatFrames": 140}
352+
],
353+
"exitCondition": {
354+
"leaveWithTemporaryBlue": {}
355+
},
356+
"unlocksDoors": [
357+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]},
358+
{"types": ["super"], "requires": []},
359+
{"types": ["powerbomb"], "requires": [{"heatFrames": 50}]}
360+
]
361+
},
311362
{
312363
"id": 9,
313364
"link": [1, 4],
@@ -316,6 +367,41 @@
316367
{"heatFrames": 75}
317368
]
318369
},
370+
{
371+
"link": [2, 1],
372+
"name": "Come In Shinecharging, Leave With Temporary Blue",
373+
"entranceCondition": {
374+
"comeInShinecharging": {
375+
"length": 4,
376+
"openEnd": 0
377+
}
378+
},
379+
"requires": [
380+
{"or": [
381+
"canXRayCancelShinecharge",
382+
{"heatFrames": 160}
383+
]},
384+
"canLongChainTemporaryBlue",
385+
"canXRayTurnaround",
386+
{"or": [
387+
{"and": [
388+
"HiJump",
389+
{"heatFrames": 690}
390+
]},
391+
{"and": [
392+
"canTrickySpringBallJump",
393+
{"heatFrames": 745}
394+
]}
395+
]}
396+
],
397+
"exitCondition": {
398+
"leaveWithTemporaryBlue": {}
399+
},
400+
"unlocksDoors": [
401+
{"types": ["super", "powerbomb"], "requires": []},
402+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]}
403+
]
404+
},
319405
{
320406
"id": 10,
321407
"link": [2, 2],
@@ -345,6 +431,41 @@
345431
}
346432
}
347433
},
434+
{
435+
"link": [2, 3],
436+
"name": "Come In Shinecharging, Leave With Temporary Blue",
437+
"entranceCondition": {
438+
"comeInShinecharging": {
439+
"length": 4,
440+
"openEnd": 0
441+
}
442+
},
443+
"requires": [
444+
{"or": [
445+
"canXRayCancelShinecharge",
446+
{"heatFrames": 160}
447+
]},
448+
"canLongChainTemporaryBlue",
449+
{"or": [
450+
{"and": [
451+
"HiJump",
452+
{"heatFrames": 680}
453+
]},
454+
{"and": [
455+
"canTrickySpringBallJump",
456+
"canXRayTurnaround",
457+
{"heatFrames": 775}
458+
]}
459+
]}
460+
],
461+
"exitCondition": {
462+
"leaveWithTemporaryBlue": {}
463+
},
464+
"unlocksDoors": [
465+
{"types": ["super", "powerbomb"], "requires": []},
466+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]}
467+
]
468+
},
348469
{
349470
"id": 12,
350471
"link": [2, 5],
@@ -448,6 +569,28 @@
448569
],
449570
"flashSuitChecked": true
450571
},
572+
{
573+
"link": [3, 1],
574+
"name": "Come In Getting Blue Speed, Leave With Temporary Blue",
575+
"entranceCondition": {
576+
"comeInGettingBlueSpeed": {
577+
"length": 12,
578+
"openEnd": 1
579+
}
580+
},
581+
"requires": [
582+
"canChainTemporaryBlue",
583+
{"heatFrames": 140}
584+
],
585+
"exitCondition": {
586+
"leaveWithTemporaryBlue": {}
587+
},
588+
"unlocksDoors": [
589+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]},
590+
{"types": ["super"], "requires": []},
591+
{"types": ["powerbomb"], "requires": [{"heatFrames": 50}]}
592+
]
593+
},
451594
{
452595
"id": 17,
453596
"link": [3, 1],
@@ -530,8 +673,8 @@
530673
"requires": [
531674
"Wave",
532675
"canShinechargeMovementTricky",
533-
{"heatFrames": 205},
534-
{"shineChargeFrames": 170}
676+
{"heatFrames": 160},
677+
{"shineChargeFrames": 160}
535678
],
536679
"exitCondition": {
537680
"leaveShinecharged": {}
@@ -557,7 +700,7 @@
557700
]},
558701
"canShinechargeMovementTricky",
559702
{"heatFrames": 255},
560-
{"shineChargeFrames": 170}
703+
{"shineChargeFrames": 160}
561704
],
562705
"exitCondition": {
563706
"leaveShinecharged": {}
@@ -572,6 +715,32 @@
572715
],
573716
"flashSuitChecked": true
574717
},
718+
{
719+
"link": [3, 2],
720+
"name": "Come In Shinecharging, Leave With Temporary Blue",
721+
"entranceCondition": {
722+
"comeInShinecharging": {
723+
"length": 12,
724+
"openEnd": 0
725+
}
726+
},
727+
"requires": [
728+
"Wave",
729+
{"or": [
730+
"canXRayCancelShinecharge",
731+
{"heatFrames": 160}
732+
]},
733+
"canLongChainTemporaryBlue",
734+
{"heatFrames": 460}
735+
],
736+
"exitCondition": {
737+
"leaveWithTemporaryBlue": {}
738+
},
739+
"unlocksDoors": [
740+
{"types": ["super", "powerbomb"], "requires": []},
741+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]}
742+
]
743+
},
575744
{
576745
"id": 23,
577746
"link": [3, 2],

‎region/norfair/east/Volcano Room.json‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,61 @@
240240
{"heatFrames": 405}
241241
]
242242
},
243+
{
244+
"link": [2, 1],
245+
"name": "Come In Getting Blue Speed, Leave With Temporary Blue (Big Jump)",
246+
"entranceCondition": {
247+
"comeInGettingBlueSpeed": {
248+
"length": 4,
249+
"openEnd": 1,
250+
"minExtraRunSpeed": "$4.7"
251+
}
252+
},
253+
"requires": [
254+
"canLongChainTemporaryBlue",
255+
"canXRayTurnaround",
256+
{"heatFrames": 760}
257+
],
258+
"exitCondition": {
259+
"leaveWithTemporaryBlue": {}
260+
},
261+
"unlocksDoors": [
262+
{"types": ["super", "powerbomb"], "requires": []},
263+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]}
264+
],
265+
"note": [
266+
"Move quickly (when X-Ray is not active) to climb the shaft before the Fune fireballs would reach Samus."
267+
],
268+
"devNote": [
269+
"The last runway tile is considered unusable, as Samus is likely to clip down through it."
270+
]
271+
},
272+
{
273+
"link": [2, 1],
274+
"name": "Come In Getting Blue Speed, Leave With Temporary Blue (Spring Ball Bounce)",
275+
"entranceCondition": {
276+
"comeInGettingBlueSpeed": {
277+
"length": 5,
278+
"openEnd": 1
279+
}
280+
},
281+
"requires": [
282+
"canTrickySpringBallBounce",
283+
"canLongChainTemporaryBlue",
284+
"canXRayTurnaround",
285+
{"heatFrames": 1020}
286+
],
287+
"exitCondition": {
288+
"leaveWithTemporaryBlue": {}
289+
},
290+
"unlocksDoors": [
291+
{"types": ["super", "powerbomb"], "requires": []},
292+
{"types": ["missiles"], "requires": [{"heatFrames": 50}]}
293+
],
294+
"note": [
295+
"Move quickly (when X-Ray is not active) to climb the shaft before the Fune fireballs would reach Samus."
296+
]
297+
},
243298
{
244299
"id": 8,
245300
"link": [2, 2],

0 commit comments

Comments
 (0)