Skip to content

Commit 9bdc9a7

Browse files
osse101osse101
authored
Merge pull request #2108 from blkerby/heated-spring-ball-bounces
Some heated spring ball bounces
2 parents 372e0b8 + 38f9625 commit 9bdc9a7

3 files changed

Lines changed: 246 additions & 3 deletions

File tree

‎region/lowernorfair/east/Lower Norfair Farming Room.json‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,79 @@
212212
{"heatFrames": 260}
213213
]
214214
},
215+
{
216+
"link": [1, 2],
217+
"name": "Spring Ball Bounce (Come in Jumping, 5-tile runway)",
218+
"entranceCondition": {
219+
"comeInJumping": {
220+
"minTiles": 5,
221+
"speedBooster": false
222+
}
223+
},
224+
"requires": [
225+
"canTrickySpringBallBounce",
226+
{"heatFrames": 265}
227+
]
228+
},
229+
{
230+
"link": [1, 2],
231+
"name": "Spring Ball Bounce (Come in Jumping, 4-tile runway)",
232+
"entranceCondition": {
233+
"comeInJumping": {
234+
"minTiles": 4,
235+
"speedBooster": false
236+
}
237+
},
238+
"requires": [
239+
"canTrickySpringBallBounce",
240+
{"heatFrames": 285}
241+
]
242+
},
243+
{
244+
"link": [1, 2],
245+
"name": "Spring Ball Bounce (Come in Jumping, 3-tile runway)",
246+
"entranceCondition": {
247+
"comeInJumping": {
248+
"minTiles": 3,
249+
"speedBooster": false
250+
}
251+
},
252+
"requires": [
253+
"canTrickySpringBallBounce",
254+
{"heatFrames": 315}
255+
]
256+
},
257+
{
258+
"link": [1, 2],
259+
"name": "Spring Ball Bounce (Come in with Spring Ball Bounce)",
260+
"entranceCondition": {
261+
"comeInWithSpringBallBounce": {
262+
"remoteAndLandingMinTiles": [[7, 0]],
263+
"speedBooster": "any",
264+
"movementType": "controlled"
265+
}
266+
},
267+
"requires": [
268+
"canTrickySpringBallBounce",
269+
{"heatFrames": 240}
270+
]
271+
},
272+
{
273+
"link": [1, 2],
274+
"name": "Speedy Spring Ball Bounce into Spring Fling",
275+
"entranceCondition": {
276+
"comeInWithSpringBallBounce": {
277+
"remoteAndLandingMinTiles": [[30, 1]],
278+
"speedBooster": false,
279+
"movementType": "controlled"
280+
}
281+
},
282+
"requires": [
283+
"canTrickySpringBallBounce",
284+
"canSpringFling",
285+
{"heatFrames": 140}
286+
]
287+
},
215288
{
216289
"id": 6,
217290
"link": [1, 2],
@@ -282,6 +355,65 @@
282355
{"heatFrames": 260}
283356
]
284357
},
358+
{
359+
"link": [2, 1],
360+
"name": "Spring Ball Bounce (Come in Running, 4-tile runway)",
361+
"entranceCondition": {
362+
"comeInRunning": {
363+
"minTiles": 3,
364+
"speedBooster": false
365+
}
366+
},
367+
"requires": [
368+
"canTrickySpringBallBounce",
369+
{"heatFrames": 235}
370+
]
371+
},
372+
{
373+
"link": [2, 1],
374+
"name": "Spring Ball Bounce (Come in Running, 3-tile runway)",
375+
"entranceCondition": {
376+
"comeInRunning": {
377+
"minTiles": 3,
378+
"speedBooster": false
379+
}
380+
},
381+
"requires": [
382+
"canTrickySpringBallBounce",
383+
{"heatFrames": 260}
384+
]
385+
},
386+
{
387+
"link": [2, 1],
388+
"name": "Spring Ball Bounce (Come in with Spring Ball Bounce)",
389+
"entranceCondition": {
390+
"comeInWithSpringBallBounce": {
391+
"remoteAndLandingMinTiles": [[7, 0]],
392+
"speedBooster": "any",
393+
"movementType": "controlled"
394+
}
395+
},
396+
"requires": [
397+
"canTrickySpringBallBounce",
398+
{"heatFrames": 240}
399+
]
400+
},
401+
{
402+
"link": [2, 1],
403+
"name": "Speedy Spring Ball Bounce into Spring Fling",
404+
"entranceCondition": {
405+
"comeInWithSpringBallBounce": {
406+
"remoteAndLandingMinTiles": [[33, 1]],
407+
"speedBooster": true,
408+
"movementType": "any"
409+
}
410+
},
411+
"requires": [
412+
"canTrickySpringBallBounce",
413+
"canSpringFling",
414+
{"heatFrames": 155}
415+
]
416+
},
285417
{
286418
"id": 10,
287419
"link": [2, 1],

‎region/lowernorfair/east/Main Hall.json‎

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,38 @@
317317
"link": [2, 4],
318318
"name": "Base",
319319
"requires": [
320-
"h_navigateHeatRooms",
321320
{"heatFrames": 360}
322321
]
323322
},
323+
{
324+
"link": [2, 4],
325+
"name": "Spring Ball Bounce (Come in Running)",
326+
"entranceCondition": {
327+
"comeInRunning": {
328+
"minTiles": 3,
329+
"speedBooster": "any"
330+
}
331+
},
332+
"requires": [
333+
"canSpringBallBounce",
334+
{"heatFrames": 260}
335+
]
336+
},
337+
{
338+
"link": [2, 4],
339+
"name": "Come in With Spring Ball Bounce",
340+
"entranceCondition": {
341+
"comeInWithSpringBallBounce": {
342+
"remoteAndLandingMinTiles": [[6.4725, 0]],
343+
"movementType": "controlled",
344+
"speedBooster": "any"
345+
}
346+
},
347+
"requires": [
348+
"canSpringBallBounce",
349+
{"heatFrames": 265}
350+
]
351+
},
324352
{
325353
"id": 34,
326354
"link": [2, 4],
@@ -364,6 +392,43 @@
364392
{"heatFrames": 410}
365393
]
366394
},
395+
{
396+
"link": [4, 1],
397+
"name": "Spring Ball Bounce (Tank Hibashi Hit)",
398+
"requires": [
399+
{"disableEquipment": "SpeedBooster"},
400+
"canTrickySpringBallBounce",
401+
{"hibashiHits": 1},
402+
{"or": [
403+
"canSpringFling",
404+
"canInsaneJump"
405+
]},
406+
{"heatFrames": 375}
407+
],
408+
"note": [
409+
"Gain max run speed, without Speed Booster equipped, and bounce onto the second 2-tile-wide platform.",
410+
"Continue uncontrolled bouncing all the way across the room, taking a boost from a Hibashi hit.",
411+
"Perform a neutral bounce on the final single-tile platform.",
412+
"If Samus is positioned relatively far left, she may miss the last platform and fall into the acid;",
413+
"this can be avoided by unequipping Spring Ball (a 'spring fling') to reset Samus' vertical speed,",
414+
"bypassing the final platform."
415+
]
416+
},
417+
{
418+
"link": [4, 1],
419+
"name": "Spring Ball Bounce (Damageless)",
420+
"requires": [
421+
{"disableEquipment": "SpeedBooster"},
422+
"canTrickySpringBallBounce",
423+
"canInsaneJump",
424+
{"heatFrames": 375}
425+
],
426+
"note": [
427+
"Gain max run speed, without Speed Booster equipped, and perform precise, controlled bounces to cross the room.",
428+
"Bounce on each of the Hibashi platforms, avoiding damage by going underneath the flames:",
429+
"the bottom of the flame disappears before the top."
430+
]
431+
},
367432
{
368433
"id": 16,
369434
"link": [4, 1],
@@ -489,7 +554,6 @@
489554
"link": [4, 2],
490555
"name": "Base",
491556
"requires": [
492-
"h_navigateHeatRooms",
493557
{"heatFrames": 330}
494558
]
495559
},
@@ -498,11 +562,18 @@
498562
"link": [4, 2],
499563
"name": "SpaceJump",
500564
"requires": [
501-
"h_navigateHeatRooms",
502565
"SpaceJump",
503566
{"heatFrames": 250}
504567
]
505568
},
569+
{
570+
"link": [4, 2],
571+
"name": "Spring Ball Bounce",
572+
"requires": [
573+
"canSpringBallBounce",
574+
{"heatFrames": 280}
575+
]
576+
},
506577
{
507578
"id": 37,
508579
"link": [4, 2],

‎region/norfair/east/Rising Tide.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,26 @@
337337
"Keeping the Sova on camera and moving a reasonable amount of the time will prevent the drops from being overloaded."
338338
]
339339
},
340+
{
341+
"link": [1, 2],
342+
"name": "Spring Ball Bounce",
343+
"entranceCondition": {
344+
"comeInRunning": {
345+
"minTiles": 4,
346+
"speedBooster": false
347+
}
348+
},
349+
"requires": [
350+
"canTrickySpringBallBounce",
351+
"canInsaneJump",
352+
"canBeVeryPatient",
353+
{"heatFrames": 390}
354+
],
355+
"note": [
356+
"Use controlled Spring Ball bounces to cross the whole room while avoiding all enemy damage.",
357+
"There is a significant chance of failure due to bad Squeept RNG."
358+
]
359+
},
340360
{
341361
"id": 12,
342362
"link": [2, 1],
@@ -628,6 +648,26 @@
628648
"or lure the left-most Sova that falls into the lava to the right and back to the left.",
629649
"Without a Super, Samus must quickly kill or freeze the Dragons. Only the right 3 Dragons must be killed in order to prevent the drops from being overloaded, but killing more makes it more lenient."
630650
]
651+
},
652+
{
653+
"link": [2, 1],
654+
"name": "Spring Ball Bounce",
655+
"entranceCondition": {
656+
"comeInRunning": {
657+
"minTiles": 4,
658+
"speedBooster": false
659+
}
660+
},
661+
"requires": [
662+
"canTrickySpringBallBounce",
663+
"canInsaneJump",
664+
"canBeVeryPatient",
665+
{"heatFrames": 390}
666+
],
667+
"note": [
668+
"Use controlled Spring Ball bounces to cross the whole room while avoiding all enemy damage.",
669+
"There is a significant chance of failure due to bad Squeept RNG."
670+
]
631671
},
632672
{
633673
"id": 24,

0 commit comments

Comments
 (0)