Skip to content

Commit cd48c0e

Browse files
authored
Merge pull request #2253 from blkerby/check-flash-suit-crateria
Crateria Central check flash suits
2 parents 720c22f + 2f3d35f commit cd48c0e

18 files changed

Lines changed: 576 additions & 236 deletions

logicalRequirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ __Example:__
516516

517517
__Additional considerations__
518518

519-
* A `canShineCharge` object implicitly requires the Speed Booster. Energy requirements for the shinespark (if applicable) are specified separately using a `shinespark` object.
519+
* A `canShineCharge` object implicitly requires the Speed Booster. Energy requirements for the shinespark (if applicable) are specified separately using a `shinespark` object. A `canShineCharge` requirement causes a flash suit to be lost.
520520

521521
#### getBlueSpeed object
522522

region/crateria/central/230 Missile Room.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
"length": 10,
8383
"openEnd": 0
8484
}
85-
}
85+
},
86+
"flashSuitChecked": true
8687
},
8788
{
8889
"id": 2,
@@ -97,13 +98,15 @@
9798
"id": 3,
9899
"link": [1, 2],
99100
"name": "Base",
100-
"requires": []
101+
"requires": [],
102+
"flashSuitChecked": true
101103
},
102104
{
103105
"id": 4,
104106
"link": [2, 1],
105107
"name": "Base",
106-
"requires": []
108+
"requires": [],
109+
"flashSuitChecked": true
107110
}
108111
],
109112
"notables": [],

region/crateria/central/Blue Brinstar Elevator Room.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
"length": 14,
7474
"openEnd": 0
7575
}
76-
}
76+
},
77+
"flashSuitChecked": true
7778
},
7879
{
7980
"id": 2,
@@ -88,7 +89,8 @@
8889
"id": 3,
8990
"link": [1, 2],
9091
"name": "Base",
91-
"requires": []
92+
"requires": [],
93+
"flashSuitChecked": true
9294
},
9395
{
9496
"id": 4,

region/crateria/central/Bomb Torizo Room.json

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@
105105
"length": 1,
106106
"openEnd": 1
107107
}
108-
}
108+
},
109+
"flashSuitChecked": true
109110
},
110111
{
111112
"id": 20,
@@ -124,6 +125,7 @@
124125
"obstruction": [1, 0]
125126
}
126127
},
128+
"flashSuitChecked": true,
127129
"devNote": ["Max extra run speed $2.B with spin, or $2.C with a quick aim-down."]
128130
},
129131
{
@@ -141,6 +143,7 @@
141143
"obstruction": [1, 0]
142144
}
143145
},
146+
"flashSuitChecked": true,
144147
"devNote": ["Max extra run speed $2.2 with spin, or $2.3 with a quick aim-down."]
145148
},
146149
{
@@ -155,6 +158,7 @@
155158
{"enemyDamage": {"enemy": "Bomb Torizo", "type": "contact", "hits": 3}}
156159
]}
157160
],
161+
"flashSuitChecked": true,
158162
"setsFlags": ["f_DefeatedBombTorizo"]
159163
},
160164
{
@@ -183,7 +187,8 @@
183187
"openEnd": 1
184188
}
185189
}
186-
}
190+
},
191+
"flashSuitChecked": true
187192
},
188193
{
189194
"id": 4,
@@ -201,7 +206,8 @@
201206
"openEnd": 1
202207
}
203208
}
204-
}
209+
},
210+
"flashSuitChecked": true
205211
},
206212
{
207213
"id": 5,
@@ -220,7 +226,8 @@
220226
},
221227
"movementType": "uncontrolled"
222228
}
223-
}
229+
},
230+
"flashSuitChecked": true
224231
},
225232
{
226233
"id": 6,
@@ -234,7 +241,8 @@
234241
"openEnd": 1
235242
}
236243
}
237-
}
244+
},
245+
"flashSuitChecked": true
238246
},
239247
{
240248
"id": 7,
@@ -250,7 +258,8 @@
250258
"openEnd": 1
251259
}
252260
}
253-
}
261+
},
262+
"flashSuitChecked": true
254263
},
255264
{
256265
"id": 8,
@@ -270,7 +279,8 @@
270279
"openEnd": 1
271280
}
272281
}
273-
}
282+
},
283+
"flashSuitChecked": true
274284
},
275285
{
276286
"id": 9,
@@ -291,7 +301,8 @@
291301
},
292302
"movementType": "uncontrolled"
293303
}
294-
}
304+
},
305+
"flashSuitChecked": true
295306
},
296307
{
297308
"id": 10,
@@ -307,7 +318,8 @@
307318
"openEnd": 1
308319
}
309320
}
310-
}
321+
},
322+
"flashSuitChecked": true
311323
},
312324
{
313325
"id": 11,
@@ -326,19 +338,22 @@
326338
"f_ZebesSetAblaze"
327339
],
328340
"setsFlags": ["f_AnimalsSaved"],
341+
"flashSuitChecked": true,
329342
"devNote": "Technically this also requires opening the wall."
330343
},
331344
{
332345
"id": 12,
333346
"link": [1, 2],
334347
"name": "Base",
335-
"requires": []
348+
"requires": [],
349+
"flashSuitChecked": true
336350
},
337351
{
338352
"id": 15,
339353
"link": [2, 1],
340354
"name": "Base",
341-
"requires": []
355+
"requires": [],
356+
"flashSuitChecked": true
342357
}
343358
],
344359
"notables": [],

0 commit comments

Comments
 (0)