Skip to content

Commit 414b03c

Browse files
osse101osse101
authored
Merge pull request #2829 from blkerby/green-maridia-bluesuit-1
Green Maridia pt. 1 (Pants Room): blue suit logic
2 parents 8207c52 + 1c1454f commit 414b03c

2 files changed

Lines changed: 273 additions & 95 deletions

File tree

‎region/maridia/inner-green/East Pants Room.json‎

Lines changed: 74 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
"openEnd": 1
9292
}
9393
},
94-
"flashSuitChecked": true
94+
"flashSuitChecked": true,
95+
"blueSuitChecked": true
9596
},
9697
{
9798
"id": 2,
@@ -123,6 +124,7 @@
123124
],
124125
"farmCycleDrops": [{"enemy": "Puyo", "count": 2}],
125126
"flashSuitChecked": true,
127+
"blueSuitChecked": true,
126128
"note": "Stand (don't crouch) next to the door and shoot diagonally down into the sand until the Puyos are killed.",
127129
"devNote": [
128130
"One or both of the Puyos above the shot block could also be farmed, but it doesn't seem worth modeling."
@@ -135,7 +137,8 @@
135137
"requires": [
136138
"h_CrystalFlash"
137139
],
138-
"flashSuitChecked": true
140+
"flashSuitChecked": true,
141+
"blueSuitChecked": true
139142
},
140143
{
141144
"id": 4,
@@ -146,6 +149,7 @@
146149
"leaveWithGModeSetup": {}
147150
},
148151
"flashSuitChecked": true,
152+
"blueSuitChecked": true,
149153
"devNote": "This can only be useful if the door does not connect to the Pants Room."
150154
},
151155
{
@@ -157,16 +161,32 @@
157161
],
158162
"gModeRegainMobility": {},
159163
"flashSuitChecked": true,
164+
"blueSuitChecked": true,
160165
"devNote": "This can only be useful if the door does not connect to the Pants Room."
161166
},
162167
{
163168
"id": 6,
164169
"link": [1, 3],
165170
"name": "Base",
166171
"requires": [
172+
"canDash",
167173
"Gravity"
168174
],
169-
"flashSuitChecked": true
175+
"flashSuitChecked": true,
176+
"blueSuitChecked": true
177+
},
178+
{
179+
"link": [1, 3],
180+
"name": "Gravity Flatley Jump",
181+
"requires": [
182+
"Gravity",
183+
"canFlatleyJump"
184+
],
185+
"flashSuitChecked": true,
186+
"blueSuitChecked": true,
187+
"note": [
188+
"Use a Flatley jump to avoid touching the sand; this is useful to avoid losing a blue suit."
189+
]
170190
},
171191
{
172192
"id": 7,
@@ -181,7 +201,8 @@
181201
"canUseFrozenEnemies"
182202
]}
183203
],
184-
"flashSuitChecked": true
204+
"flashSuitChecked": true,
205+
"blueSuitChecked": true
185206
},
186207
{
187208
"id": 8,
@@ -200,6 +221,7 @@
200221
]}
201222
],
202223
"flashSuitChecked": true,
224+
"blueSuitChecked": true,
203225
"note": "It is recommended to shoot the ceiling block immediately upon room entry to bring one of the Puyos down so that it will not be a problem later."
204226
},
205227
{
@@ -216,6 +238,7 @@
216238
]}
217239
],
218240
"flashSuitChecked": true,
241+
"blueSuitChecked": true,
219242
"note": [
220243
"Involves breaking the top left Puyo free and then freezing it while it falls.",
221244
"Walk to the end of the door platform and wait for the above puyo to land on the shot block.",
@@ -231,7 +254,8 @@
231254
"HiJump",
232255
"canJumpIntoRespawningBlock"
233256
],
234-
"flashSuitChecked": true
257+
"flashSuitChecked": true,
258+
"blueSuitChecked": true
235259
},
236260
{
237261
"id": 11,
@@ -248,6 +272,7 @@
248272
]}
249273
],
250274
"flashSuitChecked": true,
275+
"blueSuitChecked": true,
251276
"note": "It is recommended to shoot the ceiling block immediately upon room entry to bring one of the Puyos down so that it will not be a problem later."
252277
},
253278
{
@@ -272,6 +297,7 @@
272297
{"noFlashSuit": {}}
273298
],
274299
"flashSuitChecked": true,
300+
"blueSuitChecked": true,
275301
"note": [
276302
"Quickly shoot to break the shot block and then do a momentumConservingTurnaround to ascend into the little region.",
277303
"Another movement item will be needed to get closer to the crumble blocks."
@@ -286,13 +312,14 @@
286312
{
287313
"id": 26,
288314
"link": [1, 3],
289-
"name": "Use Flash Suit",
315+
"name": "Use Stored Spark",
290316
"requires": [
291-
"canPlayInSand",
317+
"h_storedSpark",
292318
{"useFlashSuit": {}},
293319
{"shinespark": {"frames": 11, "excessFrames": 1}}
294320
],
295321
"flashSuitChecked": true,
322+
"blueSuitChecked": true,
296323
"note": "Cross the sand, then spark up left."
297324
},
298325
{
@@ -318,7 +345,8 @@
318345
{"types": ["super"], "requires": []},
319346
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
320347
],
321-
"flashSuitChecked": true
348+
"flashSuitChecked": true,
349+
"blueSuitChecked": true
322350
},
323351
{
324352
"id": 13,
@@ -331,7 +359,8 @@
331359
},
332360
"requires": [],
333361
"bypassesDoorShell": "yes",
334-
"flashSuitChecked": true
362+
"flashSuitChecked": true,
363+
"blueSuitChecked": true
335364
},
336365
{
337366
"id": 14,
@@ -349,7 +378,8 @@
349378
}
350379
},
351380
"bypassesDoorShell": "yes",
352-
"flashSuitChecked": true
381+
"flashSuitChecked": true,
382+
"blueSuitChecked": true
353383
},
354384
{
355385
"id": 15,
@@ -362,7 +392,8 @@
362392
"openEnd": 1
363393
}
364394
},
365-
"flashSuitChecked": true
395+
"flashSuitChecked": true,
396+
"blueSuitChecked": true
366397
},
367398
{
368399
"id": 29,
@@ -383,7 +414,10 @@
383414
{"cycleFrames": 95}
384415
]},
385416
{"and": [
386-
"ScrewAttack",
417+
{"or": [
418+
"ScrewAttack",
419+
{"haveBlueSuit": {}}
420+
]},
387421
{"cycleFrames": 105}
388422
]},
389423
{"and": [
@@ -415,6 +449,10 @@
415449
"Spazer",
416450
{"cycleFrames": 185}
417451
]},
452+
{"and": [
453+
{"haveBlueSuit": {}},
454+
{"cycleFrames": 200}
455+
]},
418456
{"and": [
419457
"canDodgeWhileShooting",
420458
{"cycleFrames": 220}
@@ -424,7 +462,8 @@
424462
]}
425463
],
426464
"farmCycleDrops": [{"enemy": "Puyo", "count": 1}],
427-
"flashSuitChecked": true
465+
"flashSuitChecked": true,
466+
"blueSuitChecked": true
428467
},
429468
{
430469
"id": 30,
@@ -440,6 +479,10 @@
440479
"Plasma",
441480
{"cycleFrames": 230}
442481
]},
482+
{"and": [
483+
{"haveBlueSuit": {}},
484+
{"cycleFrames": 240}
485+
]},
443486
{"and": [
444487
"Grapple",
445488
{"cycleFrames": 270}
@@ -477,6 +520,7 @@
477520
],
478521
"farmCycleDrops": [{"enemy": "Puyo", "count": 3}],
479522
"flashSuitChecked": true,
523+
"blueSuitChecked": true,
480524
"devNote": [
481525
"More Puyos could be farmed at the bottom of the room, but it doesn't seem worth modeling."
482526
]
@@ -488,7 +532,8 @@
488532
"requires": [
489533
"h_CrystalFlash"
490534
],
491-
"flashSuitChecked": true
535+
"flashSuitChecked": true,
536+
"blueSuitChecked": true
492537
},
493538
{
494539
"link": [2, 2],
@@ -517,7 +562,8 @@
517562
"exitCondition": {
518563
"leaveWithGModeSetup": {}
519564
},
520-
"flashSuitChecked": true
565+
"flashSuitChecked": true,
566+
"blueSuitChecked": true
521567
},
522568
{
523569
"id": 18,
@@ -527,14 +573,16 @@
527573
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
528574
],
529575
"gModeRegainMobility": {},
530-
"flashSuitChecked": true
576+
"flashSuitChecked": true,
577+
"blueSuitChecked": true
531578
},
532579
{
533580
"id": 19,
534581
"link": [2, 3],
535582
"name": "Base",
536583
"requires": [],
537-
"flashSuitChecked": true
584+
"flashSuitChecked": true,
585+
"blueSuitChecked": true
538586
},
539587
{
540588
"id": 20,
@@ -546,7 +594,8 @@
546594
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
547595
]}
548596
],
549-
"flashSuitChecked": true
597+
"flashSuitChecked": true,
598+
"blueSuitChecked": true
550599
},
551600
{
552601
"id": 21,
@@ -568,6 +617,7 @@
568617
]}
569618
],
570619
"flashSuitChecked": true,
620+
"blueSuitChecked": true,
571621
"note": [
572622
"Freeze the Puyo at standing-shot height and then jump on top of it with a spinjump before morphing, unmorphing, and using X-Ray to standup and clip.",
573623
"Standing on a side of the room and shooting forward will freeze the Puyo at the correct height."
@@ -593,6 +643,7 @@
593643
]}
594644
],
595645
"flashSuitChecked": true,
646+
"blueSuitChecked": true,
596647
"note": [
597648
"Freeze the Puyo at standing-shot height and then jump on top of it with a spinjump before morphing, unmorphing, and using X-Ray to standup and clip.",
598649
"Standing on a side of the room and shooting forward will freeze the Puyo at the correct height."
@@ -614,6 +665,7 @@
614665
]}
615666
],
616667
"flashSuitChecked": true,
668+
"blueSuitChecked": true,
617669
"note": "Freeze the Puyo at the start of its jump animation, on the right frame."
618670
},
619671
{
@@ -624,6 +676,7 @@
624676
{"notable": "Suitless Puyo Clip"},
625677
"canSuitlessMaridia",
626678
"h_highPixelIceClip",
679+
{"noBlueSuit": {}},
627680
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}},
628681
{"or": [
629682
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 6}},
@@ -639,6 +692,7 @@
639692
]}
640693
],
641694
"flashSuitChecked": true,
695+
"blueSuitChecked": true,
642696
"note": [
643697
"Positioning the Puyo requires it to perform a big jump then start falling with a frame perfect freeze.",
644698
"One possible setup stands on the left tile of the right side and lets the puyo jump up taking a contact hit.",
@@ -660,6 +714,7 @@
660714
"Gravity"
661715
],
662716
"flashSuitChecked": true,
717+
"blueSuitChecked": true,
663718
"note": "Clip below the crumble blocks on the left side. Hold down after clipping to break them."
664719
},
665720
{
@@ -671,6 +726,7 @@
671726
"canSuitlessMaridia"
672727
],
673728
"flashSuitChecked": true,
729+
"blueSuitChecked": true,
674730
"note": [
675731
"Place a PB up against the crumble blocks, then jump and midair morph into that same position at the end of the explosion while holding CF inputs.",
676732
"Immediately after the CF, hold down to break the crumble blocks."

0 commit comments

Comments
 (0)