Skip to content

Commit 5b0b14d

Browse files
osse101osse101
authored
Merge pull request #1972 from blkerby/ice-beam-gate-long-charge
Ice Beam Gate Room anti-shortcharge
2 parents a420832 + 3ab46a8 commit 5b0b14d

3 files changed

Lines changed: 108 additions & 22 deletions

File tree

‎region/maridia/inner-green/East Sand Hall.json‎

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
{
221221
"id": 8,
222222
"link": [1, 2],
223-
"name": "Cross-Room Speed Jump (Left to Right)",
223+
"name": "Cross-Room Speed Jump over Evirs",
224224
"entranceCondition": {
225225
"comeInRunning": {
226226
"speedBooster": true,
@@ -229,7 +229,7 @@
229229
}
230230
},
231231
"requires": [
232-
{"notable": "Cross-Room Speed Jump"},
232+
{"notable": "Cross-Room Speed Jump over Evirs"},
233233
"canPlayInSand",
234234
"canCrossRoomJumpIntoWater",
235235
"canTrickyDashJump"
@@ -243,24 +243,24 @@
243243
{
244244
"id": 9,
245245
"link": [1, 2],
246-
"name": "Cross-Room SpringBall Jump (Left to Right)",
246+
"name": "Cross-Room Spring Ball Jump",
247247
"entranceCondition": {
248248
"comeInRunning": {
249249
"speedBooster": true,
250250
"minTiles": 10
251251
}
252252
},
253253
"requires": [
254-
{"notable": "Cross-Room SpringBall Jump"},
254+
{"notable": "Cross-Room Spring Ball Jump"},
255255
"canPlayInSand",
256256
"canCrossRoomJumpIntoWater",
257257
"canLateralMidAirMorph",
258258
"canTrickySpringBallJump",
259259
"canTrickyJump"
260260
],
261261
"note": [
262-
"Enter with enough run speed to jump (after the transition) across the full room using one SpringBall Jump.",
263-
"When exiting the first Sandfall, Samus will be rising still. That is the time to Springball jump."
262+
"Enter with enough run speed to jump (after the transition) across the full room using one Spring Ball Jump.",
263+
"When exiting the first Sandfall, Samus will be rising still. That is the time to Spring Ball jump."
264264
]
265265
},
266266
{
@@ -655,7 +655,7 @@
655655
{
656656
"id": 26,
657657
"link": [2, 1],
658-
"name": "Cross-Room Speed Jump (Right to Left)",
658+
"name": "Cross-Room Speed Jump over Evirs",
659659
"entranceCondition": {
660660
"comeInRunning": {
661661
"speedBooster": true,
@@ -664,7 +664,7 @@
664664
}
665665
},
666666
"requires": [
667-
{"notable": "Cross-Room Speed Jump"},
667+
{"notable": "Cross-Room Speed Jump over Evirs"},
668668
"canPlayInSand",
669669
"canCrossRoomJumpIntoWater",
670670
"canTrickyDashJump"
@@ -679,6 +679,30 @@
679679
"A little higher run speed can also work but may require releasing jump near the peak to avoid getting caught on the overhang."
680680
]
681681
},
682+
{
683+
"link": [2, 1],
684+
"name": "Cross-Room Blue Speed Jump (Right to Left)",
685+
"entranceCondition": {
686+
"comeInGettingBlueSpeed": {
687+
"length": 1,
688+
"openEnd": 1,
689+
"minExtraRunSpeed": "$4.4"
690+
}
691+
},
692+
"requires": [
693+
{"notable": "Cross-Room Blue Speed Jump (Right to Left)"},
694+
"canPlayInSand",
695+
"canCrossRoomJumpIntoWater"
696+
],
697+
"note": [
698+
"Perform a 1-tap to gain blue speed with a significant amount of momentum.",
699+
"Run through the door, and jump any time after the transition, crossing the room."
700+
],
701+
"devNote": [
702+
"This assumes an extra run speed of at least $4.4, though some lower speeds can also work ($3.B through $3.F).",
703+
"The window between $4.0 and $4.3 must be avoided because it would give too much jump height."
704+
]
705+
},
682706
{
683707
"id": 27,
684708
"link": [2, 1],
@@ -691,6 +715,7 @@
691715
}
692716
},
693717
"requires": [
718+
{"notable": "Cross-Room Blue Speed Jump (Right to Left)"},
694719
"canPlayInSand",
695720
"canCrossRoomJumpIntoWater",
696721
"canInsaneJump",
@@ -798,25 +823,25 @@
798823
{
799824
"id": 31,
800825
"link": [2, 1],
801-
"name": "Cross-Room SpringBall Jump (Right to Left)",
826+
"name": "Cross-Room Spring Ball Jump",
802827
"entranceCondition": {
803828
"comeInRunning": {
804829
"speedBooster": true,
805830
"minTiles": 10
806831
}
807832
},
808833
"requires": [
809-
{"notable": "Cross-Room SpringBall Jump"},
834+
{"notable": "Cross-Room Spring Ball Jump"},
810835
"canPlayInSand",
811836
"canCrossRoomJumpIntoWater",
812837
"canLateralMidAirMorph",
813838
"canTrickySpringBallJump",
814839
"canTrickyJump"
815840
],
816841
"note": [
817-
"Enter with enough run speed to jump (after the transition) across the full room using one SpringBall Jump.",
818-
"When exiting the first Sandfall, Samus will be rising still. That is the time to Springball jump.",
819-
"Alternatively, an immediate pause can be used to SpringBall jump during the first narrow gap between Sandfalls.",
842+
"Enter with enough run speed to jump (after the transition) across the full room using one Spring Ball Jump.",
843+
"When exiting the first Sandfall, Samus will be rising still. That is the time to Spring Ball jump.",
844+
"Alternatively, an immediate pause can be used to Spring Ball jump during the first narrow gap between Sandfalls.",
820845
"Sometimes Samus will land above the sand on the far left end of the room, where it will be necessary to unmorph and jump out."
821846
]
822847
},
@@ -1397,7 +1422,7 @@
13971422
],
13981423
"note": [
13991424
"On the left side of the raised platform, jump for max height.",
1400-
"Lateral Midair Morph for horizontal momentum, and perform the springball jump the moment before touching the sandfall.",
1425+
"Lateral Midair Morph for horizontal momentum, and perform the Spring Ball jump the moment before touching the sandfall.",
14011426
"Pause again to disable springball as soon as possible."
14021427
]
14031428
},
@@ -1441,7 +1466,7 @@
14411466
"notables": [
14421467
{
14431468
"id": 1,
1444-
"name": "Cross-Room Speed Jump",
1469+
"name": "Cross-Room Speed Jump over Evirs",
14451470
"note": [
14461471
"Stand at an effective distance of approximately 20 tiles from the door.",
14471472
"Run through the door, and jump any time after the transition, holding jump through the entire room to make it to the other side.",
@@ -1450,10 +1475,10 @@
14501475
},
14511476
{
14521477
"id": 2,
1453-
"name": "Cross-Room SpringBall Jump",
1478+
"name": "Cross-Room Spring Ball Jump",
14541479
"note": [
1455-
"Enter with enough run speed to jump (after the transition) across the full room using one SpringBall Jump.",
1456-
"When exiting the first Sandfall, Samus will be rising still. That is the time to Springball jump."
1480+
"Enter with enough run speed to jump (after the transition) across the full room using one Spring Ball Jump.",
1481+
"When exiting the first Sandfall, Samus will be rising still. That is the time to Spring Ball jump."
14571482
]
14581483
},
14591484
{
@@ -1528,8 +1553,8 @@
15281553
"name": "Spring Ball HiJump",
15291554
"note": [
15301555
"On the left side of the raised platform, jump for max height.",
1531-
"Lateral Midair Morph for horizontal momentum, and perform the springball jump the moment before touching the sandfall.",
1532-
"Pause again to disable springball as soon as possible."
1556+
"Use a stationary lateral mid-air morph for horizontal momentum, and perform the Spring Ball jump the moment before touching the sandfall.",
1557+
"Pause again to disable Spring Ball as soon as possible."
15331558
]
15341559
},
15351560
{
@@ -1541,8 +1566,16 @@
15411566
"Perform a spring ball jump with a stationary lateral mid-air morph from the left side of the current platform to get onto the Evir. Use a running jump off of the Evir.",
15421567
"As a backup, it may be possible to make the Evir rise again by hitting it with a PB - place the PB in the air to avoid double hitting and killing it."
15431568
]
1569+
},
1570+
{
1571+
"id": 12,
1572+
"name": "Cross-Room Blue Speed Jump (Right to Left)",
1573+
"note": [
1574+
"Perform a 1-tap to gain blue speed with a significant amount of momentum.",
1575+
"Run through the door, and jump any time after the transition, crossing the room."
1576+
]
15441577
}
15451578
],
15461579
"nextStratId": 69,
1547-
"nextNotableId": 12
1580+
"nextNotableId": 13
15481581
}

‎region/norfair/west/Ice Beam Gate Room.json‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,9 @@
995995
"id": 39,
996996
"link": [4, 2],
997997
"name": "Speed Through",
998+
"entranceCondition": {
999+
"comeInNormally": {}
1000+
},
9981001
"requires": [
9991002
"SpeedBooster"
10001003
]
@@ -1003,6 +1006,9 @@
10031006
"id": 40,
10041007
"link": [4, 2],
10051008
"name": "Speed Through and Leave Shinecharged",
1009+
"entranceCondition": {
1010+
"comeInNormally": {}
1011+
},
10061012
"requires": [
10071013
"h_canShineChargeMaxRunway",
10081014
{"shineChargeFrames": 50}
@@ -1017,10 +1023,42 @@
10171023
"flashSuitChecked": true,
10181024
"note": "Store the Shinespark after the second shutter to avoid breaking the Bomb Blocks in the floor."
10191025
},
1026+
{
1027+
"link": [4, 2],
1028+
"name": "Anti-Short Charge Hero Shot",
1029+
"entranceCondition": {
1030+
"comeInNormally": {}
1031+
},
1032+
"requires": [
1033+
{"notable": "Anti-Short Charge Hero Shot"},
1034+
"SpeedBooster",
1035+
"canHeroShot"
1036+
],
1037+
"exitCondition": {
1038+
"leaveWithRunway": {
1039+
"length": 45,
1040+
"openEnd": 1,
1041+
"minExtraRunSpeed": "$5.9"
1042+
}
1043+
},
1044+
"unlocksDoors": [
1045+
{"types": ["super"], "requires": []},
1046+
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
1047+
],
1048+
"flashSuitChecked": true,
1049+
"note": [
1050+
"Avoid the first two magic frames by briefly releasing dash,",
1051+
"to avoid gaining blue speed until after Samus has run over the bomb blocks.",
1052+
"Fire a shot while running, to open the door and run through."
1053+
]
1054+
},
10201055
{
10211056
"id": 41,
10221057
"link": [4, 2],
10231058
"name": "Ice Beam Mockball",
1059+
"entranceCondition": {
1060+
"comeInNormally": {}
1061+
},
10241062
"requires": [
10251063
"canMockball"
10261064
]
@@ -1442,8 +1480,18 @@
14421480
"Freeze a Mella inside the wall below the Power Bomb blocks.",
14431481
"Use it to clip slightly inside the wall, then X-Ray climb up past the Power Bomb blocks."
14441482
]
1483+
},
1484+
{
1485+
"id": 4,
1486+
"name": "Anti-Short Charge Hero Shot",
1487+
"note": [
1488+
"Run under the gates from right-to-left, carrying speed into the next room.",
1489+
"Avoid the first two magic frames by briefly releasing dash,",
1490+
"to avoid gaining blue speed until after Samus has run over the bomb blocks.",
1491+
"Fire a shot while running, to open the door and run through."
1492+
]
14451493
}
14461494
],
14471495
"nextStratId": 74,
1448-
"nextNotableId": 4
1496+
"nextNotableId": 5
14491497
}

‎schema/m3-room.schema.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@
975975
"type": "integer",
976976
"title": "Starting Down Tiles",
977977
"description": "Number of tiles at the start of the runway (away from the door) that slope down, preventing a stutter"
978+
},
979+
"minExtraRunSpeed": {
980+
"type": "string",
981+
"pattern": "^\\$[0-9|A-F]\\.[0-9|A-F]+$",
982+
"description": "Minimum extra run speed (in hexadecimal) with which it is possible to leave with this condition."
978983
}
979984
}
980985
},

0 commit comments

Comments
 (0)