Skip to content

Commit e7d0bd6

Browse files
blkerbygithub-actions[bot]
authored andcommitted
Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter
1 parent 235141d commit e7d0bd6

53 files changed

Lines changed: 292 additions & 217 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,7 @@
888888
"note": "Falling down the shaft and breaking the crumble block does not require Morph."
889889
},
890890
{
891+
"id": 69,
891892
"link": [2, 2],
892893
"name": "Geemer, Skree, and Reo Farm",
893894
"requires": [
@@ -1446,6 +1447,6 @@
14461447
]
14471448
}
14481449
],
1449-
"nextStratId": 69,
1450+
"nextStratId": 70,
14501451
"nextNotableId": 8
14511452
}

region/brinstar/blue/Morph Ball Room.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,15 @@
364364
}
365365
},
366366
{
367+
"id": 73,
367368
"link": [1, 1],
368369
"name": "Sidehopper Farm",
369370
"requires": [
370371
"h_ZebesIsAwake",
371372
"canPrepareForNextRoom",
372-
{"resetRoom": {"nodes": [1]}},
373+
{"resetRoom": {
374+
"nodes": [1]
375+
}},
373376
{"or": [
374377
{"and": [
375378
"Plasma",
@@ -426,9 +429,7 @@
426429
],
427430
"resetsObstacles": ["A", "B", "D"],
428431
"clearsObstacles": ["C"],
429-
"farmCycleDrops": [
430-
{"enemy": "Sidehopper", "count": 3}
431-
]
432+
"farmCycleDrops": [{"enemy": "Sidehopper", "count": 3}]
432433
},
433434
{
434435
"id": 10,
@@ -1401,6 +1402,6 @@
14011402
}
14021403
],
14031404
"notables": [],
1404-
"nextStratId": 73,
1405+
"nextStratId": 74,
14051406
"nextNotableId": 1
14061407
}

region/brinstar/green/Brinstar Pre-Map Room.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,16 @@
128128
"flashSuitChecked": true
129129
},
130130
{
131-
"link": [1, 1],
131+
"id": 27,
132+
"link": [1, 1],
132133
"name": "Zeela Farm",
133134
"requires": [
134-
{"resetRoom": {"nodes": [1]}},
135+
{"resetRoom": {
136+
"nodes": [1]
137+
}},
135138
{"cycleFrames": 120}
136139
],
137-
"farmCycleDrops": [
138-
{"enemy": "Zeela", "count": 1}
139-
],
140+
"farmCycleDrops": [{"enemy": "Zeela", "count": 1}],
140141
"resetsObstacles": ["A"]
141142
},
142143
{
@@ -502,6 +503,6 @@
502503
}
503504
],
504505
"notables": [],
505-
"nextStratId": 27,
506+
"nextStratId": 28,
506507
"nextNotableId": 1
507508
}

region/brinstar/green/Early Supers Room.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,7 @@
274274
"requires": [
275275
{"cycleFrames": 105}
276276
],
277-
"farmCycleDrops": [
278-
{"enemy": "Zeb", "count": 1}
279-
],
277+
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}],
280278
"flashSuitChecked": true
281279
},
282280
{
@@ -806,10 +804,13 @@
806804
}
807805
},
808806
{
807+
"id": 47,
809808
"link": [2, 2],
810809
"name": "Waver and Sidehopper Farm",
811810
"requires": [
812-
{"resetRoom": {"nodes": [2]}},
811+
{"resetRoom": {
812+
"nodes": [2]
813+
}},
813814
{"or": [
814815
"canWalljump",
815816
"canCrouchJump"
@@ -964,6 +965,6 @@
964965
]
965966
}
966967
],
967-
"nextStratId": 47,
968+
"nextStratId": 48,
968969
"nextNotableId": 4
969970
}

region/brinstar/green/Etecoon Energy Tank Room.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,7 @@
966966
]
967967
},
968968
{
969+
"id": 90,
969970
"link": [3, 3],
970971
"name": "X-Mode, Leave Shinecharged",
971972
"requires": [
@@ -985,7 +986,7 @@
985986
"By holding an angle button, it is possible turn around in X-mode without losing dash speed.",
986987
"Arm pumps can be used to get close to the ledge before shinecharging, to leave with more frames remaining."
987988
]
988-
},
989+
},
989990
{
990991
"id": 79,
991992
"link": [3, 3],
@@ -1041,6 +1042,7 @@
10411042
"devNote": "This does not require canRiskPermanentLossOfAccess if Samus returns through the crumble blocks."
10421043
},
10431044
{
1045+
"id": 91,
10441046
"link": [3, 3],
10451047
"name": "Zebbo and Beetom Farm",
10461048
"requires": [
@@ -1613,9 +1615,7 @@
16131615
{"cycleFrames": 115}
16141616
],
16151617
"flashSuitChecked": true,
1616-
"farmCycleDrops": [
1617-
{"enemy": "Zebbo", "count": 1}
1618-
]
1618+
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]
16191619
},
16201620
{
16211621
"id": 80,
@@ -1637,6 +1637,7 @@
16371637
"devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
16381638
},
16391639
{
1640+
"id": 92,
16401641
"link": [4, 4],
16411642
"name": "X-Mode, Leave With Spark",
16421643
"requires": [
@@ -1652,9 +1653,9 @@
16521653
"note": [
16531654
"While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
16541655
"by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
1655-
"a second thorn hit can be avoided."
1656+
"a second thorn hit can be avoided."
16561657
]
1657-
},
1658+
},
16581659
{
16591660
"id": 88,
16601661
"link": [4, 5],
@@ -2101,7 +2102,7 @@
21012102
]
21022103
}
21032104
],
2104-
"nextStratId": 90,
2105+
"nextStratId": 93,
21052106
"nextNotableId": 8,
21062107
"devNote": ["FIXME: add a strat to take temporary blue from the top to the bottom-right."]
21072108
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@
208208
],
209209
"clearsObstacles": ["A"],
210210
"flashSuitChecked": true,
211-
"farmCycleDrops": [
212-
{"enemy": "Beetom", "count": 4}
213-
],
211+
"farmCycleDrops": [{"enemy": "Beetom", "count": 4}],
214212
"note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.",
215213
"devNote": [
216214
"Using an adjacent 2-tile runway doesn't seem workable since heat frames may be too much to maintain energy.",

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,19 +175,17 @@
175175
{"resetRoom": {
176176
"nodes": [1]
177177
}},
178-
{"cycleFrames": 630}
178+
{"cycleFrames": 630}
179179
]},
180180
{"and": [
181-
{"resetRoom": {
181+
{"resetRoom": {
182182
"nodes": [2]
183183
}},
184184
{"cycleFrames": 900}
185185
]}
186186
]}
187187
],
188-
"farmCycleDrops": [
189-
{"enemy": "Fireflea", "count": 5}
190-
],
188+
"farmCycleDrops": [{"enemy": "Fireflea", "count": 5}],
191189
"flashSuitChecked": true
192190
},
193191
{

region/brinstar/green/Green Brinstar Main Shaft.json

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5037,39 +5037,44 @@
50375037
]}
50385038
],
50395039
"resetsObstacles": ["A"],
5040-
"farmCycleDrops": [
5041-
{"enemy": "Zeela", "count": 4}
5042-
],
5040+
"farmCycleDrops": [{"enemy": "Zeela", "count": 4}],
50435041
"flashSuitChecked": true
50445042
},
50455043
{
5044+
"id": 263,
50465045
"link": [12, 12],
50475046
"name": "Ripper Farm",
50485047
"requires": [
50495048
"ScrewAttack",
50505049
{"or": [
50515050
{"and": [
5052-
{"resetRoom": {"nodes": [2, 3]}},
5051+
{"resetRoom": {
5052+
"nodes": [2, 3]
5053+
}},
50535054
{"cycleFrames": 375}
50545055
]},
50555056
{"and": [
5056-
{"resetRoom": {"nodes": [4]}},
5057+
{"resetRoom": {
5058+
"nodes": [4]
5059+
}},
50575060
{"cycleFrames": 445}
50585061
]},
50595062
{"and": [
5060-
{"resetRoom": {"nodes": [5, 6]}},
5063+
{"resetRoom": {
5064+
"nodes": [5, 6]
5065+
}},
50615066
{"cycleFrames": 600}
50625067
]},
50635068
{"and": [
5064-
{"resetRoom": {"nodes": [1]}},
5069+
{"resetRoom": {
5070+
"nodes": [1]
5071+
}},
50655072
{"cycleFrames": 1530}
50665073
]}
50675074
]}
50685075
],
50695076
"resetsObstacles": ["A"],
5070-
"farmCycleDrops": [
5071-
{"enemy": "Ripper 2 (red)", "count": 2}
5072-
]
5077+
"farmCycleDrops": [{"enemy": "Ripper 2 (red)", "count": 2}]
50735078
},
50745079
{
50755080
"id": 229,
@@ -5179,6 +5184,7 @@
51795184
]
51805185
},
51815186
{
5187+
"id": 264,
51825188
"link": [13, 13],
51835189
"name": "Zeela Farm",
51845190
"requires": [
@@ -5198,9 +5204,7 @@
51985204
]}
51995205
],
52005206
"resetsObstacles": ["A"],
5201-
"farmCycleDrops": [
5202-
{"enemy": "Zeela", "count": 1}
5203-
],
5207+
"farmCycleDrops": [{"enemy": "Zeela", "count": 1}],
52045208
"flashSuitChecked": true
52055209
},
52065210
{
@@ -5414,6 +5418,6 @@
54145418
]
54155419
}
54165420
],
5417-
"nextStratId": 263,
5421+
"nextStratId": 265,
54185422
"nextNotableId": 5
54195423
}

region/brinstar/green/Green Hill Zone.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,7 @@
316316
"requires": [
317317
{"cycleFrames": 125}
318318
],
319-
"farmCycleDrops": [
320-
{"enemy": "Geega", "count": 1}
321-
],
319+
"farmCycleDrops": [{"enemy": "Geega", "count": 1}],
322320
"flashSuitChecked": true
323321
},
324322
{
@@ -1458,10 +1456,13 @@
14581456
}
14591457
},
14601458
{
1459+
"id": 84,
14611460
"link": [3, 3],
14621461
"name": "Sidehopper Farm",
14631462
"requires": [
1464-
{"resetRoom": {"nodes": [3]}},
1463+
{"resetRoom": {
1464+
"nodes": [3]
1465+
}},
14651466
{"or": [
14661467
{"and": [
14671468
"Plasma",
@@ -1481,9 +1482,7 @@
14811482
]}
14821483
]}
14831484
],
1484-
"farmCycleDrops": [
1485-
{"enemy": "Sm. Sidehopper", "count": 3}
1486-
],
1485+
"farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}],
14871486
"resetsObstacles": ["B"]
14881487
},
14891488
{
@@ -1685,6 +1684,6 @@
16851684
]
16861685
}
16871686
],
1688-
"nextStratId": 84,
1687+
"nextStratId": 85,
16891688
"nextNotableId": 7
16901689
}

region/brinstar/green/Noob Bridge.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@
339339
"flashSuitChecked": true
340340
},
341341
{
342+
"id": 33,
342343
"link": [2, 2],
343344
"name": "Cacatac and Zeela Farm",
344345
"requires": [
@@ -592,6 +593,6 @@
592593
}
593594
],
594595
"notables": [],
595-
"nextStratId": 33,
596+
"nextStratId": 34,
596597
"nextNotableId": 1
597598
}

0 commit comments

Comments
 (0)