Skip to content

Commit b7459f6

Browse files
aquanightkjbranch
andauthored
Apply suggestions from code review
Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
1 parent 506e678 commit b7459f6

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

region/maridia/outer/Mama Turtle Room.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -572,14 +572,13 @@
572572
"h_CrystalFlashForReserveEnergy",
573573
{"canShineCharge": {"usedTiles": 18, "gentleUpTiles": 2, "openEnd": 1}},
574574
{"or": [
575-
{"and": [
576-
{"resourceCapacity": [{"type": "RegularEnergy", "count": 149}]},
577-
{"autoReserveTrigger": {"maxReserveEnergy": 200}},
578-
"canRModeSparkInterrupt"
579-
]},
580575
{"and": [
581576
{"autoReserveTrigger": {}},
582-
{"enemyDamage": {"enemy": "Kame (Tatori)", "type": "contact", "hits": 1}},
577+
{"or": [
578+
"canInsaneJump",
579+
{"enemyDamage": {"enemy": "Kame (Tatori)", "type": "contact", "hits": 1}},
580+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 150}]}
581+
]},
583582
"canRModeSparkInterrupt"
584583
]},
585584
{"and": [
@@ -592,6 +591,11 @@
592591
"blueSuitChecked": true,
593592
"note": [
594593
"Crystal Flash upon entering. Wake Mama Turtle, shinecharge, then use Mama Turtle to interrupt."
594+
],
595+
"detailNote": [
596+
"With ~200 Reserve Energy and at least 1 Energy tank, Samus will still be refilling reserves and Mama Turtle will return and hit again.",
597+
"It is possible to midair spark as Mama Turtle is approaching, where she will hit Samus on the first pass, but not after.",
598+
"This is frame perfect with Gravity, and when Samus is forced into a standup, her feet will be slightly less than a full tile below the ledge."
595599
]
596600
},
597601
{

0 commit comments

Comments
 (0)