Skip to content

Commit 1b56797

Browse files
authored
Merge pull request #2212 from blkerby/mama-turtle-precise-stutter
Update mama turtle stutter shinecharge to the top
2 parents 2bf7604 + ad2aa9e commit 1b56797

1 file changed

Lines changed: 32 additions & 3 deletions

File tree

region/maridia/outer/Mama Turtle Room.json

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,15 +631,13 @@
631631
"link": [1, 2],
632632
"name": "Stutter Water Shinecharge",
633633
"entranceCondition": {
634-
"comeInRunning": {
635-
"speedBooster": true,
634+
"comeInStutterShinecharging": {
636635
"minTiles": 2
637636
}
638637
},
639638
"requires": [
640639
"canStutterWaterShineCharge",
641640
"canShinechargeMovement",
642-
"h_shinechargeMaxRunway",
643641
{"or": [
644642
{"shinespark": {"frames": 61, "excessFrames": 7}},
645643
{"and": [
@@ -656,6 +654,37 @@
656654
"clearsObstacles": ["B"],
657655
"devNote": "This could have a few more excess frames if not getting on top of the block to go to 2."
658656
},
657+
{
658+
"link": [1, 2],
659+
"name": "Precise Stutter Water Shinecharge",
660+
"entranceCondition": {
661+
"comeInStutterShinecharging": {
662+
"minTiles": 1
663+
}
664+
},
665+
"requires": [
666+
"canPreciseStutterWaterShineCharge",
667+
"canShinechargeMovement",
668+
{"or": [
669+
{"shinespark": {"frames": 61, "excessFrames": 7}},
670+
{"and": [
671+
"canMidairShinespark",
672+
{"shinespark": {"frames": 56, "excessFrames": 7}}
673+
]},
674+
{"and": [
675+
"canMidairShinespark",
676+
"HiJump",
677+
{"shinespark": {"frames": 52, "excessFrames": 7}}
678+
]}
679+
]}
680+
],
681+
"clearsObstacles": ["B"],
682+
"note": [
683+
"With only 1 tile of runway, this requires releasing forward for 1 or 2 frames",
684+
"and repressing forward on the last possible frame."
685+
],
686+
"devNote": "This could have a few more excess frames if not getting on top of the block to go to 2."
687+
},
659688
{
660689
"id": 10,
661690
"link": [1, 2],

0 commit comments

Comments
 (0)