Skip to content

Commit 599b624

Browse files
osse101osse101
authored
Merge pull request #2459 from nn357/xmode_cleanup
xmode cleanup of old strats to switch to the helper
2 parents ea042f4 + 4699532 commit 599b624

22 files changed

+97
-173
lines changed

‎helpers.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@
18381838
"note": "Represents triggering an R-Mode Spark Interrupt by using heat damage."
18391839
},
18401840
{
1841-
"name": "h_SpikeXModeSpikeSuit",
1841+
"name": "h_spikeXModeSpikeSuit",
18421842
"requires": [
18431843
"h_XModeSpikeHit",
18441844
"h_XModeSpikeHit",
@@ -1848,10 +1848,11 @@
18481848
"h_shinechargeMaxRunway",
18491849
"canXModeSpikeSuit",
18501850
{"spikeHits": 1}
1851-
]
1851+
],
1852+
"devNote": "This helper is used for an X-Mode shinecharge followed by a spikesuit so the leniency should be multiplactive."
18521853
},
18531854
{
1854-
"name": "h_ThornXModeSpikeSuit",
1855+
"name": "h_thornXModeSpikeSuit",
18551856
"requires": [
18561857
"h_XModeThornHit",
18571858
"h_XModeThornHit",
@@ -1861,7 +1862,8 @@
18611862
"h_shinechargeMaxRunway",
18621863
"canXModeSpikeSuit",
18631864
{"thornHits": 1}
1864-
]
1865+
],
1866+
"devNote": "This helper is used for an X-Mode shinecharge followed by a spikesuit so the leniency should be multiplactive."
18651867
},
18661868
{
18671869
"name": "h_spikeXModeShinecharge",

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -980,10 +980,10 @@
980980
},
981981
"requires": [
982982
{"shineChargeFrames": 135},
983-
"h_XModeThornHit",
984983
"canSuperJump",
985-
{"shinespark": {"frames": 7}},
986-
"canXModeBlueSuit"
984+
"h_thornXModeBlueSuit",
985+
"h_thornXModeFramePerfectExtraLeniency",
986+
{"shinespark": {"frames": 7}}
987987
],
988988
"flashSuitChecked": true
989989
},
@@ -992,10 +992,10 @@
992992
"link": [3, 2],
993993
"name": "Gain Blue Suit (Double X-Mode Super Jump)",
994994
"requires": [
995-
"h_thornDoubleXModeBlueSuit",
996995
"canSuperJump",
997-
{"shinespark": {"frames": 7}},
998-
"canXModeBlueSuit"
996+
"h_thornDoubleXModeBlueSuit",
997+
"h_thornDoubleXModeFramePerfectExtraLeniency",
998+
{"shinespark": {"frames": 7}}
999999
],
10001000
"flashSuitChecked": true
10011001
},
@@ -1131,7 +1131,8 @@
11311131
"link": [3, 3],
11321132
"name": "Gain Flash Suit (X-Mode Spikesuit)",
11331133
"requires": [
1134-
"h_ThornXModeSpikeSuit",
1134+
"h_thornXModeSpikeSuit",
1135+
"h_thornXModeFramePerfectExtraLeniency",
11351136
{"shinespark": {"frames": 12, "excessFrames": 12}}
11361137
],
11371138
"flashSuitChecked": true
@@ -1145,6 +1146,7 @@
11451146
},
11461147
"requires": [
11471148
{"shineChargeFrames": 135},
1149+
"h_thornXModeFramePerfectExtraLeniency",
11481150
"h_thornXModeBlueSuit",
11491151
{"shinespark": {"frames": 0}}
11501152
],
@@ -1155,6 +1157,7 @@
11551157
"link": [3, 3],
11561158
"name": "Gain Blue Suit (Double X-Mode)",
11571159
"requires": [
1160+
"h_thornDoubleXModeFramePerfectExtraLeniency",
11581161
"h_thornDoubleXModeBlueSuit",
11591162
{"shinespark": {"frames": 0}}
11601163
],
@@ -1165,9 +1168,8 @@
11651168
"link": [3, 3],
11661169
"name": "X-Mode, Leave Shinecharged",
11671170
"requires": [
1168-
"canXMode",
1169-
"h_XModeThornHit",
1170-
"h_shinechargeMaxRunway",
1171+
"h_thornXModeShinecharge",
1172+
"h_thornXModeFramePerfectExtraLeniency",
11711173
{"shineChargeFrames": 60}
11721174
],
11731175
"exitCondition": {
@@ -1935,9 +1937,8 @@
19351937
"name": "X-Mode, Leave With Spark",
19361938
"requires": [
19371939
{"obstaclesCleared": ["A"]},
1938-
"canXMode",
1939-
"h_XModeThornHit",
1940-
"h_shinechargeMaxRunway",
1940+
"h_thornXModeShinecharge",
1941+
"h_thornXModeFramePerfectExtraLeniency",
19411942
{"shinespark": {"frames": 62, "excessFrames": 0}}
19421943
],
19431944
"exitCondition": {
@@ -1959,6 +1960,7 @@
19591960
},
19601961
"requires": [
19611962
{"shineChargeFrames": 125},
1963+
"h_thornXModeFramePerfectExtraLeniency",
19621964
"h_thornXModeBlueSuit",
19631965
{"shinespark": {"frames": 0}}
19641966
],
@@ -2416,9 +2418,8 @@
24162418
"canTrickyDodgeEnemies"
24172419
]},
24182420
{"refill": ["Energy"]},
2419-
"canXMode",
2420-
"h_XModeThornHit",
2421-
"h_shinechargeMaxRunway",
2421+
"h_thornXModeFramePerfectExtraLeniency",
2422+
"h_thornXModeShinecharge",
24222423
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
24232424
"canRModeSparkInterrupt"
24242425
],

‎region/brinstar/kraid/Kraid Eye Door Room.json‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,7 @@
177177
"link": [1, 1],
178178
"name": "X-Mode, Leave Shinecharged",
179179
"requires": [
180-
"canXMode",
181-
{"thornHits": 2},
182-
"h_shinechargeMaxRunway",
180+
"h_thornXModeShinecharge",
183181
{"shineChargeFrames": 110}
184182
],
185183
"exitCondition": {
@@ -313,7 +311,7 @@
313311
"name": "Gain Flash Suit (X-Mode Spikesuit)",
314312
"requires": [
315313
"canBeVeryPatient",
316-
"h_ThornXModeSpikeSuit",
314+
"h_thornXModeSpikeSuit",
317315
{"shinespark": {"frames": 4, "excessFrames": 4}}
318316
],
319317
"flashSuitChecked": true,
@@ -326,7 +324,7 @@
326324
"requires": [
327325
"canBeVeryPatient",
328326
"canUseFlashSuitInitialSpark",
329-
"h_ThornXModeSpikeSuit",
327+
"h_thornXModeSpikeSuit",
330328
{"shinespark": {"frames": 19}}
331329
],
332330
"exitCondition": {
@@ -1226,9 +1224,7 @@
12261224
"link": [3, 3],
12271225
"name": "X-Mode, Leave Shinecharged",
12281226
"requires": [
1229-
"canXMode",
1230-
{"thornHits": 2},
1231-
"h_shinechargeMaxRunway",
1227+
"h_thornXModeShinecharge",
12321228
{"shineChargeFrames": 155}
12331229
],
12341230
"exitCondition": {
@@ -1382,7 +1378,7 @@
13821378
"requires": [
13831379
"canUseFlashSuitInitialSpark",
13841380
"canBeVeryPatient",
1385-
"h_ThornXModeSpikeSuit",
1381+
"h_thornXModeSpikeSuit",
13861382
{"shinespark": {"frames": 31}}
13871383
],
13881384
"exitCondition": {

‎region/brinstar/kraid/Kraid Room.json‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,17 +333,15 @@
333333
"link": [1, 1],
334334
"name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
335335
"requires": [
336-
"canXMode",
337-
"h_XModeThornHit",
338-
"h_shinechargeMaxRunway",
336+
"h_thornXModeShinecharge",
337+
"h_thornXModeFramePerfectExtraLeniency",
339338
{"or": [
340339
{"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
341340
{"and": [
342341
{"not": "f_DefeatedKraid"},
343342
"canRiskPermanentLossOfAccess"
344343
]}
345344
]},
346-
"canShinechargeMovement",
347345
{"shineChargeFrames": 45},
348346
{"or": [
349347
"canBeVeryPatient",
@@ -808,17 +806,15 @@
808806
"name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
809807
"requires": [
810808
"h_KraidCameraFix",
811-
"canXMode",
812-
"h_XModeThornHit",
813-
"h_shinechargeMaxRunway",
809+
"h_thornXModeShinecharge",
810+
"h_thornXModeFramePerfectExtraLeniency",
814811
{"or": [
815812
{"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
816813
{"and": [
817814
{"not": "f_DefeatedKraid"},
818815
"canRiskPermanentLossOfAccess"
819816
]}
820817
]},
821-
"canShinechargeMovement",
822818
{"shineChargeFrames": 45},
823819
{"or": [
824820
"canBeVeryPatient",

‎region/brinstar/pink/Mission Impossible Room.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,7 @@
213213
"name": "Leave Shinecharged (X-Mode)",
214214
"requires": [
215215
{"obstaclesCleared": ["A"]},
216-
"h_shinechargeMaxRunway",
217-
"canXMode",
218-
"h_XModeSpikeHit",
219-
"h_XModeSpikeHit",
220-
"canShinechargeMovement",
216+
"h_spikeXModeShinecharge",
221217
{"shineChargeFrames": 80}
222218
],
223219
"exitCondition": {

‎region/brinstar/pink/Pink Brinstar Wave Gate Room.json‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,7 @@
228228
]}
229229
]},
230230
"h_destroyBombWalls",
231-
"canXMode",
232-
"h_XModeSpikeHit",
233-
"h_XModeSpikeHit",
234-
"h_shinechargeMaxRunway",
231+
"h_spikeXModeShinecharge",
235232
"canBeVeryPatient",
236233
"canPauseAbuse",
237234
{"autoReserveTrigger": {}},
@@ -269,10 +266,7 @@
269266
"requires": [
270267
{"obstaclesCleared": ["A"]},
271268
"h_destroyBombWalls",
272-
"canXMode",
273-
"h_XModeSpikeHit",
274-
"h_XModeSpikeHit",
275-
"h_shinechargeMaxRunway",
269+
"h_spikeXModeShinecharge",
276270
"canBeVeryPatient",
277271
{"shineChargeFrames": 110}
278272
],
@@ -776,7 +770,7 @@
776770
{"obstaclesCleared": ["A"]},
777771
"h_destroyBombWalls",
778772
"canBeVeryPatient",
779-
"h_SpikeXModeSpikeSuit",
773+
"h_spikeXModeSpikeSuit",
780774
{"shinespark": {"frames": 3, "excessFrames": 3}}
781775
],
782776
"resetsObstacles": ["C"],
@@ -795,7 +789,7 @@
795789
"canUseFlashSuitInitialSpark",
796790
"h_destroyBombWalls",
797791
"canBeVeryPatient",
798-
"h_SpikeXModeSpikeSuit",
792+
"h_spikeXModeSpikeSuit",
799793
{"shinespark": {"frames": 26}}
800794
],
801795
"exitCondition": {
@@ -1353,7 +1347,7 @@
13531347
"canUseFlashSuitInitialSpark",
13541348
"h_destroyBombWalls",
13551349
"canBeVeryPatient",
1356-
"h_SpikeXModeSpikeSuit",
1350+
"h_spikeXModeSpikeSuit",
13571351
{"shinespark": {"frames": 26}}
13581352
],
13591353
"clearsObstacles": ["B"],
@@ -1376,10 +1370,7 @@
13761370
]},
13771371
{"obstaclesCleared": ["A"]},
13781372
{"obstaclesNotCleared": ["C"]},
1379-
"canXMode",
1380-
"h_XModeSpikeHit",
1381-
"h_XModeSpikeHit",
1382-
"h_shinechargeMaxRunway",
1373+
"h_spikeXModeShinecharge",
13831374
"canBeVeryPatient",
13841375
{"shinespark": {"frames": 16}}
13851376
],

‎region/brinstar/red/Alpha Power Bomb Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@
360360
{"samusEaterFrames": 160},
361361
"h_shinechargeMaxRunway",
362362
"h_spikeSuitSamusEaterLeniency",
363+
"h_thornXModeFramePerfectExtraLeniency",
363364
"h_thornXModeBlueSuit",
364365
{"shinespark": {"frames": 0}}
365366
],

‎region/brinstar/red/Below Spazer.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,8 @@
189189
"enemies": [["Yapping Maw"]],
190190
"explicitWeapons": ["Super"]
191191
}},
192-
"canXMode",
193-
"h_XModeThornHit",
194-
"h_shinechargeMaxRunway",
192+
"h_thornXModeShinecharge",
193+
"h_thornXModeFramePerfectExtraLeniency",
195194
{"shineChargeFrames": 75}
196195
],
197196
"exitCondition": {
@@ -632,9 +631,8 @@
632631
"enemies": [["Yapping Maw"]],
633632
"explicitWeapons": ["Super"]
634633
}},
635-
"canXMode",
636-
"h_XModeThornHit",
637-
"h_shinechargeMaxRunway",
634+
"h_thornXModeShinecharge",
635+
"h_thornXModeFramePerfectExtraLeniency",
638636
{"shineChargeFrames": 65}
639637
],
640638
"exitCondition": {

‎region/brinstar/red/Red Brinstar Fireflea Room.json‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -811,11 +811,7 @@
811811
"link": [2, 2],
812812
"name": "X-Mode Leave Shinecharged",
813813
"requires": [
814-
"canXMode",
815-
"h_XModeSpikeHit",
816-
"h_XModeSpikeHit",
817-
"h_shinechargeMaxRunway",
818-
"canShinechargeMovement",
814+
"h_spikeXModeShinecharge",
819815
{"shineChargeFrames": 95}
820816
],
821817
"exitCondition": {
@@ -1128,11 +1124,8 @@
11281124
"name": "X-Mode Leave with Spark",
11291125
"requires": [
11301126
{"obstaclesCleared": ["A"]},
1131-
"canXMode",
1132-
"h_XModeSpikeHit",
1133-
"h_XModeSpikeHit",
1127+
"h_spikeXModeShinecharge",
11341128
"canUseIFrames",
1135-
"h_shinechargeMaxRunway",
11361129
{"shinespark": {"frames": 20}}
11371130
],
11381131
"exitCondition": {
@@ -1154,11 +1147,8 @@
11541147
"requires": [
11551148
{"obstaclesCleared": ["A"]},
11561149
"SpaceJump",
1157-
"canXMode",
1158-
"h_XModeSpikeHit",
1159-
"h_XModeSpikeHit",
1150+
"h_spikeXModeShinecharge",
11601151
"canUseIFrames",
1161-
"h_shinechargeMaxRunway",
11621152
"canShinechargeMovementTricky",
11631153
{"shineChargeFrames": 160}
11641154
],

‎region/brinstar/red/Skree Boost Room.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,8 @@
229229
"name": "X-Mode, Leave Shinecharged",
230230
"requires": [
231231
"Gravity",
232-
"canXMode",
233-
"h_XModeThornHit",
234-
"h_shinechargeMaxRunway",
232+
"h_thornXModeShinecharge",
233+
"h_thornXModeFramePerfectExtraLeniency",
235234
{"shineChargeFrames": 145}
236235
],
237236
"exitCondition": {
@@ -555,9 +554,8 @@
555554
"name": "X-Mode, Leave Shinecharged",
556555
"requires": [
557556
"Gravity",
558-
"canXMode",
559-
"h_XModeThornHit",
560-
"h_shinechargeMaxRunway",
557+
"h_thornXModeShinecharge",
558+
"h_thornXModeFramePerfectExtraLeniency",
561559
{"shineChargeFrames": 70}
562560
],
563561
"exitCondition": {

0 commit comments

Comments
 (0)