Skip to content

Commit cad1166

Browse files
osse101osse101
authored
Merge pull request #2653 from kjbranch/cs-t
Tourian - Crystal Sparks
2 parents 2e3b7e6 + 4af54ef commit cad1166

11 files changed

Lines changed: 189 additions & 2 deletions

‎region/tourian/main/Big Boy Room.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,16 @@
210210
},
211211
"flashSuitChecked": true
212212
},
213+
{
214+
"link": [1, 1],
215+
"name": "Crystal Spark",
216+
"requires": [
217+
{"canShineCharge": {"usedTiles": 15, "openEnd": 0}},
218+
"h_CrystalSpark"
219+
],
220+
"flashSuitChecked": true,
221+
"blueSuitChecked": true
222+
},
213223
{
214224
"id": 9,
215225
"link": [1, 1],

‎region/tourian/main/Dust Torizo Room.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,16 @@
191191
],
192192
"flashSuitChecked": true
193193
},
194+
{
195+
"link": [1, 1],
196+
"name": "Crystal Spark",
197+
"requires": [
198+
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
199+
"h_CrystalSpark"
200+
],
201+
"flashSuitChecked": true,
202+
"blueSuitChecked": true
203+
},
194204
{
195205
"id": 9,
196206
"link": [1, 2],

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,18 @@
361361
"Once grouped, use two more Power Bombs to finish them off."
362362
]
363363
},
364+
{
365+
"link": [1, 1],
366+
"name": "Crystal Spark",
367+
"requires": [
368+
"f_KilledMetroidRoom1",
369+
{"canShineCharge": {"usedTiles": 23, "openEnd": 1}},
370+
"h_CrystalSpark"
371+
],
372+
"flashSuitChecked": true,
373+
"blueSuitChecked": true,
374+
"devNote": "FIXME: This may be possible with the Metroids alive, but is probably not worth considering."
375+
},
364376
{
365377
"id": 12,
366378
"link": [1, 1],
@@ -1725,6 +1737,18 @@
17251737
"Once grouped, use two more Power Bombs to finish them off."
17261738
]
17271739
},
1740+
{
1741+
"link": [2, 2],
1742+
"name": "Crystal Spark",
1743+
"requires": [
1744+
"f_KilledMetroidRoom1",
1745+
{"canShineCharge": {"usedTiles": 31, "openEnd": 1}},
1746+
"h_CrystalSpark"
1747+
],
1748+
"flashSuitChecked": true,
1749+
"blueSuitChecked": true,
1750+
"devNote": "FIXME: This may be possible with the Metroids alive, but is probably not worth considering."
1751+
},
17281752
{
17291753
"id": 84,
17301754
"link": [2, 2],
@@ -1756,7 +1780,7 @@
17561780
"canMetroidAvoid",
17571781
"Ice"
17581782
]},
1759-
{"canShineCharge": {"usedTiles": 31, "openEnd": 1}},
1783+
{"canShineCharge": {"usedTiles": 29, "openEnd": 1}},
17601784
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
17611785
"canRModeSparkInterrupt"
17621786
],

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,26 @@
330330
},
331331
"flashSuitChecked": true
332332
},
333+
{
334+
"link": [1, 1],
335+
"name": "Crystal Spark",
336+
"requires": [
337+
"f_KilledMetroidRoom3",
338+
{"canShineCharge": {"usedTiles": 29, "openEnd": 1}},
339+
"canInsaneJump",
340+
"h_CrystalSpark"
341+
],
342+
"flashSuitChecked": true,
343+
"blueSuitChecked": true,
344+
"note": [
345+
"The Rinka spawns can make this a bit tricky.",
346+
"Shinecharge right to left and Crystal Spark before the end of the runway, or left to right and quickly move to the right platform to avoid the Rinkas."
347+
348+
],
349+
"devNote": [
350+
"FIXME: This may be possible with the Metroids alive, or shinecharging in using the right door but both are probably not worth considering."
351+
]
352+
},
333353
{
334354
"id": 53,
335355
"link": [1, 1],

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,5 +840,9 @@
840840
}
841841
],
842842
"nextStratId": 38,
843-
"nextNotableId": 5
843+
"nextNotableId": 5,
844+
"devNote": [
845+
"FIXME: It may be possible to come into the top of the room shinecharging and Crystal Spark, but it's tricky.",
846+
"Shinecharge then time the jump to jump over the Rinkas. It probably should still require the Metroids killed if it's ever added."
847+
]
844848
}

‎region/tourian/main/Rinka Shaft.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,6 +1302,22 @@
13021302
},
13031303
"flashSuitChecked": true
13041304
},
1305+
{
1306+
"link": [3, 3],
1307+
"name": "Come in Shinecharging, Crystal Spark",
1308+
"entranceCondition": {
1309+
"comeInShinecharging": {
1310+
"length": 12,
1311+
"openEnd": 0
1312+
},
1313+
"comesInHeated": "no"
1314+
},
1315+
"requires": [
1316+
"h_CrystalSpark"
1317+
],
1318+
"flashSuitChecked": true,
1319+
"blueSuitChecked": true
1320+
},
13051321
{
13061322
"id": 64,
13071323
"link": [3, 3],

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@
7777
],
7878
"flashSuitChecked": true
7979
},
80+
{
81+
"link": [1, 1],
82+
"name": "Crystal Spark",
83+
"requires": [
84+
{"canShineCharge": {"usedTiles": 21, "openEnd": 0}},
85+
"h_CrystalSpark"
86+
],
87+
"flashSuitChecked": true,
88+
"blueSuitChecked": true
89+
},
8090
{
8191
"id": 11,
8292
"link": [1, 1],

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,19 @@
392392
"A speedy jump can reach the top platform to save Energy over shinesparking."
393393
]
394394
},
395+
{
396+
"link": [1, 2],
397+
"name": "Crystal Spark",
398+
"requires": [
399+
"canSpeedyJump",
400+
"h_shinechargeMaxRunway",
401+
"h_CrystalSpark"
402+
],
403+
"clearsObstacles": ["A"],
404+
"flashSuitChecked": true,
405+
"blueSuitChecked": true,
406+
"devNote": "This is listed here because its free to get from 1 to 2 with SpeedBooster alone, but only with being able to dash."
407+
},
395408
{
396409
"id": 35,
397410
"link": [1, 2],

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,33 @@
715715
},
716716
"flashSuitChecked": true
717717
},
718+
{
719+
"link": [2, 2],
720+
"name": "Crystal Spark (In-Room)",
721+
"requires": [
722+
{"obstaclesNotCleared": ["A"]},
723+
{"canShineCharge": {"usedTiles": 25, "openEnd": 1}},
724+
"h_CrystalSpark"
725+
],
726+
"flashSuitChecked": true,
727+
"blueSuitChecked": true
728+
},
729+
{
730+
"link": [2, 2],
731+
"name": "Come in Shinecharging, Crystal Spark",
732+
"entranceCondition": {
733+
"comeInShinecharging": {
734+
"length": 5,
735+
"openEnd": 1
736+
},
737+
"comesInHeated": "no"
738+
},
739+
"requires": [
740+
"h_CrystalSpark"
741+
],
742+
"flashSuitChecked": true,
743+
"blueSuitChecked": true
744+
},
718745
{
719746
"id": 46,
720747
"link": [2, 2],
@@ -1268,6 +1295,16 @@
12681295
"name": "Base",
12691296
"requires": [],
12701297
"flashSuitChecked": true
1298+
},
1299+
{
1300+
"link": [4, 4],
1301+
"name": "Crystal Spark",
1302+
"requires": [
1303+
{"canShineCharge": {"usedTiles": 25, "openEnd": 1}},
1304+
"h_CrystalSpark"
1305+
],
1306+
"flashSuitChecked": true,
1307+
"blueSuitChecked": true
12711308
}
12721309
],
12731310
"notables": [

‎region/tourian/main/Tourian Eye Door Room.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,22 @@
5959
],
6060
"flashSuitChecked": true
6161
},
62+
{
63+
"link": [1, 1],
64+
"name": "Come in Shinecharging, Crystal Spark",
65+
"entranceCondition": {
66+
"comeInShinecharging": {
67+
"length": 7,
68+
"openEnd": 0
69+
},
70+
"comesInHeated": "no"
71+
},
72+
"requires": [
73+
"h_CrystalSpark"
74+
],
75+
"flashSuitChecked": true,
76+
"blueSuitChecked": true
77+
},
6278
{
6379
"id": 3,
6480
"link": [1, 2],
@@ -233,6 +249,22 @@
233249
}
234250
},
235251
"flashSuitChecked": true
252+
},
253+
{
254+
"link": [2, 2],
255+
"name": "Come in Shinecharging, Crystal Spark",
256+
"entranceCondition": {
257+
"comeInShinecharging": {
258+
"length": 3,
259+
"openEnd": 0
260+
},
261+
"comesInHeated": "no"
262+
},
263+
"requires": [
264+
"h_CrystalSpark"
265+
],
266+
"flashSuitChecked": true,
267+
"blueSuitChecked": true
236268
}
237269
],
238270
"notables": [],

0 commit comments

Comments
 (0)