Skip to content

Commit 6693565

Browse files
osse101osse101
authored
Merge pull request #2806 from kjbranch/cs-un-w
Add Crystal Sparks in Upper Norfair West
2 parents 6344787 + e404cec commit 6693565

9 files changed

Lines changed: 357 additions & 0 deletions

‎region/norfair/west/Business Center.json‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,23 @@
211211
"blueSuitChecked": true,
212212
"note": "Use a Super to knock off a Sova and follow it to this door. The fastest Sova is just above the shot blocks, which takes 30 seconds."
213213
},
214+
{
215+
"link": [1, 1],
216+
"name": "Come in Shinecharging, Crystal Spark",
217+
"entranceCondition": {
218+
"comeInShinecharging": {
219+
"length": 4,
220+
"gentleDownTiles": 2,
221+
"openEnd": 0
222+
},
223+
"comesInHeated": "no"
224+
},
225+
"requires": [
226+
"h_CrystalSpark"
227+
],
228+
"flashSuitChecked": true,
229+
"blueSuitChecked": true
230+
},
214231
{
215232
"id": 3,
216233
"link": [1, 1],
@@ -1054,6 +1071,22 @@
10541071
"flashSuitChecked": true,
10551072
"blueSuitChecked": true
10561073
},
1074+
{
1075+
"link": [2, 2],
1076+
"name": "Come in Shinecharging, Crystal Spark",
1077+
"entranceCondition": {
1078+
"comeInShinecharging": {
1079+
"length": 3,
1080+
"openEnd": 0
1081+
},
1082+
"comesInHeated": "no"
1083+
},
1084+
"requires": [
1085+
"h_CrystalSpark"
1086+
],
1087+
"flashSuitChecked": true,
1088+
"blueSuitChecked": true
1089+
},
10571090
{
10581091
"id": 31,
10591092
"link": [2, 2],
@@ -1914,6 +1947,22 @@
19141947
"flashSuitChecked": true,
19151948
"blueSuitChecked": true
19161949
},
1950+
{
1951+
"link": [3, 3],
1952+
"name": "Come in Shinecharging, Crystal Spark",
1953+
"entranceCondition": {
1954+
"comeInShinecharging": {
1955+
"length": 12,
1956+
"openEnd": 0
1957+
},
1958+
"comesInHeated": "no"
1959+
},
1960+
"requires": [
1961+
"h_CrystalSpark"
1962+
],
1963+
"flashSuitChecked": true,
1964+
"blueSuitChecked": true
1965+
},
19171966
{
19181967
"id": 61,
19191968
"link": [3, 3],
@@ -2554,6 +2603,23 @@
25542603
"flashSuitChecked": true,
25552604
"blueSuitChecked": true
25562605
},
2606+
{
2607+
"link": [4, 4],
2608+
"name": "Come in Shinecharging, Crystal Spark",
2609+
"entranceCondition": {
2610+
"comeInShinecharging": {
2611+
"length": 8,
2612+
"gentleUpTiles": 4,
2613+
"openEnd": 0
2614+
},
2615+
"comesInHeated": "no"
2616+
},
2617+
"requires": [
2618+
"h_CrystalSpark"
2619+
],
2620+
"flashSuitChecked": true,
2621+
"blueSuitChecked": true
2622+
},
25572623
{
25582624
"id": 81,
25592625
"link": [4, 4],
@@ -3388,6 +3454,22 @@
33883454
"flashSuitChecked": true,
33893455
"blueSuitChecked": true
33903456
},
3457+
{
3458+
"link": [5, 5],
3459+
"name": "Come in Shinecharging, Crystal Spark",
3460+
"entranceCondition": {
3461+
"comeInShinecharging": {
3462+
"length": 12,
3463+
"openEnd": 0
3464+
},
3465+
"comesInHeated": "no"
3466+
},
3467+
"requires": [
3468+
"h_CrystalSpark"
3469+
],
3470+
"flashSuitChecked": true,
3471+
"blueSuitChecked": true
3472+
},
33913473
{
33923474
"id": 110,
33933475
"link": [5, 5],
@@ -4019,6 +4101,23 @@
40194101
"The fastest Sova is just above the middle left door, while it is on the left side of the platform, which takes 45 seconds."
40204102
]
40214103
},
4104+
{
4105+
"link": [6, 6],
4106+
"name": "Come in Shinecharging, Crystal Spark",
4107+
"entranceCondition": {
4108+
"comeInShinecharging": {
4109+
"length": 3,
4110+
"openEnd": 0
4111+
},
4112+
"comesInHeated": "no"
4113+
},
4114+
"requires": [
4115+
"h_CrystalSpark"
4116+
],
4117+
"flashSuitChecked": true,
4118+
"blueSuitChecked": true,
4119+
"devNote": "The last tile is not considered usable because the Sova will be in the way."
4120+
},
40224121
{
40234122
"id": 131,
40244123
"link": [6, 6],
@@ -4704,6 +4803,34 @@
47044803
],
47054804
"flashSuitChecked": true,
47064805
"blueSuitChecked": true
4806+
},
4807+
{
4808+
"link": [8, 8],
4809+
"name": "Crystal Spark (In-Room)",
4810+
"requires": [
4811+
{"or": [
4812+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
4813+
{"and": [
4814+
{"or": [
4815+
{"doorUnlockedAtNode": 3},
4816+
{"doorUnlockedAtNode": 5}
4817+
]},
4818+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
4819+
]},
4820+
{"and": [
4821+
{"doorUnlockedAtNode": 3},
4822+
{"doorUnlockedAtNode": 5},
4823+
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
4824+
]}
4825+
]},
4826+
"h_CrystalSpark"
4827+
],
4828+
"unlocksDoors": [
4829+
{"nodeId": 3, "types": ["ammo"], "requires": []},
4830+
{"nodeId": 5, "types": ["ammo"], "requires": []}
4831+
],
4832+
"flashSuitChecked": true,
4833+
"blueSuitChecked": true
47074834
}
47084835
],
47094836
"notables": [],

‎region/norfair/west/Crocomire Escape.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,39 @@
9999
"flashSuitChecked": true,
100100
"blueSuitChecked": true
101101
},
102+
{
103+
"link": [1, 1],
104+
"name": "Come in Shinecharging, Crystal Spark",
105+
"entranceCondition": {
106+
"comeInShinecharging": {
107+
"length": 4,
108+
"openEnd": 0
109+
}
110+
},
111+
"requires": [
112+
"h_heatedCrystalSpark"
113+
],
114+
"flashSuitChecked": true,
115+
"blueSuitChecked": true
116+
},
117+
{
118+
"link": [1, 1],
119+
"name": "Crystal Spark (In-Room)",
120+
"requires": [
121+
{"obstaclesCleared": ["A"]},
122+
{"or": [
123+
{"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
124+
{"and": [
125+
{"doorUnlockedAtNode": 1},
126+
{"canShineCharge": {"usedTiles": 17, "openEnd": 0}}
127+
]}
128+
]},
129+
"h_heatedCrystalSpark"
130+
],
131+
"flashSuitChecked": true,
132+
"blueSuitChecked": true,
133+
"devNote": "If the door is opened, it is expected to shinecharge left to right, because touching the transition is particularly unforgiving."
134+
},
102135
{
103136
"id": 45,
104137
"link": [1, 2],
@@ -713,6 +746,16 @@
713746
"flashSuitChecked": true,
714747
"blueSuitChecked": true
715748
},
749+
{
750+
"link": [2, 2],
751+
"name": "Crystal Spark (In-Room)",
752+
"requires": [
753+
{"canShineCharge": {"usedTiles": 15, "openEnd": 1}},
754+
"h_heatedCrystalSpark"
755+
],
756+
"flashSuitChecked": true,
757+
"blueSuitChecked": true
758+
},
716759
{
717760
"id": 62,
718761
"link": [2, 2],

‎region/norfair/west/Crocomire Save Room.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,26 @@
6060
"flashSuitChecked": true,
6161
"blueSuitChecked": true
6262
},
63+
{
64+
"link": [1, 1],
65+
"name": "Come in Shinecharging, Crystal Spark",
66+
"entranceCondition": {
67+
"comeInShinecharging": {
68+
"length": 2,
69+
"openEnd": 0
70+
},
71+
"comesInHeated": "no"
72+
},
73+
"requires": [
74+
"h_CrystalSparkWithoutLenience"
75+
],
76+
"flashSuitChecked": true,
77+
"blueSuitChecked": true,
78+
"devNote": [
79+
"No lenience, because reloading from the save is possible.",
80+
"This room is shorter than the 3 tile limit normally used for these strats; it is only included because it has a save."
81+
]
82+
},
6383
{
6484
"id": 3,
6585
"link": [1, 2],

‎region/norfair/west/Crocomire Speedway.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,22 @@
208208
"flashSuitChecked": true,
209209
"blueSuitChecked": true
210210
},
211+
{
212+
"link": [1, 1],
213+
"name": "Come in Shinecharging, Crystal Spark",
214+
"entranceCondition": {
215+
"comeInShinecharging": {
216+
"length": 7,
217+
"gentleDownTiles": 4,
218+
"openEnd": 0
219+
}
220+
},
221+
"requires": [
222+
"h_heatedCrystalSpark"
223+
],
224+
"flashSuitChecked": true,
225+
"blueSuitChecked": true
226+
},
211227
{
212228
"id": 3,
213229
"link": [1, 5],
@@ -377,6 +393,16 @@
377393
"flashSuitChecked": true,
378394
"blueSuitChecked": true
379395
},
396+
{
397+
"link": [2, 2],
398+
"name": "Crystal Spark",
399+
"requires": [
400+
"h_shinechargeMaxRunway",
401+
"h_heatedCrystalSpark"
402+
],
403+
"flashSuitChecked": true,
404+
"blueSuitChecked": true
405+
},
380406
{
381407
"id": 130,
382408
"link": [2, 2],
@@ -4035,6 +4061,17 @@
40354061
"flashSuitChecked": true,
40364062
"blueSuitChecked": true
40374063
},
4064+
{
4065+
"link": [9, 9],
4066+
"name": "Crystal Spark",
4067+
"requires": [
4068+
{"obstaclesCleared": ["A"]},
4069+
"h_shinechargeMaxRunway",
4070+
"h_heatedCrystalSpark"
4071+
],
4072+
"flashSuitChecked": true,
4073+
"blueSuitChecked": true
4074+
},
40384075
{
40394076
"id": 128,
40404077
"link": [10, 2],

‎region/norfair/west/Hi Jump Boots Room.json‎

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

0 commit comments

Comments
 (0)