Skip to content

Commit a3c613f

Browse files
osse101osse101
authored
Merge pull request #2805 from kjbranch/cs-un-2
Add Crystal Sparks in Croc's Lair
2 parents 3b98831 + cfbbcaf commit a3c613f

12 files changed

Lines changed: 388 additions & 2 deletions

‎helpers.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,11 @@
17331733
{
17341734
"name": "h_runOverRespawningEnemies",
17351735
"requires": [
1736-
"canCarefulJump"
1736+
"canCarefulJump",
1737+
{"or": [
1738+
"h_enemyDrops",
1739+
"Wave"
1740+
]}
17371741
],
17381742
"devNote": "canCarefulJump is used to represent leaving the enemy drops, which isn't a propper fit, but it is a tech with a similar difficulty."
17391743
},

‎region/norfair/crocomire/Cosine Room.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,23 @@
7171
"flashSuitChecked": true,
7272
"blueSuitChecked": true
7373
},
74+
{
75+
"link": [1, 1],
76+
"name": "Crystal Spark",
77+
"requires": [
78+
"h_shinechargeMaxRunway",
79+
{"or": [
80+
{"and": [
81+
"h_enemyDrops",
82+
"h_CrystalSparkWithoutLenience"
83+
]},
84+
"h_CrystalSpark"
85+
]}
86+
],
87+
"flashSuitChecked": true,
88+
"blueSuitChecked": true,
89+
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
90+
},
7491
{
7592
"id": 2,
7693
"link": [1, 1],

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,18 @@
365365
"flashSuitChecked": true,
366366
"blueSuitChecked": true
367367
},
368+
{
369+
"link": [1, 1],
370+
"name": "Crystal Spark",
371+
"requires": [
372+
"h_CrocomireCameraFix",
373+
{"canShineCharge": {"usedTiles": 14, "openEnd": 1}},
374+
"h_CrystalSpark"
375+
],
376+
"flashSuitChecked": true,
377+
"blueSuitChecked": true,
378+
"devNote": "With Crocomire defeated, the crystal spark will be done at node 4."
379+
},
368380
{
369381
"id": 5,
370382
"link": [1, 3],
@@ -1346,6 +1358,22 @@
13461358
"flashSuitChecked": true,
13471359
"blueSuitChecked": true
13481360
},
1361+
{
1362+
"link": [4, 4],
1363+
"name": "Crystal Spark",
1364+
"requires": [
1365+
{"or": [
1366+
{"and": [
1367+
"f_DefeatedCrocomire",
1368+
"h_shinechargeMaxRunway"
1369+
]},
1370+
{"canShineCharge": {"usedTiles": 32, "openEnd": 1}}
1371+
]},
1372+
"h_CrystalSpark"
1373+
],
1374+
"flashSuitChecked": true,
1375+
"blueSuitChecked": true
1376+
},
13491377
{
13501378
"id": 52,
13511379
"link": [4, 4],

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,22 @@
426426
"flashSuitChecked": true,
427427
"blueSuitChecked": true
428428
},
429+
{
430+
"link": [2, 2],
431+
"name": "Come in Shinecharging, Crystal Spark",
432+
"entranceCondition": {
433+
"comeInShinecharging": {
434+
"length": 9,
435+
"openEnd": 0
436+
},
437+
"comesInHeated": "no"
438+
},
439+
"requires": [
440+
"h_CrystalSpark"
441+
],
442+
"flashSuitChecked": true,
443+
"blueSuitChecked": true
444+
},
429445
{
430446
"id": 15,
431447
"link": [2, 3],

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

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,41 @@
6262
"flashSuitChecked": true,
6363
"blueSuitChecked": true
6464
},
65+
{
66+
"link": [1, 1],
67+
"name": "Come in Shinecharging, Crystal Spark",
68+
"entranceCondition": {
69+
"comeInShinecharging": {
70+
"length": 9,
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],
6884
"name": "Base",
69-
"requires": [],
85+
"requires": [
86+
{"or": [
87+
"canDash",
88+
"Grapple",
89+
"canWalljump",
90+
"SpaceJump",
91+
"canSpringBallJumpMidAir",
92+
"canBombJumpWaterEscape",
93+
{"and": [
94+
"HiJump",
95+
"canDownGrab"
96+
]},
97+
"canSpringBallBombJump"
98+
]}
99+
],
70100
"flashSuitChecked": true,
71101
"blueSuitChecked": true
72102
},
@@ -397,6 +427,32 @@
397427
},
398428
"flashSuitChecked": true,
399429
"blueSuitChecked": true
430+
},
431+
{
432+
"link": [2, 2],
433+
"name": "Crystal Flash",
434+
"requires": [
435+
"h_CrystalFlash"
436+
],
437+
"flashSuitChecked": true,
438+
"blueSuitChecked": true,
439+
"devNote": "This is only needed here as well, because Samus can't cross left to right with a blue suit."
440+
},
441+
{
442+
"link": [2, 2],
443+
"name": "Come in Shinecharging, Crystal Spark",
444+
"entranceCondition": {
445+
"comeInShinecharging": {
446+
"length": 8,
447+
"openEnd": 0
448+
},
449+
"comesInHeated": "no"
450+
},
451+
"requires": [
452+
"h_CrystalSpark"
453+
],
454+
"flashSuitChecked": true,
455+
"blueSuitChecked": true
400456
}
401457
],
402458
"notables": [],

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,31 @@
167167
"flashSuitChecked": true,
168168
"blueSuitChecked": true
169169
},
170+
{
171+
"link": [1, 1],
172+
"name": "Come in Shinecharging, Crystal Spark",
173+
"entranceCondition": {
174+
"comeInShinecharging": {
175+
"length": 3,
176+
"openEnd": 0
177+
},
178+
"comesInHeated": "no"
179+
},
180+
"requires": [
181+
"canShinechargeMovementTricky",
182+
"canInsaneJump",
183+
"h_CrystalSpark"
184+
],
185+
"flashSuitChecked": true,
186+
"blueSuitChecked": true,
187+
"note": [
188+
"Shinecharge on the edge then quickly jump into the hole and place the Power Bomb on the descent.",
189+
"Alternatively, it is possible to kill the Fune with a Super immediately after shinecharging."
190+
],
191+
"devNote": [
192+
"It not currently possible to represent the Super variant, because the Super would not be muliplied by the lenience factor."
193+
]
194+
},
170195
{
171196
"id": 3,
172197
"link": [1, 2],

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@
143143
"flashSuitChecked": true,
144144
"blueSuitChecked": true
145145
},
146+
{
147+
"link": [1, 1],
148+
"name": "Come in Shinecharging, Crystal Spark",
149+
"entranceCondition": {
150+
"comeInShinecharging": {
151+
"length": 3,
152+
"openEnd": 0
153+
},
154+
"comesInHeated": "no"
155+
},
156+
"requires": [
157+
"h_shinechargeMaxRunway",
158+
{"or": [
159+
{"and": [
160+
"h_enemyDrops",
161+
"h_CrystalSparkWithoutLenience"
162+
]},
163+
"h_CrystalSpark"
164+
]}
165+
],
166+
"flashSuitChecked": true,
167+
"blueSuitChecked": true,
168+
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
169+
},
146170
{
147171
"id": 4,
148172
"link": [1, 1],
@@ -981,6 +1005,22 @@
9811005
"flashSuitChecked": true,
9821006
"blueSuitChecked": true
9831007
},
1008+
{
1009+
"link": [2, 2],
1010+
"name": "Come in Shinecharging, Crystal Spark",
1011+
"entranceCondition": {
1012+
"comeInShinecharging": {
1013+
"length": 3,
1014+
"openEnd": 0
1015+
},
1016+
"comesInHeated": "no"
1017+
},
1018+
"requires": [
1019+
"h_CrystalSpark"
1020+
],
1021+
"flashSuitChecked": true,
1022+
"blueSuitChecked": true
1023+
},
9841024
{
9851025
"id": 33,
9861026
"link": [2, 2],

‎region/norfair/crocomire/Indiana Jones Room.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,22 @@
185185
"flashSuitChecked": true,
186186
"blueSuitChecked": true
187187
},
188+
{
189+
"link": [1, 1],
190+
"name": "Come in Shinecharging, Crystal Spark",
191+
"entranceCondition": {
192+
"comeInShinecharging": {
193+
"length": 9,
194+
"openEnd": 0
195+
},
196+
"comesInHeated": "no"
197+
},
198+
"requires": [
199+
"h_CrystalSpark"
200+
],
201+
"flashSuitChecked": true,
202+
"blueSuitChecked": true
203+
},
188204
{
189205
"id": 117,
190206
"link": [1, 1],
@@ -1159,6 +1175,18 @@
11591175
"blueSuitChecked": true,
11601176
"note": "Commonly known as a stutter-3, this is also doable as a 4-tap."
11611177
},
1178+
{
1179+
"link": [2, 2],
1180+
"name": "Crystal Spark",
1181+
"requires": [
1182+
{"obstaclesCleared": ["B"]},
1183+
"h_shinechargeMaxRunway",
1184+
"h_CrystalSpark"
1185+
],
1186+
"clearsObstacles": ["A"],
1187+
"flashSuitChecked": true,
1188+
"blueSuitChecked": true
1189+
},
11621190
{
11631191
"id": 138,
11641192
"link": [2, 2],

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,93 @@
10381038
"flashSuitChecked": true,
10391039
"blueSuitChecked": true
10401040
},
1041+
{
1042+
"link": [3, 3],
1043+
"name": "Crystal Spark",
1044+
"requires": [
1045+
"h_runOverRespawningEnemies",
1046+
{"or": [
1047+
{"canShineCharge": {
1048+
"usedTiles": 18,
1049+
"gentleUpTiles": 2,
1050+
"gentleDownTiles": 4,
1051+
"openEnd": 1
1052+
}},
1053+
{"and": [
1054+
{"doorUnlockedAtNode": 3},
1055+
{"canShineCharge": {
1056+
"usedTiles": 19,
1057+
"gentleUpTiles": 2,
1058+
"gentleDownTiles": 4,
1059+
"openEnd": 1
1060+
}}
1061+
]}
1062+
]},
1063+
{"or": [
1064+
{"and": [
1065+
"h_enemyDrops",
1066+
"h_CrystalSparkWithoutLenience"
1067+
]},
1068+
"h_CrystalSpark"
1069+
]}
1070+
],
1071+
"flashSuitChecked": true,
1072+
"blueSuitChecked": true,
1073+
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
1074+
},
1075+
{
1076+
"link": [3, 3],
1077+
"name": "Come in Getting Blue Speed, Shinecharge, Crystal Spark (Short Runway)",
1078+
"entranceCondition": {
1079+
"comeInGettingBlueSpeed": {
1080+
"length": 10,
1081+
"gentleDownTiles": 4,
1082+
"openEnd": 0
1083+
},
1084+
"comesInHeated": "no"
1085+
},
1086+
"requires": [
1087+
"h_shinechargeMaxRunway",
1088+
{"or": [
1089+
{"and": [
1090+
"h_enemyDrops",
1091+
"h_CrystalSparkWithoutLenience"
1092+
]},
1093+
"h_CrystalSpark"
1094+
]}
1095+
],
1096+
"flashSuitChecked": true,
1097+
"blueSuitChecked": true,
1098+
"note": "Get blue speed before the Gamets.",
1099+
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
1100+
},
1101+
{
1102+
"link": [3, 3],
1103+
"name": "Come in Shinecharging, Crystal Spark (Wave)",
1104+
"entranceCondition": {
1105+
"comeInShinecharging": {
1106+
"length": 18,
1107+
"gentleDownTiles": 4,
1108+
"gentleUpTiles": 2,
1109+
"openEnd": 0
1110+
},
1111+
"comesInHeated": "no"
1112+
},
1113+
"requires": [
1114+
"Wave",
1115+
"h_runOverRespawningEnemies",
1116+
{"or": [
1117+
{"and": [
1118+
"h_enemyDrops",
1119+
"h_CrystalSparkWithoutLenience"
1120+
]},
1121+
"h_CrystalSpark"
1122+
]}
1123+
],
1124+
"flashSuitChecked": true,
1125+
"blueSuitChecked": true,
1126+
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
1127+
},
10411128
{
10421129
"id": 95,
10431130
"link": [3, 3],

0 commit comments

Comments
 (0)