Skip to content

Commit 5769afe

Browse files
osse101osse101
authored
Merge branch 'master' into RemoveSand
2 parents b1bd54f + a03a725 commit 5769afe

29 files changed

Lines changed: 336 additions & 79 deletions

‎region/brinstar/green/Spore Spawn Room.json‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,44 @@
9999
],
100100
"flashSuitChecked": true
101101
},
102+
{
103+
"id": 14,
104+
"link": [1, 2],
105+
"name": "Plasma SBA Kill from Above (Patient)",
106+
"requires": [
107+
{"notable": "Plasma SBA Kill from Above"},
108+
"Plasma",
109+
"canSpecialBeamAttack",
110+
{"ammo": {"type": "PowerBomb", "count": 2}},
111+
"canBePatient"
112+
],
113+
"setsFlags": ["f_DefeatedSporeSpawn"],
114+
"note": [
115+
"Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
116+
"Spore Spawn will move out of range after the first hit and it will take 9 cycles to come back into range.",
117+
"Stand on the left side of the lowest part of the upper area, facing left for the first hit.",
118+
"9 cycles later, shoot again from the same spot while crouching to kill Spore Spawn."
119+
],
120+
"devNote": "2 Power Bombs total."
121+
},
122+
{
123+
"id": 15,
124+
"link": [1, 2],
125+
"name": "Plasma SBA Kill from Above (Microwave)",
126+
"requires": [
127+
{"notable": "Plasma SBA Kill from Above"},
128+
"Plasma",
129+
"canSpecialBeamAttack",
130+
{"ammo": {"type": "PowerBomb", "count": 1}},
131+
"canXRayWaitForIFrames"
132+
],
133+
"setsFlags": ["f_DefeatedSporeSpawn"],
134+
"note": [
135+
"Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
136+
"Stand in the middle of the second lowest platform above Spore Spawn, facing left and crouched.",
137+
"Then use Xray to kill Spore Spawn in 1 cycle."
138+
]
139+
},
102140
{
103141
"id": 3,
104142
"link": [1, 2],
@@ -235,11 +273,20 @@
235273
"id": 1,
236274
"name": "Moondance Clip",
237275
"note": [
238-
"Prepare an extended Moondance and wait for SporeSpawn to move to a side.",
276+
"Prepare an extended Moondance and wait for Spore Spawn to move to a side.",
239277
"In quick succession, Moonfall, turn left, and turn right while holding a spin break button to clip down into the fight arena."
240278
]
279+
},
280+
{
281+
"id": 2,
282+
"name": "Plasma SBA Kill from Above",
283+
"note": [
284+
"Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
285+
"Spore Spawn will move out of range after the first hit and it will take 9 cycles to come back into range.",
286+
"Alternatively, Xray can be used to kill Spore Spawn in 1 cycle."
287+
]
241288
}
242289
],
243-
"nextStratId": 14,
244-
"nextNotableId": 2
290+
"nextStratId": 16,
291+
"nextNotableId": 3
245292
}

‎region/brinstar/red/Red Tower.json‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,16 +2285,26 @@
22852285
"link": [7, 6],
22862286
"name": "SpringBall Jump",
22872287
"requires": [
2288-
"canSpringBallJumpMidAir",
2288+
"canTrickySpringBallJump",
22892289
{"or": [
2290-
"canWalljump",
2290+
"canConsecutiveWalljump",
2291+
"HiJump",
22912292
{"and": [
2292-
"HiJump",
2293-
"canTrickyJump"
2294-
]}
2293+
"canTrickyJump",
2294+
"canLateralMidAirMorph",
2295+
"canResetFallSpeed",
2296+
{"or": [
2297+
{"ammo": {"type": "PowerBomb", "count": 1}},
2298+
{"ammo": {"type": "Super", "count": 1}},
2299+
{"enemyDamage": {"enemy": "Ripper", "type": "contact", "hits": 1}},
2300+
"canTrickyDodgeEnemies"
2301+
]}
2302+
]},
2303+
"canSpringFling"
22952304
]},
22962305
{"or": [
2297-
"canTrickySpringBallJump",
2306+
"canTrickyJump",
2307+
"canLateralMidAirMorph",
22982308
"canSpringwall"
22992309
]}
23002310
]

‎region/brinstar/roomDiagrams/green_EarlySupersRoom_45.png‎

723 Bytes
Loading

‎region/brinstar/roomDiagrams/pink_PinkBrinstarPowerBombRoom_60.png‎

1.01 KB
Loading

‎region/brinstar/roomDiagrams/red_CaterpillarRoom_75.png‎

180 Bytes
Loading

‎region/crateria/east/East Ocean.json‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,6 @@
462462
{"shinespark": {"frames": 123, "excessFrames": 5}},
463463
"canSpaceJumpWaterBounce",
464464
{"or": [
465-
{"and": [
466-
"HiJump",
467-
"canSpaceJumpWaterEscape"
468-
]},
469465
{"and": [
470466
"canTrickyJump",
471467
"canDownGrab"
@@ -852,10 +848,6 @@
852848
"canSpaceJumpWaterBounce",
853849
{"or": [
854850
"canWalljump",
855-
{"and": [
856-
"canSpaceJumpWaterEscape",
857-
"HiJump"
858-
]},
859851
{"and": [
860852
"canTrickyJump",
861853
"canDownGrab"
@@ -1063,9 +1055,14 @@
10631055
"HiJump",
10641056
{"or": [
10651057
"canTrickySpringBallJump",
1066-
"canSpaceJumpWaterBounce"
1058+
"canSpaceJumpWaterBounce",
1059+
{"and": [
1060+
"SpaceJump",
1061+
"h_canCrouchJumpDownGrab"
1062+
]}
10671063
]}
1068-
]
1064+
],
1065+
"note": "Escape the water with a Spring Ball Jump, Space Jump on the water line to the left, or crouch jump + down grab onto the right Kamer platform."
10691066
},
10701067
{
10711068
"id": 48,

‎region/crateria/east/The Moat.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,13 @@
927927
"requires": [
928928
"Gravity",
929929
{"or": [
930-
"canTrickySpringBallJump",
930+
{"and": [
931+
"canTrickySpringBallJump",
932+
{"or": [
933+
"canLateralMidAirMorph",
934+
"canTrickyJump"
935+
]}
936+
]},
931937
{"and": [
932938
"HiJump",
933939
"canWalljump"

‎region/lowernorfair/east/Wasteland.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,13 @@
146146
"enemyName": "Dessgeega",
147147
"quantity": 3,
148148
"betweenNodes": [4, 7]
149+
},
150+
{
151+
"id": "e3",
152+
"groupName": "Wasteland Kzans",
153+
"enemyName": "Kzan",
154+
"quantity": 2,
155+
"betweenNodes": [1, 5]
149156
}
150157
],
151158
"links": [

‎region/maridia/inner-pink/Botwoon Energy Tank Room.json‎

Lines changed: 102 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,13 @@
843843
"requires": [
844844
"canSuitlessMaridia",
845845
{"or": [
846-
"canTrickySpringBallJump",
846+
{"and": [
847+
"canTrickySpringBallJump",
848+
{"or": [
849+
"canCrouchJump",
850+
"canLateralMidAirMorph"
851+
]}
852+
]},
847853
{"and": [
848854
"HiJump",
849855
"h_canUseSpringBall"
@@ -1058,18 +1064,85 @@
10581064
{
10591065
"id": 44,
10601066
"link": [1, 5],
1061-
"name": "Sand Bomb Boost",
1067+
"name": "Sand Bomb Boost (Bomb)",
10621068
"requires": [
1063-
"canDownGrab",
1069+
{"notable": "Sand Bomb Boost (Left to Right)"},
10641070
"canSandBombBoost",
1065-
"canInsaneJump"
1071+
"canInsaneJump",
1072+
{"or": [
1073+
"can4HighMidAirMorph",
1074+
"canStationaryLateralMidAirMorph"
1075+
]}
10661076
],
10671077
"collectsItems": [5],
10681078
"note": [
1069-
"Stand on the edge of the sand and place a Bomb and wait briefly before entering the sand.",
1070-
"Let the Bomb explosion push Samus up for a few frames before simultaneously jumping and aiming down.",
1071-
"There is about a 2 frame window before too much height is lost to reach the nearby ledge.",
1072-
"Jumping too early can lead to a softlock but jumping too late usually exits the sand safely."
1079+
"Stand on the edge of the sand and place a Bomb;",
1080+
"unmorph (leaving Samus crouched), then press forward to enter the sand when the bomb flashes yellow for the second time.",
1081+
"Once the Bomb puts Samus into a jumping pose where Samus is suspended mid-air slightly above the sand, press jump;",
1082+
"then aim down precisely when the bomb begins to propel Samus upward.",
1083+
"Move right to press against the wall before mid-air morphing (alternatively, a stationary lateral morph can work).",
1084+
"There is a 2-frame window for when to enter the sand:",
1085+
"if Samus enters the sand too early, she will sink slightly too far, resulting in not quite enough height to reach the tunnel;",
1086+
"if Samus enters the sand too late, she will not get properly boosted by the Bomb explosion and will end up stuck in the sand.",
1087+
"There is an 8-frame window for when to press jump, as it can be buffered during the period that the bomb begins interacting with Samus:",
1088+
"if Samus jumps too early or late, she will get stuck in the sand.",
1089+
"The timing for the aim-down press is frame-perfect: it must be pressed on the first frame that Samus begins being propelled upward by the bomb.",
1090+
"if Samus aims down too early, she will get stuck in the sand;",
1091+
"if Samus aims down too late, she will not get enough height to reach the tunnel.",
1092+
"The timing for the jump is between 6 frames before or 1 frame after the down press.",
1093+
"The amount of time that Samus holds forward after entering the sand is unimportant, as long as it is released before the aim-down."
1094+
],
1095+
"devNote": [
1096+
"The timing window for when to press jump and when to aim-down is relative to the bomb explosion,",
1097+
"independent of each other and independent of when Samus enters the sand.",
1098+
"The timing for pressing forward (from a crouch) is 38 or 39 frames after laying the Bomb.",
1099+
"The timing for the jump is between 51 and 58 frames after laying the Bomb.",
1100+
"The timing for the aim-down press is 57 frames after laying the Bomb.",
1101+
"It is also possible to stand by pressing up before entering the sand (in which case forward would be pressed 37 or 38 frames after laying the Bomb);",
1102+
"this does not affect the size of the timing windows but introduces some more possibility for error,",
1103+
"e.g. by the up input being eaten if Samus is still in the unmorphing animation,",
1104+
"or by the forward input being not immediately processed if Samus is still in the standing animation."
1105+
]
1106+
},
1107+
{
1108+
"id": 100,
1109+
"link": [1, 5],
1110+
"name": "Sand Bomb Boost (Power Bomb)",
1111+
"requires": [
1112+
{"notable": "Sand Bomb Boost (Left to Right)"},
1113+
{"tech": "canSandBombBoost"},
1114+
"h_canUsePowerBombs",
1115+
"canInsaneJump",
1116+
{"or": [
1117+
"can4HighMidAirMorph",
1118+
"canStationaryLateralMidAirMorph"
1119+
]}
1120+
],
1121+
"collectsItems": [5],
1122+
"note": [
1123+
"Stand on the edge of the sand and place a Power Bomb;",
1124+
"unmorph (leaving Samus crouched), then wait a moment before pressing forward to enter the sand.",
1125+
"On the exact frame when the Power Bomb begins to propel Samus upward, press down, and press jump on the same frame or one frame later.",
1126+
"Move right to press against the wall before mid-air morphing (alternatively, a stationary lateral morph can work).",
1127+
"There is a 13-frame window for when to enter the sand:",
1128+
"if Samus enters the sand too early, she will sink slightly too far, resulting in not quite enough height to reach the tunnel;",
1129+
"if Samus enters the sand too late, she will not get properly boosted by the Power Bomb explosion and will end up stuck in the sand.",
1130+
"The timing for the aim-down press is frame-perfect: it must be pressed on the first frame that Samus begins being propelled upward by the Power Bomb.",
1131+
"if Samus aims down too early, she will get stuck in the sand;",
1132+
"if Samus aims down too late, she will not get enough height to reach the tunnel.",
1133+
"if Samus jumps too early or late, she will get stuck in the sand.",
1134+
"The amount of time that Samus holds forward when entering the sand should be between 2 and 11 frames."
1135+
],
1136+
"devNote": [
1137+
"The timing window for when to press jump and when to aim-down is relative to the Power Bomb explosion,",
1138+
"independent of each other and independent of when Samus enters the sand.",
1139+
"The timing for pressing forward (from a crouch) is between 27 and 39 frames after laying the Power Bomb.",
1140+
"The timing for the jump is between 56 and 57 frames after laying the Power Bomb.",
1141+
"The timing for the aim-down press is 56 frames after laying the Power Bomb.",
1142+
"It is also possible to stand by pressing up before entering the sand (in which case forward would be pressed 28 or 40 frames after laying the Power Bomb);",
1143+
"this does not affect the size of the timing windows but introduces some more possibility for error,",
1144+
"e.g. by the up input being eaten if Samus is still in the unmorphing animation,",
1145+
"or by the forward input being not immediately processed if Samus is still in the standing animation."
10731146
]
10741147
},
10751148
{
@@ -1873,15 +1946,16 @@
18731946
"link": [4, 6],
18741947
"name": "Sand Bomb Boost",
18751948
"requires": [
1876-
"h_canCrouchJumpDownGrab",
1877-
"canSandBombBoost",
1878-
"canInsaneJump"
1949+
{"tech": "canSandBombBoost"},
1950+
"h_canBombThings",
1951+
"canInsaneJump",
1952+
"canDownGrab"
18791953
],
18801954
"note": [
18811955
"Kill all of the enemies and leave drops uncollected so that the Zoas will not be in the way.",
1882-
"Stand on the edge of the sand and place a Bomb and wait briefly before entering the sand.",
1883-
"Let the Bomb explosion push Samus up for a few frames before simultaneously jumping and aiming down.",
1884-
"Then move left to land on the Morph tunnel ledge.",
1956+
"Stand on the edge of the sand and place a Bomb or Power Bomb and wait briefly before entering the sand.",
1957+
"Let the explosion push Samus up for a few frames before simultaneously jumping and aiming down.",
1958+
"Then move left to down-grab onto the morph tunnel ledge.",
18851959
"Jumping too early can lead to a softlock but jumping too late usually exits the sand safely."
18861960
]
18871961
},
@@ -2013,8 +2087,20 @@
20132087
"If the timings don't work out just right, too much height is lost to the sand.",
20142088
"Crouching in sand is also a high softlock risk."
20152089
]
2090+
},
2091+
{
2092+
"id": 3,
2093+
"name": "Sand Bomb Boost (Left to Right)",
2094+
"note": [
2095+
"Stand on the edge of the sand and place a Bomb or Power Bomb and wait briefly before entering the sand.",
2096+
"Precisely as the explosion begins to propel Samus up, simultaneously press down and jump.",
2097+
"There are differences in the timing windows depending on whether a Bomb or Power Bomb is used:",
2098+
"For a Bomb, the timing to enter the sand is very precise, only 2 frames, while the timing to jump is lenient (8 frames).",
2099+
"For a Power Bomb, the timing to enter the sand lenient (13 frames), while the timing to jump is precise (2 frames).",
2100+
"In both cases, a frame-perfect aim-down input is required, and a failure likely results in Samus falling down through the sand."
2101+
]
20162102
}
20172103
],
2018-
"nextStratId": 100,
2019-
"nextNotableId": 3
2104+
"nextStratId": 101,
2105+
"nextNotableId": 4
20202106
}

‎region/maridia/inner-pink/Colosseum.json‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@
534534
"HiJump",
535535
"canNeutralDamageBoost",
536536
"canTrickySpringBallJump",
537+
"canTrickyJump",
537538
{"spikeHits": 2}
538539
]}
539540
]},
@@ -1170,11 +1171,29 @@
11701171
"requires": [
11711172
"canTrickySpringBallJump",
11721173
"canCrossRoomJumpIntoWater",
1174+
"canTrickyJump",
11731175
"canMomentumConservingTurnaround"
11741176
],
11751177
"note": "Requires a runway of one tile in the adjacent room.",
11761178
"devNote": "Possible with no openend using a harder jump but a runway that small doesn't exist."
11771179
},
1180+
{
1181+
"id": 104,
1182+
"link": [2, 3],
1183+
"name": "Cross Room Jump with Spring Ball (Lenient)",
1184+
"entranceCondition": {
1185+
"comeInJumping": {
1186+
"speedBooster": false,
1187+
"minTiles": 2
1188+
}
1189+
},
1190+
"requires": [
1191+
"canTrickySpringBallJump",
1192+
"canCrossRoomJumpIntoWater",
1193+
"canMomentumConservingTurnaround"
1194+
],
1195+
"note": "Uses a runway of two tiles in the adjacent room."
1196+
},
11781197
{
11791198
"id": 52,
11801199
"link": [2, 3],
@@ -2345,6 +2364,6 @@
23452364
]
23462365
}
23472366
],
2348-
"nextStratId": 104,
2367+
"nextStratId": 105,
23492368
"nextNotableId": 12
23502369
}

0 commit comments

Comments
 (0)