Skip to content

Commit 0c9a32b

Browse files
kjbranchkjbranch
authored
Merge pull request #1768 from kjbranch/samus-iframes
Rename canIframeSpikeJump to canUseIFrames, Cleanup
2 parents 22446f3 + 60ba704 commit 0c9a32b

32 files changed

Lines changed: 154 additions & 138 deletions

‎helpers.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,8 @@
368368
{
369369
"name": "h_IBJFromThorns",
370370
"requires": [
371-
"canIframeSpikeJump",
371+
"canUseIFrames",
372372
"canJumpIntoIBJ",
373-
"canCarefulJump",
374373
{"thornHits": 1},
375374
{"or":[
376375
"canTrickyJump",
@@ -381,9 +380,8 @@
381380
{
382381
"name": "h_IBJFromSpikes",
383382
"requires": [
384-
"canIframeSpikeJump",
383+
"canUseIFrames",
385384
"canJumpIntoIBJ",
386-
"canCarefulJump",
387385
{"spikeHits": 1},
388386
{"or":[
389387
"canTrickyJump",
@@ -394,9 +392,8 @@
394392
{
395393
"name": "h_HeatedIBJFromSpikes",
396394
"requires": [
397-
"canIframeSpikeJump",
395+
"canUseIFrames",
398396
"canJumpIntoIBJ",
399-
"canCarefulJump",
400397
{"spikeHits": 1},
401398
{"heatFrames": 100},
402399
{"or":[

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,8 @@
672672
}
673673
},
674674
"requires": [
675-
"h_ZebesIsAwake"
675+
"h_ZebesIsAwake",
676+
"canUseIFrames"
676677
],
677678
"flashSuitChecked": true,
678679
"devNote": "The immobile case is included as a separate strat, since the Geemer hit to restore mobility provides i-frames eliminating a need to account for a subsequent Geemer hit (or a way to evade it)."

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@
10371037
],
10381038
"flashSuitChecked": true,
10391039
"note": [
1040-
"Maintain IFrames by using X-Ray whenever a thorn would deal damage.",
1040+
"Maintain i-frames by using X-Ray whenever a thorn would deal damage.",
10411041
"Move by alternating between X-Ray turnarounds and normal turnarounds.",
10421042
"Simply crouch again following any accidental X-Ray Standups."
10431043
]
@@ -1464,7 +1464,7 @@
14641464
],
14651465
"flashSuitChecked": true,
14661466
"note": [
1467-
"Maintain IFrames by using X-Ray whenever a thorn would deal damage.",
1467+
"Maintain i-frames by using X-Ray whenever a thorn would deal damage.",
14681468
"Move by alternating between X-Ray turnarounds and normal turnarounds.",
14691469
"Simply crouch again following any accidental X-Ray Standups."
14701470
]
@@ -1668,7 +1668,7 @@
16681668
"name": "Spikeway X-Ray Wiggle",
16691669
"note": [
16701670
"Slowly move through the thorns by alternating between X-Ray turnarounds and normal turnarounds.",
1671-
"Maintain IFrames by using X-Ray whenever a thorn would deal damage."
1671+
"Maintain i-frames by using X-Ray whenever a thorn would deal damage."
16721672
]
16731673
},
16741674
{

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,14 +453,15 @@
453453
"name": "Speed Kill",
454454
"requires": [
455455
"h_getBlueSpeedMaxRunway",
456+
"canUseIFrames",
456457
{"enemyDamage": {
457458
"enemy": "Mini-Kraid",
458459
"type": "spike",
459460
"hits": 1
460461
}}
461462
],
462463
"clearsObstacles": ["A"],
463-
"note": "Gain Iframes by taking damage then run left to create enough space to run back to the right with speedbooster."
464+
"note": "Gain i-frames by taking damage then run left to create enough space to run back to the right with speedbooster."
464465
},
465466
{
466467
"id": 20,

‎region/brinstar/pink/Pink Brinstar Power Bomb Room.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
{
150150
"id": 3,
151151
"link": [1, 1],
152-
"name": "Leave Shinecharged (Spike I-frames, Unbroken Super Block)",
152+
"name": "Leave Shinecharged (Spike I-Frames, Unbroken Super Block)",
153153
"requires": [
154154
{"obstaclesCleared": ["A"]},
155155
{"obstaclesNotCleared": ["B"]},
@@ -158,7 +158,7 @@
158158
"openEnd": 0
159159
}},
160160
{"spikeHits": 1},
161-
"canIframeSpikeJump",
161+
"canUseIFrames",
162162
"canShinechargeMovementComplex"
163163
],
164164
"exitCondition": {
@@ -776,7 +776,7 @@
776776
"openEnd": 0
777777
}},
778778
{"spikeHits": 1},
779-
"canIframeSpikeJump"
779+
"canUseIFrames"
780780
]}
781781
]},
782782
"canShinechargeMovementComplex",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
}
496496
},
497497
"requires": [
498-
"canIframeSpikeJump",
498+
"canUseIFrames",
499499
"canNeutralDamageBoost",
500500
"canTrickyJump",
501501
{"thornHits": 5},
@@ -527,7 +527,7 @@
527527
}
528528
},
529529
"requires": [
530-
"canIframeSpikeJump",
530+
"canUseIFrames",
531531
"canNeutralDamageBoost",
532532
"canInsaneJump",
533533
{"thornHits": 2},

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"name": "Leave With Runway (Tank the Damage)",
166166
"requires": [
167167
{"obstaclesNotCleared": ["B"]},
168-
"canHitbox",
168+
"canUseIFrames",
169169
{"enemyDamage": {
170170
"enemy": "Sidehopper",
171171
"type": "contact",
@@ -188,7 +188,7 @@
188188
},
189189
"note": [
190190
"Open the door in advance, then lure the Sidehoopers to left wall. This is much easier with Morph ball.",
191-
"Take a hit, then start running with the iframes."
191+
"Take a hit, then start running with the i-frames."
192192
]
193193
},
194194
{
@@ -519,7 +519,7 @@
519519
]},
520520
{"and": [
521521
"canNeutralDamageBoost",
522-
"canIframeSpikeJump",
522+
"canUseIFrames",
523523
{"thornHits": 1}
524524
]},
525525
{"and": [
@@ -531,7 +531,7 @@
531531
"flashSuitChecked": true,
532532
"note": [
533533
"Use the Solid Blocks next to the Samus Eater to clip up through the Power Bomb Blocks.",
534-
"Carefully jump around the thorns, use HiJump to jump over them, or walk through them using IFrames."
534+
"Carefully jump around the thorns, use HiJump to jump over them, or walk through them using i-frames."
535535
]
536536
},
537537
{

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"canXMode",
138138
"h_XModeSpikeHit",
139139
"h_XModeSpikeHit",
140-
"canIframeSpikeJump",
140+
"canUseIFrames",
141141
{"or": [
142142
"SpaceJump",
143143
"h_XModeSpikeHit"
@@ -298,7 +298,7 @@
298298
}},
299299
{"or": [
300300
{"and": [
301-
"canIframeSpikeJump",
301+
"canUseIFrames",
302302
"canTrickyJump"
303303
]},
304304
{"enemyDamage": {
@@ -321,7 +321,7 @@
321321
"requires": [
322322
{"spikeHits": 4},
323323
{"or": [
324-
"canIframeSpikeJump",
324+
"canUseIFrames",
325325
{"spikeHits": 3}
326326
]}
327327
],
@@ -539,7 +539,7 @@
539539
"canCarefulJump",
540540
{"spikeHits": 3},
541541
{"or": [
542-
"canIframeSpikeJump",
542+
"canUseIFrames",
543543
{"spikeHits": 3}
544544
]}
545545
],
@@ -964,7 +964,7 @@
964964
"requires": [
965965
"HiJump",
966966
"canPreciseWalljump",
967-
"canIframeSpikeJump",
967+
"canUseIFrames",
968968
{"spikeHits": 2}
969969
],
970970
"note": "Jump from on top of the lower spikes, wall jump on the overhang, and land on the upper spikes."
@@ -982,7 +982,7 @@
982982
}},
983983
"canHorizontalDamageBoost",
984984
{"or": [
985-
"canIframeSpikeJump",
985+
"canUseIFrames",
986986
{"spikeHits": 1}
987987
]}
988988
],
@@ -1005,7 +1005,7 @@
10051005
"link": [3, 4],
10061006
"name": "Spike Run",
10071007
"requires": [
1008-
"canIframeSpikeJump",
1008+
"canUseIFrames",
10091009
{"or": [
10101010
{"and": [
10111011
"canInsaneJump",
@@ -1116,7 +1116,7 @@
11161116
{"or": [
11171117
"canTrickySpringBallJump",
11181118
{"and": [
1119-
"canIframeSpikeJump",
1119+
"canUseIFrames",
11201120
{"spikeHits": 1}
11211121
]}
11221122
]}
@@ -1140,7 +1140,7 @@
11401140
{"spikeHits": 1},
11411141
"canHorizontalDamageBoost",
11421142
"canPreciseWalljump",
1143-
"canIframeSpikeJump"
1143+
"canUseIFrames"
11441144
]}
11451145
]}
11461146
],

‎region/crateria/central/Crateria Super Room.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
"h_XModeSpikeHit",
184184
"h_XModeSpikeHit",
185185
"canShinechargeMovement",
186-
"canIframeSpikeJump",
186+
"canUseIFrames",
187187
"h_canShineChargeMaxRunway"
188188
],
189189
"devNote": "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount).",
@@ -274,7 +274,7 @@
274274
"requires": [
275275
{"spikeHits": 1},
276276
{"or": [
277-
"canIframeSpikeJump",
277+
"canUseIFrames",
278278
{"spikeHits": 1}
279279
]}
280280
]
@@ -354,7 +354,7 @@
354354
"link": [1, 4],
355355
"name": "Pause Abuse Spike Damage",
356356
"requires": [
357-
"canIframeSpikeJump",
357+
"canUseIFrames",
358358
"h_pauseAbuseMinimalReserveRefill"
359359
]
360360
},
@@ -439,7 +439,7 @@
439439
{"and": [
440440
{"spikeHits": 1},
441441
{"or": [
442-
"canIframeSpikeJump",
442+
"canUseIFrames",
443443
{"spikeHits": 1}
444444
]}
445445
]}
@@ -481,7 +481,7 @@
481481
{"and": [
482482
{"spikeHits": 1},
483483
{"or": [
484-
"canIframeSpikeJump",
484+
"canUseIFrames",
485485
{"spikeHits": 1}
486486
]}
487487
]}
@@ -522,7 +522,7 @@
522522
{"and": [
523523
{"spikeHits": 1},
524524
{"or": [
525-
"canIframeSpikeJump",
525+
"canUseIFrames",
526526
{"spikeHits": 1}
527527
]}
528528
]}
@@ -789,7 +789,7 @@
789789
],
790790
"note": [
791791
"Using only the short runway and spike pit, use one or more SpeedKeeps to Speedball towards the item location.",
792-
"This requires either a very short shortcharge, or a second SpeedKeep in the spikes which also resets Samus' run speed with a crouch jump before spike I-Frames expire."
792+
"This requires either a very short shortcharge, or a second SpeedKeep in the spikes which also resets Samus' run speed with a crouch jump before spike i-frames expire."
793793
]
794794
},
795795
{
@@ -1277,7 +1277,7 @@
12771277
"requires": [
12781278
{"spikeHits": 1},
12791279
{"or": [
1280-
"canIframeSpikeJump",
1280+
"canUseIFrames",
12811281
{"spikeHits": 1}
12821282
]}
12831283
]
@@ -1287,7 +1287,7 @@
12871287
"link": [4, 1],
12881288
"name": "Pause Abuse Spike Damage",
12891289
"requires": [
1290-
"canIframeSpikeJump",
1290+
"canUseIFrames",
12911291
"h_pauseAbuseMinimalReserveRefill"
12921292
]
12931293
},
@@ -1498,7 +1498,7 @@
14981498
"name": "In-Room SpeedKeep for Temporary Blue",
14991499
"note": [
15001500
"Using only the short runway and spike pit, use one or more SpeedKeeps to Speedball towards the item location.",
1501-
"This requires either a very short shortcharge, or a second SpeedKeep in the spikes which also resets Samus' run speed with a crouch jump before spike I-Frames expire."
1501+
"This requires either a very short shortcharge, or a second SpeedKeep in the spikes which also resets Samus' run speed with a crouch jump before spike i-frames expire."
15021502
]
15031503
},
15041504
{

‎region/crateria/east/Bowling Alley Path.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
{
329329
"id": 15,
330330
"link": [1, 2],
331-
"name": "Shinecharged DamageBoost",
331+
"name": "Come in Shinecharged, Damage Boost",
332332
"entranceCondition": {
333333
"comeInShinecharged": {
334334
"framesRequired": 140
@@ -338,7 +338,7 @@
338338
"canShinechargeMovementTricky",
339339
"canHorizontalDamageBoost",
340340
"canTrickyJump",
341-
"canHitbox",
341+
"canUseIFrames",
342342
{"enemyDamage": {
343343
"enemy": "Waver",
344344
"type": "contact",
@@ -364,7 +364,7 @@
364364
],
365365
"flashSuitChecked": true,
366366
"note": [
367-
"Use a Waver to damage boost across part of the room, then pass through any remaining enemies while IFrames are active.",
367+
"Use a Waver to damage boost across part of the room, then pass through any remaining enemies while i-frames are active.",
368368
"Killing the first waver and damage boosting with the second may be easier."
369369
]
370370
},
@@ -630,7 +630,7 @@
630630
"canShinechargeMovementTricky",
631631
"canHorizontalDamageBoost",
632632
"canTrickyJump",
633-
"canHitbox",
633+
"canUseIFrames",
634634
{"enemyDamage": {
635635
"enemy": "Choot",
636636
"type": "contact",
@@ -655,7 +655,7 @@
655655
}
656656
],
657657
"flashSuitChecked": true,
658-
"note": "Jump into the Choot to damage boost across part of the room, then pass through any remaining enemies while IFrames are active."
658+
"note": "Jump into the Choot to damage boost across part of the room, then pass through any remaining enemies while i-frames are active."
659659
},
660660
{
661661
"id": 24,

0 commit comments

Comments
 (0)