Skip to content

Commit ef635da

Browse files
blkerbyblkerby
authored
Merge pull request #2081 from vg-json-data/auto-run-scripts
Run Scripts
2 parents 6534c25 + e300c5a commit ef635da

9 files changed

Lines changed: 46 additions & 39 deletions

File tree

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@
408408
"devNote": "FIXME: With only 2 Power Bombs, this would force the item pickup in direct G-mode."
409409
},
410410
{
411+
"id": 82,
411412
"link": [1, 7],
412413
"name": "Direct G-Mode Morph Blind Movement, Overload PLMs with Item",
413414
"entranceCondition": {
@@ -782,6 +783,7 @@
782783
]
783784
},
784785
{
786+
"id": 83,
785787
"link": [2, 7],
786788
"name": "Direct G-Mode Morph Blind Movement, Overload PLMs with Item",
787789
"entranceCondition": {
@@ -983,6 +985,7 @@
983985
"devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
984986
},
985987
{
988+
"id": 84,
986989
"link": [3, 3],
987990
"name": "Direct G-Mode Morph, Power Bomb the Item, Collect Item and Return",
988991
"entranceCondition": {
@@ -997,7 +1000,7 @@
9971000
"Morph",
9981001
"h_artificialMorphSpringBall"
9991002
]},
1000-
{"ammo": { "type": "PowerBomb", "count": 2}},
1003+
{"ammo": {"type": "PowerBomb", "count": 2}},
10011004
{"or": [
10021005
"canWalljump",
10031006
"SpaceJump",
@@ -1066,6 +1069,7 @@
10661069
"devNote": ["FIXME: It's possible to farm some drops along the way."]
10671070
},
10681071
{
1072+
"id": 85,
10691073
"link": [3, 5],
10701074
"name": "Direct G-Mode Morph, Power Bomb the Item",
10711075
"entranceCondition": {
@@ -1081,7 +1085,7 @@
10811085
"Morph",
10821086
"h_artificialMorphSpringBall"
10831087
]},
1084-
{"ammo": { "type": "PowerBomb", "count": 2}},
1088+
{"ammo": {"type": "PowerBomb", "count": 2}},
10851089
{"or": [
10861090
"canWalljump",
10871091
"SpaceJump",
@@ -1373,6 +1377,7 @@
13731377
"flashSuitChecked": true
13741378
},
13751379
{
1380+
"id": 86,
13761381
"link": [4, 3],
13771382
"name": "G-Mode Morph Through Spikeway",
13781383
"entranceCondition": {
@@ -1385,18 +1390,18 @@
13851390
{"or": [
13861391
{"and": [
13871392
{"tech": "canBombHorizontally"},
1388-
{"ammo": { "type": "PowerBomb", "count": 6}},
1393+
{"ammo": {"type": "PowerBomb", "count": 6}},
13891394
{"or": [
13901395
"canInsaneJump",
1391-
{"ammo": { "type": "PowerBomb", "count": 2}}
1396+
{"ammo": {"type": "PowerBomb", "count": 2}}
13921397
]}
13931398
]},
13941399
{"and": [
13951400
"h_artificialMorphSpringBall",
1396-
{"ammo": { "type": "PowerBomb", "count": 3}},
1401+
{"ammo": {"type": "PowerBomb", "count": 3}},
13971402
{"or": [
13981403
"canInsaneJump",
1399-
{"ammo": { "type": "PowerBomb", "count": 1}}
1404+
{"ammo": {"type": "PowerBomb", "count": 1}}
14001405
]}
14011406
]},
14021407
{"and": [
@@ -1410,6 +1415,7 @@
14101415
"devNote": "G-mode isnt helpful here with real Morph."
14111416
},
14121417
{
1418+
"id": 87,
14131419
"link": [4, 3],
14141420
"name": "Direct G-Mode Morph Through Spikeway, Power Bomb the Item, Collect Item and Return",
14151421
"entranceCondition": {
@@ -1426,10 +1432,10 @@
14261432
]},
14271433
{"or": [
14281434
{"and": [
1429-
{"ammo": { "type": "PowerBomb", "count": 3}},
1435+
{"ammo": {"type": "PowerBomb", "count": 3}},
14301436
{"or": [
14311437
"canInsaneJump",
1432-
{"ammo": { "type": "PowerBomb", "count": 1}}
1438+
{"ammo": {"type": "PowerBomb", "count": 1}}
14331439
]}
14341440
]},
14351441
{"and": [
@@ -1442,7 +1448,7 @@
14421448
]}
14431449
]}
14441450
]},
1445-
{"ammo": { "type": "PowerBomb", "count": 2}},
1451+
{"ammo": {"type": "PowerBomb", "count": 2}},
14461452
{"or": [
14471453
"canWalljump",
14481454
"SpaceJump",
@@ -1562,6 +1568,7 @@
15621568
"devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
15631569
},
15641570
{
1571+
"id": 88,
15651572
"link": [4, 5],
15661573
"name": "G-Mode Morph Through Spikeway, Bomb the Crumble Blocks",
15671574
"entranceCondition": {
@@ -1575,10 +1582,10 @@
15751582
{"or": [
15761583
"canTrickyGMode",
15771584
{"and": [
1578-
{"ammo": { "type": "PowerBomb", "count": 3}},
1585+
{"ammo": {"type": "PowerBomb", "count": 3}},
15791586
{"or": [
15801587
"canInsaneJump",
1581-
{"ammo": { "type": "PowerBomb", "count": 1}}
1588+
{"ammo": {"type": "PowerBomb", "count": 1}}
15821589
]}
15831590
]},
15841591
{"and": [
@@ -1614,6 +1621,7 @@
16141621
"note": "Cross the room while killing the Beetoms, then bomb the bottom of the crumble blocks to overload PLMs and go through."
16151622
},
16161623
{
1624+
"id": 89,
16171625
"link": [4, 5],
16181626
"name": "Direct G-Mode Morph Through Spikeway, Power Bomb the Item",
16191627
"entranceCondition": {
@@ -1628,10 +1636,10 @@
16281636
"h_artificialMorphMovement",
16291637
{"or": [
16301638
{"and": [
1631-
{"ammo": { "type": "PowerBomb", "count": 3}},
1639+
{"ammo": {"type": "PowerBomb", "count": 3}},
16321640
{"or": [
16331641
"canInsaneJump",
1634-
{"ammo": { "type": "PowerBomb", "count": 1}}
1642+
{"ammo": {"type": "PowerBomb", "count": 1}}
16351643
]}
16361644
]},
16371645
{"and": [
@@ -1644,7 +1652,7 @@
16441652
]}
16451653
]}
16461654
]},
1647-
{"ammo": { "type": "PowerBomb", "count": 2}},
1655+
{"ammo": {"type": "PowerBomb", "count": 2}},
16481656
{"or": [
16491657
"canWalljump",
16501658
"SpaceJump",
@@ -2005,7 +2013,7 @@
20052013
]
20062014
}
20072015
],
2008-
"nextStratId": 82,
2016+
"nextStratId": 90,
20092017
"nextNotableId": 8,
20102018
"devNote": ["FIXME: add a strat to take temporary blue from the top to the bottom-right."]
20112019
}

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@
403403
]
404404
},
405405
{
406+
"id": 24,
406407
"link": [1, 2],
407408
"name": "Very Tricky Evade",
408409
"entranceCondition": {
@@ -413,9 +414,7 @@
413414
"canTrickyDodgeEnemies",
414415
"canInsaneJump"
415416
],
416-
"note": [
417-
"Carefully manipulate the Beetoms to avoid all damage."
418-
],
417+
"note": ["Carefully manipulate the Beetoms to avoid all damage."],
419418
"unlocksDoors": [
420419
{"nodeId": 1, "types": ["super"], "requires": []},
421420
{"nodeId": 1, "types": ["missiles", "powerbomb"], "requires": ["never"]}
@@ -503,15 +502,14 @@
503502
]
504503
},
505504
{
505+
"id": 25,
506506
"link": [2, 1],
507507
"name": "Very Tricky Evade",
508508
"requires": [
509509
"canTrickyDodgeEnemies",
510510
"canInsaneJump"
511511
],
512-
"note": [
513-
"Carefully manipulate the Beetoms to avoid all damage."
514-
]
512+
"note": ["Carefully manipulate the Beetoms to avoid all damage."]
515513
}
516514
],
517515
"notables": [
@@ -524,6 +522,6 @@
524522
]
525523
}
526524
],
527-
"nextStratId": 24,
525+
"nextStratId": 26,
528526
"nextNotableId": 2
529527
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@
455455
"clearsObstacles": ["A"]
456456
},
457457
{
458+
"id": 35,
458459
"link": [2, 3],
459460
"name": "Come in Shinecharging, Leave With Temporary Blue",
460461
"entranceCondition": {
@@ -476,9 +477,7 @@
476477
"direction": "right"
477478
}
478479
},
479-
"unlocksDoors": [
480-
{"types": ["ammo"], "requires": []}
481-
],
480+
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
482481
"flashSuitChecked": true,
483482
"note": [
484483
"Unmorph immediately after exiting the tunnel while still descending, to continue chaining temporary blue.",
@@ -738,6 +737,6 @@
738737
]
739738
}
740739
],
741-
"nextStratId": 35,
740+
"nextStratId": 36,
742741
"nextNotableId": 2
743742
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@
486486
{"enemyKill": {
487487
"enemies": [["Yellow Space Pirate (standing)", "Yellow Space Pirate (wall)"]],
488488
"explicitWeapons": ["Super", "Charge+Plasma"]
489-
}}
489+
}}
490490
]},
491491
{"and": [
492492
{"enemyDamage": {
@@ -497,7 +497,7 @@
497497
{"enemyKill": {
498498
"enemies": [["Yellow Space Pirate (standing)", "Yellow Space Pirate (wall)"]],
499499
"explicitWeapons": ["Missile", "Super", "Charge+Plasma"]
500-
}}
500+
}}
501501
]}
502502
]},
503503
{"heatFrames": 1260}

‎region/norfair/east/Bubble Mountain.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3866,6 +3866,7 @@
38663866
]
38673867
},
38683868
{
3869+
"id": 213,
38693870
"link": [8, 9],
38703871
"name": "IBJ",
38713872
"requires": [
@@ -3878,9 +3879,7 @@
38783879
"canJumpIntoIBJ"
38793880
]}
38803881
],
3881-
"note": [
3882-
"Either kill the Ripper, or dodge it by jumping into IBJ."
3883-
]
3882+
"note": ["Either kill the Ripper, or dodge it by jumping into IBJ."]
38843883
},
38853884
{
38863885
"id": 203,
@@ -4209,6 +4208,6 @@
42094208
"note": "A tricky, delayed walljump makes it possible to climb to top right in-room, with nothing."
42104209
}
42114210
],
4212-
"nextStratId": 213,
4211+
"nextStratId": 214,
42134212
"nextNotableId": 4
42144213
}

‎region/norfair/east/Spiky Platforms Tunnel.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@
207207
]
208208
},
209209
{
210+
"id": 26,
210211
"link": [1, 2],
211212
"name": "Bounceball Lava Bath (No runway)",
212213
"requires": [
@@ -409,6 +410,7 @@
409410
"note": ["Perform a bounceball to minimize lava damage.", "Ride the second Tripper."]
410411
},
411412
{
413+
"id": 27,
412414
"link": [2, 1],
413415
"name": "Bounceball Lava Bath (No runway)",
414416
"requires": [
@@ -586,6 +588,6 @@
586588
}
587589
],
588590
"notables": [],
589-
"nextStratId": 26,
591+
"nextStratId": 28,
590592
"nextNotableId": 1
591593
}

‎region/tourian/main/Blue Hopper Room.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@
435435
]
436436
},
437437
{
438+
"id": 44,
438439
"link": [2, 1],
439440
"name": "Come in With Spark (Top Position)",
440441
"entranceCondition": {
@@ -997,7 +998,7 @@
997998
]
998999
}
9991000
],
1000-
"nextStratId": 44,
1001+
"nextStratId": 45,
10011002
"nextNotableId": 6,
10021003
"devNote": [
10031004
"FIXME: This room could use obstacles indicating if each door is free of hoppers, allowing opening the door with missiles or a power bomb.",

‎region/tourian/main/Tourian Escape Room 4.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,14 @@
285285
["Tourian Space Pirate (all)"],
286286
["Tourian Space Pirate (all)"]
287287
],
288-
"explicitWeapons": [
289-
"Missile", "Super", "PowerBomb", "Wave", "Spazer", "Plasma", "ScrewAttack"
290-
]
288+
"explicitWeapons": ["Missile", "Super", "PowerBomb", "Wave", "Spazer", "Plasma", "ScrewAttack"]
291289
}}
292290
]}
293291
],
294292
"note": ["Go up safely by killing the Pirates."]
295293
},
296294
{
295+
"id": 38,
297296
"link": [1, 4],
298297
"name": "Evade Pirates",
299298
"requires": [
@@ -312,6 +311,7 @@
312311
]
313312
},
314313
{
314+
"id": 39,
315315
"link": [1, 4],
316316
"name": "Tank Damage",
317317
"requires": [
@@ -1080,6 +1080,6 @@
10801080
]
10811081
}
10821082
],
1083-
"nextStratId": 38,
1083+
"nextStratId": 40,
10841084
"nextNotableId": 5
10851085
}

‎region/wreckedship/main/Bowling Alley.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@
11231123
"canPartialFloorClip",
11241124
"h_additionalBomb"
11251125
]},
1126-
{"and": [
1126+
{"and": [
11271127
{"or": [
11281128
{"and": [
11291129
{"canShineCharge": {"usedTiles": 35, "openEnd": 1}},

0 commit comments

Comments
 (0)