Skip to content

Commit 8f7da36

Browse files
kjbranchkjbranch
authored
Merge pull request #1539 from kjbranch/flash-transition-stored-fall
Add flashSuitChecked to transitioning with stored fall speed
2 parents b382837 + 33cf4c8 commit 8f7da36

25 files changed

Lines changed: 206 additions & 120 deletions

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,8 @@
26002600
"never"
26012601
]
26022602
}
2603-
]
2603+
],
2604+
"flashSuitChecked": true
26042605
},
26052606
{
26062607
"link": [5, 6],
@@ -2627,7 +2628,8 @@
26272628
"never"
26282629
]
26292630
}
2630-
]
2631+
],
2632+
"flashSuitChecked": true
26312633
},
26322634
{
26332635
"link": [5, 12],
@@ -3048,7 +3050,8 @@
30483050
"never"
30493051
]
30503052
}
3051-
]
3053+
],
3054+
"flashSuitChecked": true
30523055
},
30533056
{
30543057
"link": [6, 5],
@@ -3075,7 +3078,8 @@
30753078
"never"
30763079
]
30773080
}
3078-
]
3081+
],
3082+
"flashSuitChecked": true
30793083
},
30803084
{
30813085
"link": [6, 6],

‎region/brinstar/pink/Dachora Room.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@
356356
"never"
357357
]
358358
}
359-
]
359+
],
360+
"flashSuitChecked": true
360361
},
361362
{
362363
"link": [1, 3],
@@ -391,7 +392,9 @@
391392
"never"
392393
]
393394
}
394-
]
395+
],
396+
"flashSuitChecked": true,
397+
"note": "It is possible to break the Bomb blocks using Screw Attack in a Moonfall, then escape the tiles with Grapple Beam."
395398
},
396399
{
397400
"link": [1, 3],
@@ -762,7 +765,8 @@
762765
"never"
763766
]
764767
}
765-
]
768+
],
769+
"flashSuitChecked": true
766770
},
767771
{
768772
"link": [3, 1],
@@ -797,7 +801,9 @@
797801
"never"
798802
]
799803
}
800-
]
804+
],
805+
"flashSuitChecked": true,
806+
"note": "It is possible to break the Bomb blocks using Screw Attack in a Moonfall, then escape the tiles with Grapple Beam."
801807
},
802808
{
803809
"link": [3, 1],

‎region/brinstar/red/Red Tower.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,8 @@
14331433
"never"
14341434
]
14351435
}
1436-
]
1436+
],
1437+
"flashSuitChecked": true
14371438
},
14381439
{
14391440
"link": [3, 4],
@@ -1460,7 +1461,8 @@
14601461
"never"
14611462
]
14621463
}
1463-
]
1464+
],
1465+
"flashSuitChecked": true
14641466
},
14651467
{
14661468
"link": [3, 5],
@@ -1787,7 +1789,8 @@
17871789
"never"
17881790
]
17891791
}
1790-
]
1792+
],
1793+
"flashSuitChecked": true
17911794
},
17921795
{
17931796
"link": [4, 3],
@@ -1814,7 +1817,8 @@
18141817
"never"
18151818
]
18161819
}
1817-
]
1820+
],
1821+
"flashSuitChecked": true
18181822
},
18191823
{
18201824
"link": [4, 4],

‎region/crateria/central/Climb.json‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -632,12 +632,12 @@
632632
},
633633
"requires": [
634634
{"or": [
635-
{"canShineCharge": {
635+
{"getBlueSpeed": {
636636
"usedTiles": 14,
637637
"openEnd": 0
638638
}},
639639
{"and": [
640-
{"canShineCharge": {
640+
{"getBlueSpeed": {
641641
"usedTiles": 15,
642642
"openEnd": 0
643643
}},
@@ -655,7 +655,8 @@
655655
{"types": ["powerbomb"], "requires": ["never"]},
656656
{"nodeId": 2, "types": ["missiles", "super"], "requires": []},
657657
{"nodeId": 2, "types": ["powerbomb"], "requires": ["never"]}
658-
]
658+
],
659+
"flashSuitChecked": true
659660
},
660661
{
661662
"link": [2, 5],
@@ -667,12 +668,12 @@
667668
},
668669
"requires": [
669670
{"or": [
670-
{"canShineCharge": {
671+
{"getBlueSpeed": {
671672
"usedTiles": 14,
672673
"openEnd": 0
673674
}},
674675
{"and": [
675-
{"canShineCharge": {
676+
{"getBlueSpeed": {
676677
"usedTiles": 15,
677678
"openEnd": 0
678679
}},
@@ -690,7 +691,8 @@
690691
{"types": ["powerbomb"], "requires": ["never"]},
691692
{"nodeId": 2, "types": ["missiles", "super"], "requires": []},
692693
{"nodeId": 2, "types": ["powerbomb"], "requires": ["never"]}
693-
]
694+
],
695+
"flashSuitChecked": true
694696
},
695697
{
696698
"link": [2, 5],
@@ -713,6 +715,7 @@
713715
{"types": ["missiles", "super"], "requires": []},
714716
{"types": ["powerbomb"], "requires": ["never"]}
715717
],
718+
"flashSuitChecked": true,
716719
"note": "Break the Bomb blocks using Screw Attack in a Moonfall, then escape the tiles with Grapple Beam."
717720
},
718721
{
@@ -1226,12 +1229,12 @@
12261229
},
12271230
"requires": [
12281231
{"or": [
1229-
{"canShineCharge": {
1232+
{"getBlueSpeed": {
12301233
"usedTiles": 12,
12311234
"openEnd": 0
12321235
}},
12331236
{"and": [
1234-
{"canShineCharge": {
1237+
{"getBlueSpeed": {
12351238
"usedTiles": 13,
12361239
"openEnd": 0
12371240
}},
@@ -1249,7 +1252,8 @@
12491252
{"types": ["powerbomb"], "requires": ["never"]},
12501253
{"nodeId": 5, "types": ["missiles", "super"], "requires": []},
12511254
{"nodeId": 5, "types": ["powerbomb"], "requires": ["never"]}
1252-
]
1255+
],
1256+
"flashSuitChecked": true
12531257
},
12541258
{
12551259
"link": [5, 2],
@@ -1261,12 +1265,12 @@
12611265
},
12621266
"requires": [
12631267
{"or": [
1264-
{"canShineCharge": {
1268+
{"getBlueSpeed": {
12651269
"usedTiles": 12,
12661270
"openEnd": 0
12671271
}},
12681272
{"and": [
1269-
{"canShineCharge": {
1273+
{"getBlueSpeed": {
12701274
"usedTiles": 13,
12711275
"openEnd": 0
12721276
}},
@@ -1284,7 +1288,8 @@
12841288
{"types": ["powerbomb"], "requires": ["never"]},
12851289
{"nodeId": 5, "types": ["missiles", "super"], "requires": []},
12861290
{"nodeId": 5, "types": ["powerbomb"], "requires": ["never"]}
1287-
]
1291+
],
1292+
"flashSuitChecked": true
12881293
},
12891294
{
12901295
"link": [5, 2],
@@ -1307,6 +1312,7 @@
13071312
{"types": ["missiles", "super"], "requires": []},
13081313
{"types": ["powerbomb"], "requires": ["never"]}
13091314
],
1315+
"flashSuitChecked": true,
13101316
"note": "Break the Bomb blocks using Screw Attack in a Moonfall, then escape the tiles with Grapple Beam."
13111317
},
13121318
{

‎region/crateria/central/Crateria Tube.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@
145145
"leaveWithStoredFallSpeed": {
146146
"fallSpeedInTiles": 1
147147
}
148-
}
148+
},
149+
"flashSuitChecked": true
149150
},
150151
{
151152
"link": [1, 2],
@@ -160,7 +161,8 @@
160161
"leaveWithStoredFallSpeed": {
161162
"fallSpeedInTiles": 2
162163
}
163-
}
164+
},
165+
"flashSuitChecked": true
164166
},
165167
{
166168
"link": [1, 2],
@@ -322,7 +324,8 @@
322324
"leaveWithStoredFallSpeed": {
323325
"fallSpeedInTiles": 1
324326
}
325-
}
327+
},
328+
"flashSuitChecked": true
326329
},
327330
{
328331
"link": [2, 1],
@@ -337,7 +340,8 @@
337340
"leaveWithStoredFallSpeed": {
338341
"fallSpeedInTiles": 2
339342
}
340-
}
343+
},
344+
"flashSuitChecked": true
341345
},
342346
{
343347
"link": [2, 1],

‎region/crateria/central/Landing Site.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,8 @@
567567
"unlocksDoors": [
568568
{"types": ["missiles", "super"], "requires": []},
569569
{"types": ["powerbomb"], "requires": ["never"]}
570-
]
570+
],
571+
"flashSuitChecked": true
571572
},
572573
{
573574
"link": [2, 4],
@@ -595,6 +596,7 @@
595596
{"types": ["missiles", "super"], "requires": []},
596597
{"types": ["powerbomb"], "requires": ["never"]}
597598
],
599+
"flashSuitChecked": true,
598600
"note": "Break the Bomb blocks using Screw Attack in a Moonfall or SpeedBooster."
599601
},
600602
{
@@ -1048,7 +1050,7 @@
10481050
}
10491051
},
10501052
"requires": [
1051-
{"canShineCharge": {
1053+
{"getBlueSpeed": {
10521054
"usedTiles": 25,
10531055
"steepDownTiles": 3,
10541056
"openEnd": 0
@@ -1062,7 +1064,8 @@
10621064
"unlocksDoors": [
10631065
{"types": ["missiles", "super"], "requires": []},
10641066
{"types": ["powerbomb"], "requires": ["never"]}
1065-
]
1067+
],
1068+
"flashSuitChecked": true
10661069
},
10671070
{
10681071
"link": [4, 2],
@@ -1074,7 +1077,7 @@
10741077
},
10751078
"requires": [
10761079
{"or": [
1077-
{"canShineCharge": {
1080+
{"getBlueSpeed": {
10781081
"usedTiles": 25,
10791082
"steepDownTiles": 3,
10801083
"openEnd": 0
@@ -1094,6 +1097,7 @@
10941097
{"types": ["missiles", "super"], "requires": []},
10951098
{"types": ["powerbomb"], "requires": ["never"]}
10961099
],
1100+
"flashSuitChecked": true,
10971101
"note": "Break the Bomb blocks using Screw Attack in a Moonfall or SpeedBooster."
10981102
},
10991103
{

‎region/crateria/east/Bowling Alley Path.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@
416416
{"types": ["missiles", "super"], "requires": []},
417417
{"types": ["powerbomb"], "requires": ["never"]}
418418
],
419+
"flashSuitChecked": true,
419420
"note": [
420421
"Freeze each of the three Choot enemies at the correct pixel height to walk across the room.",
421422
"Be careful about taking damage or falling on slopes."
@@ -441,6 +442,7 @@
441442
{"types": ["missiles", "super"], "requires": []},
442443
{"types": ["powerbomb"], "requires": ["never"]}
443444
],
445+
"flashSuitChecked": true,
444446
"note": [
445447
"Freeze each of the three Choot enemies at the correct pixel height to walk across the room.",
446448
"Be careful about taking damage or falling on slopes."
@@ -656,6 +658,7 @@
656658
{"types": ["missiles", "super"], "requires": []},
657659
{"types": ["powerbomb"], "requires": ["never"]}
658660
],
661+
"flashSuitChecked": true,
659662
"note": [
660663
"Freeze each of the three Choot enemies at the correct pixel height to walk across the room.",
661664
"Be careful about taking damage or falling on slopes."
@@ -681,6 +684,7 @@
681684
{"types": ["missiles", "super"], "requires": []},
682685
{"types": ["powerbomb"], "requires": ["never"]}
683686
],
687+
"flashSuitChecked": true,
684688
"note": [
685689
"Freeze each of the three Choot enemies at the correct pixel height to walk across the room.",
686690
"Be careful about taking damage or falling on slopes."

0 commit comments

Comments
 (0)