Skip to content

Commit 13a08b2

Browse files
osse101osse101
authored
Merge pull request #2658 from blkerby/east-norfair-bluesuit-13
Purple Shaft (etc.) blue suit logic
2 parents a9101c5 + be8bb47 commit 13a08b2

4 files changed

Lines changed: 288 additions & 110 deletions

File tree

‎region/norfair/east/Nutella Refill.json‎

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"openEnd": 1
6060
}
6161
},
62-
"flashSuitChecked": true
62+
"flashSuitChecked": true,
63+
"blueSuitChecked": true
6364
},
6465
{
6566
"id": 2,
@@ -68,7 +69,8 @@
6869
"requires": [
6970
"h_CrystalFlash"
7071
],
71-
"flashSuitChecked": true
72+
"flashSuitChecked": true,
73+
"blueSuitChecked": true
7274
},
7375
{
7476
"id": 3,
@@ -88,7 +90,8 @@
8890
{"types": ["super"], "requires": []},
8991
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
9092
],
91-
"flashSuitChecked": true
93+
"flashSuitChecked": true,
94+
"blueSuitChecked": true
9295
},
9396
{
9497
"id": 4,
@@ -111,7 +114,8 @@
111114
{"types": ["super"], "requires": []},
112115
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
113116
],
114-
"flashSuitChecked": true
117+
"flashSuitChecked": true,
118+
"blueSuitChecked": true
115119
},
116120
{
117121
"id": 5,
@@ -134,7 +138,8 @@
134138
{"types": ["super"], "requires": []},
135139
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
136140
],
137-
"flashSuitChecked": true
141+
"flashSuitChecked": true,
142+
"blueSuitChecked": true
138143
},
139144
{
140145
"id": 6,
@@ -158,6 +163,7 @@
158163
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
159164
],
160165
"flashSuitChecked": true,
166+
"blueSuitChecked": true,
161167
"note": "Jump over the Refill station before Shinesparking."
162168
},
163169
{
@@ -177,7 +183,8 @@
177183
"leaveWithTemporaryBlue": {}
178184
},
179185
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
180-
"flashSuitChecked": true
186+
"flashSuitChecked": true,
187+
"blueSuitChecked": true
181188
},
182189
{
183190
"id": 7,
@@ -190,7 +197,8 @@
190197
},
191198
"requires": [],
192199
"bypassesDoorShell": true,
193-
"flashSuitChecked": true
200+
"flashSuitChecked": true,
201+
"blueSuitChecked": true
194202
},
195203
{
196204
"id": 8,
@@ -208,7 +216,8 @@
208216
}
209217
},
210218
"bypassesDoorShell": true,
211-
"flashSuitChecked": true
219+
"flashSuitChecked": true,
220+
"blueSuitChecked": true
212221
},
213222
{
214223
"id": 9,
@@ -226,14 +235,16 @@
226235
}
227236
},
228237
"bypassesDoorShell": true,
229-
"flashSuitChecked": true
238+
"flashSuitChecked": true,
239+
"blueSuitChecked": true
230240
},
231241
{
232242
"id": 10,
233243
"link": [1, 3],
234244
"name": "Base",
235245
"requires": [],
236-
"flashSuitChecked": true
246+
"flashSuitChecked": true,
247+
"blueSuitChecked": true
237248
},
238249
{
239250
"id": 11,
@@ -253,7 +264,8 @@
253264
{"types": ["super"], "requires": []},
254265
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
255266
],
256-
"flashSuitChecked": true
267+
"flashSuitChecked": true,
268+
"blueSuitChecked": true
257269
},
258270
{
259271
"id": 12,
@@ -276,7 +288,8 @@
276288
{"types": ["super"], "requires": []},
277289
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
278290
],
279-
"flashSuitChecked": true
291+
"flashSuitChecked": true,
292+
"blueSuitChecked": true
280293
},
281294
{
282295
"id": 13,
@@ -299,7 +312,8 @@
299312
{"types": ["super"], "requires": []},
300313
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
301314
],
302-
"flashSuitChecked": true
315+
"flashSuitChecked": true,
316+
"blueSuitChecked": true
303317
},
304318
{
305319
"id": 14,
@@ -323,6 +337,7 @@
323337
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
324338
],
325339
"flashSuitChecked": true,
340+
"blueSuitChecked": true,
326341
"note": "Jump over the Refill station before Shinesparking."
327342
},
328343
{
@@ -342,7 +357,8 @@
342357
"leaveWithTemporaryBlue": {}
343358
},
344359
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
345-
"flashSuitChecked": true
360+
"flashSuitChecked": true,
361+
"blueSuitChecked": true
346362
},
347363
{
348364
"id": 15,
@@ -355,7 +371,8 @@
355371
},
356372
"requires": [],
357373
"bypassesDoorShell": true,
358-
"flashSuitChecked": true
374+
"flashSuitChecked": true,
375+
"blueSuitChecked": true
359376
},
360377
{
361378
"id": 16,
@@ -373,7 +390,8 @@
373390
}
374391
},
375392
"bypassesDoorShell": true,
376-
"flashSuitChecked": true
393+
"flashSuitChecked": true,
394+
"blueSuitChecked": true
377395
},
378396
{
379397
"id": 17,
@@ -391,7 +409,8 @@
391409
}
392410
},
393411
"bypassesDoorShell": true,
394-
"flashSuitChecked": true
412+
"flashSuitChecked": true,
413+
"blueSuitChecked": true
395414
},
396415
{
397416
"id": 18,
@@ -404,28 +423,32 @@
404423
"openEnd": 1
405424
}
406425
},
407-
"flashSuitChecked": true
426+
"flashSuitChecked": true,
427+
"blueSuitChecked": true
408428
},
409429
{
410430
"id": 19,
411431
"link": [2, 3],
412432
"name": "Base",
413433
"requires": [],
414-
"flashSuitChecked": true
434+
"flashSuitChecked": true,
435+
"blueSuitChecked": true
415436
},
416437
{
417438
"id": 20,
418439
"link": [3, 1],
419440
"name": "Base",
420441
"requires": [],
421-
"flashSuitChecked": true
442+
"flashSuitChecked": true,
443+
"blueSuitChecked": true
422444
},
423445
{
424446
"id": 21,
425447
"link": [3, 2],
426448
"name": "Base",
427449
"requires": [],
428-
"flashSuitChecked": true
450+
"flashSuitChecked": true,
451+
"blueSuitChecked": true
429452
},
430453
{
431454
"id": 22,
@@ -434,7 +457,8 @@
434457
"requires": [
435458
"h_useEnergyRefillStation"
436459
],
437-
"flashSuitChecked": true
460+
"flashSuitChecked": true,
461+
"blueSuitChecked": true
438462
}
439463
],
440464
"notables": [],

‎region/norfair/east/Purple Farming Room.json‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,22 @@
5454
"openEnd": 0
5555
}
5656
},
57-
"flashSuitChecked": true
57+
"flashSuitChecked": true,
58+
"blueSuitChecked": true
5859
},
5960
{
6061
"id": 1,
6162
"link": [1, 2],
6263
"name": "Base",
6364
"requires": [
64-
{"heatFrames": 10}
65+
{"heatFrames": 10},
66+
{"or": [
67+
"canDash",
68+
{"heatFrames": 5}
69+
]}
6570
],
66-
"flashSuitChecked": true
71+
"flashSuitChecked": true,
72+
"blueSuitChecked": true
6773
},
6874
{
6975
"id": 8,
@@ -102,15 +108,21 @@
102108
"link": [2, 1],
103109
"name": "Base",
104110
"requires": [
105-
{"heatFrames": 30}
111+
{"heatFrames": 30},
112+
{"or": [
113+
"canDash",
114+
{"heatFrames": 20}
115+
]}
106116
],
107-
"flashSuitChecked": true
117+
"flashSuitChecked": true,
118+
"blueSuitChecked": true
108119
},
109120
{
110121
"id": 3,
111122
"link": [2, 1],
112123
"name": "Leave with Runway",
113124
"requires": [
125+
"canDash",
114126
"h_runOverRespawningEnemies",
115127
{"heatFrames": 0}
116128
],
@@ -124,6 +136,7 @@
124136
},
125137
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
126138
"flashSuitChecked": true,
139+
"blueSuitChecked": true,
127140
"note": "Involves leaving some drops hanging after killing the Gamets so they don't respawn.",
128141
"devNote": "Health drops are collected while using this runway, offsetting any heat frames used to get into position."
129142
},
@@ -138,7 +151,8 @@
138151
"leaveWithGModeSetup": {}
139152
},
140153
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
141-
"flashSuitChecked": true
154+
"flashSuitChecked": true,
155+
"blueSuitChecked": true
142156
},
143157
{
144158
"id": 7,
@@ -155,6 +169,7 @@
155169
{"partialRefill": {"type": "RegularEnergy", "limit": 50}}
156170
],
157171
"flashSuitChecked": true,
172+
"blueSuitChecked": true,
158173
"note": "Regain some energy in order to use the Gamet Farm."
159174
},
160175
{
@@ -168,7 +183,8 @@
168183
{"cycleFrames": 20}
169184
],
170185
"farmCycleDrops": [{"enemy": "Gamet", "count": 5}],
171-
"flashSuitChecked": true
186+
"flashSuitChecked": true,
187+
"blueSuitChecked": true
172188
}
173189
],
174190
"notables": [],

0 commit comments

Comments
 (0)