Skip to content

Commit 6ce831e

Browse files
github-actions[bot]blkerby
github-actions[bot]
and
blkerby
authored
Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter (#2230)
Co-authored-by: blkerby <17501370+blkerby@users.noreply.github.com>
1 parent 86b1303 commit 6ce831e

17 files changed

Lines changed: 82 additions & 112 deletions

‎region/crateria/central/Landing Site.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,6 +1380,7 @@
13801380
"note": "Climb up 3 screens."
13811381
},
13821382
{
1383+
"id": 93,
13831384
"link": [4, 3],
13841385
"name": "G-Mode Deep Stuck X-Ray Climb, Ship Refill",
13851386
"entranceCondition": {
@@ -1466,6 +1467,7 @@
14661467
]
14671468
},
14681469
{
1470+
"id": 94,
14691471
"link": [4, 3],
14701472
"name": "Very Deep Stuck X-Ray Climb, Ship Refill",
14711473
"entranceCondition": {
@@ -1935,6 +1937,6 @@
19351937
]
19361938
}
19371939
],
1938-
"nextStratId": 93,
1940+
"nextStratId": 95,
19391941
"nextNotableId": 6
19401942
}

‎region/lowernorfair/east/Amphitheatre.json‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@
620620
}
621621
},
622622
{
623+
"id": 49,
623624
"link": [2, 2],
624625
"name": "Single Pirate Farm",
625626
"requires": [
@@ -637,10 +638,8 @@
637638
]}
638639
]}
639640
],
640-
"farmCycleDrops": [
641-
{"enemy": "Yellow Space Pirate (standing)", "count": 1}
642-
],
643-
"resetsObstacles": ["A"]
641+
"resetsObstacles": ["A"],
642+
"farmCycleDrops": [{"enemy": "Yellow Space Pirate (standing)", "count": 1}]
644643
},
645644
{
646645
"id": 14,
@@ -1299,6 +1298,7 @@
12991298
]
13001299
},
13011300
{
1301+
"id": 50,
13021302
"link": [5, 5],
13031303
"name": "Single Pirate Farm",
13041304
"requires": [
@@ -1342,10 +1342,8 @@
13421342
]}
13431343
]}
13441344
],
1345-
"farmCycleDrops": [
1346-
{"enemy": "Yellow Space Pirate (standing)", "count": 1}
1347-
],
1348-
"clearsObstacles": ["A"]
1345+
"clearsObstacles": ["A"],
1346+
"farmCycleDrops": [{"enemy": "Yellow Space Pirate (standing)", "count": 1}]
13491347
}
13501348
],
13511349
"notables": [
@@ -1367,6 +1365,6 @@
13671365
]
13681366
}
13691367
],
1370-
"nextStratId": 49,
1368+
"nextStratId": 51,
13711369
"nextNotableId": 3
13721370
}

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
],
163163
"strats": [
164164
{
165+
"id": 109,
165166
"link": [1, 1],
166167
"name": "Viola Farm",
167168
"requires": [
@@ -188,13 +189,12 @@
188189
]}
189190
],
190191
"clearsObstacles": ["A"],
191-
"farmCycleDrops": [
192-
{"enemy": "Viola", "count": 2}
193-
],
192+
"farmCycleDrops": [{"enemy": "Viola", "count": 2}],
194193
"flashSuitChecked": true,
195194
"note": "Enter the room standing so the Pirate will shoot and then walk away."
196195
},
197196
{
197+
"id": 110,
198198
"link": [1, 1],
199199
"name": "Pirate Farm",
200200
"requires": [
@@ -2107,6 +2107,7 @@
21072107
"devNote": ["FIXME: An option of killing the Pirate can also be possible."]
21082108
},
21092109
{
2110+
"id": 111,
21102111
"link": [4, 4],
21112112
"name": "Viola Farm",
21122113
"requires": [
@@ -2134,16 +2135,15 @@
21342135
]}
21352136
],
21362137
"clearsObstacles": ["A"],
2137-
"farmCycleDrops": [
2138-
{"enemy": "Viola", "count": 2}
2139-
],
2138+
"farmCycleDrops": [{"enemy": "Viola", "count": 2}],
21402139
"flashSuitChecked": true,
21412140
"note": [
21422141
"Bait the top Pirate back to the left and then each Pirate will be clear of the door for a short time.",
21432142
"Place the Power Bomb on the floor to kill the Violas together."
21442143
]
21452144
},
21462145
{
2146+
"id": 112,
21472147
"link": [4, 4],
21482148
"name": "Pirate Farm",
21492149
"requires": [
@@ -2171,9 +2171,7 @@
21712171
]}
21722172
],
21732173
"resetsObstacles": ["A"],
2174-
"farmCycleDrops": [
2175-
{"enemy": "Yellow Space Pirate (wall)", "count": 1}
2176-
],
2174+
"farmCycleDrops": [{"enemy": "Yellow Space Pirate (wall)", "count": 1}],
21772175
"flashSuitChecked": true,
21782176
"devNote": "FIXME: There are more ways to farm the Pirates."
21792177
},
@@ -2517,12 +2515,11 @@
25172515
{"cycleFrames": 200}
25182516
],
25192517
"resetsObstacles": ["A"],
2520-
"farmCycleDrops": [
2521-
{"enemy": "Viola", "count": 2}
2522-
],
2518+
"farmCycleDrops": [{"enemy": "Viola", "count": 2}],
25232519
"flashSuitChecked": true
25242520
},
25252521
{
2522+
"id": 113,
25262523
"link": [5, 5],
25272524
"name": "Fast Viola Farm",
25282525
"requires": [
@@ -2532,6 +2529,7 @@
25322529
"flashSuitChecked": true
25332530
},
25342531
{
2532+
"id": 114,
25352533
"link": [5, 5],
25362534
"name": "Long Viola Farm",
25372535
"requires": [
@@ -2565,6 +2563,6 @@
25652563
}
25662564
],
25672565
"notables": [],
2568-
"nextStratId": 109,
2566+
"nextStratId": 115,
25692567
"nextNotableId": 1
25702568
}

‎region/lowernorfair/east/Lower Norfair Farming Room.json‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -682,9 +682,7 @@
682682
]}
683683
]}
684684
],
685-
"farmCycleDrops": [
686-
{"enemy": "Zebbo", "count": 2}
687-
],
685+
"farmCycleDrops": [{"enemy": "Zebbo", "count": 2}],
688686
"flashSuitChecked": true
689687
},
690688
{
@@ -712,9 +710,7 @@
712710
{"cycleFrames": 410}
713711
]}
714712
],
715-
"farmCycleDrops": [
716-
{"enemy": "Viola", "count": 5}
717-
],
713+
"farmCycleDrops": [{"enemy": "Viola", "count": 5}],
718714
"flashSuitChecked": true,
719715
"devNote": "Taking damage isn't unlikely, but the Zebbos are here as an Energy farm."
720716
},
@@ -734,6 +730,7 @@
734730
]
735731
},
736732
{
733+
"id": 47,
737734
"link": [3, 3],
738735
"name": "Zebbo Farm",
739736
"requires": [
@@ -745,9 +742,7 @@
745742
{"simpleCycleFrames": 110},
746743
{"cycleFrames": 30}
747744
],
748-
"farmCycleDrops": [
749-
{"enemy": "Zebbo", "count": 2}
750-
]
745+
"farmCycleDrops": [{"enemy": "Zebbo", "count": 2}]
751746
},
752747
{
753748
"id": 24,
@@ -827,9 +822,7 @@
827822
"canFarmWhileShooting",
828823
{"heatFramesWithEnergyDrops": {
829824
"frames": 400,
830-
"drops": [
831-
{"enemy": "Zebbo", "count": 4}
832-
]
825+
"drops": [{"enemy": "Zebbo", "count": 4}]
833826
}},
834827
{"partialRefill": {"type": "PowerBomb", "limit": 4}},
835828
{"heatFrames": 200}
@@ -847,6 +840,6 @@
847840
}
848841
],
849842
"notables": [],
850-
"nextStratId": 47,
843+
"nextStratId": 48,
851844
"nextNotableId": 1
852845
}

‎region/lowernorfair/east/Lower Norfair Fireflea Room.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@
391391
"devNote": "An extra powerbomb can be used but an extra fireflea farm is included in that case."
392392
},
393393
{
394+
"id": 69,
394395
"link": [2, 2],
395396
"name": "Full Fireflea Farm",
396397
"requires": [
@@ -431,11 +432,7 @@
431432
{"and": [
432433
"canFarmWhileShooting",
433434
"canHorizontalDamageBoost",
434-
{"enemyDamage": {
435-
"enemy": "Fireflea",
436-
"type": "contact",
437-
"hits": 2
438-
}},
435+
{"enemyDamage": {"enemy": "Fireflea", "type": "contact", "hits": 2}},
439436
{"or": [
440437
"canPreciseWalljump",
441438
{"and": [
@@ -459,11 +456,10 @@
459456
]}
460457
],
461458
"resetsObstacles": ["A"],
462-
"farmCycleDrops": [
463-
{"enemy": "Fireflea", "count": 5}
464-
]
459+
"farmCycleDrops": [{"enemy": "Fireflea", "count": 5}]
465460
},
466461
{
462+
"id": 70,
467463
"link": [2, 2],
468464
"name": "Small Fireflea Farm",
469465
"requires": [
@@ -509,9 +505,7 @@
509505
]}
510506
],
511507
"resetsObstacles": ["A"],
512-
"farmCycleDrops": [
513-
{"enemy": "Fireflea", "count": 2}
514-
]
508+
"farmCycleDrops": [{"enemy": "Fireflea", "count": 2}]
515509
},
516510
{
517511
"id": 7,
@@ -1403,6 +1397,6 @@
14031397
]
14041398
}
14051399
],
1406-
"nextStratId": 69,
1400+
"nextStratId": 71,
14071401
"nextNotableId": 4
14081402
}

‎region/lowernorfair/east/Lower Norfair Spring Ball Maze.json‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
}
222222
},
223223
{
224+
"id": 88,
224225
"link": [1, 1],
225226
"name": "Single Alcoon Farm",
226227
"requires": [
@@ -252,11 +253,10 @@
252253
],
253254
"clearsObstacles": ["A"],
254255
"resetsObstacles": ["B", "C"],
255-
"farmCycleDrops": [
256-
{"enemy": "Alcoon", "count": 1}
257-
]
256+
"farmCycleDrops": [{"enemy": "Alcoon", "count": 1}]
258257
},
259258
{
259+
"id": 89,
260260
"link": [1, 1],
261261
"name": "Partial Alcoon Farm",
262262
"requires": [
@@ -283,9 +283,7 @@
283283
{"heatFrames": 420}
284284
]}
285285
]},
286-
{"resourceAvailable": [
287-
{"type": "Energy", "count": 50}
288-
]},
286+
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
289287
{"partialRefill": {"type": "PowerBomb", "limit": 1}}
290288
],
291289
"clearsObstacles": ["A"]
@@ -758,6 +756,7 @@
758756
}
759757
},
760758
{
759+
"id": 90,
761760
"link": [3, 3],
762761
"name": "Alcoon Farm",
763762
"requires": [
@@ -799,11 +798,10 @@
799798
]}
800799
],
801800
"resetsObstacles": ["A", "B", "C"],
802-
"farmCycleDrops": [
803-
{"enemy": "Alcoon", "count": 3}
804-
]
801+
"farmCycleDrops": [{"enemy": "Alcoon", "count": 3}]
805802
},
806803
{
804+
"id": 91,
807805
"link": [3, 3],
808806
"name": "Partial Alcoon Farm",
809807
"requires": [
@@ -830,9 +828,7 @@
830828
{"heatFrames": 910}
831829
]}
832830
]},
833-
{"resourceAvailable": [
834-
{"type": "Energy", "count": 50}
835-
]},
831+
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
836832
{"partialRefill": {"type": "PowerBomb", "limit": 3}}
837833
]
838834
},
@@ -1937,6 +1933,6 @@
19371933
"note": "Jump and Morph with a speedball to enter the morph tunnel and then use SpringBall to break the bomb blocks."
19381934
}
19391935
],
1940-
"nextStratId": 88,
1936+
"nextStratId": 92,
19411937
"nextNotableId": 3
19421938
}

‎region/lowernorfair/east/Metal Pirates Room.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -986,9 +986,7 @@
986986
]}
987987
],
988988
"clearsObstacles": ["A"],
989-
"farmCycleDrops": [
990-
{"enemy": "Space Pirate (fighting)", "count": 2}
991-
],
989+
"farmCycleDrops": [{"enemy": "Space Pirate (fighting)", "count": 2}],
992990
"devNote": "FIXME: There are many more beam combinations that could be used."
993991
},
994992
{
@@ -1007,9 +1005,7 @@
10071005
{"cycleFrames": 730}
10081006
],
10091007
"clearsObstacles": ["A"],
1010-
"farmCycleDrops": [
1011-
{"enemy": "Space Pirate (fighting)", "count": 2}
1012-
],
1008+
"farmCycleDrops": [{"enemy": "Space Pirate (fighting)", "count": 2}],
10131009
"note": [
10141010
"Use the Echoes created by shinesparking to defeat the Metal Pirates.",
10151011
"This involves Shineparking into a precise point while also turning the Pirates vulnerable as the echoes reach them."

0 commit comments

Comments
 (0)