Skip to content

Commit aaf376e

Browse files
osse101osse101
authored
Merge pull request #2665 from kjbranch/cs-kraid-brin
Crystal Spark - Warehouse Brinstar
2 parents c25f8b0 + 0a5e8e1 commit aaf376e

8 files changed

Lines changed: 273 additions & 1 deletion

‎region/brinstar/kraid/Baby Kraid Room.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,16 @@
411411
],
412412
"flashSuitChecked": true
413413
},
414+
{
415+
"link": [1, 1],
416+
"name": "Crystal Spark",
417+
"requires": [
418+
"h_shinechargeMaxRunway",
419+
"h_CrystalSpark"
420+
],
421+
"flashSuitChecked": true,
422+
"blueSuitChecked": true
423+
},
414424
{
415425
"id": 9,
416426
"link": [1, 2],

‎region/brinstar/kraid/Kraid Eye Door Room.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,22 @@
114114
"Freeze the Zeb after it thaws, noting that it will rise one pixel relative to its first frozen location."
115115
]
116116
},
117+
{
118+
"link": [1, 1],
119+
"name": "Come in Shinecharging, Crystal Spark",
120+
"entranceCondition": {
121+
"comeInShinecharging": {
122+
"length": 4,
123+
"openEnd": 0
124+
},
125+
"comesInHeated": "no"
126+
},
127+
"requires": [
128+
"h_CrystalSpark"
129+
],
130+
"flashSuitChecked": true,
131+
"blueSuitChecked": true
132+
},
117133
{
118134
"id": 4,
119135
"link": [1, 1],
@@ -848,6 +864,22 @@
848864
"Keep a half-tile gap between the Zeb and the runway to extend the runway as much as possible."
849865
]
850866
},
867+
{
868+
"link": [2, 2],
869+
"name": "Come in Shinecharging, Crystal Spark",
870+
"entranceCondition": {
871+
"comeInShinecharging": {
872+
"length": 3,
873+
"openEnd": 0
874+
},
875+
"comesInHeated": "no"
876+
},
877+
"requires": [
878+
"h_CrystalSpark"
879+
],
880+
"flashSuitChecked": true,
881+
"blueSuitChecked": true
882+
},
851883
{
852884
"id": 30,
853885
"link": [2, 2],

‎region/brinstar/kraid/Kraid Recharge Station.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,27 @@
5858
},
5959
"flashSuitChecked": true
6060
},
61+
{
62+
"link": [1, 1],
63+
"name": "Come in Shinecharging, Crystal Spark",
64+
"entranceCondition": {
65+
"comeInShinecharging": {
66+
"length": 2,
67+
"openEnd": 0
68+
},
69+
"comesInHeated": "no"
70+
},
71+
"requires": [
72+
"h_CrystalSparkWithoutLenience",
73+
"h_MissileRefillStationAllAmmo"
74+
],
75+
"flashSuitChecked": true,
76+
"blueSuitChecked": true,
77+
"devNote": [
78+
"No lenience, if the refill station refills Power Bombs.",
79+
"This room is shorter than the 3 tile limit normally used for these strats; it is only included if it can refill Power Bombs."
80+
]
81+
},
6182
{
6283
"id": 2,
6384
"link": [1, 2],

‎region/brinstar/kraid/Kraid Room.json‎

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,33 @@
237237
},
238238
"flashSuitChecked": true
239239
},
240+
{
241+
"link": [1, 1],
242+
"name": "Crystal Spark",
243+
"requires": [
244+
"f_DefeatedKraid",
245+
{"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
246+
"h_CrystalSpark"
247+
],
248+
"flashSuitChecked": true,
249+
"blueSuitChecked": true
250+
},
251+
{
252+
"link": [1, 1],
253+
"name": "Come in Shinecharging, Crystal Spark",
254+
"entranceCondition": {
255+
"comeInShinecharging": {
256+
"length": 3,
257+
"openEnd": 0
258+
},
259+
"comesInHeated": "no"
260+
},
261+
"requires": [
262+
"h_CrystalSpark"
263+
],
264+
"flashSuitChecked": true,
265+
"blueSuitChecked": true
266+
},
240267
{
241268
"id": 36,
242269
"link": [1, 1],
@@ -733,7 +760,12 @@
733760
"id": 16,
734761
"link": [2, 2],
735762
"name": "Leave With Runway",
736-
"requires": [],
763+
"requires": [
764+
{"or": [
765+
"f_DefeatedKraid",
766+
"h_KraidCameraFix"
767+
]}
768+
],
737769
"exitCondition": {
738770
"leaveWithRunway": {
739771
"length": 4,
@@ -921,9 +953,33 @@
921953
"link": [2, 2],
922954
"name": "Crystal Flash",
923955
"requires": [
956+
{"or": [
957+
"f_DefeatedKraid",
958+
"h_KraidCameraFix"
959+
]},
924960
"h_CrystalFlash"
925961
],
926962
"flashSuitChecked": true
963+
},
964+
{
965+
"link": [2, 2],
966+
"name": "Come in Shinecharging, Crystal Spark",
967+
"entranceCondition": {
968+
"comeInShinecharging": {
969+
"length": 3,
970+
"openEnd": 0
971+
},
972+
"comesInHeated": "no"
973+
},
974+
"requires": [
975+
{"or": [
976+
"f_DefeatedKraid",
977+
"h_KraidCameraFix"
978+
]},
979+
"h_CrystalSpark"
980+
],
981+
"flashSuitChecked": true,
982+
"blueSuitChecked": true
927983
}
928984
],
929985
"notables": [],

‎region/brinstar/kraid/Kraid Save Room.json‎

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

‎region/brinstar/kraid/Warehouse Entrance.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,43 @@
109109
],
110110
"flashSuitChecked": true
111111
},
112+
{
113+
"link": [1, 1],
114+
"name": "Crystal Spark (In-Room)",
115+
"requires": [
116+
{"or": [
117+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}},
118+
{"and": [
119+
{"doorUnlockedAtNode": 1},
120+
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
121+
]},
122+
{"and": [
123+
{"obstaclesCleared": ["A"]},
124+
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}}
125+
]}
126+
]},
127+
"h_CrystalSpark"
128+
],
129+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
130+
"flashSuitChecked": true,
131+
"blueSuitChecked": true
132+
},
133+
{
134+
"link": [1, 1],
135+
"name": "Come in Shinecharging, Crystal Spark",
136+
"entranceCondition": {
137+
"comeInShinecharging": {
138+
"length": 13,
139+
"openEnd": 0
140+
},
141+
"comesInHeated": "no"
142+
},
143+
"requires": [
144+
"h_CrystalSpark"
145+
],
146+
"flashSuitChecked": true,
147+
"blueSuitChecked": true
148+
},
112149
{
113150
"id": 43,
114151
"link": [1, 1],
@@ -622,6 +659,17 @@
622659
],
623660
"flashSuitChecked": true
624661
},
662+
{
663+
"link": [3, 3],
664+
"name": "Crystal Spark",
665+
"requires": [
666+
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
667+
"h_CrystalSpark"
668+
],
669+
"flashSuitChecked": true,
670+
"blueSuitChecked": true,
671+
"devNote": "FIXME: Coming in from the left would incorrectly require a Super to get here and another to return."
672+
},
625673
{
626674
"id": 31,
627675
"link": [3, 4],

‎region/brinstar/kraid/Warehouse Kihunter Room.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,27 @@
182182
},
183183
"flashSuitChecked": true
184184
},
185+
{
186+
"link": [1, 1],
187+
"name": "Crystal Spark",
188+
"requires": [
189+
{"obstaclesCleared": ["C"]},
190+
{"or": [
191+
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
192+
{"and": [
193+
{"obstaclesNotCleared": ["D"]},
194+
{"canShineCharge": {"usedTiles": 31, "openEnd": 1}}
195+
]}
196+
]},
197+
"h_CrystalSpark"
198+
],
199+
"flashSuitChecked": true,
200+
"blueSuitChecked": true,
201+
"devNote": [
202+
"FIXME: This assumes the left door is not a Power Bomb locked door.",
203+
"Otherwise Samus would need to shinecharge the other direction and would break the floor blocks"
204+
]
205+
},
185206
{
186207
"id": 46,
187208
"link": [1, 1],
@@ -490,6 +511,22 @@
490511
],
491512
"flashSuitChecked": true
492513
},
514+
{
515+
"link": [2, 2],
516+
"name": "Come in Shinecharging, Crystal Spark",
517+
"entranceCondition": {
518+
"comeInShinecharging": {
519+
"length": 8,
520+
"openEnd": 0
521+
},
522+
"comesInHeated": "no"
523+
},
524+
"requires": [
525+
"h_CrystalSpark"
526+
],
527+
"flashSuitChecked": true,
528+
"blueSuitChecked": true
529+
},
493530
{
494531
"id": 16,
495532
"link": [2, 5],
@@ -691,6 +728,22 @@
691728
],
692729
"flashSuitChecked": true
693730
},
731+
{
732+
"link": [3, 3],
733+
"name": "Come in Shinecharging, Crystal Spark",
734+
"entranceCondition": {
735+
"comeInShinecharging": {
736+
"length": 3,
737+
"openEnd": 0
738+
},
739+
"comesInHeated": "no"
740+
},
741+
"requires": [
742+
"h_CrystalSpark"
743+
],
744+
"flashSuitChecked": true,
745+
"blueSuitChecked": true
746+
},
694747
{
695748
"id": 23,
696749
"link": [3, 5],

‎region/brinstar/kraid/Warehouse Zeela Room.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,22 @@
137137
],
138138
"flashSuitChecked": true
139139
},
140+
{
141+
"link": [1, 1],
142+
"name": "Come in Shinecharging, Crystal Spark",
143+
"entranceCondition": {
144+
"comeInShinecharging": {
145+
"length": 5,
146+
"openEnd": 0
147+
},
148+
"comesInHeated": "no"
149+
},
150+
"requires": [
151+
"h_CrystalSpark"
152+
],
153+
"flashSuitChecked": true,
154+
"blueSuitChecked": true
155+
},
140156
{
141157
"id": 4,
142158
"link": [1, 1],
@@ -343,6 +359,22 @@
343359
},
344360
"flashSuitChecked": true
345361
},
362+
{
363+
"link": [2, 2],
364+
"name": "Come in Shinecharging, Crystal Spark",
365+
"entranceCondition": {
366+
"comeInShinecharging": {
367+
"length": 4,
368+
"openEnd": 0
369+
},
370+
"comesInHeated": "no"
371+
},
372+
"requires": [
373+
"h_CrystalSpark"
374+
],
375+
"flashSuitChecked": true,
376+
"blueSuitChecked": true
377+
},
346378
{
347379
"id": 14,
348380
"link": [2, 2],

0 commit comments

Comments
 (0)