Skip to content

Commit f7eef40

Browse files
blkerbyblkerby
authored
Merge pull request #1922 from blkerby/grapple-jumps-2
Cross-room grapple jumps
2 parents 6fe828f + 94caf12 commit f7eef40

42 files changed

Lines changed: 2060 additions & 14 deletions

Some content is hidden

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

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,24 @@
539539
"flashSuitChecked": true,
540540
"note": "Starting an IBJ from spring ball with no other items is not very precise, it just takes a bit of an odd timing."
541541
},
542+
{
543+
"link": [2, 1],
544+
"name": "Precise Grapple Jump",
545+
"entranceCondition": {
546+
"comeInWithGrappleSwing": {
547+
"blocks": [
548+
{"position": [13, 5], "environment": "water", "note": "Mt. Everest"}
549+
]
550+
}
551+
},
552+
"requires": [
553+
"canPreciseGrappleJump"
554+
],
555+
"devNote": [
556+
"This can work from other setup rooms, but it would have no purpose coming from an air room,",
557+
"since you could just do a running jump through the door and airball."
558+
]
559+
},
542560
{
543561
"id": 27,
544562
"link": [2, 1],

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4455,6 +4455,24 @@
44554455
],
44564456
"flashSuitChecked": true
44574457
},
4458+
{
4459+
"link": [10, 9],
4460+
"name": "Tricky Grapple Jump",
4461+
"entranceCondition": {
4462+
"comeInWithGrappleSwing": {
4463+
"blocks": [
4464+
{"position": [8, 3], "note": "Grapple Beam Room"},
4465+
{"position": [7, 3], "note": "Colosseum"}
4466+
]
4467+
}
4468+
},
4469+
"requires": [
4470+
"canTrickyGrappleJump"
4471+
],
4472+
"devNote": [
4473+
"Aside from these two, other setup rooms do not appear to work."
4474+
]
4475+
},
44584476
{
44594477
"id": 204,
44604478
"link": [10, 10],

‎region/brinstar/pink/Pink Brinstar Hopper Room.json‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,55 @@
14301430
"flashSuitChecked": true,
14311431
"note": "Using a power bomb against the left wall will kill the enemies and trigger the elevator."
14321432
},
1433+
{
1434+
"link": [2, 3],
1435+
"name": "Precise Grapple Jump",
1436+
"entranceCondition": {
1437+
"comeInWithGrappleSwing": {
1438+
"blocks": [
1439+
{"position": [13, 5], "environment": "water", "note": "Mt. Everest"},
1440+
{"position": [7, 3], "note": "The Precious Room"},
1441+
{"position": [7, 2], "note": "The Moat"}
1442+
]
1443+
}
1444+
},
1445+
"requires": [
1446+
"canPreciseGrappleJump"
1447+
]
1448+
},
1449+
{
1450+
"link": [2, 3],
1451+
"name": "Tricky Grapple Jump",
1452+
"entranceCondition": {
1453+
"comeInWithGrappleSwing": {
1454+
"blocks": [
1455+
{"position": [8, 2], "note": "Bowling Alley"},
1456+
{"position": [7, 3], "obstructions": [[6, 10]], "note": "Red Brinstar Firefleas Room"}
1457+
]
1458+
}
1459+
},
1460+
"requires": [
1461+
"canTrickyGrappleJump"
1462+
],
1463+
"devNote": [
1464+
"This appears not to be possible from Crateria Super Room?"
1465+
]
1466+
},
1467+
{
1468+
"link": [2, 3],
1469+
"name": "Tricky Grapple Jump (Gravity)",
1470+
"entranceCondition": {
1471+
"comeInWithGrappleSwing": {
1472+
"blocks": [
1473+
{"position": [7, 3], "environment": "water", "note": "Pants Room"}
1474+
]
1475+
}
1476+
},
1477+
"requires": [
1478+
"Gravity",
1479+
"canTrickyGrappleJump"
1480+
]
1481+
},
14331482
{
14341483
"id": 68,
14351484
"link": [2, 3],

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,52 @@
11271127
"Otherwise, after landing, move quickly to jump up to the next platform, to avoid being hit by the Cac or its projectiles."
11281128
]
11291129
},
1130+
{
1131+
"link": [2, 4],
1132+
"name": "Grapple Jump",
1133+
"entranceCondition": {
1134+
"comeInWithGrappleSwing": {
1135+
"blocks": [
1136+
{"position": [8, 3], "note": "Grapple Beam Room"},
1137+
{"position": [7, 3], "note": "Colosseum"}
1138+
]
1139+
}
1140+
},
1141+
"requires": [
1142+
"canGrappleJump"
1143+
]
1144+
},
1145+
{
1146+
"link": [2, 4],
1147+
"name": "Precise Grapple Jump",
1148+
"entranceCondition": {
1149+
"comeInWithGrappleSwing": {
1150+
"blocks": [
1151+
{"position": [-1, 5], "environment": "water", "note": "Mt. Everest"},
1152+
{"position": [6, 4], "note": "Grapple Tutorial Room 2"}
1153+
]
1154+
}
1155+
},
1156+
"requires": [
1157+
"canPreciseGrappleJump"
1158+
]
1159+
},
1160+
{
1161+
"link": [2, 4],
1162+
"name": "Tricky Grapple Jump",
1163+
"entranceCondition": {
1164+
"comeInWithGrappleSwing": {
1165+
"blocks": [
1166+
{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
1167+
{"position": [5, 2], "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"},
1168+
{"position": [2.375, 4.5625], "note": "Post Crocomire Farming Room"}
1169+
]
1170+
}
1171+
},
1172+
"requires": [
1173+
"canTrickyGrappleJump"
1174+
]
1175+
},
11301176
{
11311177
"id": 47,
11321178
"link": [2, 4],

‎region/brinstar/red/Red Brinstar Fireflea Room.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,18 @@
147147
}
148148
}
149149
},
150+
{
151+
"link": [1, 1],
152+
"name": "Leave With Grapple Swing",
153+
"requires": [],
154+
"exitCondition": {
155+
"leaveWithGrappleSwing": {
156+
"blocks": [
157+
{"position": [7, 3], "obstructions": [[6, 10]], "note": "Third closest Grapple block"}
158+
]
159+
}
160+
}
161+
},
150162
{
151163
"id": 3,
152164
"link": [1, 1],

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,6 +1565,40 @@
15651565
],
15661566
"flashSuitChecked": true
15671567
},
1568+
{
1569+
"link": [3, 6],
1570+
"name": "Tricky Grapple Jump",
1571+
"entranceCondition": {
1572+
"comeInWithGrappleSwing": {
1573+
"blocks": [
1574+
{"position": [-1, 5], "environment": "water", "note": "Mt. Everest"},
1575+
{"position": [8, 3], "note": "Grapple Beam Room"}
1576+
]
1577+
}
1578+
},
1579+
"requires": [
1580+
"canTrickyGrappleJump"
1581+
]
1582+
},
1583+
{
1584+
"link": [3, 6],
1585+
"name": "Absurd Grapple Jump",
1586+
"entranceCondition": {
1587+
"comeInWithGrappleSwing": {
1588+
"blocks": [
1589+
{"position": [7, 3], "note": "Colosseum"},
1590+
{"position": [6, 4], "note": "Grapple Tutorial Room 2"}
1591+
]
1592+
}
1593+
},
1594+
"requires": [
1595+
"canTrickyGrappleJump",
1596+
"canBeExtremelyPatient"
1597+
],
1598+
"devNote": [
1599+
"FIXME: Setups from other rooms, such as Moat, are theoretically possible but appear to be even more difficult."
1600+
]
1601+
},
15681602
{
15691603
"id": 62,
15701604
"link": [3, 6],

‎region/crateria/central/Crateria Super Room.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,18 @@
240240
}
241241
}
242242
},
243+
{
244+
"link": [1, 1],
245+
"name": "Leave With Grapple Swing",
246+
"requires": [],
247+
"exitCondition": {
248+
"leaveWithGrappleSwing": {
249+
"blocks": [
250+
{"position": [9, 2], "note": "Closest Grapple block to door"}
251+
]
252+
}
253+
}
254+
},
243255
{
244256
"id": 2,
245257
"link": [1, 1],

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,18 @@
116116
],
117117
"flashSuitChecked": true
118118
},
119+
{
120+
"link": [1, 1],
121+
"name": "Leave With Grapple Swing",
122+
"requires": [],
123+
"exitCondition": {
124+
"leaveWithGrappleSwing": {
125+
"blocks": [
126+
{"position": [7, 2], "note": "Closest Grapple block to left door"}
127+
]
128+
}
129+
}
130+
},
119131
{
120132
"id": 3,
121133
"link": [1, 1],
@@ -688,6 +700,18 @@
688700
}
689701
}
690702
},
703+
{
704+
"link": [2, 2],
705+
"name": "Leave With Grapple Swing",
706+
"requires": [],
707+
"exitCondition": {
708+
"leaveWithGrappleSwing": {
709+
"blocks": [
710+
{"position": [5, 2], "note": "Closest Grapple block to right door"}
711+
]
712+
}
713+
}
714+
},
691715
{
692716
"id": 35,
693717
"link": [2, 2],

‎region/lowernorfair/east/Fast Pillars Setup Room.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,42 @@
845845
],
846846
"flashSuitChecked": true
847847
},
848+
{
849+
"link": [1, 4],
850+
"name": "Tricky Grapple Jump",
851+
"entranceCondition": {
852+
"comeInWithGrappleSwing": {
853+
"blocks": [
854+
{"position": [-1, 5], "environment": "water", "note": "Mt. Everest"},
855+
{"position": [8, 3], "note": "Grapple Beam Room"},
856+
{"position": [7, 3], "note": "Colosseum"},
857+
{"position": [6, 4], "note": "Grapple Tutorial Room 2"},
858+
{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"}
859+
]
860+
}
861+
},
862+
"requires": [
863+
"h_heatProof",
864+
"canTrickyGrappleJump"
865+
]
866+
},
867+
{
868+
"link": [1, 4],
869+
"name": "Absurd Grapple Jump",
870+
"entranceCondition": {
871+
"comeInWithGrappleSwing": {
872+
"blocks": [
873+
{"position": [5, 2], "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"},
874+
{"position": [2.375, 4.5625], "note": "Post Crocomire Farming Room"}
875+
]
876+
}
877+
},
878+
"requires": [
879+
"h_heatProof",
880+
"canTrickyGrappleJump",
881+
"canBeExtremelyPatient"
882+
]
883+
},
848884
{
849885
"id": 15,
850886
"link": [1, 5],

‎region/lowernorfair/east/Ridley's Room.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"from": 1,
9898
"to": [
9999
{"id": 1},
100+
{"id": 2},
100101
{"id": 3}
101102
]
102103
},
@@ -142,6 +143,41 @@
142143
"flashSuitChecked": true,
143144
"devNote": "FIXME: Ridley could also be used to set up G-mode, but the chaos of the fight makes this difficult."
144145
},
146+
{
147+
"link": [1, 2],
148+
"name": "Precise Grapple Jump",
149+
"entranceCondition": {
150+
"comeInWithGrappleSwing": {
151+
"blocks": [
152+
{"position": [-1, 5], "environment": "water", "note": "Mt. Everest"},
153+
{"position": [8, 3], "note": "Grapple Beam Room"},
154+
{"position": [7, 3], "note": "Colosseum"}
155+
]
156+
}
157+
},
158+
"requires": [
159+
"h_heatProof",
160+
"canPreciseGrappleJump"
161+
]
162+
},
163+
{
164+
"link": [1, 2],
165+
"name": "Tricky Grapple Jump",
166+
"entranceCondition": {
167+
"comeInWithGrappleSwing": {
168+
"blocks": [
169+
{"position": [6, 4], "note": "Grapple Tutorial Room 2"},
170+
{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
171+
{"position": [5, 2], "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"},
172+
{"position": [2.375, 4.5625], "note": "Post Crocomire Farming Room"}
173+
]
174+
}
175+
},
176+
"requires": [
177+
"h_heatProof",
178+
"canTrickyGrappleJump"
179+
]
180+
},
145181
{
146182
"id": 3,
147183
"link": [1, 3],

0 commit comments

Comments
 (0)