Skip to content

Commit 77d44e8

Browse files
authored
Merge pull request #2283 from kjbranch/kraid-flash
Kraid Brinstar check flash suits
2 parents 7179ddd + 0a5e784 commit 77d44e8

10 files changed

Lines changed: 363 additions & 145 deletions

region/brinstar/kraid/Baby Kraid Room.json

Lines changed: 55 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@
117117
"length": 3,
118118
"openEnd": 1
119119
}
120-
}
120+
},
121+
"flashSuitChecked": true
121122
},
122123
{
123124
"id": 35,
@@ -141,6 +142,7 @@
141142
"obstruction": [3, 0]
142143
}
143144
},
145+
"flashSuitChecked": true,
144146
"note": [
145147
"Leaving with upward momentum is possible in three ways:",
146148
"1) Most easily, with a momentum-conserving morph against the ceiling through the transition,",
@@ -189,7 +191,8 @@
189191
},
190192
"minExtraRunSpeed": "$1.3"
191193
}
192-
}
194+
},
195+
"flashSuitChecked": true
193196
},
194197
{
195198
"id": 4,
@@ -209,7 +212,8 @@
209212
"openEnd": 1
210213
}
211214
}
212-
}
215+
},
216+
"flashSuitChecked": true
213217
},
214218
{
215219
"id": 5,
@@ -230,7 +234,8 @@
230234
},
231235
"movementType": "uncontrolled"
232236
}
233-
}
237+
},
238+
"flashSuitChecked": true
234239
},
235240
{
236241
"id": 6,
@@ -246,7 +251,8 @@
246251
"openEnd": 1
247252
}
248253
}
249-
}
254+
},
255+
"flashSuitChecked": true
250256
},
251257
{
252258
"id": 7,
@@ -305,6 +311,7 @@
305311
]}
306312
]}
307313
],
314+
"flashSuitChecked": true,
308315
"resetsObstacles": ["A"],
309316
"farmCycleDrops": [{"enemy": "Green Space Pirate (standing)", "count": 3}]
310317
},
@@ -328,7 +335,8 @@
328335
"farmCycleDrops": [
329336
{"enemy": "Green Space Pirate (standing)", "count": 3},
330337
{"enemy": "Mini-Kraid", "count": 1}
331-
]
338+
],
339+
"flashSuitChecked": true
332340
},
333341
{
334342
"id": 8,
@@ -345,7 +353,8 @@
345353
"name": "Enemies Already Killed",
346354
"requires": [
347355
{"obstaclesCleared": ["A"]}
348-
]
356+
],
357+
"flashSuitChecked": true
349358
},
350359
{
351360
"id": 10,
@@ -396,9 +405,14 @@
396405
}},
397406
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 3}}
398407
]}
408+
]},
409+
{"or": [
410+
"h_complexToCarryFlashSuit",
411+
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 3}}
399412
]}
400413
],
401414
"clearsObstacles": ["A"],
415+
"flashSuitChecked": true,
402416
"devNote": "Power Bombs only sometimes work on mini kraid for some reason."
403417
},
404418
{
@@ -413,17 +427,19 @@
413427
}},
414428
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}}
415429
],
430+
"flashSuitChecked": true,
416431
"note": "Quickly run through to tank the Pirate (or its laser) and one of Mini-Kraid's spikes."
417432
},
418433
{
419434
"id": 12,
420435
"link": [1, 2],
421436
"name": "Speedbooster Dodge Kill",
422437
"requires": [
423-
"canCarefulJump",
438+
"canDodgeWhileShooting",
424439
{"getBlueSpeed": {"usedTiles": 29, "openEnd": 2}}
425440
],
426441
"clearsObstacles": ["A"],
442+
"flashSuitChecked": true,
427443
"note": [
428444
"Shoot the pirates to prevent their lasers, then jump over them to get to the runway.",
429445
"Mini-Kraid spikes will block the runway fairly quickly; a shortcharge can allow for more run space but isn't required."
@@ -442,7 +458,8 @@
442458
"hits": 1
443459
}}
444460
],
445-
"clearsObstacles": ["A"]
461+
"clearsObstacles": ["A"],
462+
"flashSuitChecked": true
446463
},
447464
{
448465
"id": 14,
@@ -452,6 +469,7 @@
452469
"canCarefulJump",
453470
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}}
454471
],
472+
"flashSuitChecked": true,
455473
"note": "Shoot the pirates to prevent their lasers, then jump over them. Tank one Mini-Kraid spike."
456474
},
457475
{
@@ -460,7 +478,8 @@
460478
"name": "Space Jump",
461479
"requires": [
462480
"SpaceJump"
463-
]
481+
],
482+
"flashSuitChecked": true
464483
},
465484
{
466485
"id": 16,
@@ -488,7 +507,8 @@
488507
"requires": [
489508
{"obstaclesCleared": ["A"]}
490509
],
491-
"devNote": "Power Bombs only sometimes work on mini kraid for some reason."
510+
"flashSuitChecked": true,
511+
"devNote": "FIXME: Power Bombs only sometimes work on mini kraid. It was mentioned that it may require moving left while the PB explodes. This should be tested and applied to the logic."
492512
},
493513
{
494514
"id": 18,
@@ -520,7 +540,8 @@
520540
]}
521541
]}
522542
],
523-
"clearsObstacles": ["A"]
543+
"clearsObstacles": ["A"],
544+
"flashSuitChecked": true
524545
},
525546
{
526547
"id": 19,
@@ -532,6 +553,7 @@
532553
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}}
533554
],
534555
"clearsObstacles": ["A"],
556+
"flashSuitChecked": true,
535557
"note": "Gain i-frames by taking damage then run left to create enough space to run back to the right with speedbooster."
536558
},
537559
{
@@ -552,6 +574,7 @@
552574
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}}
553575
]}
554576
],
577+
"flashSuitChecked": true,
555578
"note": "Wait to hit one of Mini-Kraid's spikes, then run through."
556579
},
557580
{
@@ -625,7 +648,8 @@
625648
}
626649
},
627650
"requires": [],
628-
"bypassesDoorShell": true
651+
"bypassesDoorShell": true,
652+
"flashSuitChecked": true
629653
},
630654
{
631655
"id": 24,
@@ -642,7 +666,8 @@
642666
"blockPositions": [[3, 12]]
643667
}
644668
},
645-
"bypassesDoorShell": true
669+
"bypassesDoorShell": true,
670+
"flashSuitChecked": true
646671
},
647672
{
648673
"id": 25,
@@ -659,7 +684,8 @@
659684
"blockPositions": [[3, 13]]
660685
}
661686
},
662-
"bypassesDoorShell": true
687+
"bypassesDoorShell": true,
688+
"flashSuitChecked": true
663689
},
664690
{
665691
"id": 40,
@@ -711,7 +737,8 @@
711737
]}
712738
],
713739
"resetsObstacles": ["A"],
714-
"farmCycleDrops": [{"enemy": "Mini-Kraid", "count": 1}]
740+
"farmCycleDrops": [{"enemy": "Mini-Kraid", "count": 1}],
741+
"flashSuitChecked": true
715742
},
716743
{
717744
"id": 26,
@@ -739,6 +766,7 @@
739766
{"refill": ["Energy", "Missile", "Super"]}
740767
],
741768
"clearsObstacles": ["A"],
769+
"flashSuitChecked": true,
742770
"devNote": "These two farms are combined, to allow an option of using using Supers farmed from Mini-Kraid to kill the Pirates."
743771
},
744772
{
@@ -751,7 +779,8 @@
751779
"length": 4,
752780
"openEnd": 1
753781
}
754-
}
782+
},
783+
"flashSuitChecked": true
755784
},
756785
{
757786
"id": 36,
@@ -773,6 +802,7 @@
773802
"obstruction": [4, 0]
774803
}
775804
},
805+
"flashSuitChecked": true,
776806
"devNote": [
777807
"Max extra run speed $7.0.",
778808
"Press against the overhang left of the ceiling spikes,",
@@ -811,7 +841,8 @@
811841
},
812842
"minExtraRunSpeed": "$1.6"
813843
}
814-
}
844+
},
845+
"flashSuitChecked": true
815846
},
816847
{
817848
"id": 30,
@@ -831,7 +862,8 @@
831862
"openEnd": 1
832863
}
833864
}
834-
}
865+
},
866+
"flashSuitChecked": true
835867
},
836868
{
837869
"id": 31,
@@ -852,7 +884,8 @@
852884
},
853885
"movementType": "uncontrolled"
854886
}
855-
}
887+
},
888+
"flashSuitChecked": true
856889
},
857890
{
858891
"id": 32,
@@ -868,7 +901,8 @@
868901
"openEnd": 1
869902
}
870903
}
871-
}
904+
},
905+
"flashSuitChecked": true
872906
},
873907
{
874908
"id": 33,

0 commit comments

Comments
 (0)