Skip to content

Commit 0186286

Browse files
blkerbyblkerby
authored
Merge pull request #1975 from blkerby/more-doorlock-skips
Add missing Grapple Teleport strats, use 'Door Lock Skip' in names
2 parents 911293c + 6690701 commit 0186286

71 files changed

Lines changed: 147 additions & 129 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
{
561561
"id": 27,
562562
"link": [2, 1],
563-
"name": "Grapple Teleport",
563+
"name": "Grapple Teleport Door Lock Skip",
564564
"entranceCondition": {
565565
"comeInWithGrappleTeleport": {
566566
"blockPositions": [[3, 12], [3, 13]]

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
{
286286
"id": 9,
287287
"link": [1, 2],
288-
"name": "Grapple Teleport",
288+
"name": "Grapple Teleport Door Lock Skip",
289289
"entranceCondition": {
290290
"comeInWithGrappleTeleport": {
291291
"blockPositions": [[12, 12], [12, 13]]
@@ -426,7 +426,7 @@
426426
{
427427
"id": 16,
428428
"link": [2, 1],
429-
"name": "Grapple Teleport",
429+
"name": "Grapple Teleport Door Lock Skip",
430430
"entranceCondition": {
431431
"comeInWithGrappleTeleport": {
432432
"blockPositions": [[3, 12], [3, 13]]
@@ -644,7 +644,7 @@
644644
{
645645
"id": 27,
646646
"link": [2, 3],
647-
"name": "Grapple Teleport",
647+
"name": "Grapple Teleport Door Lock Skip",
648648
"entranceCondition": {
649649
"comeInWithGrappleTeleport": {
650650
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
@@ -818,7 +818,7 @@
818818
{
819819
"id": 34,
820820
"link": [3, 2],
821-
"name": "Grapple Teleport",
821+
"name": "Grapple Teleport Door Lock Skip",
822822
"entranceCondition": {
823823
"comeInWithGrappleTeleport": {
824824
"blockPositions": [[12, 12], [12, 13]]

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@
10231023
{
10241024
"id": 34,
10251025
"link": [3, 1],
1026-
"name": "Grapple Teleport",
1026+
"name": "Grapple Teleport Door Lock Skip",
10271027
"entranceCondition": {
10281028
"comeInWithGrappleTeleport": {
10291029
"blockPositions": [[2, 34]]

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
{
565565
"id": 22,
566566
"link": [2, 1],
567-
"name": "Grapple Teleport",
567+
"name": "Grapple Teleport Door Lock Skip",
568568
"entranceCondition": {
569569
"comeInWithGrappleTeleport": {
570570
"blockPositions": [[2, 18], [2, 28], [2, 29]]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
{
396396
"id": 10,
397397
"link": [2, 1],
398-
"name": "Grapple Teleport",
398+
"name": "Grapple Teleport Door Lock Skip",
399399
"entranceCondition": {
400400
"comeInWithGrappleTeleport": {
401401
"blockPositions": [[3, 12], [3, 13]]
@@ -580,7 +580,7 @@
580580
{
581581
"id": 19,
582582
"link": [2, 3],
583-
"name": "Grapple Teleport",
583+
"name": "Grapple Teleport Door Lock Skip",
584584
"entranceCondition": {
585585
"comeInWithGrappleTeleport": {
586586
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
@@ -1124,7 +1124,7 @@
11241124
{
11251125
"id": 43,
11261126
"link": [4, 3],
1127-
"name": "Grapple Teleport",
1127+
"name": "Grapple Teleport Door Lock Skip",
11281128
"entranceCondition": {
11291129
"comeInWithGrappleTeleport": {
11301130
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]

‎region/brinstar/green/Green Brinstar Beetom Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
{
524524
"id": 24,
525525
"link": [1, 2],
526-
"name": "Grapple Teleport",
526+
"name": "Grapple Teleport Door Lock Skip",
527527
"entranceCondition": {
528528
"comeInWithGrappleTeleport": {
529529
"blockPositions": [[12, 12], [12, 13]]
@@ -771,7 +771,7 @@
771771
{
772772
"id": 38,
773773
"link": [2, 1],
774-
"name": "Grapple Teleport",
774+
"name": "Grapple Teleport Door Lock Skip",
775775
"entranceCondition": {
776776
"comeInWithGrappleTeleport": {
777777
"blockPositions": [[3, 12], [3, 13]]

‎region/brinstar/green/Green Brinstar Fireflea Room.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,18 @@
200200
"requires": [],
201201
"flashSuitChecked": true
202202
},
203+
{
204+
"link": [2, 1],
205+
"name": "Grapple Teleport Door Lock Skip",
206+
"entranceCondition": {
207+
"comeInWithGrappleTeleport": {
208+
"blockPositions": [[2, 28], [2, 29]]
209+
}
210+
},
211+
"requires": [],
212+
"bypassesDoorShell": true,
213+
"flashSuitChecked": true
214+
},
203215
{
204216
"id": 9,
205217
"link": [2, 1],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
{
726726
"id": 35,
727727
"link": [2, 1],
728-
"name": "Grapple Teleport",
728+
"name": "Grapple Teleport Door Lock Skip",
729729
"entranceCondition": {
730730
"comeInWithGrappleTeleport": {
731731
"blockPositions": [[3, 12], [3, 13]]

‎region/brinstar/green/Noob Bridge.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
{
278278
"id": 15,
279279
"link": [2, 1],
280-
"name": "Grapple Teleport",
280+
"name": "Grapple Teleport Door Lock Skip",
281281
"entranceCondition": {
282282
"comeInWithGrappleTeleport": {
283283
"blockPositions": [[3, 12], [3, 13]]

‎region/brinstar/kraid/Baby Kraid Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
{
542542
"id": 23,
543543
"link": [2, 1],
544-
"name": "Grapple Teleport",
544+
"name": "Grapple Teleport Door Lock Skip",
545545
"entranceCondition": {
546546
"comeInWithGrappleTeleport": {
547547
"blockPositions": [[3, 12], [3, 13]]

0 commit comments

Comments
 (0)