Skip to content

Commit b423728

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

116 files changed

Lines changed: 583 additions & 1003 deletions

File tree

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: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,7 @@
500500
"name": "Geemer, Skree, and Reo Farm",
501501
"requires": [
502502
"h_ZebesIsAwake",
503-
{"resetRoom": {
504-
"nodes": [1]
505-
}},
503+
{"resetRoom": {"nodes": [1]}},
506504
{"cycleFrames": 400}
507505
],
508506
"resetsObstacles": ["A", "B", "C", "D"],
@@ -903,13 +901,11 @@
903901
"canConsecutiveWalljump",
904902
"SpaceJump"
905903
]},
906-
{"resetRoom": {
907-
"nodes": [2]
908-
}},
904+
{"resetRoom": {"nodes": [2]}},
909905
{"cycleFrames": 1350}
910906
],
911-
"resetsObstacles": ["C", "D"],
912907
"clearsObstacles": ["A", "B"],
908+
"resetsObstacles": ["C", "D"],
913909
"farmCycleDrops": [
914910
{"enemy": "Geemer (blue)", "count": 2},
915911
{"enemy": "Skree", "count": 2},

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,12 @@
108108
"h_ZebesIsAwake",
109109
{"or": [
110110
{"and": [
111-
{"resetRoom": {
112-
"nodes": [1, 2]
113-
}},
111+
{"resetRoom": {"nodes": [1, 2]}},
114112
{"cycleFrames": 150}
115113
]},
116114
{"and": [
117115
"Morph",
118-
{"resetRoom": {
119-
"nodes": [3]
120-
}},
116+
{"resetRoom": {"nodes": [3]}},
121117
{"or": [
122118
{"cycleFrames": 510},
123119
{"and": [

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,7 @@
370370
"requires": [
371371
"h_ZebesIsAwake",
372372
"canPrepareForNextRoom",
373-
{"resetRoom": {
374-
"nodes": [1]
375-
}},
373+
{"resetRoom": {"nodes": [1]}},
376374
{"or": [
377375
{"and": [
378376
"Plasma",
@@ -427,8 +425,8 @@
427425
]}
428426
]}
429427
],
430-
"resetsObstacles": ["A", "B", "D"],
431428
"clearsObstacles": ["C"],
429+
"resetsObstacles": ["A", "B", "D"],
432430
"farmCycleDrops": [{"enemy": "Sidehopper", "count": 3}]
433431
},
434432
{

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,11 @@
132132
"link": [1, 1],
133133
"name": "Zeela Farm",
134134
"requires": [
135-
{"resetRoom": {
136-
"nodes": [1]
137-
}},
135+
{"resetRoom": {"nodes": [1]}},
138136
{"cycleFrames": 120}
139137
],
140-
"farmCycleDrops": [{"enemy": "Zeela", "count": 1}],
141-
"resetsObstacles": ["A"]
138+
"resetsObstacles": ["A"],
139+
"farmCycleDrops": [{"enemy": "Zeela", "count": 1}]
142140
},
143141
{
144142
"id": 2,
@@ -443,9 +441,7 @@
443441
"link": [2, 2],
444442
"name": "Zeela & Sidehopper Farm",
445443
"requires": [
446-
{"resetRoom": {
447-
"nodes": [2]
448-
}},
444+
{"resetRoom": {"nodes": [2]}},
449445
{"cycleFrames": 320},
450446
{"or": [
451447
"canDodgeWhileShooting",
@@ -465,11 +461,11 @@
465461
]}
466462
],
467463
"resetsObstacles": ["A"],
468-
"flashSuitChecked": true,
469464
"farmCycleDrops": [
470465
{"enemy": "Zeela", "count": 2},
471466
{"enemy": "Sm. Sidehopper", "count": 1}
472-
]
467+
],
468+
"flashSuitChecked": true
473469
},
474470
{
475471
"id": 24,

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,7 @@
398398
"canSpringBallJumpMidAir",
399399
"h_crouchJumpDownGrab"
400400
]},
401-
{"resetRoom": {
402-
"nodes": [1]
403-
}}
401+
{"resetRoom": {"nodes": [1]}}
404402
]
405403
}
406404
],
@@ -435,9 +433,7 @@
435433
"canSpringBallJumpMidAir",
436434
"h_crouchJumpDownGrab"
437435
]},
438-
{"resetRoom": {
439-
"nodes": [1]
440-
}}
436+
{"resetRoom": {"nodes": [1]}}
441437
]
442438
}
443439
],
@@ -809,9 +805,7 @@
809805
"link": [2, 2],
810806
"name": "Waver and Sidehopper Farm",
811807
"requires": [
812-
{"resetRoom": {
813-
"nodes": [2]
814-
}},
808+
{"resetRoom": {"nodes": [2]}},
815809
{"or": [
816810
"canWalljump",
817811
"canCrouchJump"
@@ -838,12 +832,12 @@
838832
]}
839833
]}
840834
],
835+
"clearsObstacles": ["A"],
836+
"resetsObstacles": ["B"],
841837
"farmCycleDrops": [
842838
{"enemy": "Waver", "count": 4},
843839
{"enemy": "Sm. Sidehopper", "count": 3}
844840
],
845-
"clearsObstacles": ["A"],
846-
"resetsObstacles": ["B"],
847841
"flashSuitChecked": true
848842
},
849843
{

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,9 +1047,7 @@
10471047
"name": "Zebbo and Beetom Farm",
10481048
"requires": [
10491049
"Morph",
1050-
{"resetRoom": {
1051-
"nodes": [3]
1052-
}},
1050+
{"resetRoom": {"nodes": [3]}},
10531051
{"cycleFrames": 630},
10541052
{"or": [
10551053
{"enemyKill": {
@@ -1068,11 +1066,11 @@
10681066
],
10691067
"clearsObstacles": ["A"],
10701068
"resetsObstacles": ["B"],
1071-
"flashSuitChecked": true,
10721069
"farmCycleDrops": [
10731070
{"enemy": "Beetom", "count": 2},
10741071
{"enemy": "Zebbo", "count": 1}
1075-
]
1072+
],
1073+
"flashSuitChecked": true
10761074
},
10771075
{
10781076
"id": 75,
@@ -1580,9 +1578,7 @@
15801578
"link": [4, 4],
15811579
"name": "Zebbo and Beetom Farm",
15821580
"requires": [
1583-
{"resetRoom": {
1584-
"nodes": [4]
1585-
}},
1581+
{"resetRoom": {"nodes": [4]}},
15861582
{"cycleFrames": 530},
15871583
{"or": [
15881584
{"enemyKill": {
@@ -1600,11 +1596,11 @@
16001596
],
16011597
"clearsObstacles": ["A"],
16021598
"resetsObstacles": ["B"],
1603-
"flashSuitChecked": true,
16041599
"farmCycleDrops": [
16051600
{"enemy": "Beetom", "count": 2},
16061601
{"enemy": "Zebbo", "count": 2}
1607-
]
1602+
],
1603+
"flashSuitChecked": true
16081604
},
16091605
{
16101606
"id": 52,
@@ -1615,8 +1611,8 @@
16151611
{"simpleCycleFrames": 85},
16161612
{"cycleFrames": 30}
16171613
],
1618-
"flashSuitChecked": true,
1619-
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]
1614+
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}],
1615+
"flashSuitChecked": true
16201616
},
16211617
{
16221618
"id": 80,

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@
178178
"link": [1, 1],
179179
"name": "Beetom Farm",
180180
"requires": [
181-
{"resetRoom": {
182-
"nodes": [1, 2]
183-
}},
181+
{"resetRoom": {"nodes": [1, 2]}},
184182
{"or": [
185183
{"and": [
186184
"ScrewAttack",
@@ -207,8 +205,8 @@
207205
]}
208206
],
209207
"clearsObstacles": ["A"],
210-
"flashSuitChecked": true,
211208
"farmCycleDrops": [{"enemy": "Beetom", "count": 4}],
209+
"flashSuitChecked": true,
212210
"note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.",
213211
"devNote": [
214212
"Using an adjacent 2-tile runway doesn't seem workable since heat frames may be too much to maintain energy.",
@@ -312,9 +310,7 @@
312310
"link": [1, 1],
313311
"name": "10 Power Bomb Crystal Flash",
314312
"requires": [
315-
{"resetRoom": {
316-
"nodes": [1, 2]
317-
}},
313+
{"resetRoom": {"nodes": [1, 2]}},
318314
{"or": [
319315
{"obstaclesCleared": ["A"]},
320316
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,11 @@
172172
"requires": [
173173
{"or": [
174174
{"and": [
175-
{"resetRoom": {
176-
"nodes": [1]
177-
}},
175+
{"resetRoom": {"nodes": [1]}},
178176
{"cycleFrames": 630}
179177
]},
180178
{"and": [
181-
{"resetRoom": {
182-
"nodes": [2]
183-
}},
179+
{"resetRoom": {"nodes": [2]}},
184180
{"cycleFrames": 900}
185181
]}
186182
]}
@@ -275,9 +271,7 @@
275271
{"thornHits": 1},
276272
{"or": [
277273
"h_spikeSuitThornHitLeniency",
278-
{"resetRoom": {
279-
"nodes": [1, 2]
280-
}}
274+
{"resetRoom": {"nodes": [1, 2]}}
281275
]},
282276
"canSpikeSuit",
283277
{"shinespark": {"frames": 5, "excessFrames": 5}}

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

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4845,8 +4845,8 @@
48454845
"name": "Cross-Room Spring Ball Bounce",
48464846
"entranceCondition": {
48474847
"comeInWithSpringBallBounce": {
4848-
"movementType": "any",
48494848
"speedBooster": true,
4849+
"movementType": "any",
48504850
"remoteAndLandingMinTiles": [[42, 0]]
48514851
}
48524852
},
@@ -5011,21 +5011,15 @@
50115011
"requires": [
50125012
{"or": [
50135013
{"and": [
5014-
{"resetRoom": {
5015-
"nodes": [2, 3, 4]
5016-
}},
5014+
{"resetRoom": {"nodes": [2, 3, 4]}},
50175015
{"cycleFrames": 660}
50185016
]},
50195017
{"and": [
5020-
{"resetRoom": {
5021-
"nodes": [5, 6]
5022-
}},
5018+
{"resetRoom": {"nodes": [5, 6]}},
50235019
{"cycleFrames": 760}
50245020
]},
50255021
{"and": [
5026-
{"resetRoom": {
5027-
"nodes": [1]
5028-
}},
5022+
{"resetRoom": {"nodes": [1]}},
50295023
{"cycleFrames": 1700}
50305024
]}
50315025
]},
@@ -5048,27 +5042,19 @@
50485042
"ScrewAttack",
50495043
{"or": [
50505044
{"and": [
5051-
{"resetRoom": {
5052-
"nodes": [2, 3]
5053-
}},
5045+
{"resetRoom": {"nodes": [2, 3]}},
50545046
{"cycleFrames": 375}
50555047
]},
50565048
{"and": [
5057-
{"resetRoom": {
5058-
"nodes": [4]
5059-
}},
5049+
{"resetRoom": {"nodes": [4]}},
50605050
{"cycleFrames": 445}
50615051
]},
50625052
{"and": [
5063-
{"resetRoom": {
5064-
"nodes": [5, 6]
5065-
}},
5053+
{"resetRoom": {"nodes": [5, 6]}},
50665054
{"cycleFrames": 600}
50675055
]},
50685056
{"and": [
5069-
{"resetRoom": {
5070-
"nodes": [1]
5071-
}},
5057+
{"resetRoom": {"nodes": [1]}},
50725058
{"cycleFrames": 1530}
50735059
]}
50745060
]}
@@ -5190,15 +5176,11 @@
51905176
"requires": [
51915177
{"or": [
51925178
{"and": [
5193-
{"resetRoom": {
5194-
"nodes": [7]
5195-
}},
5179+
{"resetRoom": {"nodes": [7]}},
51965180
{"cycleFrames": 270}
51975181
]},
51985182
{"and": [
5199-
{"resetRoom": {
5200-
"nodes": [8]
5201-
}},
5183+
{"resetRoom": {"nodes": [8]}},
52025184
{"cycleFrames": 620}
52035185
]}
52045186
]}

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,9 +1519,7 @@
15191519
"link": [3, 3],
15201520
"name": "Sidehopper Farm",
15211521
"requires": [
1522-
{"resetRoom": {
1523-
"nodes": [3]
1524-
}},
1522+
{"resetRoom": {"nodes": [3]}},
15251523
{"or": [
15261524
{"and": [
15271525
"Plasma",
@@ -1541,8 +1539,8 @@
15411539
]}
15421540
]}
15431541
],
1544-
"farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}],
1545-
"resetsObstacles": ["B"]
1542+
"resetsObstacles": ["B"],
1543+
"farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}]
15461544
},
15471545
{
15481546
"id": 65,

0 commit comments

Comments
 (0)