Skip to content

Commit b321b17

Browse files
osse101osse101
authored
Merge pull request #2689 from kjbranch/blue-spark-2
Blue suit sparks - Wrecked Ship, Tourian
2 parents f9056ca + 4c11474 commit b321b17

8 files changed

Lines changed: 119 additions & 35 deletions

File tree

‎region/tourian/main/Metroid Room 1.json‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -848,16 +848,18 @@
848848
{
849849
"id": 74,
850850
"link": [1, 2],
851-
"name": "Use Flash Suit",
851+
"name": "Use Stored Spark",
852852
"requires": [
853853
{"or": [
854854
"f_KilledMetroidRoom1",
855855
"canMetroidAvoid"
856856
]},
857-
{"useFlashSuit": {}},
857+
"h_storedSpark",
858+
"canDash",
858859
{"shinespark": {"frames": 4, "excessFrames": 2}}
859860
],
860-
"flashSuitChecked": true
861+
"flashSuitChecked": true,
862+
"blueSuitChecked": true
861863
},
862864
{
863865
"id": 20,
@@ -1311,10 +1313,11 @@
13111313
{
13121314
"id": 75,
13131315
"link": [2, 1],
1314-
"name": "Use Flash Suit",
1316+
"name": "Use Stored Spark",
13151317
"requires": [
13161318
"canMetroidAvoid",
1317-
{"useFlashSuit": {}},
1319+
"h_storedSpark",
1320+
"canDash",
13181321
{"shinespark": {"frames": 8, "excessFrames": 1}},
13191322
{"or": [
13201323
"canInsaneJump",
@@ -1335,6 +1338,7 @@
13351338
]}
13361339
],
13371340
"flashSuitChecked": true,
1341+
"blueSuitChecked": true,
13381342
"note": [
13391343
"While on the first platform, perform a long jump to the left then diagonally spark low into the side of the next platform.",
13401344
"This will put Samus into a position where the Metroid will swoop underneath her."
@@ -1344,10 +1348,11 @@
13441348
{
13451349
"id": 76,
13461350
"link": [2, 1],
1347-
"name": "Use Flash Suit, Metroids Cleared",
1351+
"name": "Use Stored Spark, Metroids Cleared",
13481352
"requires": [
13491353
"f_KilledMetroidRoom1",
1350-
{"useFlashSuit": {}},
1354+
"h_storedSpark",
1355+
"canDash",
13511356
{"shinespark": {"frames": 4, "excessFrames": 2}},
13521357
{"or": [
13531358
"canInsaneJump",
@@ -1367,7 +1372,8 @@
13671372
{"acidFrames": 27}
13681373
]}
13691374
],
1370-
"flashSuitChecked": true
1375+
"flashSuitChecked": true,
1376+
"blueSuitChecked": true
13711377
},
13721378
{
13731379
"id": 28,

‎region/tourian/main/Mother Brain Room.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,16 +569,17 @@
569569
{
570570
"id": 32,
571571
"link": [2, 3],
572-
"name": "Speed Zebetite Skip (Use Flash Suit)",
572+
"name": "Speed Zebetite Skip (Use Stored Spark)",
573573
"requires": [
574574
{"notable": "Speed Zebetite Skip"},
575575
"canUseIFrames",
576-
{"useFlashSuit": {}},
576+
"h_storedSpark",
577577
"Morph",
578578
{"shinespark": {"frames": 4}},
579579
{"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}
580580
],
581581
"flashSuitChecked": true,
582+
"blueSuitChecked": true,
582583
"note": [
583584
"Shinespark diagonally into the lower Rinka Spawner while holding down, spamming jump, then pressing forward,",
584585
"in order to glitch through the first Mother Brain Zebetites during Samus' i-frames.",

‎region/tourian/main/Tourian Escape Room 3.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,20 @@
409409
{
410410
"id": 35,
411411
"link": [1, 2],
412-
"name": "Use Flash Suit",
412+
"name": "Use Stored Spark",
413413
"requires": [
414414
{"obstaclesCleared": ["A"]},
415-
{"useFlashSuit": {}},
415+
"h_storedSpark",
416416
{"shinespark": {"frames": 7, "excessFrames": 5}}
417417
],
418418
"flashSuitChecked": true,
419-
"note": "With the pirates killed, Samus can spark up near the center of the room to save Energy."
419+
"blueSuitChecked": true,
420+
"note": "With the pirates killed, Samus can spark up near the center of the room to save Energy.",
421+
"devNote": [
422+
"The top pirates can be killed the same way as the lower pirates, where the obstacle was cleared.",
423+
"Using blue suit to kill the pirates and then using it to spark up would make it so that there is potentially no way to kill the upper pirates;",
424+
"But Samus will either have SpeedBooster or some high-level tech, which will be enough to get through the rest damageless."
425+
]
420426
},
421427
{
422428
"id": 36,

‎region/tourian/main/Tourian Escape Room 4.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,13 @@
519519
{
520520
"id": 28,
521521
"link": [1, 4],
522-
"name": "Use Flash Suit",
522+
"name": "Use Stored Spark",
523523
"requires": [
524-
{"useFlashSuit": {}},
524+
"h_storedSpark",
525525
{"shinespark": {"frames": 55, "excessFrames": 13}}
526526
],
527-
"flashSuitChecked": true
527+
"flashSuitChecked": true,
528+
"blueSuitChecked": true
528529
},
529530
{
530531
"id": 44,
@@ -1218,9 +1219,9 @@
12181219
{
12191220
"id": 29,
12201221
"link": [3, 1],
1221-
"name": "Use Flash Suit",
1222+
"name": "Use Stored Spark",
12221223
"requires": [
1223-
{"useFlashSuit": {}},
1224+
"h_storedSpark",
12241225
{"or": [
12251226
{"shinespark": {"frames": 76, "excessFrames": 5}},
12261227
{"and": [
@@ -1238,7 +1239,8 @@
12381239
]}
12391240
]}
12401241
],
1241-
"flashSuitChecked": true
1242+
"flashSuitChecked": true,
1243+
"blueSuitChecked": true
12421244
},
12431245
{
12441246
"id": 24,

‎region/wreckedship/main/Bowling Alley.json‎

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,10 @@
437437
"requires": [
438438
{"not": "f_DefeatedPhantoon"},
439439
"canRiskPermanentLossOfAccess",
440-
"h_shinechargeMaxRunway",
440+
{"or": [
441+
"h_shinechargeMaxRunway",
442+
"h_storedSpark"
443+
]},
441444
"canShinechargeMovement",
442445
{"shinespark": {"frames": 1, "excessFrames": 1}},
443446
"canShinesparkSlopeClip",
@@ -452,6 +455,7 @@
452455
},
453456
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
454457
"flashSuitChecked": true,
458+
"blueSuitChecked": true,
455459
"note": [
456460
"Gain a shinecharge near the Chozo statue, jump on top of it,",
457461
"press against the wall to the right, and activate a horizontal shinespark to the right.",
@@ -529,6 +533,39 @@
529533
"The leaveNormally is to ensure it won't be required to do the Speed block moondance blind up there."
530534
]
531535
},
536+
{
537+
"link": [2, 1],
538+
"name": "Shinespark Slope Clip X-Ray Climb (Use Stored Spark)",
539+
"requires": [
540+
"h_storedSpark",
541+
"canDash",
542+
"canShinechargeMovementTricky",
543+
{"shinespark": {"frames": 88, "excessFrames": 0}},
544+
"canShinesparkSlopeClip",
545+
"canXRayClimb",
546+
{"or": [
547+
{"getBlueSpeed": {"usedTiles": 16, "steepDownTiles": 4, "openEnd": 0}},
548+
"can4HighMidAirMorph"
549+
]}
550+
],
551+
"exitCondition": {
552+
"leaveNormally": {}
553+
},
554+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
555+
"flashSuitChecked": true,
556+
"blueSuitChecked": true,
557+
"note": [
558+
"Jump close to ceiling, and activate a shinespark to the right.",
559+
"If successful, Samus will clip into the wall behind the Chozo statue and be able to X-Ray climb up."
560+
],
561+
"detailNote": [
562+
"Only certain horizontal positions will cause Samus to clip into the wall.",
563+
"It will work to activate the spark while Samus is centered under the second Grapple block or slightly to the left."
564+
],
565+
"devNote": [
566+
"The leaveNormally is to ensure it won't be required to do the Speed block moondance blind up there."
567+
]
568+
},
532569
{
533570
"id": 11,
534571
"link": [2, 2],
@@ -1146,13 +1183,15 @@
11461183
{
11471184
"id": 32,
11481185
"link": [2, 6],
1149-
"name": "Use Flash Suit",
1186+
"name": "Use Stored Spark",
11501187
"requires": [
11511188
"canHorizontalShinespark",
1152-
{"useFlashSuit": {}},
1189+
"h_storedSpark",
1190+
"canDash",
11531191
{"shinespark": {"frames": 82, "excessFrames": 8}}
11541192
],
1155-
"flashSuitChecked": true
1193+
"flashSuitChecked": true,
1194+
"blueSuitChecked": true
11561195
},
11571196
{
11581197
"id": 33,
@@ -2170,8 +2209,7 @@
21702209
"flashSuitChecked": true,
21712210
"note": [
21722211
"Use X-mode to gain a shinecharge near the Chozo statue.",
2173-
"Jump onto the Chozo statue, press against the wall, and shinespark into it to clip in;",
2174-
"then X-Ray climb up."
2212+
"Jump onto the Chozo statue, press against the wall, and shinespark into it to clip in, then X-Ray climb up."
21752213
],
21762214
"detailNote": [
21772215
"A second spike hit can be avoided by holding an angle button to turn around while in X-mode;",
@@ -2181,6 +2219,32 @@
21812219
"The leaveNormally is to ensure it won't be required to do the Speed block moondance blind up there."
21822220
]
21832221
},
2222+
{
2223+
"link": [6, 1],
2224+
"name": "Shinespark Slope Clip X-Ray Climb (Use Stored Spark)",
2225+
"requires": [
2226+
"h_storedSpark",
2227+
{"shinespark": {"frames": 1, "excessFrames": 1}},
2228+
"canShinesparkSlopeClip",
2229+
"canXRayClimb",
2230+
{"or": [
2231+
{"getBlueSpeed": {"usedTiles": 16, "steepDownTiles": 4, "openEnd": 0}},
2232+
"can4HighMidAirMorph"
2233+
]}
2234+
],
2235+
"exitCondition": {
2236+
"leaveNormally": {}
2237+
},
2238+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
2239+
"flashSuitChecked": true,
2240+
"blueSuitChecked": true,
2241+
"note": [
2242+
"Jump onto the Chozo statue, press against the wall, and shinespark into it to clip in, then X-Ray climb up.."
2243+
],
2244+
"devNote": [
2245+
"The leaveNormally is to ensure it won't be required to do the Speed block moondance blind up there."
2246+
]
2247+
},
21842248
{
21852249
"id": 54,
21862250
"link": [6, 3],

‎region/wreckedship/main/Sponge Bath.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,12 +535,13 @@
535535
{
536536
"id": 21,
537537
"link": [1, 2],
538-
"name": "Use Flash Suit",
538+
"name": "Use Stored Spark",
539539
"requires": [
540-
{"useFlashSuit": {}},
540+
"h_storedSpark",
541541
{"shinespark": {"frames": 4, "excessFrames": 2}}
542542
],
543-
"flashSuitChecked": true
543+
"flashSuitChecked": true,
544+
"blueSuitChecked": true
544545
},
545546
{
546547
"id": 22,

‎region/wreckedship/main/Wrecked Ship Energy Tank Room.json‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -828,12 +828,14 @@
828828
{
829829
"id": 19,
830830
"link": [1, 2],
831-
"name": "Use Flash Suit",
831+
"name": "Use Stored Spark",
832832
"requires": [
833-
{"useFlashSuit": {}},
833+
"h_storedSpark",
834+
"canDash",
834835
{"shinespark": {"frames": 13, "excessFrames": 2}}
835836
],
836-
"flashSuitChecked": true
837+
"flashSuitChecked": true,
838+
"blueSuitChecked": true
837839
},
838840
{
839841
"id": 20,
@@ -944,12 +946,14 @@
944946
{
945947
"id": 26,
946948
"link": [2, 1],
947-
"name": "Use Flash Suit",
949+
"name": "Use Stored Spark",
948950
"requires": [
949-
{"useFlashSuit": {}},
951+
"h_storedSpark",
952+
"canDash",
950953
{"shinespark": {"frames": 14, "excessFrames": 4}}
951954
],
952-
"flashSuitChecked": true
955+
"flashSuitChecked": true,
956+
"blueSuitChecked": true
953957
},
954958
{
955959
"id": 27,

‎tech.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2321,7 +2321,7 @@
23212321
"id": 203,
23222322
"name": "canShinesparkSlopeClip",
23232323
"techRequires": [
2324-
"canShinespark"
2324+
"canHorizontalShinespark"
23252325
],
23262326
"otherRequires": [],
23272327
"note": [

0 commit comments

Comments
 (0)