Skip to content

Commit 9ce5a51

Browse files
osse101osse101
authored
Merge pull request #1675 from kjbranch/croc-flash-use
Crocomire: Use Flash Suit
2 parents 0b32894 + b388ff0 commit 9ce5a51

7 files changed

Lines changed: 211 additions & 3 deletions

‎region/norfair/crocomire/Crocomire's Room.json‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
{
340340
"id": 16,
341341
"link": [3, 4],
342-
"name": "Gravity Acid",
342+
"name": "Gravity Acid Bath",
343343
"requires": [
344344
"Gravity",
345345
{"acidFrames": 40}
@@ -350,7 +350,18 @@
350350
"link": [3, 4],
351351
"name": "Acid Bath",
352352
"requires": [
353-
{"acidFrames": 100}
353+
{"acidFrames": 100},
354+
{"or": [
355+
"canWalljump",
356+
{"acidFrames": 15}
357+
]}
358+
]
359+
},
360+
{
361+
"link": [3, 4],
362+
"name": "HiJump Acid Bath",
363+
"requires": [
364+
{"acidFrames": 75}
354365
]
355366
},
356367
{
@@ -364,6 +375,39 @@
364375
{"acidFrames": 55}
365376
]
366377
},
378+
{
379+
"link": [3, 4],
380+
"name": "Acid Bath, Use Flash Suit",
381+
"requires": [
382+
{"acidFrames": 55},
383+
{"useFlashSuit": {}},
384+
{"shinespark": {"frames": 9, "excessFrames": 0}}
385+
],
386+
"flashSuitChecked": true,
387+
"note": "Jump in the acid multiple times and spark diagonally during the last jump."
388+
},
389+
{
390+
"link": [3, 4],
391+
"name": "Long Horizontal Spark, Use Flash Suit",
392+
"requires": [
393+
{"useFlashSuit": {}},
394+
{"shinespark": {"frames": 139, "excessFrames": 108}}
395+
],
396+
"flashSuitChecked": true,
397+
"note": "Jump and spark horizontally across the room. With a lot of Energy, it would be better to take an acid bath and spark diagonally."
398+
},
399+
{
400+
"link": [3, 4],
401+
"name": "Horizontal Spark, Use Flash Suit, Down Grab",
402+
"requires": [
403+
"canInsaneJump",
404+
"canDownGrab",
405+
{"useFlashSuit": {}},
406+
{"shinespark": {"frames": 32, "excessFrames": 0}}
407+
],
408+
"flashSuitChecked": true,
409+
"note": "Jump and spark horizontally across the room at a precise height just above the acid in order to crash into then down grab the floor."
410+
},
367411
{
368412
"id": 19,
369413
"link": [3, 4],
@@ -657,6 +701,22 @@
657701
],
658702
"note": "With a precise enough jump and a quick airball, it's possible to avoid acid damage without a shinespark or wall jump."
659703
},
704+
{
705+
"link": [4, 3],
706+
"name": "Use Flash Suit",
707+
"requires": [
708+
{"useFlashSuit": {}},
709+
{"or": [
710+
{"shinespark": {"frames": 31, "excessFrames": 7}},
711+
{"or": [
712+
"SpeedBooster",
713+
{"shinespark": {"frames": 6, "excessFrames": 4}}
714+
]}
715+
]}
716+
],
717+
"flashSuitChecked": true,
718+
"note": "Jump and spark horizontally, or with a big speedy jump, spark diagonally to the item."
719+
},
660720
{
661721
"id": 40,
662722
"link": [4, 3],

‎region/norfair/crocomire/Grapple Beam Room.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,16 @@
204204
"Climb up 2 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door."
205205
]
206206
},
207+
{
208+
"link": [2, 1],
209+
"name": "Use Flash Suit",
210+
"requires": [
211+
{"useFlashSuit": {}},
212+
{"shinespark": {"frames": 24, "excessFrames": 5}}
213+
],
214+
"flashSuitChecked": true,
215+
"note": "From the first platform on the left, spin jump and press against the next platform and spark up right."
216+
},
207217
{
208218
"id": 11,
209219
"link": [2, 1],

‎region/norfair/crocomire/Grapple Tutorial Room 2.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"requires": [
103103
"HiJump",
104104
{"or": [
105-
"canWalljump",
105+
"canPreciseWalljump",
106106
"SpeedBooster"
107107
]}
108108
]
@@ -138,6 +138,21 @@
138138
"canWallJumpBombBoost"
139139
]
140140
},
141+
{
142+
"link": [1, 2],
143+
"name": "Use Flash Suit",
144+
"requires": [
145+
{"useFlashSuit": {}},
146+
{"or": [
147+
{"shinespark": {"frames": 11, "excessFrames": 5}},
148+
{"and": [
149+
"HiJump",
150+
{"shinespark": {"frames": 7, "excessFrames": 4}}
151+
]}
152+
]}
153+
],
154+
"flashSuitChecked": true
155+
},
141156
{
142157
"id": 9,
143158
"link": [1, 2],

‎region/norfair/crocomire/Grapple Tutorial Room 3.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
"from": 4,
106106
"to": [
107107
{"id": 1},
108+
{"id": 2},
108109
{"id": 3}
109110
]
110111
}
@@ -427,6 +428,15 @@
427428
"With at least two tiles of run speed, jump over the first moat by maximizing the jump distance and then MockBall into a regular springball to jump over the second moat."
428429
]
429430
},
431+
{
432+
"link": [1, 3],
433+
"name": "Use Flash Suit",
434+
"requires": [
435+
{"useFlashSuit": {}},
436+
{"shinespark": {"frames": 44, "excessFrames": 6}}
437+
],
438+
"flashSuitChecked": true
439+
},
430440
{
431441
"id": 16,
432442
"link": [1, 3],
@@ -848,6 +858,29 @@
848858
"name": "Base",
849859
"requires": []
850860
},
861+
{
862+
"link": [4, 2],
863+
"name": "Leave with Spark, Use Flash Suit",
864+
"requires": [
865+
{"or": [
866+
{"ammo": {"type": "Super", "count": 1}},
867+
{"obstaclesCleared": ["A"]}
868+
]},
869+
{"useFlashSuit": {}},
870+
{"shinespark": {"frames": 22, "excessFrames": 0}}
871+
],
872+
"exitCondition": {
873+
"leaveWithSpark": {}
874+
},
875+
"unlocksDoors": [
876+
{
877+
"types": ["ammo"],
878+
"requires": []
879+
}
880+
],
881+
"flashSuitChecked": true,
882+
"note": "Kill the Puyos in the right pit, jump in the pool multiple times while opening the gate and the door, then spark out the door."
883+
},
851884
{
852885
"id": 43,
853886
"link": [4, 3],
@@ -939,6 +972,15 @@
939972
"h_canDoubleSpringBallJumpWithHiJump"
940973
],
941974
"note": "Jump when the water level is at its lowest."
975+
},
976+
{
977+
"link": [4, 3],
978+
"name": "Use Flash Suit",
979+
"requires": [
980+
{"useFlashSuit": {}},
981+
{"shinespark": {"frames": 6, "excessFrames": 3}}
982+
],
983+
"flashSuitChecked": true
942984
}
943985
],
944986
"nextStratId": 50,

‎region/norfair/crocomire/Post Crocomire Farming Room.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,15 @@
13401340
"flashSuitChecked": true,
13411341
"note": "Shortcharge to the right and then jump from below the floating platform to reach the top left door."
13421342
},
1343+
{
1344+
"link": [5, 1],
1345+
"name": "Use Flash Suit",
1346+
"requires": [
1347+
{"useFlashSuit": {}},
1348+
{"shinespark": {"frames": 8, "excessFrames": 4}}
1349+
],
1350+
"flashSuitChecked": true
1351+
},
13431352
{
13441353
"id": 61,
13451354
"link": [5, 2],

‎region/norfair/crocomire/Post Crocomire Jump Room.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,17 @@
887887
"flashSuitChecked": true,
888888
"note": "Spark from the ground, left of the Power Bomb blocks."
889889
},
890+
{
891+
"link": [2, 5],
892+
"name": "Use Flash Suit",
893+
"requires": [
894+
{"useFlashSuit": {}},
895+
{"shinespark": {"frames": 98, "excessFrames": 95}}
896+
],
897+
"clearsObstacles": ["B"],
898+
"flashSuitChecked": true,
899+
"note": "Use a flash suit to spark horizontally through the speed blocks. Samus may stop above the acid, but it should always be possible to land on one of the platforms."
900+
},
890901
{
891902
"id": 44,
892903
"link": [2, 6],
@@ -1055,6 +1066,16 @@
10551066
"Then you need to manipulate it to go high enough to be used as a stepping stone once frozen."
10561067
]
10571068
},
1069+
{
1070+
"link": [5, 1],
1071+
"name": "Use Flash Suit",
1072+
"requires": [
1073+
{"useFlashSuit": {}},
1074+
{"shinespark": {"frames": 22, "excessFrames": 13}}
1075+
],
1076+
"flashSuitChecked": true,
1077+
"note": "Jump back from the leftmost floating platform and diagonally shinespark at the peak of the jump towards the door to minimize shinespark damage."
1078+
},
10581079
{
10591080
"id": 56,
10601081
"link": [5, 1],
@@ -1136,6 +1157,26 @@
11361157
"clearsObstacles": ["B"],
11371158
"note": "Gravity makes it possible to charge a spark in the acid in order to break the speed blocks."
11381159
},
1160+
{
1161+
"link": [5, 2],
1162+
"name": "Use Flash Suit",
1163+
"requires": [
1164+
{"useFlashSuit": {}},
1165+
{"or": [
1166+
{"shinespark": {"frames": 33, "excessFrames": 7}},
1167+
{"and": [
1168+
{"shinespark": {"frames": 33, "excessFrames": 30}},
1169+
{"enemyDamage": {
1170+
"enemy": "Mella",
1171+
"type": "contact",
1172+
"hits": 1
1173+
}}
1174+
]}
1175+
]}
1176+
],
1177+
"clearsObstacles": ["B"],
1178+
"flashSuitChecked": true
1179+
},
11391180
{
11401181
"link": [5, 2],
11411182
"name": "Break Speed Blocks, Insane Short Charge",
@@ -1257,6 +1298,22 @@
12571298
],
12581299
"devNote": "While the high pixel position looks possible, it is fairly unreasonable, as it also requires very precise horizontal positioning and the Mellas are chaotic."
12591300
},
1301+
{
1302+
"link": [5, 3],
1303+
"name": "Use Flash Suit",
1304+
"requires": [
1305+
{"useFlashSuit": {}},
1306+
{"or": [
1307+
{"shinespark": {"frames": 30, "excessFrames": 6}},
1308+
{"and": [
1309+
"HiJump",
1310+
{"shinespark": {"frames": 25, "excessFrames": 6}}
1311+
]}
1312+
]}
1313+
],
1314+
"clearsObstacles": ["B"],
1315+
"flashSuitChecked": true
1316+
},
12601317
{
12611318
"id": 65,
12621319
"link": [6, 1],

‎region/norfair/crocomire/Post Crocomire Shaft.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,21 @@
502502
"Climb up 3 screens, then perform a turn-around spin jump to the left to reach the platform."
503503
]
504504
},
505+
{
506+
"link": [3, 4],
507+
"name": "Use Flash Suit",
508+
"requires": [
509+
{"useFlashSuit": {}},
510+
{"or": [
511+
{"shinespark": {"frames": 39, "excessFrames": 6}},
512+
{"and": [
513+
"HiJump",
514+
{"shinespark": {"frames": 35, "excessFrames": 6}}
515+
]}
516+
]}
517+
],
518+
"flashSuitChecked": true
519+
},
505520
{
506521
"id": 27,
507522
"link": [3, 4],

0 commit comments

Comments
 (0)