Skip to content

Commit ad4e279

Browse files
kjbranchkjbranch
authored
Merge branch 'master' into hard-bosses
2 parents 2a61297 + d6e931b commit ad4e279

67 files changed

Lines changed: 3757 additions & 1093 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎helpers.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,18 @@
790790
]}
791791
]
792792
},
793+
{
794+
"name": "h_extremelyTrickyToCarryFlashSuit",
795+
"requires": [
796+
{"or": [
797+
{"noFlashSuit": {}},
798+
{"and": [
799+
"canTrickyCarryFlashSuit",
800+
"canBeExtremelyPatient"
801+
]}
802+
]}
803+
]
804+
},
793805
{
794806
"name": "h_PlasmaHitbox",
795807
"requires": [
@@ -1282,6 +1294,22 @@
12821294
]}
12831295
],
12841296
"note": "There is a delay after using X-Ray before shooting, but the shot cannot be buffered, as it instantly despawns. Grapple can bypass this cooldown."
1297+
},
1298+
{
1299+
"name": "h_heatedGrappleTeleportWallEscape",
1300+
"requires": [
1301+
{"tech": "canGrappleTeleportWallEscape"},
1302+
{"or": [
1303+
{"and": [
1304+
"Morph",
1305+
{"heatFrames": 90}
1306+
]},
1307+
{"and": [
1308+
"canXRayClimb",
1309+
{"heatFrames": 120}
1310+
]}
1311+
]}
1312+
]
12851313
}
12861314
]
12871315
},

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,24 @@
659659
"since you could just do a running jump through the door and airball."
660660
]
661661
},
662+
{
663+
"id": 53,
664+
"link": [2, 1],
665+
"name": "Grapple Teleport Door Escape",
666+
"entranceCondition": {
667+
"comeInWithGrappleTeleport": {
668+
"blockPositions": [[3, 12], [3, 13]]
669+
}
670+
},
671+
"requires": [
672+
{"or": [
673+
"canGrappleTeleportWallEscape",
674+
{"doorUnlockedAtNode": 1}
675+
]}
676+
],
677+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
678+
"flashSuitChecked": true
679+
},
662680
{
663681
"id": 27,
664682
"link": [2, 1],
@@ -925,6 +943,6 @@
925943
}
926944
],
927945
"notables": [],
928-
"nextStratId": 53,
946+
"nextStratId": 54,
929947
"nextNotableId": 1
930948
}

‎region/brinstar/blue/Construction Zone.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,24 @@
866866
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
867867
"flashSuitChecked": true
868868
},
869+
{
870+
"id": 54,
871+
"link": [3, 2],
872+
"name": "Grapple Teleport Door Escape",
873+
"entranceCondition": {
874+
"comeInWithGrappleTeleport": {
875+
"blockPositions": [[12, 12], [12, 13]]
876+
}
877+
},
878+
"requires": [
879+
{"or": [
880+
"canGrappleTeleportWallEscape",
881+
{"doorUnlockedAtNode": 2}
882+
]}
883+
],
884+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
885+
"flashSuitChecked": true
886+
},
869887
{
870888
"id": 34,
871889
"link": [3, 2],
@@ -960,6 +978,6 @@
960978
]
961979
}
962980
],
963-
"nextStratId": 54,
981+
"nextStratId": 55,
964982
"nextNotableId": 3
965983
}

‎region/brinstar/green/Brinstar Pre-Map Room.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,24 @@
314314
"requires": [],
315315
"flashSuitChecked": true
316316
},
317+
{
318+
"id": 28,
319+
"link": [2, 1],
320+
"name": "Grapple Teleport Door Escape",
321+
"entranceCondition": {
322+
"comeInWithGrappleTeleport": {
323+
"blockPositions": [[3, 12], [3, 13]]
324+
}
325+
},
326+
"requires": [
327+
{"or": [
328+
"canGrappleTeleportWallEscape",
329+
{"doorUnlockedAtNode": 1}
330+
]}
331+
],
332+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
333+
"flashSuitChecked": true
334+
},
317335
{
318336
"id": 15,
319337
"link": [2, 1],
@@ -499,6 +517,6 @@
499517
}
500518
],
501519
"notables": [],
502-
"nextStratId": 28,
520+
"nextStratId": 29,
503521
"nextNotableId": 1
504522
}

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

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,24 @@
443443
"Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
444444
]
445445
},
446+
{
447+
"id": 93,
448+
"link": [2, 1],
449+
"name": "Grapple Teleport Door Escape",
450+
"entranceCondition": {
451+
"comeInWithGrappleTeleport": {
452+
"blockPositions": [[3, 12], [3, 13]]
453+
}
454+
},
455+
"requires": [
456+
{"or": [
457+
"canGrappleTeleportWallEscape",
458+
{"doorUnlockedAtNode": 1}
459+
]}
460+
],
461+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
462+
"flashSuitChecked": true
463+
},
446464
{
447465
"id": 10,
448466
"link": [2, 1],
@@ -1245,6 +1263,24 @@
12451263
"requires": [],
12461264
"flashSuitChecked": true
12471265
},
1266+
{
1267+
"id": 94,
1268+
"link": [4, 1],
1269+
"name": "Grapple Teleport Door Escape",
1270+
"entranceCondition": {
1271+
"comeInWithGrappleTeleport": {
1272+
"blockPositions": [[3, 12], [3, 13]]
1273+
}
1274+
},
1275+
"requires": [
1276+
{"or": [
1277+
"canGrappleTeleportWallEscape",
1278+
{"doorUnlockedAtNode": 1}
1279+
]}
1280+
],
1281+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
1282+
"flashSuitChecked": true
1283+
},
12481284
{
12491285
"id": 39,
12501286
"link": [4, 1],
@@ -2100,7 +2136,7 @@
21002136
]
21012137
}
21022138
],
2103-
"nextStratId": 93,
2139+
"nextStratId": 95,
21042140
"nextNotableId": 8,
21052141
"devNote": ["FIXME: add a strat to take temporary blue from the top to the bottom-right."]
21062142
}

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,24 @@
12631263
"requires": [],
12641264
"flashSuitChecked": true
12651265
},
1266+
{
1267+
"id": 90,
1268+
"link": [3, 1],
1269+
"name": "Grapple Teleport Door Escape",
1270+
"entranceCondition": {
1271+
"comeInWithGrappleTeleport": {
1272+
"blockPositions": [[3, 12], [3, 13]]
1273+
}
1274+
},
1275+
"requires": [
1276+
{"or": [
1277+
"canGrappleTeleportWallEscape",
1278+
{"doorUnlockedAtNode": 1}
1279+
]}
1280+
],
1281+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
1282+
"flashSuitChecked": true
1283+
},
12661284
{
12671285
"id": 51,
12681286
"link": [3, 1],
@@ -1766,6 +1784,6 @@
17661784
]
17671785
}
17681786
],
1769-
"nextStratId": 90,
1787+
"nextStratId": 91,
17701788
"nextNotableId": 7
17711789
}

‎region/brinstar/kraid/Warehouse Entrance.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,24 @@
472472
},
473473
"requires": []
474474
},
475+
{
476+
"id": 47,
477+
"link": [3, 1],
478+
"name": "Grapple Teleport Door Escape",
479+
"entranceCondition": {
480+
"comeInWithGrappleTeleport": {
481+
"blockPositions": [[3, 12], [3, 13]]
482+
}
483+
},
484+
"requires": [
485+
{"or": [
486+
"canGrappleTeleportWallEscape",
487+
{"doorUnlockedAtNode": 1}
488+
]}
489+
],
490+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
491+
"flashSuitChecked": true
492+
},
475493
{
476494
"id": 22,
477495
"link": [3, 1],
@@ -766,6 +784,6 @@
766784
]
767785
}
768786
],
769-
"nextStratId": 47,
787+
"nextStratId": 48,
770788
"nextNotableId": 2
771789
}

‎region/brinstar/pink/Dachora Room.json‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,24 @@
474474
"flashSuitChecked": true,
475475
"note": "Use a Power Bomb to destroy the bomb block wall."
476476
},
477+
{
478+
"id": 61,
479+
"link": [1, 3],
480+
"name": "Grapple Teleport Door Escape",
481+
"entranceCondition": {
482+
"comeInWithGrappleTeleport": {
483+
"blockPositions": [[108, 12], [108, 13]]
484+
}
485+
},
486+
"requires": [
487+
{"or": [
488+
"canGrappleTeleportWallEscape",
489+
{"doorUnlockedAtNode": 3}
490+
]}
491+
],
492+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
493+
"flashSuitChecked": true
494+
},
477495
{
478496
"id": 18,
479497
"link": [1, 3],
@@ -745,6 +763,24 @@
745763
"A single IBJ is slow enough at the top to overload them before Samus can hit the blocks."
746764
]
747765
},
766+
{
767+
"id": 62,
768+
"link": [2, 3],
769+
"name": "Grapple Teleport Door Escape",
770+
"entranceCondition": {
771+
"comeInWithGrappleTeleport": {
772+
"blockPositions": [[108, 12], [108, 13]]
773+
}
774+
},
775+
"requires": [
776+
{"or": [
777+
"canGrappleTeleportWallEscape",
778+
{"doorUnlockedAtNode": 3}
779+
]}
780+
],
781+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
782+
"flashSuitChecked": true
783+
},
748784
{
749785
"id": 35,
750786
"link": [2, 3],
@@ -919,6 +955,24 @@
919955
},
920956
"requires": []
921957
},
958+
{
959+
"id": 63,
960+
"link": [3, 1],
961+
"name": "Grapple Teleport Door Escape",
962+
"entranceCondition": {
963+
"comeInWithGrappleTeleport": {
964+
"blockPositions": [[3, 12], [3, 13]]
965+
}
966+
},
967+
"requires": [
968+
{"or": [
969+
"canGrappleTeleportWallEscape",
970+
{"doorUnlockedAtNode": 1}
971+
]}
972+
],
973+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
974+
"flashSuitChecked": true
975+
},
922976
{
923977
"id": 45,
924978
"link": [3, 1],
@@ -1203,6 +1257,6 @@
12031257
]
12041258
}
12051259
],
1206-
"nextStratId": 61,
1260+
"nextStratId": 64,
12071261
"nextNotableId": 5
12081262
}

‎region/brinstar/pink/Mission Impossible Room.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,9 @@
671671
"Then hold right to release Grapple while standing.",
672672
"Samus should get pushed up onto the floor.",
673673
"Run to the right and reach the door, taking just one hit from a Hopper."
674+
],
675+
"devNote": [
676+
"This doesn't require `canGrappleTeleportWallEscape` tech, because the lower floor height makes it easier."
674677
]
675678
},
676679
{

‎region/brinstar/pink/Pink Brinstar Wave Gate Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@
19611961
"after just one pixel of Samus' feet are visible while crouching facing left, perform exactly 7 more X-Ray stand-ups.",
19621962
"Use X-ray to face left, then run and jump to barely make it onto the ledge."
19631963
],
1964-
"devNote": ["3 pixels stuck in the door is X position 478 (0x1DE)."]
1964+
"devNote": ["3 pixels stuck in the door is X position $1DE."]
19651965
},
19661966
{
19671967
"id": 65,
@@ -1987,9 +1987,9 @@
19871987
"Use X-ray to face left, then run and jump to barely make it onto the ledge."
19881988
],
19891989
"devNote": [
1990-
"9 pixels stuck in the door is X position 484 (0x1E4).",
1991-
"The correct Y positions for the jump are 193 (0xC1), 188 (0xBC), and 187 (0xBB)",
1992-
"FIXME: Some of the X position to the left (482, 483) could also work; maybe investigate which vertical positions work for them?"
1990+
"9 pixels stuck in the door is X position $1E4.",
1991+
"The correct Y positions for the jump are $C1, $BC, and $BB",
1992+
"FIXME: Some of the X position to the left ($1E2, $1E3) could also work; maybe investigate which vertical positions work for them?"
19931993
]
19941994
},
19951995
{

0 commit comments

Comments
 (0)