Skip to content

Commit ce47c09

Browse files
blkerbyblkerby
authored
Merge pull request #1930 from vg-json-data/auto-run-scripts
Run Scripts
2 parents f7eef40 + 81a18f2 commit ce47c09

39 files changed

Lines changed: 345 additions & 199 deletions

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,13 +540,12 @@
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
},
542542
{
543+
"id": 47,
543544
"link": [2, 1],
544545
"name": "Precise Grapple Jump",
545546
"entranceCondition": {
546547
"comeInWithGrappleSwing": {
547-
"blocks": [
548-
{"position": [13, 5], "environment": "water", "note": "Mt. Everest"}
549-
]
548+
"blocks": [{"position": [13, 5], "environment": "water", "note": "Mt. Everest"}]
550549
}
551550
},
552551
"requires": [
@@ -748,6 +747,6 @@
748747
}
749748
],
750749
"notables": [],
751-
"nextStratId": 47,
750+
"nextStratId": 48,
752751
"nextNotableId": 1
753752
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4456,6 +4456,7 @@
44564456
"flashSuitChecked": true
44574457
},
44584458
{
4459+
"id": 251,
44594460
"link": [10, 9],
44604461
"name": "Tricky Grapple Jump",
44614462
"entranceCondition": {
@@ -4469,9 +4470,7 @@
44694470
"requires": [
44704471
"canTrickyGrappleJump"
44714472
],
4472-
"devNote": [
4473-
"Aside from these two, other setup rooms do not appear to work."
4474-
]
4473+
"devNote": ["Aside from these two, other setup rooms do not appear to work."]
44754474
},
44764475
{
44774476
"id": 204,
@@ -5108,6 +5107,6 @@
51085107
]
51095108
}
51105109
],
5111-
"nextStratId": 251,
5110+
"nextStratId": 252,
51125111
"nextNotableId": 5
51135112
}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,6 +1431,7 @@
14311431
"note": "Using a power bomb against the left wall will kill the enemies and trigger the elevator."
14321432
},
14331433
{
1434+
"id": 82,
14341435
"link": [2, 3],
14351436
"name": "Precise Grapple Jump",
14361437
"entranceCondition": {
@@ -1447,31 +1448,33 @@
14471448
]
14481449
},
14491450
{
1451+
"id": 83,
14501452
"link": [2, 3],
14511453
"name": "Tricky Grapple Jump",
14521454
"entranceCondition": {
14531455
"comeInWithGrappleSwing": {
14541456
"blocks": [
14551457
{"position": [8, 2], "note": "Bowling Alley"},
1456-
{"position": [7, 3], "obstructions": [[6, 10]], "note": "Red Brinstar Firefleas Room"}
1458+
{
1459+
"position": [7, 3],
1460+
"obstructions": [[6, 10]],
1461+
"note": "Red Brinstar Firefleas Room"
1462+
}
14571463
]
14581464
}
14591465
},
14601466
"requires": [
14611467
"canTrickyGrappleJump"
14621468
],
1463-
"devNote": [
1464-
"This appears not to be possible from Crateria Super Room?"
1465-
]
1469+
"devNote": ["This appears not to be possible from Crateria Super Room?"]
14661470
},
14671471
{
1472+
"id": 84,
14681473
"link": [2, 3],
14691474
"name": "Tricky Grapple Jump (Gravity)",
14701475
"entranceCondition": {
14711476
"comeInWithGrappleSwing": {
1472-
"blocks": [
1473-
{"position": [7, 3], "environment": "water", "note": "Pants Room"}
1474-
]
1477+
"blocks": [{"position": [7, 3], "environment": "water", "note": "Pants Room"}]
14751478
}
14761479
},
14771480
"requires": [
@@ -1647,6 +1650,6 @@
16471650
]
16481651
}
16491652
],
1650-
"nextStratId": 82,
1653+
"nextStratId": 85,
16511654
"nextNotableId": 6
16521655
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,7 @@
11281128
]
11291129
},
11301130
{
1131+
"id": 100,
11311132
"link": [2, 4],
11321133
"name": "Grapple Jump",
11331134
"entranceCondition": {
@@ -1143,6 +1144,7 @@
11431144
]
11441145
},
11451146
{
1147+
"id": 101,
11461148
"link": [2, 4],
11471149
"name": "Precise Grapple Jump",
11481150
"entranceCondition": {
@@ -1158,13 +1160,17 @@
11581160
]
11591161
},
11601162
{
1163+
"id": 102,
11611164
"link": [2, 4],
11621165
"name": "Tricky Grapple Jump",
11631166
"entranceCondition": {
11641167
"comeInWithGrappleSwing": {
11651168
"blocks": [
11661169
{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
1167-
{"position": [5, 2], "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"},
1170+
{
1171+
"position": [5, 2],
1172+
"note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
1173+
},
11681174
{"position": [2.375, 4.5625], "note": "Post Crocomire Farming Room"}
11691175
]
11701176
}
@@ -2124,6 +2130,6 @@
21242130
}
21252131
],
21262132
"notables": [],
2127-
"nextStratId": 100,
2133+
"nextStratId": 103,
21282134
"nextNotableId": 1
21292135
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,18 @@
148148
}
149149
},
150150
{
151+
"id": 62,
151152
"link": [1, 1],
152153
"name": "Leave With Grapple Swing",
153154
"requires": [],
154155
"exitCondition": {
155156
"leaveWithGrappleSwing": {
156157
"blocks": [
157-
{"position": [7, 3], "obstructions": [[6, 10]], "note": "Third closest Grapple block"}
158+
{
159+
"position": [7, 3],
160+
"obstructions": [[6, 10]],
161+
"note": "Third closest Grapple block"
162+
}
158163
]
159164
}
160165
}
@@ -1166,6 +1171,6 @@
11661171
]
11671172
}
11681173
],
1169-
"nextStratId": 62,
1174+
"nextStratId": 63,
11701175
"nextNotableId": 7
11711176
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,6 +1566,7 @@
15661566
"flashSuitChecked": true
15671567
},
15681568
{
1569+
"id": 123,
15691570
"link": [3, 6],
15701571
"name": "Tricky Grapple Jump",
15711572
"entranceCondition": {
@@ -1581,6 +1582,7 @@
15811582
]
15821583
},
15831584
{
1585+
"id": 124,
15841586
"link": [3, 6],
15851587
"name": "Absurd Grapple Jump",
15861588
"entranceCondition": {
@@ -2750,6 +2752,6 @@
27502752
]
27512753
}
27522754
],
2753-
"nextStratId": 123,
2755+
"nextStratId": 125,
27542756
"nextNotableId": 10
27552757
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,13 @@
241241
}
242242
},
243243
{
244+
"id": 75,
244245
"link": [1, 1],
245246
"name": "Leave With Grapple Swing",
246247
"requires": [],
247248
"exitCondition": {
248249
"leaveWithGrappleSwing": {
249-
"blocks": [
250-
{"position": [9, 2], "note": "Closest Grapple block to door"}
251-
]
250+
"blocks": [{"position": [9, 2], "note": "Closest Grapple block to door"}]
252251
}
253252
}
254253
},
@@ -1536,6 +1535,6 @@
15361535
]
15371536
}
15381537
],
1539-
"nextStratId": 75,
1538+
"nextStratId": 76,
15401539
"nextNotableId": 5
15411540
}

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,13 @@
117117
"flashSuitChecked": true
118118
},
119119
{
120+
"id": 61,
120121
"link": [1, 1],
121122
"name": "Leave With Grapple Swing",
122123
"requires": [],
123124
"exitCondition": {
124125
"leaveWithGrappleSwing": {
125-
"blocks": [
126-
{"position": [7, 2], "note": "Closest Grapple block to left door"}
127-
]
126+
"blocks": [{"position": [7, 2], "note": "Closest Grapple block to left door"}]
128127
}
129128
}
130129
},
@@ -701,14 +700,13 @@
701700
}
702701
},
703702
{
703+
"id": 62,
704704
"link": [2, 2],
705705
"name": "Leave With Grapple Swing",
706706
"requires": [],
707707
"exitCondition": {
708708
"leaveWithGrappleSwing": {
709-
"blocks": [
710-
{"position": [5, 2], "note": "Closest Grapple block to right door"}
711-
]
709+
"blocks": [{"position": [5, 2], "note": "Closest Grapple block to right door"}]
712710
}
713711
}
714712
},
@@ -1154,6 +1152,6 @@
11541152
]
11551153
}
11561154
],
1157-
"nextStratId": 61,
1155+
"nextStratId": 63,
11581156
"nextNotableId": 3
11591157
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@
846846
"flashSuitChecked": true
847847
},
848848
{
849+
"id": 93,
849850
"link": [1, 4],
850851
"name": "Tricky Grapple Jump",
851852
"entranceCondition": {
@@ -865,12 +866,16 @@
865866
]
866867
},
867868
{
869+
"id": 94,
868870
"link": [1, 4],
869871
"name": "Absurd Grapple Jump",
870872
"entranceCondition": {
871873
"comeInWithGrappleSwing": {
872874
"blocks": [
873-
{"position": [5, 2], "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"},
875+
{
876+
"position": [5, 2],
877+
"note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
878+
},
874879
{"position": [2.375, 4.5625], "note": "Post Crocomire Farming Room"}
875880
]
876881
}
@@ -2033,6 +2038,6 @@
20332038
}
20342039
],
20352040
"notables": [],
2036-
"nextStratId": 93,
2041+
"nextStratId": 95,
20372042
"nextNotableId": 1
20382043
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
"devNote": "FIXME: Ridley could also be used to set up G-mode, but the chaos of the fight makes this difficult."
145145
},
146146
{
147+
"id": 23,
147148
"link": [1, 2],
148149
"name": "Precise Grapple Jump",
149150
"entranceCondition": {
@@ -161,14 +162,18 @@
161162
]
162163
},
163164
{
165+
"id": 24,
164166
"link": [1, 2],
165167
"name": "Tricky Grapple Jump",
166168
"entranceCondition": {
167169
"comeInWithGrappleSwing": {
168170
"blocks": [
169171
{"position": [6, 4], "note": "Grapple Tutorial Room 2"},
170172
{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
171-
{"position": [5, 2], "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"},
173+
{
174+
"position": [5, 2],
175+
"note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
176+
},
172177
{"position": [2.375, 4.5625], "note": "Post Crocomire Farming Room"}
173178
]
174179
}
@@ -491,6 +496,6 @@
491496
"note": "Fight Ridley without immunity to heat damage."
492497
}
493498
],
494-
"nextStratId": 23,
499+
"nextStratId": 25,
495500
"nextNotableId": 2
496501
}

0 commit comments

Comments
 (0)