Skip to content

xmode cleanup of old strats to switch to the helper #2459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 30, 2025
Merged

xmode cleanup of old strats to switch to the helper #2459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
db491e0
xmode cleanup of old strats to switch to the helper
nn357 Nov 25, 2025
ba8e56f
Update Kraid Room.json
nn357 Nov 25, 2025
5716ca7
Update The Worst Room In The Game.json
nn357 Nov 25, 2025
d98f08a
Update Double Chamber.json
nn357 Nov 27, 2025
c095fa6
Update Double Chamber.json
nn357 Nov 27, 2025
6f471ac
Merge branch 'master' into xmode_cleanup
nn357 Nov 27, 2025
4699532
add frameperfect x-mode lenicy to alpha peeb
nn357 Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions helpers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,7 @@
"note": "Represents triggering an R-Mode Spark Interrupt by using heat damage."
},
{
"name": "h_SpikeXModeSpikeSuit",
"name": "h_spikeXModeSpikeSuit",
"requires": [
"h_XModeSpikeHit",
"h_XModeSpikeHit",
Expand All @@ -1848,10 +1848,11 @@
"h_shinechargeMaxRunway",
"canXModeSpikeSuit",
{"spikeHits": 1}
]
],
"devNote": "This helper is used for an X-Mode shinecharge followed by a spikesuit so the leniency should be multiplactive."
},
{
"name": "h_ThornXModeSpikeSuit",
"name": "h_thornXModeSpikeSuit",
"requires": [
"h_XModeThornHit",
"h_XModeThornHit",
Expand All @@ -1861,7 +1862,8 @@
"h_shinechargeMaxRunway",
"canXModeSpikeSuit",
{"thornHits": 1}
]
],
"devNote": "This helper is used for an X-Mode shinecharge followed by a spikesuit so the leniency should be multiplactive."
},
{
"name": "h_spikeXModeShinecharge",
Expand Down
33 changes: 17 additions & 16 deletions region/brinstar/green/Etecoon Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,10 +980,10 @@
},
"requires": [
{"shineChargeFrames": 135},
"h_XModeThornHit",
"canSuperJump",
{"shinespark": {"frames": 7}},
"canXModeBlueSuit"
"h_thornXModeBlueSuit",
"h_thornXModeFramePerfectExtraLeniency",
{"shinespark": {"frames": 7}}
],
"flashSuitChecked": true
},
Expand All @@ -992,10 +992,10 @@
"link": [3, 2],
"name": "Gain Blue Suit (Double X-Mode Super Jump)",
"requires": [
"h_thornDoubleXModeBlueSuit",
"canSuperJump",
{"shinespark": {"frames": 7}},
"canXModeBlueSuit"
"h_thornDoubleXModeBlueSuit",
"h_thornDoubleXModeFramePerfectExtraLeniency",
{"shinespark": {"frames": 7}}
],
"flashSuitChecked": true
},
Expand Down Expand Up @@ -1127,7 +1127,8 @@
"link": [3, 3],
"name": "Gain Flash Suit (X-Mode Spikesuit)",
"requires": [
"h_ThornXModeSpikeSuit",
"h_thornXModeSpikeSuit",
"h_thornXModeFramePerfectExtraLeniency",
{"shinespark": {"frames": 12, "excessFrames": 12}}
],
"flashSuitChecked": true
Expand All @@ -1141,6 +1142,7 @@
},
"requires": [
{"shineChargeFrames": 135},
"h_thornXModeFramePerfectExtraLeniency",
"h_thornXModeBlueSuit",
{"shinespark": {"frames": 0}}
],
Expand All @@ -1151,6 +1153,7 @@
"link": [3, 3],
"name": "Gain Blue Suit (Double X-Mode)",
"requires": [
"h_thornDoubleXModeFramePerfectExtraLeniency",
"h_thornDoubleXModeBlueSuit",
{"shinespark": {"frames": 0}}
],
Expand All @@ -1161,9 +1164,8 @@
"link": [3, 3],
"name": "X-Mode, Leave Shinecharged",
"requires": [
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"shineChargeFrames": 60}
],
"exitCondition": {
Expand Down Expand Up @@ -1927,9 +1929,8 @@
"name": "X-Mode, Leave With Spark",
"requires": [
{"obstaclesCleared": ["A"]},
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"shinespark": {"frames": 62, "excessFrames": 0}}
],
"exitCondition": {
Expand All @@ -1951,6 +1952,7 @@
},
"requires": [
{"shineChargeFrames": 125},
"h_thornXModeFramePerfectExtraLeniency",
"h_thornXModeBlueSuit",
{"shinespark": {"frames": 0}}
],
Expand Down Expand Up @@ -2407,9 +2409,8 @@
"canTrickyDodgeEnemies"
]},
{"refill": ["Energy"]},
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeFramePerfectExtraLeniency",
"h_thornXModeShinecharge",
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
"canRModeSparkInterrupt"
],
Expand Down
14 changes: 5 additions & 9 deletions region/brinstar/kraid/Kraid Eye Door Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,7 @@
"link": [1, 1],
"name": "X-Mode, Leave Shinecharged",
"requires": [
"canXMode",
{"thornHits": 2},
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
{"shineChargeFrames": 110}
],
"exitCondition": {
Expand Down Expand Up @@ -313,7 +311,7 @@
"name": "Gain Flash Suit (X-Mode Spikesuit)",
"requires": [
"canBeVeryPatient",
"h_ThornXModeSpikeSuit",
"h_thornXModeSpikeSuit",
{"shinespark": {"frames": 4, "excessFrames": 4}}
],
"flashSuitChecked": true,
Expand All @@ -326,7 +324,7 @@
"requires": [
"canBeVeryPatient",
"canUseFlashSuitInitialSpark",
"h_ThornXModeSpikeSuit",
"h_thornXModeSpikeSuit",
{"shinespark": {"frames": 19}}
],
"exitCondition": {
Expand Down Expand Up @@ -1226,9 +1224,7 @@
"link": [3, 3],
"name": "X-Mode, Leave Shinecharged",
"requires": [
"canXMode",
{"thornHits": 2},
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
{"shineChargeFrames": 155}
],
"exitCondition": {
Expand Down Expand Up @@ -1382,7 +1378,7 @@
"requires": [
"canUseFlashSuitInitialSpark",
"canBeVeryPatient",
"h_ThornXModeSpikeSuit",
"h_thornXModeSpikeSuit",
{"shinespark": {"frames": 31}}
],
"exitCondition": {
Expand Down
12 changes: 4 additions & 8 deletions region/brinstar/kraid/Kraid Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,17 +333,15 @@
"link": [1, 1],
"name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
"requires": [
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"or": [
{"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
{"and": [
{"not": "f_DefeatedKraid"},
"canRiskPermanentLossOfAccess"
]}
]},
"canShinechargeMovement",
{"shineChargeFrames": 45},
{"or": [
"canBeVeryPatient",
Expand Down Expand Up @@ -805,17 +803,15 @@
"name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
"requires": [
"h_KraidCameraFix",
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"or": [
{"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
{"and": [
{"not": "f_DefeatedKraid"},
"canRiskPermanentLossOfAccess"
]}
]},
"canShinechargeMovement",
{"shineChargeFrames": 45},
{"or": [
"canBeVeryPatient",
Expand Down
6 changes: 1 addition & 5 deletions region/brinstar/pink/Mission Impossible Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,7 @@
"name": "Leave Shinecharged (X-Mode)",
"requires": [
{"obstaclesCleared": ["A"]},
"h_shinechargeMaxRunway",
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"canShinechargeMovement",
"h_spikeXModeShinecharge",
{"shineChargeFrames": 80}
],
"exitCondition": {
Expand Down
21 changes: 6 additions & 15 deletions region/brinstar/pink/Pink Brinstar Wave Gate Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,7 @@
]}
]},
"h_destroyBombWalls",
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"h_shinechargeMaxRunway",
"h_spikeXModeShinecharge",
"canBeVeryPatient",
"canPauseAbuse",
{"autoReserveTrigger": {}},
Expand Down Expand Up @@ -269,10 +266,7 @@
"requires": [
{"obstaclesCleared": ["A"]},
"h_destroyBombWalls",
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"h_shinechargeMaxRunway",
"h_spikeXModeShinecharge",
"canBeVeryPatient",
{"shineChargeFrames": 110}
],
Expand Down Expand Up @@ -776,7 +770,7 @@
{"obstaclesCleared": ["A"]},
"h_destroyBombWalls",
"canBeVeryPatient",
"h_SpikeXModeSpikeSuit",
"h_spikeXModeSpikeSuit",
{"shinespark": {"frames": 3, "excessFrames": 3}}
],
"resetsObstacles": ["C"],
Expand All @@ -795,7 +789,7 @@
"canUseFlashSuitInitialSpark",
"h_destroyBombWalls",
"canBeVeryPatient",
"h_SpikeXModeSpikeSuit",
"h_spikeXModeSpikeSuit",
{"shinespark": {"frames": 26}}
],
"exitCondition": {
Expand Down Expand Up @@ -1353,7 +1347,7 @@
"canUseFlashSuitInitialSpark",
"h_destroyBombWalls",
"canBeVeryPatient",
"h_SpikeXModeSpikeSuit",
"h_spikeXModeSpikeSuit",
{"shinespark": {"frames": 26}}
],
"clearsObstacles": ["B"],
Expand All @@ -1376,10 +1370,7 @@
]},
{"obstaclesCleared": ["A"]},
{"obstaclesNotCleared": ["C"]},
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"h_shinechargeMaxRunway",
"h_spikeXModeShinecharge",
"canBeVeryPatient",
{"shinespark": {"frames": 16}}
],
Expand Down
1 change: 1 addition & 0 deletions region/brinstar/red/Alpha Power Bomb Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@
{"samusEaterFrames": 160},
"h_shinechargeMaxRunway",
"h_spikeSuitSamusEaterLeniency",
"h_thornXModeFramePerfectExtraLeniency",
"h_thornXModeBlueSuit",
{"shinespark": {"frames": 0}}
],
Expand Down
10 changes: 4 additions & 6 deletions region/brinstar/red/Below Spazer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@
"enemies": [["Yapping Maw"]],
"explicitWeapons": ["Super"]
}},
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"shineChargeFrames": 75}
],
"exitCondition": {
Expand Down Expand Up @@ -632,9 +631,8 @@
"enemies": [["Yapping Maw"]],
"explicitWeapons": ["Super"]
}},
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"shineChargeFrames": 65}
],
"exitCondition": {
Expand Down
16 changes: 3 additions & 13 deletions region/brinstar/red/Red Brinstar Fireflea Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,11 +811,7 @@
"link": [2, 2],
"name": "X-Mode Leave Shinecharged",
"requires": [
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"h_shinechargeMaxRunway",
"canShinechargeMovement",
"h_spikeXModeShinecharge",
{"shineChargeFrames": 95}
],
"exitCondition": {
Expand Down Expand Up @@ -1128,11 +1124,8 @@
"name": "X-Mode Leave with Spark",
"requires": [
{"obstaclesCleared": ["A"]},
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"h_spikeXModeShinecharge",
"canUseIFrames",
"h_shinechargeMaxRunway",
{"shinespark": {"frames": 20}}
],
"exitCondition": {
Expand All @@ -1154,11 +1147,8 @@
"requires": [
{"obstaclesCleared": ["A"]},
"SpaceJump",
"canXMode",
"h_XModeSpikeHit",
"h_XModeSpikeHit",
"h_spikeXModeShinecharge",
"canUseIFrames",
"h_shinechargeMaxRunway",
"canShinechargeMovementTricky",
{"shineChargeFrames": 160}
],
Expand Down
10 changes: 4 additions & 6 deletions region/brinstar/red/Skree Boost Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,8 @@
"name": "X-Mode, Leave Shinecharged",
"requires": [
"Gravity",
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"shineChargeFrames": 145}
],
"exitCondition": {
Expand Down Expand Up @@ -555,9 +554,8 @@
"name": "X-Mode, Leave Shinecharged",
"requires": [
"Gravity",
"canXMode",
"h_XModeThornHit",
"h_shinechargeMaxRunway",
"h_thornXModeShinecharge",
"h_thornXModeFramePerfectExtraLeniency",
{"shineChargeFrames": 70}
],
"exitCondition": {
Expand Down
2 changes: 1 addition & 1 deletion region/crateria/central/Climb Supers Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
"link": [1, 1],
"name": "Gain Flash Suit (X-Mode Spikesuit)",
"requires": [
"h_SpikeXModeSpikeSuit",
"h_spikeXModeSpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
],
"flashSuitChecked": true
Expand Down
Loading