Skip to content

Commit 2bf7604

Browse files
Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter (#2213)
Co-authored-by: blkerby <17501370+blkerby@users.noreply.github.com>
1 parent dea538b commit 2bf7604

12 files changed

Lines changed: 55 additions & 40 deletions

region/lowernorfair/east/Mickey Mouse Room.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,7 @@
12121212
"clearsObstacles": ["D"]
12131213
},
12141214
{
1215+
"id": 88,
12151216
"link": [4, 6],
12161217
"name": "Cross with Crystal Flash",
12171218
"requires": [
@@ -1220,7 +1221,7 @@
12201221
"h_heatedCrystalFlash",
12211222
{"heatFrames": 120}
12221223
]
1223-
},
1224+
},
12241225
{
12251226
"id": 52,
12261227
"link": [6, 1],
@@ -1868,6 +1869,6 @@
18681869
]
18691870
}
18701871
],
1871-
"nextStratId": 88,
1872+
"nextStratId": 89,
18721873
"nextNotableId": 5
18731874
}

region/lowernorfair/east/Ridley's Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@
850850
"HiJump"
851851
]}
852852
]}
853-
]}
853+
]}
854854
]}
855855
]
856856
},

region/maridia/inner-yellow/Butterfly Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@
726726
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
727727
},
728728
{
729+
"id": 47,
729730
"link": [2, 2],
730731
"name": "Zoa Farm (In Sand, Strong Weapon)",
731732
"requires": [
@@ -754,6 +755,7 @@
754755
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
755756
},
756757
{
758+
"id": 48,
757759
"link": [2, 2],
758760
"name": "Zoa Farm (In Sand, Power Beam)",
759761
"requires": [
@@ -895,6 +897,6 @@
895897
"note": "Repeatedly freeze the Zoas to slowly push Samus into the wall and through the locked doorway."
896898
}
897899
],
898-
"nextStratId": 47,
900+
"nextStratId": 49,
899901
"nextNotableId": 3
900902
}

region/maridia/inner-yellow/Kassiuz Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
"farmCycleDrops": [{"enemy": "Puyo", "count": 2}]
135135
},
136136
{
137+
"id": 27,
137138
"link": [1, 1],
138139
"name": "Puyo and Choot Farm",
139140
"requires": [
@@ -629,6 +630,7 @@
629630
"devNote": "Max extra run speed $0.8"
630631
},
631632
{
633+
"id": 28,
632634
"link": [2, 2],
633635
"name": "Choot Farm",
634636
"requires": [
@@ -687,6 +689,6 @@
687689
]
688690
}
689691
],
690-
"nextStratId": 27,
692+
"nextStratId": 29,
691693
"nextNotableId": 2
692694
}

region/maridia/inner-yellow/Maridia Elevator Room.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
}
239239
},
240240
{
241+
"id": 56,
241242
"link": [1, 1],
242243
"name": "Owtch Farm",
243244
"requires": [
@@ -252,7 +253,7 @@
252253
{"cycleFrames": 470},
253254
{"or": [
254255
"canWalljump",
255-
"SpaceJump"
256+
"SpaceJump"
256257
]}
257258
]},
258259
{"and": [
@@ -1342,14 +1343,15 @@
13421343
"flashSuitChecked": true
13431344
},
13441345
{
1346+
"id": 57,
13451347
"link": [3, 3],
13461348
"name": "Ripper Farm",
13471349
"requires": [
13481350
"ScrewAttack",
13491351
{"or": [
13501352
{"and": [
13511353
{"resetRoom": {"nodes": [1]}},
1352-
{"cycleFrames": 780}
1354+
{"cycleFrames": 780}
13531355
]},
13541356
{"and": [
13551357
{"resetRoom": {"nodes": [2]}},
@@ -1358,7 +1360,7 @@
13581360
{"and": [
13591361
{"resetRoom": {"nodes": [3]}},
13601362
{"cycleFrames": 1560}
1361-
]}
1363+
]}
13621364
]},
13631365
{"or": [
13641366
"canConsecutiveWalljump",
@@ -1368,9 +1370,7 @@
13681370
]}
13691371
]}
13701372
],
1371-
"farmCycleDrops": [
1372-
{"enemy": "Ripper", "count": 6}
1373-
]
1373+
"farmCycleDrops": [{"enemy": "Ripper", "count": 6}]
13741374
},
13751375
{
13761376
"id": 43,
@@ -1415,7 +1415,7 @@
14151415
}
14161416
],
14171417
"notables": [],
1418-
"nextStratId": 56,
1418+
"nextStratId": 58,
14191419
"nextNotableId": 1,
14201420
"devNote": [
14211421
"FIXME: A 2->3 'Come In Shinecharging, Leave Shinecharged' strat is theoretically possible",

region/norfair/east/Rising Tide.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"farmCycleDrops": [{"enemy": "Sova", "count": 4}]
111111
},
112112
{
113+
"id": 38,
113114
"link": [1, 1],
114115
"name": "Dragon and Sova Farm",
115116
"requires": [
@@ -132,7 +133,7 @@
132133
{"cycleFrames": 1440}
133134
]},
134135
{"and": [
135-
"Grapple",
136+
"Grapple",
136137
{"cycleFrames": 1800}
137138
]}
138139
]}
@@ -143,6 +144,7 @@
143144
]
144145
},
145146
{
147+
"id": 39,
146148
"link": [1, 1],
147149
"name": "Squeept Farm",
148150
"requires": [
@@ -766,6 +768,7 @@
766768
}
767769
},
768770
{
771+
"id": 40,
769772
"link": [2, 2],
770773
"name": "Sova Farm",
771774
"requires": [
@@ -794,6 +797,7 @@
794797
"devNote": "Add canTrickyJump for catching the Sovas on their first cycles."
795798
},
796799
{
800+
"id": 41,
797801
"link": [2, 2],
798802
"name": "Dragon and Sova Farm",
799803
"requires": [
@@ -820,7 +824,7 @@
820824
{"cycleFrames": 1230}
821825
]},
822826
{"and": [
823-
"Grapple",
827+
"Grapple",
824828
{"cycleFrames": 1680}
825829
]}
826830
]}
@@ -861,6 +865,6 @@
861865
}
862866
],
863867
"notables": [],
864-
"nextStratId": 38,
868+
"nextStratId": 42,
865869
"nextNotableId": 1
866870
}

region/norfair/east/Single Chamber.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
}
222222
},
223223
{
224+
"id": 97,
224225
"link": [1, 1],
225226
"name": "Single Multiviola Farm",
226227
"requires": [
@@ -234,9 +235,7 @@
234235
{"cycleFrames": 30}
235236
]}
236237
],
237-
"farmCycleDrops": [
238-
{"enemy": "Multiviola", "count": 1}
239-
]
238+
"farmCycleDrops": [{"enemy": "Multiviola", "count": 1}]
240239
},
241240
{
242241
"id": 61,
@@ -713,6 +712,7 @@
713712
}
714713
},
715714
{
715+
"id": 98,
716716
"link": [2, 2],
717717
"name": "Alcoon and Multiviola Farm",
718718
"requires": [
@@ -1410,6 +1410,7 @@
14101410
}
14111411
},
14121412
{
1413+
"id": 99,
14131414
"link": [3, 3],
14141415
"name": "Alcoon and Multiviola Farm",
14151416
"requires": [
@@ -2054,6 +2055,7 @@
20542055
}
20552056
},
20562057
{
2058+
"id": 100,
20572059
"link": [4, 4],
20582060
"name": "Alcoon and Multiviola Farm",
20592061
"requires": [
@@ -2093,6 +2095,7 @@
20932095
]
20942096
},
20952097
{
2098+
"id": 101,
20962099
"link": [4, 4],
20972100
"name": "Single Multiviola Farm",
20982101
"requires": [
@@ -2107,9 +2110,7 @@
21072110
{"cycleFrames": 30}
21082111
]}
21092112
],
2110-
"farmCycleDrops": [
2111-
{"enemy": "Multiviola", "count": 1}
2112-
],
2113+
"farmCycleDrops": [{"enemy": "Multiviola", "count": 1}],
21132114
"note": "Jump and aim down two to three times to activate the Multiviola."
21142115
},
21152116
{
@@ -2356,6 +2357,7 @@
23562357
]
23572358
},
23582359
{
2360+
"id": 102,
23592361
"link": [5, 6],
23602362
"name": "Cross with Crystal Flash (Early Position)",
23612363
"requires": [
@@ -2365,6 +2367,7 @@
23652367
]
23662368
},
23672369
{
2370+
"id": 103,
23682371
"link": [5, 6],
23692372
"name": "Cross with Crystal Flash (Later Position)",
23702373
"requires": [
@@ -2505,6 +2508,6 @@
25052508
}
25062509
],
25072510
"notables": [],
2508-
"nextStratId": 97,
2511+
"nextStratId": 104,
25092512
"nextNotableId": 1
25102513
}

region/norfair/east/Speed Booster Hall.json

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@
154154
]}
155155
]}
156156
],
157-
"farmCycleDrops": [
158-
{"enemy": "Geruta", "count": 3}
159-
],
160-
"resetsObstacles": ["A"]
157+
"resetsObstacles": ["A"],
158+
"farmCycleDrops": [{"enemy": "Geruta", "count": 3}]
161159
},
162160
{
161+
"id": 37,
163162
"link": [1, 1],
164163
"name": "Geruta and Metaree Farm",
165164
"requires": [
@@ -168,11 +167,11 @@
168167
"ScrewAttack",
169168
{"cycleFrames": 1140}
170169
],
170+
"resetsObstacles": ["A"],
171171
"farmCycleDrops": [
172172
{"enemy": "Metaree", "count": 2},
173173
{"enemy": "Geruta", "count": 3}
174-
],
175-
"resetsObstacles": ["A"]
174+
]
176175
},
177176
{
178177
"id": 3,
@@ -317,6 +316,7 @@
317316
"note": "Shoot from the middle of the second set of crumble blocks from the left."
318317
},
319318
{
319+
"id": 38,
320320
"link": [1, 2],
321321
"name": "Double Crystal Flash",
322322
"requires": [
@@ -619,6 +619,7 @@
619619
]
620620
},
621621
{
622+
"id": 39,
622623
"link": [2, 1],
623624
"name": "Double Crystal Flash",
624625
"requires": [
@@ -636,9 +637,7 @@
636637
"Use a Crystal Flash after crossing 4 crumble block bridges,",
637638
"and a second Crystal Flash in the middle of the large ramp in the center of the room."
638639
],
639-
"detailNote": [
640-
"This allows crossing the room without tanks or Speed Booster."
641-
],
640+
"detailNote": ["This allows crossing the room without tanks or Speed Booster."],
642641
"devNote": [
643642
"FIXME: this may not be possible if the lava is rising (with Speed Booster and the flag not yet set)."
644643
]
@@ -840,6 +839,7 @@
840839
}
841840
},
842841
{
842+
"id": 40,
843843
"link": [2, 2],
844844
"name": "Geruta Farm",
845845
"requires": [
@@ -892,10 +892,8 @@
892892
]}
893893
]}
894894
],
895-
"farmCycleDrops": [
896-
{"enemy": "Geruta", "count": 3}
897-
],
898895
"resetsObstacles": ["A"],
896+
"farmCycleDrops": [{"enemy": "Geruta", "count": 3}],
899897
"devNote": "FIXME: The rising lava event may make it impossible to reset at 2."
900898
},
901899
{
@@ -953,6 +951,6 @@
953951
}
954952
],
955953
"notables": [],
956-
"nextStratId": 37,
954+
"nextStratId": 41,
957955
"nextNotableId": 1
958956
}

0 commit comments

Comments
 (0)