Skip to content

Commit 194f608

Browse files
kjbranchkjbranch
committed
more
1 parent eb41331 commit 194f608

14 files changed

Lines changed: 236 additions & 41 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,8 @@
11351135
"h_canArtificialMorphMovement",
11361136
{"or": [
11371137
"canConsecutiveWalljump",
1138-
"SpaceJump"
1138+
"SpaceJump",
1139+
"h_canArtificialMorphLongIBJ"
11391140
]}
11401141
],
11411142
"note": "After overloading the PLMs by touching the item, go through the crumble and bomb blocks to the top door.",

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -739,8 +739,16 @@
739739
"link": [2, 2],
740740
"name": "G-Mode Setup - Get Hit By Zero",
741741
"requires": [
742-
"canBeVeryPatient",
743-
"Morph",
742+
{"or": [
743+
{"and": [
744+
"Morph",
745+
"canBeVeryPatient"
746+
]},
747+
{"and": [
748+
"canBePatient",
749+
{"ammo": {"type": "Super", "count": 2}}
750+
]}
751+
]},
744752
{"or": [
745753
"HiJump",
746754
"canWalljump",
@@ -755,9 +763,11 @@
755763
},
756764
"flashSuitChecked": true,
757765
"note": [
758-
"It takes around 4 minutes to get the Zero to this door.",
766+
"It takes around 4 minutes to get the Zero to this door with Morph, or 90 seconds with 2 Supers.",
759767
"The Zero only moves on camera and the camera scrolls when exiting the morph tunnel.",
760-
"Let the Zero lead through the morph tunnel or wait for the it to get very close to Samus before touching the scroll block at the exit."
768+
"Let the Zero lead through the morph tunnel or wait for the it to get very close to Samus before touching the scroll block at the exit.",
769+
"To speed this up and avoid the Morph requirement, use a Super when the Zero is at the tip of the platform extending out below the morph tunnel.",
770+
"The Zero will fall onto a lower platform, and another Super can be used to make it fall on the left platform."
761771
]
762772
},
763773
{

‎region/crateria/central/Climb.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,8 +1728,10 @@
17281728
],
17291729
"flashSuitChecked": true,
17301730
"note": [
1731-
"Use an X-Ray climb to position Samus to where she can break the Bomb block with Screw Attack.",
1732-
"This is an 8 screen climb."
1731+
"Climb 8 screens and position Samus to where she is visually standing above the door.",
1732+
"For the last X-Ray turnaround, face right then press and hold the X-ray scope input, buffer a jump then perform the X-Ray turnaround.",
1733+
"If done correctly Samus will be standing up and facing left, while the jump button is still pressed without a jump occuring.",
1734+
"Press right to break the bomb blocks with a spinjump then left to exit the wall. Jump in place to fix the camera as needed."
17331735
]
17341736
},
17351737
{

‎region/maridia/inner-pink/West Cactus Alley Room.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,11 @@
233233
"canXRayClimb"
234234
],
235235
"flashSuitChecked": true,
236-
"note": "Climb up a little less than 1 screen."
236+
"note": [
237+
"Once Doorstuck, do 2 turnarounds and and kill the bottom Cacatac with angle shots.",
238+
"Resume the climb until you're at the second Cacatac' height and kill it.",
239+
"Resume the climb until Samus' chest pokes out of the ground and wiggle out to the right."
240+
]
237241
},
238242
{
239243
"id": 10,

‎region/maridia/inner-yellow/Plasma Spark Room.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@
12021202
{
12031203
"id": 45,
12041204
"link": [3, 4],
1205-
"name": "Shinespark",
1205+
"name": "Come in Shinecharged, Shinespark",
12061206
"entranceCondition": {
12071207
"comeInShinecharged": {}
12081208
},
@@ -1223,6 +1223,31 @@
12231223
"It helps to face right before Shinesparking."
12241224
]
12251225
},
1226+
{
1227+
"link": [3, 4],
1228+
"name": "Come in Shinecharging, Shinespark",
1229+
"entranceCondition": {
1230+
"comeInShinecharging": {
1231+
"length": 4,
1232+
"openEnd": 1
1233+
}
1234+
},
1235+
"requires": [
1236+
"canShinechargeMovementComplex",
1237+
{"or": [
1238+
{"shinespark": {"frames": 43, "excessFrames": 3}},
1239+
{"and": [
1240+
"canMidairShinespark",
1241+
{"shinespark": {"frames": 30, "excessFrames": 3}}
1242+
]}
1243+
]}
1244+
],
1245+
"flashSuitChecked": true,
1246+
"note": [
1247+
"Shinespark from the left side of the water, or the very edge of the land.",
1248+
"It helps to face right before Shinesparking."
1249+
]
1250+
},
12261251
{
12271252
"id": 71,
12281253
"link": [3, 4],

‎region/maridia/outer/Crab Hole.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,12 +840,14 @@
840840
]},
841841
{"or": [
842842
"canCrouchJump",
843-
"canDownGrab"
843+
"canDownGrab",
844+
"canFlatleyJump"
844845
]}
845846
],
846847
"note": [
847848
"Stand on a frozen crab, then freeze a second one on the edge of the hole above.",
848-
"Use a crouch jump and/or down grab to get onto the crab above."
849+
"Use a crouch jump and/or down grab to get onto the crab above.",
850+
"Alternatively, freeze a crab on the ceiling, overhanging the hole above, then flatley jump onto the crab."
849851
]
850852
},
851853
{

‎region/maridia/outer/Glass Tunnel.json‎

Lines changed: 155 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,37 @@
780780
],
781781
"flashSuitChecked": true
782782
},
783+
{
784+
"link": [1, 4],
785+
"name": "G-Mode Morph Power Bomb Gravity Jump",
786+
"entranceCondition": {
787+
"comeInWithGMode": {
788+
"mode": "any",
789+
"morphed": true
790+
}
791+
},
792+
"requires": [
793+
{"notable": "Breaking the Tube Gravity Jump"},
794+
{"not": "f_MaridiaTubeBroken"},
795+
"canRiskPermanentLossOfAccess",
796+
"h_canArtificialMorphPowerBomb",
797+
"canSuitlessMaridia",
798+
"canTrickyJump"
799+
],
800+
"unlocksDoors": [
801+
{"types": ["super"], "requires": []},
802+
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
803+
],
804+
"setsFlags": ["f_MaridiaTubeBroken"],
805+
"flashSuitChecked": true,
806+
"note": [
807+
"In direct G-Mode, the tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
808+
"In indirect G-Mode, Samus must exit G-Mode before the Power Bomb explodes.",
809+
"Either way, it is recommended to exit G-Mode before the Power Bomb goes off to be safe.",
810+
"Jump as the first action to gravity jump to the top of the room.",
811+
"Note that the door will be closed, so open it during the ascent. This can only be attempted once."
812+
]
813+
},
783814
{
784815
"id": 142,
785816
"link": [1, 4],
@@ -862,6 +893,36 @@
862893
"flashSuitChecked": true,
863894
"note": "The tube will break when exiting G-Mode or when the Power Bomb finishes detonating, whichever is later."
864895
},
896+
{
897+
"link": [1, 6],
898+
"name": "G-Mode Morph Power Bomb Gravity Jump",
899+
"entranceCondition": {
900+
"comeInWithGMode": {
901+
"mode": "any",
902+
"morphed": true
903+
}
904+
},
905+
"requires": [
906+
{"notable": "Breaking the Tube Gravity Jump"},
907+
{"not": "f_MaridiaTubeBroken"},
908+
"canRiskPermanentLossOfAccess",
909+
"h_canArtificialMorphPowerBomb",
910+
"canSuitlessMaridia",
911+
"canTrickyJump"
912+
],
913+
"setsFlags": ["f_MaridiaTubeBroken"],
914+
"flashSuitChecked": true,
915+
"note": [
916+
"In direct G-Mode, the tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
917+
"In indirect G-Mode, Samus must exit G-Mode before the Power Bomb explodes.",
918+
"Either way, it is recommended to exit G-Mode before the Power Bomb goes off to be safe.",
919+
"Jump as the first action to gravity jump to the top of the room. This can only be attempted once."
920+
],
921+
"devNote": [
922+
"This could be useful as a way to unlock the top door for later, if there is no normal way to climb the room.",
923+
"FIXME: Strats to unlock door 4 from 6 need to be added."
924+
]
925+
},
865926
{
866927
"id": 107,
867928
"link": [2, 1],
@@ -1728,6 +1789,36 @@
17281789
"f_MaridiaTubeBroken"
17291790
]
17301791
},
1792+
{
1793+
"link": [2, 6],
1794+
"name": "G-Mode Morph Power Bomb Gravity Jump",
1795+
"entranceCondition": {
1796+
"comeInWithGMode": {
1797+
"mode": "any",
1798+
"morphed": true
1799+
}
1800+
},
1801+
"requires": [
1802+
{"notable": "Breaking the Tube Gravity Jump"},
1803+
{"not": "f_MaridiaTubeBroken"},
1804+
"canRiskPermanentLossOfAccess",
1805+
"h_canArtificialMorphPowerBomb",
1806+
"canSuitlessMaridia",
1807+
"canTrickyJump"
1808+
],
1809+
"setsFlags": ["f_MaridiaTubeBroken"],
1810+
"flashSuitChecked": true,
1811+
"note": [
1812+
"In direct G-Mode, the tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
1813+
"In indirect G-Mode, Samus must exit G-Mode before the Power Bomb explodes.",
1814+
"Either way, it is recommended to exit G-Mode before the Power Bomb goes off to be safe.",
1815+
"Jump as the first action to gravity jump to the top of the room. This can only be attempted once."
1816+
],
1817+
"devNote": [
1818+
"This could be useful as a way to unlock the top door for later, if there is no normal way to climb the room.",
1819+
"FIXME: Strats to unlock door 4 from 6 need to be added."
1820+
]
1821+
},
17311822
{
17321823
"id": 34,
17331824
"link": [2, 6],
@@ -2416,6 +2507,37 @@
24162507
],
24172508
"flashSuitChecked": true
24182509
},
2510+
{
2511+
"link": [3, 4],
2512+
"name": "G-Mode Morph Power Bomb Gravity Jump",
2513+
"entranceCondition": {
2514+
"comeInWithGMode": {
2515+
"mode": "any",
2516+
"morphed": true
2517+
}
2518+
},
2519+
"requires": [
2520+
{"notable": "Breaking the Tube Gravity Jump"},
2521+
{"not": "f_MaridiaTubeBroken"},
2522+
"canRiskPermanentLossOfAccess",
2523+
"h_canArtificialMorphPowerBomb",
2524+
"canSuitlessMaridia",
2525+
"canTrickyJump"
2526+
],
2527+
"unlocksDoors": [
2528+
{"types": ["super"], "requires": []},
2529+
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
2530+
],
2531+
"setsFlags": ["f_MaridiaTubeBroken"],
2532+
"flashSuitChecked": true,
2533+
"note": [
2534+
"In direct G-Mode, the tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
2535+
"In indirect G-Mode, Samus must exit G-Mode before the Power Bomb explodes.",
2536+
"Either way, it is recommended to exit G-Mode before the Power Bomb goes off to be safe.",
2537+
"Jump as the first action to gravity jump to the top of the room.",
2538+
"Note that the door will be closed, so open it during the ascent. This can only be attempted once."
2539+
]
2540+
},
24192541
{
24202542
"id": 147,
24212543
"link": [3, 4],
@@ -2639,6 +2761,36 @@
26392761
"flashSuitChecked": true,
26402762
"note": "The tube will break when exiting G-Mode or when the Power Bomb finishes detonating, whichever is later."
26412763
},
2764+
{
2765+
"link": [3, 6],
2766+
"name": "G-Mode Morph Power Bomb Gravity Jump",
2767+
"entranceCondition": {
2768+
"comeInWithGMode": {
2769+
"mode": "any",
2770+
"morphed": true
2771+
}
2772+
},
2773+
"requires": [
2774+
{"notable": "Breaking the Tube Gravity Jump"},
2775+
{"not": "f_MaridiaTubeBroken"},
2776+
"canRiskPermanentLossOfAccess",
2777+
"h_canArtificialMorphPowerBomb",
2778+
"canSuitlessMaridia",
2779+
"canTrickyJump"
2780+
],
2781+
"setsFlags": ["f_MaridiaTubeBroken"],
2782+
"flashSuitChecked": true,
2783+
"note": [
2784+
"In direct G-Mode, the tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
2785+
"In indirect G-Mode, Samus must exit G-Mode before the Power Bomb explodes.",
2786+
"Either way, it is recommended to exit G-Mode before the Power Bomb goes off to be safe.",
2787+
"Jump as the first action to gravity jump to the top of the room. This can only be attempted once."
2788+
],
2789+
"devNote": [
2790+
"This could be useful as a way to unlock the top door for later, if there is no normal way to climb the room.",
2791+
"FIXME: Strats to unlock door 4 from 6 need to be added."
2792+
]
2793+
},
26422794
{
26432795
"id": 59,
26442796
"link": [3, 6],
@@ -2950,9 +3102,10 @@
29503102
"setsFlags": ["f_MaridiaTubeBroken"],
29513103
"flashSuitChecked": true,
29523104
"note": [
2953-
"The tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
3105+
"In direct G-Mode, the tube will break once Samus moves after exiting G-Mode or when the Power Bomb finishes detonating, whichever is later.",
3106+
"In indirect G-Mode, Samus must exit G-Mode before the Power Bomb explodes.",
3107+
"Either way, it is recommended to exit G-Mode before the Power Bomb goes off to be safe.",
29543108
"Be sure not to overload PLMs with the camera scroll blocks which are next to the tube.",
2955-
"It is possible to exit G-Mode before the Power Bomb goes off to be safe.",
29563109
"Jump as the first action to gravity jump to the top of the room.",
29573110
"Note that the door will be closed, so open it during the ascent. This can only be attempted once."
29583111
]

‎region/maridia/outer/Mt. Everest.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,10 +1098,6 @@
10981098
"name": "Ice Moonfall Door Lock Skip",
10991099
"requires": [
11001100
"Gravity",
1101-
{"or": [
1102-
"canWalljump",
1103-
"canGravityJump"
1104-
]},
11051101
{"ammo": {"type": "Super", "count": 1}},
11061102
"canTrickyUseFrozenEnemies",
11071103
"canEnemyStuckMoonfall",
@@ -1926,10 +1922,6 @@
19261922
"name": "Ice Moonfall Door Lock Skip",
19271923
"requires": [
19281924
"Gravity",
1929-
{"or": [
1930-
"canWalljump",
1931-
"canGravityJump"
1932-
]},
19331925
"canTrickyUseFrozenEnemies",
19341926
"canEnemyStuckMoonfall",
19351927
"canFreeFallClip"

‎region/norfair/crocomire/Post Crocomire Jump Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@
11151115
{
11161116
"id": 52,
11171117
"link": [5, 1],
1118-
"name": "Spring Ball Jump",
1118+
"name": "HiJump, Spring Ball Jump",
11191119
"requires": [
11201120
"HiJump",
11211121
"canSpringBallJumpMidAir"

‎region/norfair/east/Cathedral Entrance.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,10 @@
475475
"name": "Frozen Sova",
476476
"requires": [
477477
"canTrickyUseFrozenEnemies",
478+
"canWalljump",
478479
{"heatFrames": 950}
479-
]
480+
],
481+
"devNote": "FIXME: It is possible but very precise to avoid the wall jump requirement here."
480482
},
481483
{
482484
"id": 20,

0 commit comments

Comments
 (0)