Skip to content

Commit 126d473

Browse files
authored
Merge pull request #2027 from vg-json-data/auto-run-scripts
Run Scripts
2 parents 5e90179 + 305feb4 commit 126d473

19 files changed

Lines changed: 105 additions & 36 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@
467467
]
468468
},
469469
{
470+
"id": 51,
470471
"link": [2, 1],
471472
"name": "Come in Shinecharged, Shinespark",
472473
"entranceCondition": {
@@ -834,6 +835,6 @@
834835
}
835836
],
836837
"notables": [],
837-
"nextStratId": 51,
838+
"nextStratId": 52,
838839
"nextNotableId": 1
839840
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4702,6 +4702,7 @@
47024702
"note": "With a runway of at least 12 tiles in the adjacent room, Samus should always be able to jump high enough if she jumps just before hitting the right wall."
47034703
},
47044704
{
4705+
"id": 252,
47054706
"link": [10, 14],
47064707
"name": "Side Platform Cross Room Jump",
47074708
"entranceCondition": {
@@ -5149,6 +5150,6 @@
51495150
]
51505151
}
51515152
],
5152-
"nextStratId": 252,
5153+
"nextStratId": 253,
51535154
"nextNotableId": 5
51545155
}

region/brinstar/green/Green Hill Zone.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@
464464
"devNote": "This is technically possible with 14 tiles but it might require too much precision."
465465
},
466466
{
467+
"id": 80,
467468
"link": [1, 2],
468469
"name": "Side Platform Cross Room Jump",
469470
"entranceCondition": {
@@ -557,7 +558,7 @@
557558
"requires": [],
558559
"note": ["This applies to Metal Pirates Room."],
559560
"detailNote": ["This has a 3-frame window for the jump."]
560-
}
561+
}
561562
]
562563
}
563564
},
@@ -1579,6 +1580,6 @@
15791580
]
15801581
}
15811582
],
1582-
"nextStratId": 80,
1583+
"nextStratId": 81,
15831584
"nextNotableId": 7
15841585
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,7 @@
840840
"devNote": "This requires extra run speed of at least $6.0."
841841
},
842842
{
843+
"id": 87,
843844
"link": [1, 3],
844845
"name": "Side Platform Cross Room Jump",
845846
"entranceCondition": {
@@ -1832,6 +1833,6 @@
18321833
]
18331834
}
18341835
],
1835-
"nextStratId": 87,
1836+
"nextStratId": 88,
18361837
"nextNotableId": 6
18371838
}

region/brinstar/red/Red Tower.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2483,6 +2483,7 @@
24832483
]
24842484
},
24852485
{
2486+
"id": 125,
24862487
"link": [9, 5],
24872488
"name": "HiJump, Space Jump Climb Between the Rippers",
24882489
"requires": [
@@ -2496,6 +2497,7 @@
24962497
]
24972498
},
24982499
{
2500+
"id": 126,
24992501
"link": [9, 5],
25002502
"name": "Bootless Space Jump Climb Between the Rippers",
25012503
"requires": [
@@ -2775,6 +2777,6 @@
27752777
]
27762778
}
27772779
],
2778-
"nextStratId": 125,
2780+
"nextStratId": 127,
27792781
"nextNotableId": 10
27802782
}

region/crateria/east/The Moat.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
]
234234
},
235235
{
236+
"id": 63,
236237
"link": [1, 2],
237238
"name": "Side Platform Cross Room Jump",
238239
"entranceCondition": {
@@ -1235,6 +1236,6 @@
12351236
]
12361237
}
12371238
],
1238-
"nextStratId": 63,
1239+
"nextStratId": 64,
12391240
"nextNotableId": 3
12401241
}

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,7 @@
888888
]
889889
},
890890
{
891+
"id": 96,
891892
"link": [1, 4],
892893
"name": "G-Mode",
893894
"entranceCondition": {
@@ -922,6 +923,7 @@
922923
]
923924
},
924925
{
926+
"id": 97,
925927
"link": [1, 4],
926928
"name": "G-Mode Morph, Power Bomb the Pirate",
927929
"entranceCondition": {
@@ -932,7 +934,7 @@
932934
},
933935
"requires": [
934936
"h_heatedGMode",
935-
{"ammo": { "type": "PowerBomb", "count": 3}},
937+
{"ammo": {"type": "PowerBomb", "count": 3}},
936938
"h_canArtificialMorphIBJ",
937939
"canInsaneJump",
938940
{"heatFrames": 80}
@@ -949,6 +951,7 @@
949951
"devNote": "FIXME: It may be possible to kill the upper pirates in a way where Samus can collect their drops on the path to the door."
950952
},
951953
{
954+
"id": 98,
952955
"link": [1, 4],
953956
"name": "G-Mode Morph, IBJ Pirate Avoid",
954957
"entranceCondition": {
@@ -1009,6 +1012,7 @@
10091012
]
10101013
},
10111014
{
1015+
"id": 99,
10121016
"link": [1, 5],
10131017
"name": "G-Mode Morph, Power Bomb the Blocks",
10141018
"entranceCondition": {
@@ -1255,6 +1259,7 @@
12551259
"flashSuitChecked": true
12561260
},
12571261
{
1262+
"id": 100,
12581263
"link": [2, 5],
12591264
"name": "G-Mode Morph, Power Bomb the Blocks",
12601265
"entranceCondition": {
@@ -1611,6 +1616,7 @@
16111616
"flashSuitChecked": true
16121617
},
16131618
{
1619+
"id": 101,
16141620
"link": [3, 5],
16151621
"name": "G-Mode Morph, Power Bomb the Blocks",
16161622
"entranceCondition": {
@@ -1799,6 +1805,7 @@
17991805
"flashSuitChecked": true
18001806
},
18011807
{
1808+
"id": 102,
18021809
"link": [4, 1],
18031810
"name": "G-Mode",
18041811
"entranceCondition": {
@@ -1814,6 +1821,7 @@
18141821
"note": "Avoid getting hit by one of the pirate's stationary, invisible lasers on G-mode exit."
18151822
},
18161823
{
1824+
"id": 103,
18171825
"link": [4, 1],
18181826
"name": "G-Mode, Pirate Kill, Pause Abuse",
18191827
"entranceCondition": {
@@ -1836,6 +1844,7 @@
18361844
]
18371845
},
18381846
{
1847+
"id": 104,
18391848
"link": [4, 1],
18401849
"name": "G-Mode Morph, Pirate Kill, Pause Abuse",
18411850
"entranceCondition": {
@@ -1846,7 +1855,7 @@
18461855
},
18471856
"requires": [
18481857
"canTrickyGMode",
1849-
{"ammo": {"type": "PowerBomb","count": 3}},
1858+
{"ammo": {"type": "PowerBomb", "count": 3}},
18501859
"h_heatedGModePauseAbuse"
18511860
],
18521861
"flashSuitChecked": true,
@@ -1999,6 +2008,7 @@
19992008
"note": "Fall onto the platform, then wait for the pirate to jump back to the right before returning through the door."
20002009
},
20012010
{
2011+
"id": 105,
20022012
"link": [4, 5],
20032013
"name": "G-Mode Morph, Power Bomb the Blocks",
20042014
"entranceCondition": {
@@ -2284,6 +2294,6 @@
22842294
}
22852295
],
22862296
"notables": [],
2287-
"nextStratId": 96,
2297+
"nextStratId": 106,
22882298
"nextNotableId": 1
22892299
}

region/lowernorfair/east/Metal Pirates Room.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@
323323
]
324324
},
325325
{
326+
"id": 37,
326327
"link": [1, 4],
327328
"name": "G-Mode",
328329
"entranceCondition": {
@@ -582,6 +583,7 @@
582583
]
583584
},
584585
{
586+
"id": 38,
585587
"link": [2, 4],
586588
"name": "G-Mode",
587589
"entranceCondition": {
@@ -970,6 +972,7 @@
970972
]
971973
},
972974
{
975+
"id": 39,
973976
"link": [4, 1],
974977
"name": "G-Mode, Cross the Room",
975978
"requires": [
@@ -978,6 +981,7 @@
978981
]
979982
},
980983
{
984+
"id": 40,
981985
"link": [4, 1],
982986
"name": "G-Mode, Ammo Kill",
983987
"requires": [
@@ -1002,6 +1006,7 @@
10021006
]
10031007
},
10041008
{
1009+
"id": 41,
10051010
"link": [4, 1],
10061011
"name": "G-Mode, Beam Kill",
10071012
"requires": [
@@ -1062,6 +1067,7 @@
10621067
]
10631068
},
10641069
{
1070+
"id": 42,
10651071
"link": [4, 1],
10661072
"name": "G-Mode, Shinespark Kill",
10671073
"requires": [
@@ -1090,6 +1096,7 @@
10901096
]
10911097
},
10921098
{
1099+
"id": 43,
10931100
"link": [4, 2],
10941101
"name": "G-Mode, Cross the Room",
10951102
"requires": [
@@ -1098,6 +1105,7 @@
10981105
]
10991106
},
11001107
{
1108+
"id": 44,
11011109
"link": [4, 2],
11021110
"name": "G-Mode, Ammo Kill",
11031111
"requires": [
@@ -1124,6 +1132,7 @@
11241132
]
11251133
},
11261134
{
1135+
"id": 45,
11271136
"link": [4, 2],
11281137
"name": "G-Mode, Beam Kill",
11291138
"requires": [
@@ -1186,6 +1195,7 @@
11861195
]
11871196
},
11881197
{
1198+
"id": 46,
11891199
"link": [4, 2],
11901200
"name": "G-Mode, Shinespark Kill",
11911201
"requires": [
@@ -1226,7 +1236,7 @@
12261236
]
12271237
}
12281238
],
1229-
"nextStratId": 37,
1239+
"nextStratId": 47,
12301240
"nextNotableId": 2,
12311241
"devNote": "All kill heatframes have been lowered by 250 to adjust for the traversal requirement"
12321242
}

region/lowernorfair/east/Pillar Room.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@
559559
]
560560
},
561561
{
562+
"id": 34,
562563
"link": [1, 2],
563564
"name": "G-Mode, Screw Attack",
564565
"entranceCondition": {
@@ -1201,6 +1202,7 @@
12011202
"bypassesDoorShell": true
12021203
},
12031204
{
1205+
"id": 35,
12041206
"link": [2, 1],
12051207
"name": "G-Mode, Screw Attack",
12061208
"entranceCondition": {
@@ -1232,12 +1234,18 @@
12321234
"unlocksDoors": [
12331235
{
12341236
"types": ["missiles"],
1235-
"requires": [{"heatFrames": 50}, {"acidFrames": 50}]
1237+
"requires": [
1238+
{"heatFrames": 50},
1239+
{"acidFrames": 50}
1240+
]
12361241
},
12371242
{"types": ["super"], "requires": []},
12381243
{
12391244
"types": ["powerbomb"],
1240-
"requires": [{"heatFrames": 110}, {"acidFrames": 110}]
1245+
"requires": [
1246+
{"heatFrames": 110},
1247+
{"acidFrames": 110}
1248+
]
12411249
}
12421250
],
12431251
"flashSuitChecked": true
@@ -1310,6 +1318,6 @@
13101318
]
13111319
}
13121320
],
1313-
"nextStratId": 34,
1321+
"nextStratId": 36,
13141322
"nextNotableId": 3
13151323
}

region/lowernorfair/east/Red Kihunter Shaft.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@
551551
"flashSuitChecked": true
552552
},
553553
{
554+
"id": 84,
554555
"link": [2, 3],
555556
"name": "G-Mode",
556557
"entranceCondition": {
@@ -700,6 +701,7 @@
700701
"bypassesDoorShell": true
701702
},
702703
{
704+
"id": 85,
703705
"link": [3, 2],
704706
"name": "G-Mode",
705707
"entranceCondition": {
@@ -811,6 +813,7 @@
811813
]
812814
},
813815
{
816+
"id": 86,
814817
"link": [3, 5],
815818
"name": "G-Mode",
816819
"entranceCondition": {
@@ -1678,6 +1681,6 @@
16781681
]
16791682
}
16801683
],
1681-
"nextStratId": 84,
1684+
"nextStratId": 87,
16821685
"nextNotableId": 4
16831686
}

0 commit comments

Comments
 (0)