Skip to content

Commit c21068f

Browse files
authored
Merge pull request #1769 from kjbranch/quick-drop
Rename canQuickCrumbleEscape to canQuickDrop
2 parents e41b667 + e99e218 commit c21068f

4 files changed

Lines changed: 41 additions & 34 deletions

File tree

region/brinstar/green/Early Supers Room.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
"openEnd": 0
221221
}},
222222
"canShinechargeMovementTricky",
223-
"canQuickCrumbleEscape",
223+
"canQuickDrop",
224224
{"shinespark": {"frames": 1}}
225225
],
226226
"exitCondition": {
@@ -767,7 +767,7 @@
767767
"link": [3, 1],
768768
"name": "Quick Crumble Escape",
769769
"requires": [
770-
"canQuickCrumbleEscape"
770+
"canQuickDrop"
771771
],
772772
"failures": [
773773
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
"openEnd": 1
535535
}},
536536
"canShinechargeMovement",
537-
"canQuickCrumbleEscape"
537+
"canQuickDrop"
538538
],
539539
"unlocksDoors": [
540540
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@
714714
"name": "Mission Impossible",
715715
"requires": [
716716
{"notable": "Mission Impossible"},
717-
"canQuickCrumbleEscape",
717+
"canQuickDrop",
718718
"HiJump",
719719
"canPreciseWalljump",
720720
{"obstaclesCleared": ["A", "B"]}
@@ -738,7 +738,7 @@
738738
"name": "Mission Impossible Walljumpless",
739739
"requires": [
740740
{"notable": "Mission Impossible Walljumpless"},
741-
"canQuickCrumbleEscape",
741+
"canQuickDrop",
742742
"HiJump",
743743
"canCrumbleJump",
744744
{"obstaclesCleared": ["A", "B"]}
@@ -778,7 +778,7 @@
778778
]}
779779
]},
780780
"canShinechargeMovementComplex",
781-
"canQuickCrumbleEscape",
781+
"canQuickDrop",
782782
{"or": [
783783
{"shinespark": {"frames": 19, "excessFrames": 7}},
784784
{"and": [
@@ -808,7 +808,7 @@
808808
"name": "Mission Impossible Shinespark (Flash Suit)",
809809
"requires": [
810810
{"notable": "Mission Impossible Shinespark"},
811-
"canQuickCrumbleEscape",
811+
"canQuickDrop",
812812
{"useFlashSuit": {}},
813813
{"or": [
814814
{"shinespark": {"frames": 19, "excessFrames": 7}},

tech.json

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -637,11 +637,42 @@
637637
]
638638
},
639639
{
640-
"id": 47,
641-
"name": "canQuickCrumbleEscape",
640+
"id": 180,
641+
"name": "canMomentumConservingTurnaround",
642642
"techRequires": [],
643643
"otherRequires": [],
644-
"note": "The combination of a crumble quick drop, and landing on a lower surface and jumping back over the crumble block before it re-forms."
644+
"note": [
645+
"Uses the uninteruptable frames of turning around in order to continue moving after hitting a solid object.",
646+
"Can be used to make it through an opening door, or barely just past a ledge.",
647+
"It is often beneficial to be in a downward pose when hitting the ceiling, in order to shrink Samus' hitbox to delay contact."
648+
],
649+
"extensionTechs": [
650+
{
651+
"id": 47,
652+
"name": "canQuickDrop",
653+
"techRequires": [
654+
"canMomentumConservingTurnaround"
655+
],
656+
"otherRequires": [],
657+
"note": [
658+
"Using a momentum conserving turnaround on a crumble block, an opening doorshell, or any other breaking block, to preserve Samus' momentum.",
659+
"This is often used when traversing with a shinecharge, or to quickly fall through a crumble block and jump back through it before it re-forms."
660+
]
661+
}
662+
]
663+
},
664+
{
665+
"id": 181,
666+
"name": "canMomentumConservingMorph",
667+
"techRequires": [],
668+
"otherRequires": [
669+
"Morph"
670+
],
671+
"note": [
672+
"Uses the uninteruptable frames of morphing or unmorphing in order to continue moving up after hitting a solid object above.",
673+
"This can be used to make it barely just past a ledge.",
674+
"The same technique can also be used to temporarily glide along a ceiling to extend a jump horizontally."
675+
]
645676
},
646677
{
647678
"id": 48,
@@ -2541,30 +2572,6 @@
25412572
"otherRequires": [],
25422573
"note": "Canceling an aim angle while crouching and turning around, to wiggle to the right."
25432574
},
2544-
{
2545-
"id": 180,
2546-
"name": "canMomentumConservingTurnaround",
2547-
"techRequires": [],
2548-
"otherRequires": [],
2549-
"note": [
2550-
"Uses the uninteruptable frames of turning around in order to continue moving after hitting a solid object.",
2551-
"Can be used to make it through an opening door, or barely just past a ledge.",
2552-
"It is often beneficial to be in a downward pose when hitting the ceiling, in order to shrink Samus' hitbox to delay contact."
2553-
]
2554-
},
2555-
{
2556-
"id": 181,
2557-
"name": "canMomentumConservingMorph",
2558-
"techRequires": [],
2559-
"otherRequires": [
2560-
"Morph"
2561-
],
2562-
"note": [
2563-
"Uses the uninteruptable frames of morphing or unmorphing in order to continue moving up after hitting a solid object above.",
2564-
"This can be used to make it barely just past a ledge.",
2565-
"The same technique can also be used to temporarily glide along a ceiling to extend a jump horizontally."
2566-
]
2567-
},
25682575
{
25692576
"id": 182,
25702577
"name": "canCameraManip",

0 commit comments

Comments
 (0)