From 5edd77474015a43bbf303febc22dfe5c040fe1ec Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Fri, 30 May 2025 08:19:17 -0600 Subject: [PATCH 1/3] Kraid X-mode leave shinecharged --- region/brinstar/kraid/Kraid Room.json | 42 +++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/region/brinstar/kraid/Kraid Room.json b/region/brinstar/kraid/Kraid Room.json index caf901545d..eaca80423e 100644 --- a/region/brinstar/kraid/Kraid Room.json +++ b/region/brinstar/kraid/Kraid Room.json @@ -231,7 +231,7 @@ { "id": 2, "link": [1, 1], - "name": "Leave Shinecharged", + "name": "Leave Shinecharged (Kraid Defeated)", "requires": [ {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, "canShinechargeMovement", @@ -241,8 +241,46 @@ "exitCondition": { "leaveShinecharged": {} }, + "flashSuitChecked": true + }, + { + "link": [1, 1], + "name": "Leave Shinecharged (X-Mode or Kraid Defeated)", + "requires": [ + "canXMode", + "h_XModeThornHit", + "h_XModeThornHit", + "h_shinechargeMaxRunway", + {"or": [ + {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, + {"and": [ + {"not": "f_DefeatedKraid"}, + "canRiskPermanentLossOfAccess" + ]} + ]}, + "canShinechargeMovement", + {"shineChargeFrames": 55}, + {"or": [ + {"and": [ + "canNeutralDamageBoost", + "canBeVeryPatient" + ]}, + {"shineChargeFrames": 10} + ]} + ], + "exitCondition": { + "leaveShinecharged": {} + }, "flashSuitChecked": true, - "devNote": "An X-Mode strat is likely possible but not included. It would require the doors unlocked and canRiskPermanentLossOfAccess." + "note": [ + "If Kraid is alive, use X-mode on the thorns to gain a shinecharge.", + "While running on the thorns, Samus' will be flashing as i-frames continually refresh;", + "by timing the shinecharge and X-Ray release to happen just before i-frames run out,", + "Samus can get a neutral damage boost to quickly put her on the ledge." + ], + "devNote": [ + "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model." + ] }, { "id": 3, From fe2d60c94a224f7dec843c8f227793a064ecc517 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Fri, 30 May 2025 10:36:56 -0600 Subject: [PATCH 2/3] tighten shineChargeFrames in regular leaveShinecharged strats --- region/brinstar/kraid/Kraid Room.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/region/brinstar/kraid/Kraid Room.json b/region/brinstar/kraid/Kraid Room.json index eaca80423e..e339d0e830 100644 --- a/region/brinstar/kraid/Kraid Room.json +++ b/region/brinstar/kraid/Kraid Room.json @@ -236,7 +236,7 @@ {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, "canShinechargeMovement", "f_DefeatedKraid", - {"shineChargeFrames": 45} + {"shineChargeFrames": 40} ], "exitCondition": { "leaveShinecharged": {} @@ -566,7 +566,7 @@ {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, "canShinechargeMovement", "f_DefeatedKraid", - {"shineChargeFrames": 45} + {"shineChargeFrames": 40} ], "exitCondition": { "leaveShinecharged": {} From 8a1efca47da25701f8b7067b9f20bba000c98af2 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Tue, 3 Jun 2025 07:07:39 -0600 Subject: [PATCH 3/3] describe angle turnaround, adjust requirements, add right-side strat --- region/brinstar/kraid/Kraid Room.json | 65 ++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/region/brinstar/kraid/Kraid Room.json b/region/brinstar/kraid/Kraid Room.json index e339d0e830..0f401f09e2 100644 --- a/region/brinstar/kraid/Kraid Room.json +++ b/region/brinstar/kraid/Kraid Room.json @@ -249,7 +249,6 @@ "requires": [ "canXMode", "h_XModeThornHit", - "h_XModeThornHit", "h_shinechargeMaxRunway", {"or": [ {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, @@ -259,13 +258,13 @@ ]} ]}, "canShinechargeMovement", - {"shineChargeFrames": 55}, + {"shineChargeFrames": 45}, {"or": [ + "canBeVeryPatient", {"and": [ - "canNeutralDamageBoost", - "canBeVeryPatient" - ]}, - {"shineChargeFrames": 10} + "h_XModeThornHit", + {"shineChargeFrames": 20} + ]} ]} ], "exitCondition": { @@ -273,10 +272,12 @@ }, "flashSuitChecked": true, "note": [ - "If Kraid is alive, use X-mode on the thorns to gain a shinecharge.", - "While running on the thorns, Samus' will be flashing as i-frames continually refresh;", - "by timing the shinecharge and X-Ray release to happen just before i-frames run out,", - "Samus can get a neutral damage boost to quickly put her on the ledge." + "If Kraid is alive, use X-mode on the thorns to gain blue speed.", + "Hold an angle button to turn around while retaining blue.", + "If needed, arm pump to get close to the ledge without touching it.", + "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;", + "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,", + "a second thorn hit can be avoided." ], "devNote": [ "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model." @@ -561,7 +562,7 @@ { "id": 17, "link": [2, 2], - "name": "Leave Shinecharged", + "name": "Leave Shinecharged (Kraid Defeated)", "requires": [ {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, "canShinechargeMovement", @@ -571,8 +572,48 @@ "exitCondition": { "leaveShinecharged": {} }, + "flashSuitChecked": true + }, + { + "link": [2, 2], + "name": "Leave Shinecharged (X-Mode or Kraid Defeated)", + "requires": [ + "h_KraidCameraFix", + "canXMode", + "h_XModeThornHit", + "h_shinechargeMaxRunway", + {"or": [ + {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, + {"and": [ + {"not": "f_DefeatedKraid"}, + "canRiskPermanentLossOfAccess" + ]} + ]}, + "canShinechargeMovement", + {"shineChargeFrames": 45}, + {"or": [ + "canBeVeryPatient", + {"and": [ + "h_XModeThornHit", + {"shineChargeFrames": 20} + ]} + ]} + ], + "exitCondition": { + "leaveShinecharged": {} + }, "flashSuitChecked": true, - "devNote": "An X-Mode strat is likely possible but not included. It would require the doors unlocked and canRiskPermanentLossOfAccess." + "note": [ + "If Kraid is alive, use X-mode on the thorns to gain blue speed.", + "Hold an angle button to turn around while retaining blue.", + "If needed, arm pump to get close to the ledge without touching it.", + "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;", + "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,", + "a second thorn hit can be avoided." + ], + "devNote": [ + "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model." + ] }, { "id": 18,