Skip to content

Commit 80a1d2f

Browse files
authored
Merge pull request #1523 from kjbranch/shinecharged-flash
Add flashSuitChecked to all Strats with comeInShinecharged or leaveShinecharged
2 parents 526b4b2 + c8b4f79 commit 80a1d2f

145 files changed

Lines changed: 1457 additions & 580 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

region/brinstar/blue/Blue Brinstar Boulder Room.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
"leaveShinecharged": {
7878
"framesRemaining": 140
7979
}
80-
}
80+
},
81+
"flashSuitChecked": true
8182
},
8283
{
8384
"link": [1, 1],
@@ -138,7 +139,8 @@
138139
"framesRemaining": 100
139140
}
140141
},
141-
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
142+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
143+
"flashSuitChecked": true
142144
},
143145
{
144146
"link": [1, 2],
@@ -160,6 +162,7 @@
160162
{"types": ["powerbomb"], "requires": []},
161163
{"types": ["missiles", "super"], "requires": ["canTrickyJump"]}
162164
],
165+
"flashSuitChecked": true,
163166
"note": [
164167
"Shoot the bridge to see where it ends.",
165168
"Opening the door requires a shot that is fired while Samus has some momentum from running to the right.",

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,8 @@
225225
"leaveShinecharged": {
226226
"framesRemaining": 140
227227
}
228-
}
228+
},
229+
"flashSuitChecked": true
229230
},
230231
{
231232
"link": [1, 1],
@@ -242,7 +243,8 @@
242243
"leaveShinecharged": {
243244
"framesRemaining": 120
244245
}
245-
}
246+
},
247+
"flashSuitChecked": true
246248
},
247249
{
248250
"link": [1, 1],

region/brinstar/blue/Construction Zone.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
"unlocksDoors": [
150150
{"types": ["super"], "requires": []},
151151
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
152-
]
152+
],
153+
"flashSuitChecked": true
153154
},
154155
{
155156
"link": [1, 2],
@@ -214,7 +215,8 @@
214215
"unlocksDoors": [
215216
{"types": ["super"], "requires": []},
216217
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
217-
]
218+
],
219+
"flashSuitChecked": true
218220
},
219221
{
220222
"link": [1, 4],
@@ -240,7 +242,8 @@
240242
"unlocksDoors": [
241243
{"types": ["super"], "requires": []},
242244
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
243-
]
245+
],
246+
"flashSuitChecked": true
244247
},
245248
{
246249
"link": [2, 1],
@@ -363,7 +366,8 @@
363366
"unlocksDoors": [
364367
{"types": ["super"], "requires": []},
365368
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
366-
]
369+
],
370+
"flashSuitChecked": true
367371
},
368372
{
369373
"link": [2, 3],

region/brinstar/blue/Morph Ball Room.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@
213213
"framesRemaining": 135
214214
}
215215
},
216+
"flashSuitChecked": true,
216217
"devNote": "Destroy obstacle C by travelling between nodes 1 and 6."
217218
},
218219
{
@@ -527,7 +528,8 @@
527528
"leaveShinecharged": {
528529
"framesRemaining": 130
529530
}
530-
}
531+
},
532+
"flashSuitChecked": true
531533
},
532534
{
533535
"link": [2, 3],
@@ -613,7 +615,8 @@
613615
"leaveShinecharged": {
614616
"framesRemaining": 130
615617
}
616-
}
618+
},
619+
"flashSuitChecked": true
617620
},
618621
{
619622
"link": [3, 5],

region/brinstar/green/Brinstar Pre-Map Room.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@
357357
"framesRemaining": 80
358358
}
359359
},
360-
"note": "Use the upper platform to gain a shinecharge and carry it out the right door.",
361-
"flashSuitChecked": true
360+
"flashSuitChecked": true,
361+
"note": "Use the upper platform to gain a shinecharge and carry it out the right door."
362362
},
363363
{
364364
"link": [2, 2],

region/brinstar/green/Green Brinstar Beetom Room.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@
401401
"never"
402402
]
403403
}
404-
]
404+
],
405+
"flashSuitChecked": true
405406
},
406407
{
407408
"link": [1, 2],
@@ -445,7 +446,8 @@
445446
"never"
446447
]
447448
}
448-
]
449+
],
450+
"flashSuitChecked": true
449451
},
450452
{
451453
"link": [1, 2],
@@ -474,6 +476,7 @@
474476
]
475477
}
476478
],
479+
"flashSuitChecked": true,
477480
"note": [
478481
"Depending on Samus' momentum when entering the room, it may be necessary to make a small jump before shooting open the door, to avoid a Beetom from blocking the shot."
479482
]
@@ -644,7 +647,8 @@
644647
"never"
645648
]
646649
}
647-
]
650+
],
651+
"flashSuitChecked": true
648652
},
649653
{
650654
"link": [2, 1],
@@ -688,7 +692,8 @@
688692
"never"
689693
]
690694
}
691-
]
695+
],
696+
"flashSuitChecked": true
692697
},
693698
{
694699
"link": [2, 1],
@@ -717,6 +722,7 @@
717722
]
718723
}
719724
],
725+
"flashSuitChecked": true,
720726
"note": [
721727
"Depending on Samus' momentum when entering the room, it may be necessary to make a small jump before shooting open the door, to avoid a Beetom from blocking the shot."
722728
]

0 commit comments

Comments
 (0)