Skip to content

Commit ea7519a

Browse files
osse101osse101
authored
Merge pull request #1674 from kjbranch/pink-m-flash-use-6
Pink Maridia (Final): Use Flash Suit
2 parents f77d026 + 8b5e045 commit ea7519a

7 files changed

Lines changed: 232 additions & 19 deletions

File tree

‎region/maridia/inner-pink/East Sand Hole.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@
394394
"canSunkenTileWideWallClimb"
395395
]}
396396
],
397+
"flashSuitChecked": true,
397398
"note": [
398399
"Shinespark to the first ledge. To use a flash suit in deep sand:",
399400
"vertically - quickly roll the directional inputs from forward to up and jump.",
@@ -413,6 +414,7 @@
413414
{"useFlashSuit": {}},
414415
{"shinespark": {"frames": 19, "excessFrames": 7}}
415416
],
417+
"flashSuitChecked": true,
416418
"note": "After landing on the sand, get a good jump off of it then spark diagonally up all the way out of the water."
417419
},
418420
{
@@ -520,6 +522,7 @@
520522
]}
521523
]}
522524
],
525+
"flashSuitChecked": true,
523526
"note": [
524527
"While against the left wall, crouch jump and spark diagonally at the top of the jump.",
525528
"The easiest way to crouch jump without using the flash suit is to hold shot."
@@ -632,7 +635,8 @@
632635
"requires": [
633636
{"useFlashSuit": {}},
634637
{"shinespark": {"frames": 8, "excessFrames": 5}}
635-
]
638+
],
639+
"flashSuitChecked": true
636640
}
637641
],
638642
"nextStratId": 26,

‎region/maridia/inner-pink/Halfie Climb Room.json‎

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,21 @@
768768
}
769769
]
770770
},
771+
{
772+
"link": [1, 4],
773+
"name": "Use Flash Suit",
774+
"requires": [
775+
{"useFlashSuit": {}},
776+
{"or": [
777+
{"shinespark": {"frames": 17, "excessFrames": 3}},
778+
{"and": [
779+
"HiJump",
780+
{"shinespark": {"frames": 14, "excessFrames": 3}}
781+
]}
782+
]}
783+
],
784+
"flashSuitChecked": true
785+
},
771786
{
772787
"id": 33,
773788
"link": [1, 4],
@@ -1068,13 +1083,27 @@
10681083
}
10691084
]
10701085
},
1086+
{
1087+
"link": [2, 1],
1088+
"name": "Use Flash Suit",
1089+
"requires": [
1090+
{"useFlashSuit": {}},
1091+
{"or": [
1092+
{"shinespark": {"frames": 17, "excessFrames": 3}},
1093+
{"and": [
1094+
"HiJump",
1095+
{"shinespark": {"frames": 13, "excessFrames": 3}}
1096+
]}
1097+
]}
1098+
],
1099+
"flashSuitChecked": true
1100+
},
10711101
{
10721102
"id": 48,
10731103
"link": [2, 1],
10741104
"name": "Very Long Underwater Walljump Climb",
10751105
"requires": [
1076-
{"notable": "Very Long Underwater Walljump Climb"},
1077-
"canUnderwaterWalljump"
1106+
"canLongUnderwaterWalljump"
10781107
],
10791108
"note": "This underwater walljump is very long."
10801109
},
@@ -1820,6 +1849,21 @@
18201849
}
18211850
]
18221851
},
1852+
{
1853+
"link": [2, 4],
1854+
"name": "Use Flash Suit",
1855+
"requires": [
1856+
{"useFlashSuit": {}},
1857+
{"or": [
1858+
{"shinespark": {"frames": 35, "excessFrames": 3}},
1859+
{"and": [
1860+
"HiJump",
1861+
{"shinespark": {"frames": 31, "excessFrames": 3}}
1862+
]}
1863+
]}
1864+
],
1865+
"flashSuitChecked": true
1866+
},
18231867
{
18241868
"id": 84,
18251869
"link": [2, 4],
@@ -2117,6 +2161,18 @@
21172161
"Do not stand on the Oums when they begin to attack."
21182162
]
21192163
},
2164+
{
2165+
"link": [3, 2],
2166+
"name": "Use Flash Suit",
2167+
"requires": [
2168+
"Morph",
2169+
"canUseEnemies",
2170+
{"useFlashSuit": {}},
2171+
{"shinespark": {"frames": 4, "excessFrames": 2}}
2172+
],
2173+
"flashSuitChecked": true,
2174+
"note": "Go under the Oums to lure one and use it to get to the left. Shinespark to get up the next ledge."
2175+
},
21202176
{
21212177
"id": 100,
21222178
"link": [3, 2],
@@ -2774,11 +2830,6 @@
27742830
"Samus will fall into the door transition, bypassing any lock that may be on the door."
27752831
]
27762832
},
2777-
{
2778-
"id": 4,
2779-
"name": "Very Long Underwater Walljump Climb",
2780-
"note": "This underwater walljump is very long."
2781-
},
27822833
{
27832834
"id": 5,
27842835
"name": "Very Deep Stuck X-Ray Climb",

‎region/maridia/inner-pink/The Precious Room.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,57 @@
494494
"canCrossRoomJumpIntoWater"
495495
]
496496
},
497+
{
498+
"link": [2, 1],
499+
"name": "Use Flash Suit",
500+
"requires": [
501+
{"useFlashSuit": {}},
502+
{"or": [
503+
{"shinespark": {"frames": 37, "excessFrames": 9}},
504+
{"and": [
505+
"HiJump",
506+
{"shinespark": {"frames": 33, "excessFrames": 8}}
507+
]}
508+
]}
509+
],
510+
"flashSuitChecked": true
511+
},
512+
{
513+
"link": [2, 1],
514+
"name": "Cross Room Jump, Use Flash Suit",
515+
"entranceCondition": {
516+
"comeInJumping": {
517+
"speedBooster": "any",
518+
"minTiles": 0.4375
519+
}
520+
},
521+
"requires": [
522+
"canCrossRoomJumpIntoWater",
523+
{"useFlashSuit": {}},
524+
{"shinespark": {"frames": 16, "excessFrames": 9}}
525+
],
526+
"flashSuitChecked": true,
527+
"note": [
528+
"Cross room jump onto the top middle platform before sparking.",
529+
"Requires a runway of 1 tile in the adjacent room."
530+
],
531+
"devNote": [
532+
"Assumes Samus lands, then jumps again before sparking.",
533+
"There is no HiJump variant, as that can jump out of the water."
534+
]
535+
},
536+
{
537+
"link": [2, 1],
538+
"name": "Long Underwater Wall Jump, Use Flash Suit",
539+
"requires": [
540+
"canTrickyCarryFlashSuit",
541+
"canLongUnderwaterWalljump",
542+
{"useFlashSuit": {}},
543+
{"shinespark": {"frames": 12, "excessFrames": 8}}
544+
],
545+
"flashSuitChecked": true,
546+
"note": "Underwater wall jump to the top middle platform before sparking to save Energy."
547+
},
497548
{
498549
"id": 27,
499550
"link": [2, 1],

‎region/maridia/inner-pink/West Cactus Alley Room.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,52 @@
389389
"It may be necessary to time the walljump attempts by watching the water level, or by stalling with additional walljumps as the water rises."
390390
]
391391
},
392+
{
393+
"link": [1, 2],
394+
"name": "Use Flash Suit",
395+
"requires": [
396+
{"useFlashSuit": {}},
397+
{"or": [
398+
{"shinespark": {"frames": 17, "excessFrames": 3}},
399+
{"and": [
400+
"HiJump",
401+
{"shinespark": {"frames": 7, "excessFrames": 5}}
402+
]}
403+
]},
404+
{"enemyDamage": {
405+
"enemy": "Cacatac",
406+
"hits": 1,
407+
"type": "spike"
408+
}}
409+
],
410+
"flashSuitChecked": true,
411+
"devNote": "The spike hit may be avoidable, but it shouldn't matter much."
412+
},
413+
{
414+
"link": [1, 2],
415+
"name": "Cross Room Jump, Use Flash Suit",
416+
"entranceCondition": {
417+
"comeInJumping": {
418+
"speedBooster": "any",
419+
"minTiles": 1
420+
}
421+
},
422+
"requires": [
423+
"canCrossRoomJumpIntoWater",
424+
{"useFlashSuit": {}},
425+
{"shinespark": {"frames": 10, "excessFrames": 5}},
426+
{"enemyDamage": {
427+
"enemy": "Cacatac",
428+
"hits": 1,
429+
"type": "spike"
430+
}}
431+
],
432+
"flashSuitChecked": true,
433+
"devNote": [
434+
"The spike hit may be avoidable, but it shouldn't matter much.",
435+
"The runway could be reduced to 0.4375 tiles with SpeedBooster."
436+
]
437+
},
392438
{
393439
"id": 22,
394440
"link": [1, 2],

‎region/maridia/inner-pink/West Sand Hole.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,65 @@
360360
"A diagonal ShineSpark will most likely not have any horizontal movement when performed from the sand."
361361
]
362362
},
363+
{
364+
"link": [1, 7],
365+
"name": "Jump Assist, Use Flash Suit",
366+
"requires": [
367+
"canPlayInSand",
368+
{"or": [
369+
"HiJump",
370+
"canSpringBallJumpMidAir"
371+
]},
372+
{"useFlashSuit": {}},
373+
{"or": [
374+
{"shinespark": {"frames": 10, "excessFrames": 3}},
375+
{"and": [
376+
"HiJump",
377+
{"shinespark": {"frames": 7, "excessFrames": 3}}
378+
]}
379+
]}
380+
],
381+
"flashSuitChecked": true
382+
},
383+
{
384+
"link": [1, 7],
385+
"name": "Break Block on Descent, Use Flash Suit",
386+
"requires": [
387+
"canPlayInSand",
388+
{"or": [
389+
"h_canUsePowerBombs",
390+
"Wave"
391+
]},
392+
{"useFlashSuit": {}},
393+
{"shinespark": {"frames": 18, "excessFrames": 3}}
394+
],
395+
"flashSuitChecked": true,
396+
"note": "Break the block on the descent with Wave or a Power Bomb, jump off the sand, then spark diagonally out of the water."
397+
},
398+
{
399+
"link": [1, 7],
400+
"name": "Hero Shot Break Block, Use Flash Suit",
401+
"requires": [
402+
"canPlayInSand",
403+
"canHeroShot",
404+
{"useFlashSuit": {}},
405+
{"or": [
406+
{"shinespark": {"frames": 27, "excessFrames": 5}},
407+
{"and": [
408+
"canTrickyCarryFlashSuit",
409+
{"shinespark": {"frames": 18, "excessFrames": 3}}
410+
]}
411+
]}
412+
],
413+
"flashSuitChecked": true,
414+
"note": [
415+
"From the bottom of the sand, shoot upwards to break the block then Shinespark up. To use a flash suit in deep sand:",
416+
"vertically - quickly roll the directional inputs from forward to up and jump.",
417+
"diagonally, with minimal horizontal speed - while holding angle, quickly tap forward then press and hold jump.",
418+
"Alternatively, to save Energy, shoot the block without falling into the sand, then reposition and spark up left.",
419+
"This can be done with a midair unmorph then shoot up, or from shooting up from the sand surface then quickly spin jumping off in order not to sink."
420+
]
421+
},
363422
{
364423
"id": 14,
365424
"link": [1, 7],

‎region/maridia/outer/Fish Tank.json‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,7 @@
677677
"link": [1, 5],
678678
"name": "Very Long Underwater Walljump Climb (In Room)",
679679
"requires": [
680-
{"notable": "Very Long Underwater Walljump Climb"},
681-
"canUnderwaterWalljump",
680+
"canLongUnderwaterWalljump",
682681
{"or": [
683682
"canUseFrozenEnemies",
684683
"canSpringBallJumpMidAir",
@@ -708,8 +707,7 @@
708707
}
709708
},
710709
"requires": [
711-
{"notable": "Very Long Underwater Walljump Climb"},
712-
"canUnderwaterWalljump",
710+
"canLongUnderwaterWalljump",
713711
"canTrickyJump",
714712
"canDisableEquipment",
715713
"canMomentumConservingTurnaround"
@@ -1888,13 +1886,6 @@
18881886
"This requires a very precise jump from the very edge of the ledge and risks falling into the Bottom-Left pit which may be difficult to climb back from."
18891887
]
18901888
},
1891-
{
1892-
"id": 2,
1893-
"name": "Very Long Underwater Walljump Climb",
1894-
"note": [
1895-
"This underwater walljump is very long. Some jump assistance, cross room jump, or a flatley jump from the door frame is needed to get to the first overhang."
1896-
]
1897-
},
18981889
{
18991890
"id": 3,
19001891
"name": "Grapple Teleport into Grapple Jump",

‎tech.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,17 @@
11051105
"This tech assumes Samus has HiJump and only expects gaining about 1 tile of height through consecutive walljumping."
11061106
],
11071107
"extensionTechs": [
1108+
{
1109+
"name": "canLongUnderwaterWalljump",
1110+
"techRequires": [
1111+
"canUnderwaterWalljump"
1112+
],
1113+
"otherRequires": [],
1114+
"note": [
1115+
"The ability to gain height by walljumping underwater against a single wall.",
1116+
"This tech assumes Samus has HiJump and expects gaining more than 1 tile of height through consecutive walljumping."
1117+
]
1118+
},
11081119
{
11091120
"id": 186,
11101121
"name": "canUnderwaterWalljumpBreakFree",

0 commit comments

Comments
 (0)