Skip to content

Commit 9dea7c6

Browse files
authored
Merge pull request #1980 from vg-json-data/auto-run-scripts
Run Scripts
2 parents 0186286 + 9f69f6c commit 9dea7c6

21 files changed

Lines changed: 177 additions & 63 deletions

region/brinstar/green/Green Brinstar Fireflea Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
"flashSuitChecked": true
202202
},
203203
{
204+
"id": 14,
204205
"link": [2, 1],
205206
"name": "Grapple Teleport Door Lock Skip",
206207
"entranceCondition": {
@@ -290,6 +291,6 @@
290291
}
291292
],
292293
"notables": [],
293-
"nextStratId": 14,
294+
"nextStratId": 15,
294295
"nextNotableId": 1
295296
}

region/brinstar/kraid/Kraid Eye Door Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,7 @@
779779
"bypassesDoorShell": true
780780
},
781781
{
782+
"id": 44,
782783
"link": [3, 1],
783784
"name": "Carry Grapple Teleport (Upper Middle Position)",
784785
"entranceCondition": {
@@ -916,6 +917,6 @@
916917
}
917918
],
918919
"notables": [],
919-
"nextStratId": 44,
920+
"nextStratId": 45,
920921
"nextNotableId": 1
921922
}

region/lowernorfair/west/Fast Ripper Room.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@
319319
"flashSuitChecked": true
320320
},
321321
{
322+
"id": 28,
322323
"link": [1, 2],
323324
"name": "Indirect G-Mode, Despawn Gate",
324325
"entranceCondition": {
@@ -360,6 +361,7 @@
360361
]
361362
},
362363
{
364+
"id": 29,
363365
"link": [1, 2],
364366
"name": "Indirect G-Mode Morph, Despawn Gate",
365367
"entranceCondition": {
@@ -390,6 +392,7 @@
390392
]
391393
},
392394
{
395+
"id": 30,
393396
"link": [1, 2],
394397
"name": "Indirect G-Mode, Despawn Gate, Open Gate",
395398
"entranceCondition": {
@@ -423,6 +426,7 @@
423426
]
424427
},
425428
{
429+
"id": 31,
426430
"link": [1, 2],
427431
"name": "Indirect G-Mode Morph, Despawn Gate, Open Gate",
428432
"entranceCondition": {
@@ -477,6 +481,7 @@
477481
"note": "The time lost by setting up a few strategic kills is pretty much offset by not having damage recoil."
478482
},
479483
{
484+
"id": 32,
480485
"link": [1, 3],
481486
"name": "Direct G-Mode",
482487
"entranceCondition": {
@@ -505,6 +510,7 @@
505510
]
506511
},
507512
{
513+
"id": 33,
508514
"link": [1, 3],
509515
"name": "Direct G-Mode Morph",
510516
"entranceCondition": {
@@ -528,6 +534,7 @@
528534
]
529535
},
530536
{
537+
"id": 34,
531538
"link": [1, 3],
532539
"name": "Direct G-Mode, Immobile",
533540
"entranceCondition": {
@@ -546,6 +553,7 @@
546553
"note": "This strat just saves one Ripper hit when tanking the Rippers because of the i-frames when taking the hit to regain mobility."
547554
},
548555
{
556+
"id": 35,
549557
"link": [2, 1],
550558
"name": "Indirect G-Mode, Despawn Gate",
551559
"entranceCondition": {
@@ -586,6 +594,7 @@
586594
"devNote": "FIXME: It is possible to cross the room with nothing, but is quite precise. It might need to be a notable strat."
587595
},
588596
{
597+
"id": 36,
589598
"link": [2, 1],
590599
"name": "Indirect G-Mode Morph, Despawn Gate",
591600
"entranceCondition": {
@@ -734,6 +743,7 @@
734743
"devNote": "FIXME: These heatFrames are the worst case scenario, otherwise the entire room would need to be modeled."
735744
},
736745
{
746+
"id": 37,
737747
"link": [2, 2],
738748
"name": "Indirect G-Mode, Despawn Gate, Open Gate",
739749
"entranceCondition": {
@@ -762,6 +772,7 @@
762772
]
763773
},
764774
{
775+
"id": 38,
765776
"link": [2, 2],
766777
"name": "Indirect G-Mode Morph, Despawn Gate, Open Gate",
767778
"entranceCondition": {
@@ -856,6 +867,6 @@
856867
}
857868
],
858869
"notables": [],
859-
"nextStratId": 28,
870+
"nextStratId": 39,
860871
"nextNotableId": 1
861872
}

region/maridia/inner-green/East Sand Hall.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,7 @@
680680
]
681681
},
682682
{
683+
"id": 69,
683684
"link": [2, 1],
684685
"name": "Cross-Room Blue Speed Jump (Right to Left)",
685686
"entranceCondition": {
@@ -1576,6 +1577,6 @@
15761577
]
15771578
}
15781579
],
1579-
"nextStratId": 69,
1580+
"nextStratId": 70,
15801581
"nextNotableId": 13
15811582
}

region/maridia/inner-green/Oasis.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@
574574
"devNote": "This does not have collision oscillation."
575575
},
576576
{
577+
"id": 72,
577578
"link": [1, 3],
578579
"name": "Cross Room Jump Through Top Door (Blue Speed)",
579580
"entranceCondition": {
@@ -1223,6 +1224,7 @@
12231224
"devNote": "This does not have collision oscillation."
12241225
},
12251226
{
1227+
"id": 73,
12261228
"link": [2, 3],
12271229
"name": "Cross Room Jump Through Top Door (Blue Speed)",
12281230
"entranceCondition": {
@@ -1775,9 +1777,9 @@
17751777
"this first turnaround should be done early enough that the turnaround is complete by the time Samus clears the two-tile passage in the middle of the room.",
17761778
"The second momentum conserving turnaround must be done somewhat late, and by switching from holding forward to holding backward one frame later (a perfect 'boomerang').",
17771779
"Shoot open the door, and use a third momentum conserving turnaround on it as it opens."
1778-
]
1780+
]
17791781
}
17801782
],
1781-
"nextStratId": 72,
1783+
"nextStratId": 74,
17821784
"nextNotableId": 3
17831785
}

region/maridia/inner-pink/Draygon's Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,7 @@
883883
]
884884
},
885885
{
886+
"id": 58,
886887
"link": [1, 2],
887888
"name": "Side Platform Cross Room Jump",
888889
"entranceCondition": {
@@ -1219,6 +1220,6 @@
12191220
]
12201221
}
12211222
],
1222-
"nextStratId": 58,
1223+
"nextStratId": 59,
12231224
"nextNotableId": 7
12241225
}

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,7 @@
969969
"devNote": "The rhythm for placing 4 Bombs quickly is the main component of ceiling bomb jumps."
970970
},
971971
{
972+
"id": 190,
972973
"link": [1, 4],
973974
"name": "Side Platform Cross Room Jump",
974975
"entranceCondition": {
@@ -1036,9 +1037,7 @@
10361037
]}
10371038
]}
10381039
],
1039-
"note": [
1040-
"This applies to Statues Hallway."
1041-
],
1040+
"note": ["This applies to Statues Hallway."],
10421041
"devNote": [
10431042
"Using the full runway and single-pixel arm pump, with a momentum-conserving morph",
10441043
"this has a 4-frame window for the jump, and a 2-frame to 4-frame window for the morph (with later jumps giving a larger window for the morph).",
@@ -1064,9 +1063,7 @@
10641063
"Using the full runway, this has a 2-frame window for the jump,",
10651064
"and either a 1-frame window or 2-frame window for the morph, depending on the jump timing (last-frame jump being better)."
10661065
],
1067-
"devNote": [
1068-
"This involves getting extra dash speed $6.0 or $6.1."
1069-
]
1066+
"devNote": ["This involves getting extra dash speed $6.0 or $6.1."]
10701067
},
10711068
{
10721069
"minHeight": 2,
@@ -2367,6 +2364,7 @@
23672364
]
23682365
},
23692366
{
2367+
"id": 191,
23702368
"link": [2, 4],
23712369
"name": "Side Platform Cross Room Jump (Hi-Jump)",
23722370
"entranceCondition": {
@@ -2379,9 +2377,7 @@
23792377
"speedBooster": true,
23802378
"obstructions": [[1, 0]],
23812379
"requires": [],
2382-
"note": [
2383-
"This applies to Dust Torizo Room."
2384-
]
2380+
"note": ["This applies to Dust Torizo Room."]
23852381
},
23862382
{
23872383
"minHeight": 3,
@@ -2393,9 +2389,7 @@
23932389
"canTrickyDashJump",
23942390
"canMomentumConservingTurnaround"
23952391
],
2396-
"note": [
2397-
"This applies to Metal Pirates Room."
2398-
],
2392+
"note": ["This applies to Metal Pirates Room."],
23992393
"devNote": [
24002394
"FIXME: canTrickyDashJump is for difficulty placement; it doesn't really have anything to do with the non-linearity of Speed Booster jump height."
24012395
]
@@ -2446,6 +2440,7 @@
24462440
]
24472441
},
24482442
{
2443+
"id": 192,
24492444
"link": [2, 4],
24502445
"name": "Side Platform Cross Room Jump (Spring Ball Jump)",
24512446
"entranceCondition": {
@@ -2458,19 +2453,15 @@
24582453
"speedBooster": true,
24592454
"obstructions": [[1, 0]],
24602455
"requires": [],
2461-
"note": [
2462-
"This applies to Dust Torizo Room."
2463-
]
2456+
"note": ["This applies to Dust Torizo Room."]
24642457
},
24652458
{
24662459
"minHeight": 3,
24672460
"maxHeight": 3,
24682461
"minTiles": 39.4375,
24692462
"speedBooster": true,
24702463
"obstructions": [[3, 2]],
2471-
"note": [
2472-
"This applies to Metal Pirates Room."
2473-
]
2464+
"note": ["This applies to Metal Pirates Room."]
24742465
},
24752466
{
24762467
"minHeight": 2,
@@ -4156,6 +4147,6 @@
41564147
]
41574148
}
41584149
],
4159-
"nextStratId": 190,
4150+
"nextStratId": 193,
41604151
"nextNotableId": 6
41614152
}

region/maridia/inner-pink/The Precious Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@
514514
"note": "Turn around and break spin to move vertically while near the height of the floating platform."
515515
},
516516
{
517+
"id": 39,
517518
"link": [2, 1],
518519
"name": "Side Platform Cross Room Jump",
519520
"entranceCondition": {
@@ -606,6 +607,7 @@
606607
]
607608
},
608609
{
610+
"id": 40,
609611
"link": [2, 1],
610612
"name": "Side Platform Cross Room Jump, Spring Ball Jump",
611613
"entranceCondition": {
@@ -838,6 +840,6 @@
838840
}
839841
],
840842
"notables": [],
841-
"nextStratId": 39,
843+
"nextStratId": 41,
842844
"nextNotableId": 1
843845
}

region/maridia/inner-pink/West Cactus Alley Room.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@
303303
]
304304
},
305305
{
306+
"id": 53,
306307
"link": [1, 2],
307308
"name": "Side Platform Cross Room Jump",
308309
"entranceCondition": {
@@ -328,9 +329,7 @@
328329
"minTiles": 4,
329330
"speedBooster": false,
330331
"obstructions": [[1, 0]],
331-
"note": [
332-
"This applies to Ridley Tank Room and Dust Torizo Room."
333-
]
332+
"note": ["This applies to Ridley Tank Room and Dust Torizo Room."]
334333
},
335334
{
336335
"minHeight": 3,
@@ -341,9 +340,7 @@
341340
"requires": [
342341
"HiJump"
343342
],
344-
"note": [
345-
"This applies to Big Boy Room and Mickey Mouse Room."
346-
],
343+
"note": ["This applies to Big Boy Room and Mickey Mouse Room."],
347344
"devNote": [
348345
"With a momentum-conserving turnaround, this could be done with shorter runway,",
349346
"but there aren't rooms in the game that it would apply to."
@@ -359,9 +356,7 @@
359356
"HiJump",
360357
"canMomentumConservingMorph"
361358
],
362-
"note": [
363-
"This applies to Metal Pirates Room."
364-
],
359+
"note": ["This applies to Metal Pirates Room."],
365360
"devNote": [
366361
"FIXME: assuming the other room is heated based on its geometry is awkward;",
367362
"consider setting up a more proper way of representing it."
@@ -1103,7 +1098,7 @@
11031098
]
11041099
}
11051100
],
1106-
"nextStratId": 53,
1101+
"nextStratId": 54,
11071102
"nextNotableId": 2,
11081103
"devNote": ["FIXME: add 1->2 leaveWithTemporaryBlue strats."]
11091104
}

region/maridia/inner-yellow/Bug Sand Hole.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@
244244
"flashSuitChecked": true
245245
},
246246
{
247+
"id": 83,
247248
"link": [1, 1],
248249
"name": "Carry G-Mode Back Through",
249250
"entranceCondition": {
@@ -272,6 +273,7 @@
272273
"flashSuitChecked": true
273274
},
274275
{
276+
"id": 84,
275277
"link": [1, 1],
276278
"name": "Carry G-Mode Morph Back Through",
277279
"entranceCondition": {
@@ -1590,6 +1592,6 @@
15901592
]
15911593
}
15921594
],
1593-
"nextStratId": 83,
1595+
"nextStratId": 85,
15941596
"nextNotableId": 4
15951597
}

0 commit comments

Comments
 (0)