Skip to content

Commit ff51496

Browse files
blkerbyblkerby
authored
Merge pull request #2139 from vg-json-data/auto-run-scripts
Run Scripts
2 parents 484def9 + 6dd4dbb commit ff51496

31 files changed

Lines changed: 209 additions & 173 deletions

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@
323323
]
324324
},
325325
{
326+
"id": 85,
326327
"link": [1, 1],
327328
"name": "Double Geega Farm",
328329
"requires": [
@@ -957,6 +958,7 @@
957958
]
958959
},
959960
{
961+
"id": 86,
960962
"link": [2, 1],
961963
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
962964
"entranceCondition": {
@@ -1307,6 +1309,7 @@
13071309
]
13081310
},
13091311
{
1312+
"id": 87,
13101313
"link": [3, 1],
13111314
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
13121315
"entranceCondition": {
@@ -1740,6 +1743,6 @@
17401743
]
17411744
}
17421745
],
1743-
"nextStratId": 85,
1746+
"nextStratId": 88,
17441747
"nextNotableId": 7
17451748
}

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,13 @@
263263
"flashSuitChecked": true
264264
},
265265
{
266+
"id": 38,
266267
"link": [1, 1],
267268
"name": "Pirate Farm",
268269
"requires": [
269-
{"resetRoom": {"nodes": [1]}},
270+
{"resetRoom": {
271+
"nodes": [1]
272+
}},
270273
{"or": [
271274
{"and": [
272275
"Plasma",
@@ -304,17 +307,22 @@
304307
]}
305308
]}
306309
],
307-
"farmCycleDrops": [
308-
{"enemy": "Green Space Pirate (standing)", "count": 3}
309-
],
310+
"farmCycleDrops": [{"enemy": "Green Space Pirate (standing)", "count": 3}],
310311
"resetsObstacles": ["A"]
311312
},
312313
{
314+
"id": 39,
313315
"link": [1, 1],
314316
"name": "Pirate and Mini-Kraid Farm (Blue Speed)",
315317
"requires": [
316-
{"resetRoom": {"nodes": [1]}},
317-
{"enemyDamage": {"enemy": "Green Space Pirate (standing)", "type": "contact", "hits": 1}},
318+
{"resetRoom": {
319+
"nodes": [1]
320+
}},
321+
{"enemyDamage": {
322+
"enemy": "Green Space Pirate (standing)",
323+
"type": "contact",
324+
"hits": 1
325+
}},
318326
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}},
319327
"canUseIFrames",
320328
"h_getBlueSpeedMaxRunway",
@@ -658,10 +666,13 @@
658666
"bypassesDoorShell": true
659667
},
660668
{
669+
"id": 40,
661670
"link": [2, 2],
662671
"name": "Mini-Kraid Farm",
663672
"requires": [
664-
{"resetRoom": {"nodes": [2]}},
673+
{"resetRoom": {
674+
"nodes": [2]
675+
}},
665676
{"or": [
666677
{"and": [
667678
{"or": [
@@ -694,7 +705,7 @@
694705
"Wave",
695706
"Spazer"
696707
]},
697-
{"and": [
708+
{"and": [
698709
"canDodgeWhileShooting",
699710
{"or": [
700711
"Ice",
@@ -705,9 +716,7 @@
705716
"canTrickyDodgeEnemies"
706717
]}
707718
],
708-
"farmCycleDrops": [
709-
{"enemy": "Mini-Kraid", "count": 1}
710-
],
719+
"farmCycleDrops": [{"enemy": "Mini-Kraid", "count": 1}],
711720
"resetsObstacles": ["A"]
712721
},
713722
{
@@ -917,6 +926,6 @@
917926
}
918927
],
919928
"notables": [],
920-
"nextStratId": 38,
929+
"nextStratId": 41,
921930
"nextNotableId": 1
922931
}

‎region/brinstar/kraid/Warehouse Energy Tank Room.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@
123123
]}
124124
],
125125
"clearsObstacles": ["A"],
126-
"farmCycleDrops": [
127-
{"enemy": "Beetom", "count": 4}
128-
],
126+
"farmCycleDrops": [{"enemy": "Beetom", "count": 4}],
129127
"note": [
130128
"Kill the Beetoms with Screw Attack or using Bombs or Power Bombs,",
131129
"either freezing them or carefully avoiding them to minimize damage."

‎region/brinstar/kraid/Warehouse Kihunter Room.json‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,13 @@
248248
]
249249
},
250250
{
251+
"id": 47,
251252
"link": [1, 1],
252253
"name": "Kihunter Farm",
253254
"requires": [
254-
{"resetRoom": {"nodes": [1]}},
255+
{"resetRoom": {
256+
"nodes": [1]
257+
}},
255258
{"or": [
256259
{"and": [
257260
"ScrewAttack",
@@ -285,9 +288,7 @@
285288
]}
286289
]}
287290
],
288-
"farmCycleDrops": [
289-
{"enemy": "Kihunter (green)", "count": 4}
290-
],
291+
"farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}],
291292
"resetsObstacles": ["A", "B", "D"],
292293
"clearsObstacles": ["C"]
293294
},
@@ -418,10 +419,13 @@
418419
}
419420
},
420421
{
422+
"id": 48,
421423
"link": [2, 2],
422424
"name": "Kihunter Farm",
423425
"requires": [
424-
{"resetRoom": {"nodes": [2]}},
426+
{"resetRoom": {
427+
"nodes": [2]
428+
}},
425429
"canDodgeWhileShooting",
426430
{"or": [
427431
"HiJump",
@@ -460,9 +464,7 @@
460464
]}
461465
]}
462466
],
463-
"farmCycleDrops": [
464-
{"enemy": "Kihunter (green)", "count": 4}
465-
],
467+
"farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}],
466468
"resetsObstacles": ["A", "B"],
467469
"clearsObstacles": ["C", "D"],
468470
"note": [
@@ -579,10 +581,13 @@
579581
]
580582
},
581583
{
584+
"id": 49,
582585
"link": [3, 3],
583586
"name": "Kihunter Farm",
584587
"requires": [
585-
{"resetRoom": {"nodes": [3]}},
588+
{"resetRoom": {
589+
"nodes": [3]
590+
}},
586591
"h_useMorphBombs",
587592
{"or": [
588593
{"and": [
@@ -615,9 +620,7 @@
615620
]}
616621
]}
617622
],
618-
"farmCycleDrops": [
619-
{"enemy": "Kihunter (green)", "count": 4}
620-
],
623+
"farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}],
621624
"resetsObstacles": ["A", "D"],
622625
"clearsObstacles": ["B", "C"]
623626
},
@@ -1009,7 +1012,7 @@
10091012
]
10101013
}
10111014
],
1012-
"nextStratId": 47,
1015+
"nextStratId": 50,
10131016
"nextNotableId": 5,
10141017
"devNote": [
10151018
"FIXME: An ice moonfall might be possible to clip past the bottom left door shell?",

‎region/brinstar/kraid/Warehouse Zeela Room.json‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,21 @@
127127
]},
128128
{"and": [
129129
{"resetRoom": {
130-
"nodes": [2]}
131-
},
130+
"nodes": [2]
131+
}},
132132
{"cycleFrames": 380}
133133
]},
134134
{"and": [
135135
"h_useMorphBombs",
136136
{"resetRoom": {
137-
"nodes": [3]}
138-
},
137+
"nodes": [3]
138+
}},
139139
{"cycleFrames": 900}
140140
]}
141141
]}
142142
],
143143
"resetsObstacles": ["A"],
144-
"farmCycleDrops": [
145-
{"enemy": "Zeela", "count": 3}
146-
]
144+
"farmCycleDrops": [{"enemy": "Zeela", "count": 3}]
147145
},
148146
{
149147
"id": 2,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,7 @@
989989
]
990990
},
991991
{
992+
"id": 60,
992993
"link": [3, 1],
993994
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
994995
"entranceCondition": {
@@ -1204,6 +1205,6 @@
12041205
]
12051206
}
12061207
],
1207-
"nextStratId": 60,
1208+
"nextStratId": 61,
12081209
"nextNotableId": 5
12091210
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,13 @@
301301
}
302302
},
303303
{
304+
"id": 41,
304305
"link": [1, 1],
305306
"name": "Sidehopper Farm",
306307
"requires": [
307-
{"resetRoom": {"nodes": [1]}},
308+
{"resetRoom": {
309+
"nodes": [1]
310+
}},
308311
{"or": [
309312
{"and": [
310313
"ScrewAttack",
@@ -344,9 +347,7 @@
344347
],
345348
"clearsObstacles": ["A"],
346349
"resetsObstacles": ["B"],
347-
"farmCycleDrops": [
348-
{"enemy": "Sidehopper", "count": 2}
349-
]
350+
"farmCycleDrops": [{"enemy": "Sidehopper", "count": 2}]
350351
},
351352
{
352353
"id": 10,
@@ -949,6 +950,6 @@
949950
]
950951
}
951952
],
952-
"nextStratId": 41,
953+
"nextStratId": 42,
953954
"nextNotableId": 6
954955
}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,15 +566,18 @@
566566
"note": "Kill the Sidehoppers with a Power Bomb upon entry."
567567
},
568568
{
569+
"id": 93,
569570
"link": [1, 1],
570571
"name": "Sidehopper Farm",
571572
"requires": [
572573
"canPrepareForNextRoom",
573-
{"resetRoom": {"nodes": [1]}},
574-
{"or":[
574+
{"resetRoom": {
575+
"nodes": [1]
576+
}},
577+
{"or": [
575578
{"and": [
576579
"ScrewAttack",
577-
{"cycleFrames": 130}
580+
{"cycleFrames": 130}
578581
]},
579582
{"and": [
580583
"h_PlasmaHitbox",
@@ -1216,16 +1219,19 @@
12161219
}
12171220
},
12181221
{
1222+
"id": 94,
12191223
"link": [2, 2],
12201224
"name": "Sidehopper Farm",
12211225
"requires": [
12221226
"canWalljump",
12231227
"canTrickyJump",
1224-
{"resetRoom": {"nodes": [2]}},
1228+
{"resetRoom": {
1229+
"nodes": [2]
1230+
}},
12251231
{"or": [
12261232
{"and": [
12271233
"ScrewAttack",
1228-
{"cycleFrames": 600}
1234+
{"cycleFrames": 600}
12291235
]},
12301236
{"and": [
12311237
"Plasma",
@@ -2240,6 +2246,6 @@
22402246
]
22412247
}
22422248
],
2243-
"nextStratId": 93,
2249+
"nextStratId": 95,
22442250
"nextNotableId": 6
22452251
}

‎region/brinstar/pink/Spore Spawn Farming Room.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,17 @@
8383
{"simpleCycleFrames": 85},
8484
{"cycleFrames": 20}
8585
],
86-
"farmCycleDrops": [
87-
{"enemy": "Zeb", "count": 1}
88-
]
86+
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
8987
},
9088
{
89+
"id": 19,
9190
"link": [1, 1],
9291
"name": "Double Zeb Farm",
9392
"requires": [
9493
"canDodgeWhileShooting",
9594
{"cycleFrames": 105}
9695
],
97-
"farmCycleDrops": [
98-
{"enemy": "Zeb", "count": 2}
99-
],
96+
"farmCycleDrops": [{"enemy": "Zeb", "count": 2}],
10097
"note": [
10198
"Jump back and forth between the left two bug pipes to farm them simultaneously."
10299
],
@@ -369,6 +366,6 @@
369366
]
370367
}
371368
],
372-
"nextStratId": 19,
369+
"nextStratId": 20,
373370
"nextNotableId": 2
374371
}

‎region/brinstar/pink/Spore Spawn Super Room.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@
122122
{"simpleCycleFrames": 85},
123123
{"cycleFrames": 20}
124124
],
125-
"farmCycleDrops": [
126-
{"enemy": "Zeb", "count": 1}
127-
]
125+
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
128126
},
129127
{
130128
"id": 2,

0 commit comments

Comments
 (0)