Skip to content

Commit 9c0fe6c

Browse files
Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter (#2171)
Co-authored-by: blkerby <17501370+blkerby@users.noreply.github.com>
1 parent 230dfd6 commit 9c0fe6c

14 files changed

Lines changed: 90 additions & 68 deletions

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,7 @@
13211321
"devNote": "The off screen movement is just during an artificial morphed IBJ - the IBJ is long and Samus is covered for most of it."
13221322
},
13231323
{
1324+
"id": 70,
13241325
"link": [5, 2],
13251326
"name": "G-Mode Morph Shoot the Ceiling Block Item",
13261327
"requires": [
@@ -1338,6 +1339,7 @@
13381339
]
13391340
},
13401341
{
1342+
"id": 71,
13411343
"link": [5, 2],
13421344
"name": "G-Mode Morph Power Bomb the Ceiling Block Item",
13431345
"requires": [
@@ -1465,6 +1467,6 @@
14651467
]
14661468
}
14671469
],
1468-
"nextStratId": 70,
1470+
"nextStratId": 72,
14691471
"nextNotableId": 8
14701472
}

region/brinstar/blue/Morph Ball Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@
10111011
]
10121012
},
10131013
{
1014+
"id": 74,
10141015
"link": [1, 5],
10151016
"name": "Indirect G-Mode Morph, Overload PLMs, Power Bomb Wall",
10161017
"entranceCondition": {
@@ -1078,6 +1079,7 @@
10781079
]
10791080
},
10801081
{
1082+
"id": 75,
10811083
"link": [1, 5],
10821084
"name": "Direct G-Mode Morph, Overload PLMs, Power Bomb Wall",
10831085
"entranceCondition": {
@@ -1472,6 +1474,6 @@
14721474
}
14731475
],
14741476
"notables": [],
1475-
"nextStratId": 74,
1477+
"nextStratId": 76,
14761478
"nextNotableId": 1
14771479
}

region/brinstar/red/Red Brinstar Fireflea Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@
531531
]
532532
},
533533
{
534+
"id": 68,
534535
"link": [2, 1],
535536
"name": "X-Ray Access Damage Boost Speedy Jump",
536537
"requires": [
@@ -988,6 +989,7 @@
988989
]
989990
},
990991
{
992+
"id": 69,
991993
"link": [2, 4],
992994
"name": "Damage Boost and Use I-Frames",
993995
"requires": [
@@ -1306,6 +1308,6 @@
13061308
]
13071309
}
13081310
],
1309-
"nextStratId": 68,
1311+
"nextStratId": 70,
13101312
"nextNotableId": 7
13111313
}

region/crateria/central/Climb.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2058,6 +2058,7 @@
20582058
"note": "Starting with a crouch, diagonal shinespark to the top to break the bomb blocks to the morph tunnels on the right."
20592059
},
20602060
{
2061+
"id": 107,
20612062
"link": [6, 3],
20622063
"name": "Behemoth Spark while Farming",
20632064
"requires": [
@@ -2379,6 +2380,6 @@
23792380
]
23802381
}
23812382
],
2382-
"nextStratId": 107,
2383+
"nextStratId": 108,
23832384
"nextNotableId": 7
23842385
}

region/crateria/central/Landing Site.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@
472472
"flashSuitChecked": true
473473
},
474474
{
475+
"id": 92,
475476
"link": [1, 1],
476477
"name": "G-Mode Power Bomb the Blocks",
477478
"entranceCondition": {
@@ -1870,6 +1871,6 @@
18701871
]
18711872
}
18721873
],
1873-
"nextStratId": 92,
1874+
"nextStratId": 93,
18741875
"nextNotableId": 6
18751876
}

region/crateria/east/Crab Maze.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@
345345
]
346346
},
347347
{
348+
"id": 28,
348349
"link": [1, 3],
349350
"name": "G-Mode Morph, Crab Boost",
350351
"entranceCondition": {
@@ -396,6 +397,7 @@
396397
]
397398
},
398399
{
400+
"id": 29,
399401
"link": [2, 1],
400402
"name": "G-Mode Morph, Crab Boost",
401403
"entranceCondition": {
@@ -651,6 +653,6 @@
651653
}
652654
],
653655
"notables": [],
654-
"nextStratId": 28,
656+
"nextStratId": 30,
655657
"nextNotableId": 1
656658
}

region/crateria/east/The Moat.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@
556556
]
557557
},
558558
{
559+
"id": 65,
559560
"link": [1, 2],
560561
"name": "Come in Getting Blue Speed, Leave With Temporary Blue (Spring Ball Bounce)",
561562
"entranceCondition": {
@@ -581,9 +582,7 @@
581582
"Enter with blue speed and bounce on the item pedestal to make it across, then unmorph into temporary blue.",
582583
"If entering at high speed, morph on the left side of the pedestal so that there is enough space to use a controlled Spring Ball bounce."
583584
],
584-
"detailNote": [
585-
"If entering with very low speed, a spring fling can help make it across."
586-
]
585+
"detailNote": ["If entering with very low speed, a spring fling can help make it across."]
587586
},
588587
{
589588
"id": 20,
@@ -1290,6 +1289,6 @@
12901289
]
12911290
}
12921291
],
1293-
"nextStratId": 65,
1292+
"nextStratId": 66,
12941293
"nextNotableId": 4
12951294
}

region/crateria/east/West Ocean.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2494,7 +2494,7 @@
24942494
{"or": [
24952495
{"and": [
24962496
"canUseFrozenEnemies",
2497-
"canPreciseWalljump"
2497+
"canPreciseWalljump"
24982498
]},
24992499
"canTrickyWalljump",
25002500
{"and": [
@@ -3083,6 +3083,7 @@
30833083
"flashSuitChecked": true
30843084
},
30853085
{
3086+
"id": 144,
30863087
"link": [16, 14],
30873088
"name": "Shinespark Through Crumble Blocks, Quick Morph",
30883089
"requires": [
@@ -3276,7 +3277,7 @@
32763277
]
32773278
}
32783279
],
3279-
"nextStratId": 144,
3280+
"nextStratId": 145,
32803281
"nextNotableId": 14,
32813282
"note": "The section between Bowling Alley Path and Bowling Alley is excluded from West Ocean and considered as its own room instead (Homing Geemer Room)"
32823283
}

region/maridia/inner-pink/Botwoon Energy Tank Room.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,7 @@
12591259
]
12601260
},
12611261
{
1262+
"id": 114,
12621263
"link": [1, 6],
12631264
"name": "G-Mode Overload PLMs, Speed Block X-Ray Climb",
12641265
"entranceCondition": {
@@ -2215,6 +2216,7 @@
22152216
]
22162217
},
22172218
{
2219+
"id": 115,
22182220
"link": [4, 6],
22192221
"name": "G-Mode Overload PLMs, Speed Block X-Ray Climb",
22202222
"entranceCondition": {
@@ -2498,6 +2500,6 @@
24982500
]
24992501
}
25002502
],
2501-
"nextStratId": 114,
2503+
"nextStratId": 116,
25022504
"nextNotableId": 4
25032505
}

region/maridia/outer/Fish Tank.json

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@
354354
]
355355
},
356356
{
357+
"id": 127,
357358
"link": [1, 1],
358359
"name": "Skultera Farm (Single Skultera)",
359360
"requires": [
@@ -362,27 +363,27 @@
362363
{"and": [
363364
"Gravity",
364365
{"or": [
365-
{"and": [
366-
"Plasma",
367-
{"cycleFrames": 140}
368-
]},
369-
{"and": [
370-
"ScrewAttack",
371-
{"cycleFrames": 170}
372-
]},
373-
{"and": [
374-
"Wave",
375-
{"cycleFrames": 190}
376-
]},
377-
{"and": [
378-
"Spazer",
379-
{"cycleFrames": 210}
380-
]},
381-
{"and": [
382-
"Ice",
383-
{"cycleFrames": 290}
384-
]},
385-
{"cycleFrames": 390}
366+
{"and": [
367+
"Plasma",
368+
{"cycleFrames": 140}
369+
]},
370+
{"and": [
371+
"ScrewAttack",
372+
{"cycleFrames": 170}
373+
]},
374+
{"and": [
375+
"Wave",
376+
{"cycleFrames": 190}
377+
]},
378+
{"and": [
379+
"Spazer",
380+
{"cycleFrames": 210}
381+
]},
382+
{"and": [
383+
"Ice",
384+
{"cycleFrames": 290}
385+
]},
386+
{"cycleFrames": 390}
386387
]}
387388
]},
388389
{"and": [
@@ -406,9 +407,7 @@
406407
]}
407408
]}
408409
],
409-
"farmCycleDrops": [
410-
{"enemy": "Skultera", "count": 1}
411-
]
410+
"farmCycleDrops": [{"enemy": "Skultera", "count": 1}]
412411
},
413412
{
414413
"id": 7,
@@ -1419,16 +1418,15 @@
14191418
}
14201419
},
14211420
{
1421+
"id": 128,
14221422
"link": [2, 2],
14231423
"name": "Pirate Farm (Single Pirate)",
14241424
"requires": [
14251425
{"resetRoom": {"nodes": [2]}},
14261426
{"cycleFrames": 630},
14271427
"Plasma"
14281428
],
1429-
"farmCycleDrops": [
1430-
{"enemy": "Pink Space Pirate (standing)", "count": 1}
1431-
],
1429+
"farmCycleDrops": [{"enemy": "Pink Space Pirate (standing)", "count": 1}],
14321430
"devNote": [
14331431
"This is for farming suitless.",
14341432
"If Gravity is available, it is instead worthwhile to farm all the Pirates in the room."
@@ -2915,6 +2913,7 @@
29152913
]
29162914
},
29172915
{
2916+
"id": 129,
29182917
"link": [6, 6],
29192918
"name": "Skultera Farm (All Skulteras)",
29202919
"requires": [
@@ -2957,13 +2956,11 @@
29572956
{"cycleFrames": 1685}
29582957
]}
29592958
],
2960-
"farmCycleDrops": [
2961-
{"enemy": "Skultera", "count": 4}
2962-
],
2959+
"farmCycleDrops": [{"enemy": "Skultera", "count": 4}],
29632960
"devNote": [
29642961
"Farming Skulteras with Plasma or Screw Attack is included for completeness,",
29652962
"though with these items it would be better to farm the Pirates.",
2966-
"FIXME: there are other, slower ways to farm here, e.g. without Gravity."
2963+
"FIXME: there are other, slower ways to farm here, e.g. without Gravity."
29672964
]
29682965
},
29692966
{
@@ -3004,12 +3001,8 @@
30043001
]}
30053002
]}
30063003
],
3007-
"farmCycleDrops": [
3008-
{"enemy": "Pink Space Pirate (standing)", "count": 4}
3009-
],
3010-
"devNote": [
3011-
"FIXME: there are other, slower ways to farm here, e.g. without Gravity."
3012-
]
3004+
"farmCycleDrops": [{"enemy": "Pink Space Pirate (standing)", "count": 4}],
3005+
"devNote": ["FIXME: there are other, slower ways to farm here, e.g. without Gravity."]
30133006
},
30143007
{
30153008
"id": 75,
@@ -3277,7 +3270,7 @@
32773270
]
32783271
}
32793272
],
3280-
"nextStratId": 127,
3273+
"nextStratId": 130,
32813274
"nextNotableId": 9,
32823275
"devNote": [
32833276
"FIXME: node 4 should have 'implicitLeaveNormally'/'implicitUnlocksDoors' false."

0 commit comments

Comments
 (0)