Skip to content

Commit 8b70181

Browse files
kjbranchkjbranch
authored
Add Crystal Sparks in Green Maridia (#2802)
1 parent d35b596 commit 8b70181

7 files changed

Lines changed: 309 additions & 0 deletions

File tree

‎region/maridia/inner-green/East Pants Room.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,25 @@
490490
],
491491
"flashSuitChecked": true
492492
},
493+
{
494+
"link": [2, 2],
495+
"name": "Come in Shinecharging, Crystal Spark",
496+
"entranceCondition": {
497+
"comeInShinecharging": {
498+
"length": 4,
499+
"openEnd": 0
500+
},
501+
"comesInHeated": "no"
502+
},
503+
"requires": [
504+
"Gravity",
505+
"h_CrystalSpark"
506+
],
507+
"flashSuitChecked": true,
508+
"blueSuitChecked": true,
509+
"note": "Use the first half of the runway in order to avoid the Puyo jumping into Samus.",
510+
"devNote": "It doesn't seem reasonable to use blue speed to kill the Puyo without falling through the crumbles."
511+
},
493512
{
494513
"id": 17,
495514
"link": [2, 2],

‎region/maridia/inner-green/East Sand Hall.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,23 @@
200200
],
201201
"flashSuitChecked": true
202202
},
203+
{
204+
"link": [1, 1],
205+
"name": "Come in Shinecharging, Crystal Spark",
206+
"entranceCondition": {
207+
"comeInShinecharging": {
208+
"length": 3,
209+
"openEnd": 0
210+
},
211+
"comesInHeated": "no"
212+
},
213+
"requires": [
214+
"Gravity",
215+
"h_CrystalSpark"
216+
],
217+
"flashSuitChecked": true,
218+
"blueSuitChecked": true
219+
},
203220
{
204221
"id": 3,
205222
"link": [1, 1],
@@ -1458,6 +1475,23 @@
14581475
],
14591476
"flashSuitChecked": true
14601477
},
1478+
{
1479+
"link": [2, 2],
1480+
"name": "Come in Shinecharging, Crystal Spark",
1481+
"entranceCondition": {
1482+
"comeInShinecharging": {
1483+
"length": 3,
1484+
"openEnd": 0
1485+
},
1486+
"comesInHeated": "no"
1487+
},
1488+
"requires": [
1489+
"Gravity",
1490+
"h_CrystalSpark"
1491+
],
1492+
"flashSuitChecked": true,
1493+
"blueSuitChecked": true
1494+
},
14611495
{
14621496
"id": 39,
14631497
"link": [2, 2],

‎region/maridia/inner-green/Lonely Crab Room.json‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,90 @@
425425
"and Samus should be in the correct position with subpixels $3FFF."
426426
]
427427
},
428+
{
429+
"link": [1, 1],
430+
"name": "Come in Shinecharging, Crystal Spark (Short Runway)",
431+
"entranceCondition": {
432+
"comeInShinecharging": {
433+
"length": 3,
434+
"openEnd": 0
435+
},
436+
"comesInHeated": "no"
437+
},
438+
"requires": [
439+
"Gravity",
440+
{"or": [
441+
{"and": [
442+
"h_enemyDrops",
443+
"h_CrystalSparkWithoutLenience"
444+
]},
445+
"h_CrystalSpark"
446+
]}
447+
],
448+
"flashSuitChecked": true,
449+
"blueSuitChecked": true,
450+
"note": "Only using a small portion of the runway will ensure that the crab dies before it reaches Samus."
451+
},
452+
{
453+
"link": [1, 1],
454+
"name": "Come in Shinecharging, Crystal Spark",
455+
"entranceCondition": {
456+
"comeInShinecharging": {
457+
"length": 6,
458+
"openEnd": 0
459+
},
460+
"comesInHeated": "no"
461+
},
462+
"requires": [
463+
"Gravity",
464+
"canInsaneJump",
465+
{"or": [
466+
{"and": [
467+
"h_enemyDrops",
468+
"h_CrystalSparkWithoutLenience"
469+
]},
470+
"h_CrystalSpark"
471+
]}
472+
],
473+
"flashSuitChecked": true,
474+
"blueSuitChecked": true,
475+
"note": "Samus is only able to use about half of the runway and be able to Crystal Spark before the crab reaches her."
476+
},
477+
{
478+
"link": [1, 1],
479+
"name": "Crystal Spark (In-Room)",
480+
"requires": [
481+
"Gravity",
482+
{"or": [
483+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
484+
{"and": [
485+
{"or": [
486+
{"doorUnlockedAtNode": 1},
487+
{"doorUnlockedAtNode": 2}
488+
]},
489+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
490+
]},
491+
{"and": [
492+
{"doorUnlockedAtNode": 1},
493+
{"doorUnlockedAtNode": 2},
494+
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
495+
]}
496+
]},
497+
{"or": [
498+
{"and": [
499+
"h_enemyDrops",
500+
"h_CrystalSparkWithoutLenience"
501+
]},
502+
"h_CrystalSpark"
503+
]}
504+
],
505+
"unlocksDoors": [
506+
{"nodeId": 1, "types": ["ammo"], "requires": []},
507+
{"nodeId": 2, "types": ["ammo"], "requires": []}
508+
],
509+
"flashSuitChecked": true,
510+
"blueSuitChecked": true
511+
},
428512
{
429513
"id": 5,
430514
"link": [1, 1],
@@ -1193,6 +1277,29 @@
11931277
"and Samus should be in the correct position with subpixels $3FFF."
11941278
]
11951279
},
1280+
{
1281+
"link": [2, 2],
1282+
"name": "Come in Shinecharging, Crystal Spark",
1283+
"entranceCondition": {
1284+
"comeInShinecharging": {
1285+
"length": 12,
1286+
"openEnd": 0
1287+
},
1288+
"comesInHeated": "no"
1289+
},
1290+
"requires": [
1291+
"Gravity",
1292+
{"or": [
1293+
{"and": [
1294+
"h_enemyDrops",
1295+
"h_CrystalSparkWithoutLenience"
1296+
]},
1297+
"h_CrystalSpark"
1298+
]}
1299+
],
1300+
"flashSuitChecked": true,
1301+
"blueSuitChecked": true
1302+
},
11961303
{
11971304
"id": 30,
11981305
"link": [2, 2],
@@ -1581,6 +1688,23 @@
15811688
"The `h_getBlueSpeedMaxRunway` requirement is to satisfy the tests,",
15821689
"since we don't have a way to represent that the temporary blue originates from the startsWithShineCharge."
15831690
]
1691+
},
1692+
{
1693+
"link": [4, 2],
1694+
"name": "Crystal Spark",
1695+
"startsWithShineCharge": true,
1696+
"requires": [
1697+
{"shineChargeFrames": 0},
1698+
{"or": [
1699+
{"and": [
1700+
"h_enemyDrops",
1701+
"h_underwaterCrystalSparkWithoutLenience"
1702+
]},
1703+
"h_underwaterCrystalSpark"
1704+
]}
1705+
],
1706+
"flashSuitChecked": true,
1707+
"blueSuitChecked": true
15841708
}
15851709
],
15861710
"notables": [],

‎region/maridia/inner-green/Oasis.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3279,6 +3279,35 @@
32793279
"clearsObstacles": ["A"],
32803280
"flashSuitChecked": true
32813281
},
3282+
{
3283+
"link": [5, 5],
3284+
"name": "Crystal Spark (In-Room)",
3285+
"requires": [
3286+
"Gravity",
3287+
{"or": [
3288+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
3289+
{"and": [
3290+
{"or": [
3291+
{"doorUnlockedAtNode": 1},
3292+
{"doorUnlockedAtNode": 2}
3293+
]},
3294+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
3295+
]},
3296+
{"and": [
3297+
{"doorUnlockedAtNode": 1},
3298+
{"doorUnlockedAtNode": 2},
3299+
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
3300+
]}
3301+
]},
3302+
"h_CrystalSpark"
3303+
],
3304+
"unlocksDoors": [
3305+
{"nodeId": 1, "types": ["ammo"], "requires": []},
3306+
{"nodeId": 2, "types": ["ammo"], "requires": []}
3307+
],
3308+
"flashSuitChecked": true,
3309+
"blueSuitChecked": true
3310+
},
32823311
{
32833312
"id": 61,
32843313
"link": [5, 6],
@@ -3431,6 +3460,24 @@
34313460
"since we don't have a way to represent that the temporary blue originates from the startsWithShineCharge."
34323461
]
34333462
},
3463+
{
3464+
"link": [7, 1],
3465+
"name": "Crystal Spark",
3466+
"startsWithShineCharge": true,
3467+
"requires": [
3468+
{"shineChargeFrames": 0},
3469+
{"or": [
3470+
{"and": [
3471+
"Gravity",
3472+
"h_CrystalSpark"
3473+
]},
3474+
"h_underwaterCrystalSpark"
3475+
]}
3476+
],
3477+
"clearsObstacles": ["A"],
3478+
"flashSuitChecked": true,
3479+
"blueSuitChecked": true
3480+
},
34343481
{
34353482
"id": 32,
34363483
"link": [7, 2],
@@ -3618,6 +3665,24 @@
36183665
"since we don't have a way to represent that the temporary blue originates from the startsWithShineCharge."
36193666
]
36203667
},
3668+
{
3669+
"link": [8, 2],
3670+
"name": "Crystal Spark",
3671+
"startsWithShineCharge": true,
3672+
"requires": [
3673+
{"shineChargeFrames": 0},
3674+
{"or": [
3675+
{"and": [
3676+
"Gravity",
3677+
"h_CrystalSpark"
3678+
]},
3679+
"h_underwaterCrystalSpark"
3680+
]}
3681+
],
3682+
"clearsObstacles": ["A"],
3683+
"flashSuitChecked": true,
3684+
"blueSuitChecked": true
3685+
},
36213686
{
36223687
"id": 142,
36233688
"link": [8, 4],

‎region/maridia/inner-green/Shaktool Room.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,22 @@
249249
],
250250
"flashSuitChecked": true
251251
},
252+
{
253+
"link": [1, 1],
254+
"name": "Crystal Spark",
255+
"requires": [
256+
{"obstaclesCleared": ["A", "B"]},
257+
{"or": [
258+
"Gravity",
259+
"canWaterShineCharge"
260+
]},
261+
"h_shinechargeMaxRunway",
262+
"h_CrystalSpark"
263+
],
264+
"flashSuitChecked": true,
265+
"blueSuitChecked": true,
266+
"note": "Time the shinecharge for when the water is low."
267+
},
252268
{
253269
"id": 6,
254270
"link": [1, 1],

‎region/maridia/inner-green/Spring Ball Room.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,22 @@
6262
],
6363
"flashSuitChecked": true
6464
},
65+
{
66+
"link": [1, 1],
67+
"name": "Come in Shinecharging, Crystal Spark",
68+
"entranceCondition": {
69+
"comeInShinecharging": {
70+
"length": 6,
71+
"openEnd": 0
72+
},
73+
"comesInHeated": "no"
74+
},
75+
"requires": [
76+
"h_CrystalSpark"
77+
],
78+
"flashSuitChecked": true,
79+
"blueSuitChecked": true
80+
},
6581
{
6682
"id": 3,
6783
"link": [1, 2],

‎region/maridia/inner-green/West Sand Hall.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,23 @@
104104
],
105105
"flashSuitChecked": true
106106
},
107+
{
108+
"link": [1, 1],
109+
"name": "Come in Shinecharging, Crystal Spark",
110+
"entranceCondition": {
111+
"comeInShinecharging": {
112+
"length": 3,
113+
"openEnd": 0
114+
},
115+
"comesInHeated": "no"
116+
},
117+
"requires": [
118+
"Gravity",
119+
"h_CrystalSpark"
120+
],
121+
"flashSuitChecked": true,
122+
"blueSuitChecked": true
123+
},
107124
{
108125
"id": 3,
109126
"link": [1, 2],
@@ -858,6 +875,24 @@
858875
],
859876
"flashSuitChecked": true
860877
},
878+
{
879+
"link": [2, 2],
880+
"name": "Come in Shinecharging, Crystal Spark",
881+
"entranceCondition": {
882+
"comeInShinecharging": {
883+
"length": 3,
884+
"openEnd": 0
885+
},
886+
"comesInHeated": "no"
887+
},
888+
"requires": [
889+
"Gravity",
890+
"canInsaneJump",
891+
"h_CrystalSpark"
892+
],
893+
"flashSuitChecked": true,
894+
"blueSuitChecked": true
895+
},
861896
{
862897
"id": 29,
863898
"link": [2, 2],

0 commit comments

Comments
 (0)