Skip to content

Commit ba28143

Browse files
authored
Merge pull request #1828 from vg-json-data/auto-run-scripts
Run Scripts
2 parents 72b482e + ef290e7 commit ba28143

17 files changed

Lines changed: 68 additions & 36 deletions

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@
330330
]
331331
},
332332
{
333+
"id": 44,
333334
"link": [2, 1],
334335
"name": "Space Jump Jumping Entry",
335336
"entranceCondition": {
@@ -594,6 +595,7 @@
594595
"flashSuitChecked": true
595596
},
596597
{
598+
"id": 45,
597599
"link": [2, 3],
598600
"name": "Fall Into Water",
599601
"entranceCondition": {
@@ -602,6 +604,7 @@
602604
"requires": []
603605
},
604606
{
607+
"id": 46,
605608
"link": [2, 3],
606609
"name": "Fall Into Room With Mockball",
607610
"entranceCondition": {
@@ -714,7 +717,7 @@
714717
"devNote": "The crouch jump is not actually necessary but helps slightly. It is also possible to use the crouch jump while maintaining the flash suit."
715718
}
716719
],
717-
"nextStratId": 44,
720+
"nextStratId": 47,
718721
"notables": [],
719722
"nextNotableId": 1
720723
}

region/brinstar/blue/Construction Zone.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,16 @@
9292
"h_ZebesIsAwake",
9393
{"or": [
9494
{"and": [
95-
{"resetRoom": {"nodes": [1, 2]}},
95+
{"resetRoom": {
96+
"nodes": [1, 2]
97+
}},
9698
{"cycleFrames": 150}
9799
]},
98100
{"and": [
99101
"Morph",
100-
{"resetRoom": {"nodes": [3]}},
102+
{"resetRoom": {
103+
"nodes": [3]
104+
}},
101105
{"or": [
102106
{"cycleFrames": 510},
103107
{"and": [
@@ -108,9 +112,7 @@
108112
]}
109113
]}
110114
],
111-
"farmCycleDrops": [
112-
{"enemy": "Geemer (blue)", "count": 2}
113-
]
115+
"farmCycleDrops": [{"enemy": "Geemer (blue)", "count": 2}]
114116
},
115117
{
116118
"id": 46,

region/brinstar/green/Green Hill Zone.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
"flashSuitChecked": true
172172
},
173173
{
174+
"id": 79,
174175
"link": [1, 1],
175176
"name": "Open Blue Gate",
176177
"requires": [],
@@ -1382,7 +1383,7 @@
13821383
"note": "It's a long Tunnel Crawl, so there's a heavy softlock risk."
13831384
}
13841385
],
1385-
"nextStratId": 79,
1386+
"nextStratId": 80,
13861387
"notables": [
13871388
{
13881389
"id": 1,

region/brinstar/pink/Big Pink.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,6 +1132,7 @@
11321132
"note": "Jump through the door and shoot it open as you enter, landing on the door frame to avoid falling through the crumbles."
11331133
},
11341134
{
1135+
"id": 137,
11351136
"link": [5, 5],
11361137
"name": "Door Stuck, Open Door",
11371138
"entranceCondition": {
@@ -1141,9 +1142,7 @@
11411142
"canPrepareForNextRoom",
11421143
{"doorUnlockedAtNode": 5}
11431144
],
1144-
"unlocksDoors": [
1145-
{"types": ["ammo"], "requires": []}
1146-
]
1145+
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
11471146
},
11481147
{
11491148
"id": 41,
@@ -1176,6 +1175,7 @@
11761175
"requires": []
11771176
},
11781177
{
1178+
"id": 138,
11791179
"link": [5, 13],
11801180
"name": "Fall Into Room With Mockball",
11811181
"entranceCondition": {
@@ -2536,9 +2536,7 @@
25362536
"requires": [
25372537
{"cycleFrames": 105}
25382538
],
2539-
"farmCycleDrops": [
2540-
{"enemy": "Zeb", "count": 1}
2541-
]
2539+
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
25422540
},
25432541
{
25442542
"id": 121,
@@ -2751,7 +2749,7 @@
27512749
]
27522750
}
27532751
],
2754-
"nextStratId": 137,
2752+
"nextStratId": 139,
27552753
"notables": [
27562754
{
27572755
"id": 1,

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@
313313
"flashSuitChecked": true
314314
},
315315
{
316+
"id": 38,
316317
"link": [1, 1],
317318
"name": "Carry G-Mode Back through the Door",
318319
"entranceCondition": {
@@ -333,6 +334,7 @@
333334
"flashSuitChecked": true
334335
},
335336
{
337+
"id": 39,
336338
"link": [1, 1],
337339
"name": "Carry G-Mode Morph Back through the Door",
338340
"entranceCondition": {
@@ -811,7 +813,7 @@
811813
"clearsObstacles": ["B"]
812814
}
813815
],
814-
"nextStratId": 38,
816+
"nextStratId": 40,
815817
"notables": [
816818
{
817819
"id": 1,

region/crateria/east/West Ocean.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2253,6 +2253,7 @@
22532253
]
22542254
},
22552255
{
2256+
"id": 138,
22562257
"link": [12, 9],
22572258
"name": "Speedy HiJump",
22582259
"requires": [
@@ -2280,6 +2281,7 @@
22802281
"flashSuitChecked": true
22812282
},
22822283
{
2284+
"id": 139,
22832285
"link": [12, 13],
22842286
"name": "Respawning Shot Block Moondance",
22852287
"requires": [
@@ -2763,7 +2765,7 @@
27632765
]
27642766
}
27652767
],
2766-
"nextStratId": 138,
2768+
"nextStratId": 140,
27672769
"notables": [
27682770
{
27692771
"id": 1,

region/lowernorfair/east/Lower Norfair Fireflea Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@
984984
]
985985
},
986986
{
987+
"id": 65,
987988
"link": [5, 7],
988989
"name": "X-Mode Shinespark",
989990
"requires": [
@@ -1095,7 +1096,7 @@
10951096
]
10961097
}
10971098
],
1098-
"nextStratId": 65,
1099+
"nextStratId": 66,
10991100
"notables": [
11001101
{
11011102
"id": 1,

region/lowernorfair/east/Pillar Room.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
]
189189
},
190190
{
191+
"id": 28,
191192
"link": [1, 2],
192193
"name": "Come In With Spark",
193194
"entranceCondition": {
@@ -226,6 +227,7 @@
226227
]
227228
},
228229
{
230+
"id": 29,
229231
"link": [1, 2],
230232
"name": "Come In Shinecharging, Shinespark",
231233
"entranceCondition": {
@@ -267,6 +269,7 @@
267269
]
268270
},
269271
{
272+
"id": 30,
270273
"link": [1, 2],
271274
"name": "Come In Shinecharged, Shinespark",
272275
"entranceCondition": {
@@ -695,6 +698,7 @@
695698
]
696699
},
697700
{
701+
"id": 31,
698702
"link": [2, 1],
699703
"name": "Come In With Spark",
700704
"entranceCondition": {
@@ -742,6 +746,7 @@
742746
]
743747
},
744748
{
749+
"id": 32,
745750
"link": [2, 1],
746751
"name": "Come In Shinecharging, Shinespark",
747752
"entranceCondition": {
@@ -804,6 +809,7 @@
804809
]
805810
},
806811
{
812+
"id": 33,
807813
"link": [2, 1],
808814
"name": "Come In Shinecharged, Shinespark",
809815
"entranceCondition": {
@@ -1196,7 +1202,7 @@
11961202
"flashSuitChecked": true
11971203
}
11981204
],
1199-
"nextStratId": 28,
1205+
"nextStratId": 34,
12001206
"notables": [
12011207
{
12021208
"id": 1,

region/maridia/inner-pink/Crab Shaft.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1140,6 +1140,7 @@
11401140
"flashSuitChecked": true
11411141
},
11421142
{
1143+
"id": 66,
11431144
"link": [3, 4],
11441145
"name": "Fall Into Room",
11451146
"entranceCondition": {
@@ -1155,6 +1156,7 @@
11551156
"requires": []
11561157
},
11571158
{
1159+
"id": 67,
11581160
"link": [4, 3],
11591161
"name": "Base",
11601162
"requires": [
@@ -1171,6 +1173,7 @@
11711173
"flashSuitChecked": true
11721174
},
11731175
{
1176+
"id": 68,
11741177
"link": [4, 3],
11751178
"name": "Crouch Jump",
11761179
"requires": [
@@ -1248,7 +1251,7 @@
12481251
"flashSuitChecked": true
12491252
}
12501253
],
1251-
"nextStratId": 66,
1254+
"nextStratId": 69,
12521255
"notables": [
12531256
{
12541257
"id": 1,

region/maridia/inner-pink/Halfie Climb Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3350,6 +3350,7 @@
33503350
"flashSuitChecked": true
33513351
},
33523352
{
3353+
"id": 174,
33533354
"link": [4, 4],
33543355
"name": "Carry G-Mode Back through the Door",
33553356
"entranceCondition": {
@@ -3370,6 +3371,7 @@
33703371
"flashSuitChecked": true
33713372
},
33723373
{
3374+
"id": 175,
33733375
"link": [4, 4],
33743376
"name": "Carry G-Mode Morph Back through the Door",
33753377
"entranceCondition": {
@@ -3499,7 +3501,7 @@
34993501
]
35003502
}
35013503
],
3502-
"nextStratId": 174,
3504+
"nextStratId": 176,
35033505
"notables": [
35043506
{
35053507
"id": 1,

0 commit comments

Comments
 (0)