Skip to content

Commit d16efba

Browse files
osse101osse101
authored
Merge pull request #2827 from blkerby/yellow-maridia-bluesuit-1
Yellow Maridia pt. 1 (Plasma Room, etc.): blue suit logic
2 parents 414b03c + 8d4352b commit d16efba

8 files changed

Lines changed: 842 additions & 465 deletions

‎region/maridia/inner-yellow/Butterfly Room.json‎

Lines changed: 109 additions & 30 deletions
Large diffs are not rendered by default.

‎region/maridia/inner-yellow/Forgotten Highway Save Room.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"openEnd": 1
4848
}
4949
},
50-
"flashSuitChecked": true
50+
"flashSuitChecked": true,
51+
"blueSuitChecked": true
5152
},
5253
{
5354
"id": 2,
@@ -56,7 +57,8 @@
5657
"requires": [
5758
"h_CrystalFlash"
5859
],
59-
"flashSuitChecked": true
60+
"flashSuitChecked": true,
61+
"blueSuitChecked": true
6062
},
6163
{
6264
"link": [1, 1],
@@ -83,14 +85,16 @@
8385
"link": [1, 2],
8486
"name": "Base",
8587
"requires": [],
86-
"flashSuitChecked": true
88+
"flashSuitChecked": true,
89+
"blueSuitChecked": true
8790
},
8891
{
8992
"id": 4,
9093
"link": [2, 1],
9194
"name": "Base",
9295
"requires": [],
93-
"flashSuitChecked": true
96+
"flashSuitChecked": true,
97+
"blueSuitChecked": true
9498
}
9599
],
96100
"notables": [],

‎region/maridia/inner-yellow/Kassiuz Room.json‎

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
"openEnd": 1
7474
}
7575
},
76-
"flashSuitChecked": true
76+
"flashSuitChecked": true,
77+
"blueSuitChecked": true
7778
},
7879
{
7980
"id": 2,
@@ -88,7 +89,8 @@
8889
"openEnd": 1
8990
}
9091
},
91-
"flashSuitChecked": true
92+
"flashSuitChecked": true,
93+
"blueSuitChecked": true
9294
},
9395
{
9496
"id": 3,
@@ -106,7 +108,8 @@
106108
"Plasma",
107109
"Wave",
108110
"Spazer",
109-
"ScrewAttack"
111+
"ScrewAttack",
112+
{"haveBlueSuit": {}}
110113
]},
111114
{"cycleFrames": 210}
112115
]},
@@ -118,7 +121,8 @@
118121
]}
119122
],
120123
"farmCycleDrops": [{"enemy": "Puyo", "count": 2}],
121-
"flashSuitChecked": true
124+
"flashSuitChecked": true,
125+
"blueSuitChecked": true
122126
},
123127
{
124128
"id": 27,
@@ -160,6 +164,10 @@
160164
"ScrewAttack",
161165
{"cycleFrames": 1000}
162166
]},
167+
{"and": [
168+
{"haveBlueSuit": {}},
169+
{"cycleFrames": 1000}
170+
]},
163171
{"and": [
164172
"Wave",
165173
{"cycleFrames": 1080}
@@ -179,7 +187,8 @@
179187
{"enemy": "Puyo", "count": 4},
180188
{"enemy": "Choot", "count": 3}
181189
],
182-
"flashSuitChecked": true
190+
"flashSuitChecked": true,
191+
"blueSuitChecked": true
183192
},
184193
{
185194
"id": 4,
@@ -188,7 +197,8 @@
188197
"requires": [
189198
"h_CrystalFlash"
190199
],
191-
"flashSuitChecked": true
200+
"flashSuitChecked": true,
201+
"blueSuitChecked": true
192202
},
193203
{
194204
"id": 5,
@@ -198,7 +208,8 @@
198208
"exitCondition": {
199209
"leaveWithGModeSetup": {}
200210
},
201-
"flashSuitChecked": true
211+
"flashSuitChecked": true,
212+
"blueSuitChecked": true
202213
},
203214
{
204215
"id": 6,
@@ -208,7 +219,8 @@
208219
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
209220
],
210221
"gModeRegainMobility": {},
211-
"flashSuitChecked": true
222+
"flashSuitChecked": true,
223+
"blueSuitChecked": true
212224
},
213225
{
214226
"id": 7,
@@ -229,7 +241,8 @@
229241
]}
230242
]}
231243
],
232-
"flashSuitChecked": true
244+
"flashSuitChecked": true,
245+
"blueSuitChecked": true
233246
},
234247
{
235248
"id": 21,
@@ -247,6 +260,7 @@
247260
]}
248261
],
249262
"flashSuitChecked": true,
263+
"blueSuitChecked": true,
250264
"note": "Use Spring Ball to jump up the right side of the room."
251265
},
252266
{
@@ -262,7 +276,8 @@
262276
"requires": [
263277
{"shinespark": {"frames": 58, "excessFrames": 6}}
264278
],
265-
"flashSuitChecked": true
279+
"flashSuitChecked": true,
280+
"blueSuitChecked": true
266281
},
267282
{
268283
"id": 9,
@@ -275,7 +290,8 @@
275290
{"shineChargeFrames": 20},
276291
{"shinespark": {"frames": 58, "excessFrames": 6}}
277292
],
278-
"flashSuitChecked": true
293+
"flashSuitChecked": true,
294+
"blueSuitChecked": true
279295
},
280296
{
281297
"id": 18,
@@ -299,6 +315,7 @@
299315
},
300316
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
301317
"flashSuitChecked": true,
318+
"blueSuitChecked": true,
302319
"note": [
303320
"Perform a sequence of three mid-air Spring Ball jumps, each immediately followed by an unmorph to avoid bonking the wall;",
304321
"after each unmorph, use a pause-buffered remorph to continue chaining temporary blue."
@@ -310,9 +327,9 @@
310327
{
311328
"id": 16,
312329
"link": [1, 2],
313-
"name": "Use Flash Suit",
330+
"name": "Use Stored Spark",
314331
"requires": [
315-
{"useFlashSuit": {}},
332+
"h_storedSpark",
316333
{"or": [
317334
{"shinespark": {"frames": 48, "excessFrames": 12}},
318335
{"and": [
@@ -322,12 +339,13 @@
322339
]}
323340
],
324341
"flashSuitChecked": true,
342+
"blueSuitChecked": true,
325343
"note": "With HiJump, climb to the first Choot platform, jump left and spark up right to save Energy."
326344
},
327345
{
328346
"id": 17,
329347
"link": [1, 2],
330-
"name": "Use Flash Suit, Frozen Puyo Climb",
348+
"name": "Use Stored Spark, Frozen Puyo Climb",
331349
"requires": [
332350
"canTrickyUseFrozenEnemies",
333351
"canTrickyCarryFlashSuit",
@@ -336,10 +354,11 @@
336354
"Spazer",
337355
"Plasma"
338356
]},
339-
{"useFlashSuit": {}},
357+
"h_storedSpark",
340358
{"shinespark": {"frames": 13, "excessFrames": 10}}
341359
],
342360
"flashSuitChecked": true,
361+
"blueSuitChecked": true,
343362
"note": [
344363
"To save a lot of Energy, climb the room with ice before shinesparking to the door.",
345364
"To climb the room, stand on a frozen enemy, lure the Puyo from above and freeze it midair twice to progress."
@@ -361,6 +380,7 @@
361380
"canOffScreenMovement"
362381
],
363382
"flashSuitChecked": true,
383+
"blueSuitChecked": true,
364384
"note": [
365385
"Climb up 2.5 screens.",
366386
"Stop when about half of Samus (or less) is visible at the top of the screen.",
@@ -387,6 +407,7 @@
387407
"canOffScreenMovement"
388408
],
389409
"flashSuitChecked": true,
410+
"blueSuitChecked": true,
390411
"note": [
391412
"Climb up 2.5 screens.",
392413
"Stop when about half of Samus (or less) is visible at the top of the screen.",
@@ -423,6 +444,7 @@
423444
]}
424445
],
425446
"flashSuitChecked": true,
447+
"blueSuitChecked": true,
426448
"note": [
427449
"IBJ up the climb. This is a lot easier with PBs or Spring Ball to help kill the enemies.",
428450
"With PBs, use one on entry to deal with the Puyos, then IBJ up the right side and use another to kill the middle Choot.",
@@ -446,7 +468,8 @@
446468
"canTrickyGrappleJump",
447469
"canMidairWiggle"
448470
],
449-
"flashSuitChecked": false
471+
"flashSuitChecked": false,
472+
"blueSuitChecked": true
450473
},
451474
{
452475
"id": 23,
@@ -472,7 +495,8 @@
472495
]}
473496
]}
474497
],
475-
"flashSuitChecked": false
498+
"flashSuitChecked": false,
499+
"blueSuitChecked": true
476500
},
477501
{
478502
"id": 24,
@@ -502,7 +526,8 @@
502526
]}
503527
]}
504528
],
505-
"flashSuitChecked": false
529+
"flashSuitChecked": false,
530+
"blueSuitChecked": true
506531
},
507532
{
508533
"id": 25,
@@ -526,7 +551,8 @@
526551
"canMidairWiggle",
527552
"canBeExtremelyPatient"
528553
],
529-
"flashSuitChecked": false
554+
"flashSuitChecked": false,
555+
"blueSuitChecked": true
530556
},
531557
{
532558
"id": 20,
@@ -553,6 +579,7 @@
553579
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
554580
],
555581
"flashSuitChecked": true,
582+
"blueSuitChecked": true,
556583
"note": [
557584
"Moonfall from the ledge just below the door, then weave between the floating platforms.",
558585
"It is possible to either perform the mid-air spark at high speed while falling, or to land and jump into a mid-air spark.",
@@ -573,7 +600,8 @@
573600
"link": [2, 1],
574601
"name": "Base",
575602
"requires": [],
576-
"flashSuitChecked": true
603+
"flashSuitChecked": true,
604+
"blueSuitChecked": true
577605
},
578606
{
579607
"id": 19,
@@ -595,6 +623,7 @@
595623
},
596624
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
597625
"flashSuitChecked": true,
626+
"blueSuitChecked": true,
598627
"note": [
599628
"Use a short speedball to destroy the top Choot or go under it.",
600629
"Then chain temporary blue into the next room."
@@ -611,7 +640,8 @@
611640
"openEnd": 1
612641
}
613642
},
614-
"flashSuitChecked": true
643+
"flashSuitChecked": true,
644+
"blueSuitChecked": true
615645
},
616646
{
617647
"id": 26,
@@ -629,6 +659,7 @@
629659
}
630660
},
631661
"flashSuitChecked": true,
662+
"blueSuitChecked": true,
632663
"devNote": "Max extra run speed $0.8"
633664
},
634665
{
@@ -637,6 +668,10 @@
637668
"name": "Choot Farm",
638669
"requires": [
639670
{"resetRoom": {"nodes": [2]}},
671+
{"or": [
672+
"canDash",
673+
{"cycleFrames": 20}
674+
]},
640675
{"or": [
641676
{"and": [
642677
"Grapple",
@@ -658,6 +693,10 @@
658693
"ScrewAttack",
659694
{"cycleFrames": 200}
660695
]},
696+
{"and": [
697+
{"haveBlueSuit": {}},
698+
{"cycleFrames": 200}
699+
]},
661700
{"and": [
662701
"canPseudoScrew",
663702
{"cycleFrames": 220}
@@ -670,7 +709,8 @@
670709
]}
671710
],
672711
"farmCycleDrops": [{"enemy": "Choot", "count": 1}],
673-
"flashSuitChecked": true
712+
"flashSuitChecked": true,
713+
"blueSuitChecked": true
674714
},
675715
{
676716
"id": 15,
@@ -679,7 +719,8 @@
679719
"requires": [
680720
"h_CrystalFlash"
681721
],
682-
"flashSuitChecked": true
722+
"flashSuitChecked": true,
723+
"blueSuitChecked": true
683724
}
684725
],
685726
"notables": [

0 commit comments

Comments
 (0)