Skip to content

Commit 13610b4

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

20 files changed

Lines changed: 84 additions & 55 deletions

‎region/brinstar/blue/Construction Zone.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@
376376
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
377377
},
378378
{
379+
"id": 53,
379380
"link": [1, 3],
380381
"name": "Ice Moonfall Clip",
381382
"requires": [
@@ -921,6 +922,6 @@
921922
]
922923
}
923924
],
924-
"nextStratId": 53,
925+
"nextStratId": 54,
925926
"nextNotableId": 3
926927
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@
594594
]
595595
},
596596
{
597+
"id": 70,
597598
"link": [1, 4],
598599
"name": "Suitless Bootless Evir Freeze (Left to Center)",
599600
"requires": [
@@ -1118,6 +1119,7 @@
11181119
]
11191120
},
11201121
{
1122+
"id": 71,
11211123
"link": [2, 4],
11221124
"name": "Door Stuck Flatley Jump",
11231125
"entranceCondition": {
@@ -1505,6 +1507,7 @@
15051507
]
15061508
},
15071509
{
1510+
"id": 72,
15081511
"link": [4, 2],
15091512
"name": "Suitless Bootless Evir Climb",
15101513
"requires": [
@@ -1686,9 +1689,9 @@
16861689
"Perform a frame-perfect Flatley jump from inside the door to just barely reach the first pillar.",
16871690
"Use a Power Bomb to make the Evir rise.",
16881691
"Freeze it with Ice to jump across."
1689-
]
1692+
]
16901693
}
16911694
],
1692-
"nextStratId": 70,
1695+
"nextStratId": 73,
16931696
"nextNotableId": 16
16941697
}

‎region/maridia/inner-pink/Aqueduct.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,6 +1305,7 @@
13051305
]
13061306
},
13071307
{
1308+
"id": 184,
13081309
"link": [2, 2],
13091310
"name": "Yard Farm (2 Yards)",
13101311
"requires": [
@@ -2155,6 +2156,7 @@
21552156
}
21562157
},
21572158
{
2159+
"id": 185,
21582160
"link": [5, 5],
21592161
"name": "Yard Farm (1 Yard)",
21602162
"requires": [
@@ -2809,6 +2811,7 @@
28092811
]
28102812
},
28112813
{
2814+
"id": 186,
28122815
"link": [6, 6],
28132816
"name": "Yard Farm (2 Yards)",
28142817
"requires": [
@@ -3685,7 +3688,7 @@
36853688
]
36863689
}
36873690
],
3688-
"nextStratId": 184,
3691+
"nextStratId": 187,
36893692
"nextNotableId": 10,
36903693
"devNote": [
36913694
"FIXME: An obstacle or two could be added to represent the bomb blocks and crumble blocks, and simple 1->9 strats could be added;",

‎region/maridia/inner-pink/Below Botwoon Energy Tank.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"link": [1, 1],
150150
"name": "Zoa Farm",
151151
"requires": [
152-
"h_navigateUnderwater",
152+
"h_navigateUnderwater",
153153
{"or": [
154154
{"and": [
155155
{"or": [

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,6 +1423,7 @@
14231423
"note": "Coming in with zero momentum, all it takes is one non-HiJump full height jump forward, then activate."
14241424
},
14251425
{
1426+
"id": 116,
14261427
"link": [4, 1],
14271428
"name": "Suitless Water Shinecharge, Leave Shinecharged",
14281429
"entranceCondition": {
@@ -1448,6 +1449,7 @@
14481449
]
14491450
},
14501451
{
1452+
"id": 117,
14511453
"link": [4, 1],
14521454
"name": "Suitless Stutter Water Shinecharge, Leave Shinecharged",
14531455
"entranceCondition": {
@@ -1467,6 +1469,7 @@
14671469
]
14681470
},
14691471
{
1472+
"id": 118,
14701473
"link": [4, 1],
14711474
"name": "Precise Suitless Stutter Water Shinecharge, Leave Shinecharged",
14721475
"entranceCondition": {
@@ -2048,19 +2051,19 @@
20482051
"Grapple",
20492052
{"simpleCycleFrames": 105},
20502053
{"cycleFrames": 20}
2051-
]},
2054+
]},
20522055
{"and": [
20532056
{"or": [
20542057
"Plasma",
20552058
"Wave",
20562059
"Spazer"
20572060
]},
20582061
{"simpleCycleFrames": 115},
2059-
{"cycleFrames": 20}
2062+
{"cycleFrames": 20}
20602063
]},
20612064
{"and": [
20622065
{"simpleCycleFrames": 115},
2063-
{"cycleFrames": 30}
2066+
{"cycleFrames": 30}
20642067
]}
20652068
]}
20662069
]},
@@ -2650,6 +2653,6 @@
26502653
]
26512654
}
26522655
],
2653-
"nextStratId": 116,
2656+
"nextStratId": 119,
26542657
"nextNotableId": 4
26552658
}

‎region/maridia/inner-yellow/Plasma Room.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@
534534
"note": "The 4 standing pirates take 2 Pseudo Screws to kill each, so Samus must take 4 hits. No damage is taken when the enemy dies."
535535
},
536536
{
537+
"id": 32,
537538
"link": [2, 3],
538539
"name": "Damage-Avoiding Pseudo-Screw",
539540
"requires": [
@@ -546,7 +547,7 @@
546547
"type": "contact",
547548
"hits": 2
548549
}},
549-
"canBeVeryPatient"
550+
"canBeVeryPatient"
550551
]}
551552
],
552553
"note": [
@@ -675,6 +676,6 @@
675676
]
676677
}
677678
],
678-
"nextStratId": 32,
679+
"nextStratId": 33,
679680
"nextNotableId": 2
680681
}

‎region/maridia/outer/Fish Tank.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@
730730
]
731731
},
732732
{
733+
"id": 130,
733734
"link": [1, 5],
734735
"name": "Jump to the Frozen Fish",
735736
"requires": [
@@ -740,6 +741,7 @@
740741
]
741742
},
742743
{
744+
"id": 131,
743745
"link": [1, 5],
744746
"name": "Tricky Dash Jump",
745747
"requires": [
@@ -2321,6 +2323,7 @@
23212323
"flashSuitChecked": true
23222324
},
23232325
{
2326+
"id": 132,
23242327
"link": [3, 3],
23252328
"name": "Carry G-Mode Back Up, Bomb Into Spring Ball Jump",
23262329
"entranceCondition": {
@@ -3314,7 +3317,7 @@
33143317
]
33153318
}
33163319
],
3317-
"nextStratId": 130,
3320+
"nextStratId": 133,
33183321
"nextNotableId": 9,
33193322
"devNote": [
33203323
"FIXME: node 4 should have 'implicitLeaveNormally'/'implicitUnlocksDoors' false."

‎region/maridia/outer/Maridia Tube.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@
12001200
"flashSuitChecked": true
12011201
},
12021202
{
1203+
"id": 159,
12031204
"link": [2, 1],
12041205
"name": "Carry G-Mode Morph Through Tube, Bomb Into Spring Ball Jump",
12051206
"entranceCondition": {
@@ -1638,6 +1639,7 @@
16381639
"flashSuitChecked": true
16391640
},
16401641
{
1642+
"id": 160,
16411643
"link": [2, 3],
16421644
"name": "Carry G-Mode Morph Through Tube, Bomb Into Spring Ball Jump",
16431645
"entranceCondition": {
@@ -3031,6 +3033,7 @@
30313033
"note": "If the tube is unbroken, this requires a tunnel crawl or unmorph at the top right of the tube in order to clip down through it."
30323034
},
30333035
{
3036+
"id": 161,
30343037
"link": [4, 1],
30353038
"name": "G-Mode Morph, Carry G-Mode Through Tube (Top to Left)",
30363039
"entranceCondition": {
@@ -3152,6 +3155,7 @@
31523155
"note": "If the tube is unbroken, this requires a tunnel crawl or unmorph at the top right of the tube in order to clip down through it."
31533156
},
31543157
{
3158+
"id": 162,
31553159
"link": [4, 3],
31563160
"name": "G-Mode Morph, Carry G-Mode Through Tube (Top to Right)",
31573161
"entranceCondition": {
@@ -3557,6 +3561,6 @@
35573561
]
35583562
}
35593563
],
3560-
"nextStratId": 159,
3564+
"nextStratId": 163,
35613565
"nextNotableId": 5
35623566
}

‎region/maridia/outer/Mt. Everest.json‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,16 +1113,15 @@
11131113
]
11141114
},
11151115
{
1116+
"id": 260,
11161117
"link": [2, 2],
11171118
"name": "Sciser Farm (1 Sciser)",
1118-
"requires": [
1119+
"requires": [
11191120
{"resetRoom": {"nodes": [2]}},
11201121
{"cycleFrames": 900}
11211122
],
11221123
"resetsObstacles": ["A", "B"],
1123-
"farmCycleDrops": [
1124-
{"enemy": "Sciser", "count": 1}
1125-
],
1124+
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}],
11261125
"devNote": [
11271126
"This case is just for if items and tech are not available to kill the first Sciser before it climbs too high."
11281127
]
@@ -1131,7 +1130,7 @@
11311130
"id": 30,
11321131
"link": [2, 2],
11331132
"name": "Sciser Farm (2 Scisers)",
1134-
"requires": [
1133+
"requires": [
11351134
{"resetRoom": {"nodes": [2]}},
11361135
{"or": [
11371136
{"and": [
@@ -1187,9 +1186,7 @@
11871186
]}
11881187
],
11891188
"resetsObstacles": ["A", "B"],
1190-
"farmCycleDrops": [
1191-
{"enemy": "Sciser", "count": 2}
1192-
]
1189+
"farmCycleDrops": [{"enemy": "Sciser", "count": 2}]
11931190
},
11941191
{
11951192
"id": 31,
@@ -2015,14 +2012,15 @@
20152012
}
20162013
},
20172014
{
2015+
"id": 261,
20182016
"link": [3, 3],
20192017
"name": "Sciser Farm (1 Sciser)",
2020-
"requires": [
2018+
"requires": [
20212019
{"resetRoom": {"nodes": [3]}},
20222020
{"or": [
20232021
{"and": [
20242022
"Grapple",
2025-
{"cycleFrames": 90}
2023+
{"cycleFrames": 90}
20262024
]},
20272025
{"and": [
20282026
{"or": [
@@ -2038,10 +2036,10 @@
20382036
{"and": [
20392037
{"or": [
20402038
"Plasma",
2041-
"Wave"
2039+
"Wave"
20422040
]},
20432041
"canDodgeWhileShooting"
2044-
]}
2042+
]}
20452043
]}
20462044
]},
20472045
{"and": [
@@ -2083,9 +2081,7 @@
20832081
]}
20842082
],
20852083
"resetsObstacles": ["A", "B"],
2086-
"farmCycleDrops": [
2087-
{"enemy": "Sciser", "count": 1}
2088-
]
2084+
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}]
20892085
},
20902086
{
20912087
"id": 242,
@@ -3721,9 +3717,10 @@
37213717
"devNote": "This depends on how far the Morph tunnel is expanded, but this is both the minimum distance and the distance Map Rando has expanded."
37223718
},
37233719
{
3720+
"id": 262,
37243721
"link": [6, 6],
37253722
"name": "Sciser Farm (1 Sciser)",
3726-
"requires": [
3723+
"requires": [
37273724
"h_EverestMorphTunnelExpanded",
37283725
"canDodgeWhileShooting",
37293726
{"resetRoom": {"nodes": [6]}},
@@ -3757,9 +3754,7 @@
37573754
]}
37583755
],
37593756
"resetsObstacles": ["A", "B"],
3760-
"farmCycleDrops": [
3761-
{"enemy": "Sciser", "count": 1}
3762-
]
3757+
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}]
37633758
},
37643759
{
37653760
"id": 136,
@@ -4175,7 +4170,7 @@
41754170
{"resetRoom": {"nodes": [2]}},
41764171
{"cycleFrames": 1125},
41774172
{"or": [
4178-
"canWalljump",
4173+
"canWalljump",
41794174
{"and": [
41804175
"canGravityJump",
41814176
{"cycleFrames": 55},
@@ -4235,6 +4230,7 @@
42354230
"devNote": "Other movement options are possible, though slower (e.g. Gravity jump everywhere)."
42364231
},
42374232
{
4233+
"id": 263,
42384234
"link": [7, 7],
42394235
"name": "Sciser Farm (5 Scisers, Gravity)",
42404236
"requires": [
@@ -4302,11 +4298,10 @@
43024298
],
43034299
"resetsObstacles": ["A", "B"],
43044300
"farmCycleDrops": [{"enemy": "Sciser", "count": 5}],
4305-
"devNote": [
4306-
"FIXME: Other, slower options are also possible."
4307-
]
4301+
"devNote": ["FIXME: Other, slower options are also possible."]
43084302
},
43094303
{
4304+
"id": 264,
43104305
"link": [7, 7],
43114306
"name": "Sciser Farm (3 Scisers, Grapple)",
43124307
"requires": [
@@ -5701,7 +5696,7 @@
57015696
]
57025697
}
57035698
],
5704-
"nextStratId": 260,
5699+
"nextStratId": 265,
57055700
"nextNotableId": 11,
57065701
"devNote": [
57075702
"FIXME: A 4->6 grapple teleport is possible, but the wrong-side transition will usually put Samus out-of-bounds. "

0 commit comments

Comments
 (0)