Skip to content

Commit 8841750

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

6 files changed

Lines changed: 49 additions & 22 deletions

File tree

region/brinstar/blue/Morph Ball Room.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@
388388
]
389389
},
390390
{
391+
"id": 67,
391392
"link": [1, 1],
392393
"name": "Prepared Kill on Entry, Morph Entry",
393394
"entranceCondition": {
@@ -518,6 +519,7 @@
518519
]
519520
},
520521
{
522+
"id": 68,
521523
"link": [1, 1],
522524
"name": "Mockball Entry, Tank Hit",
523525
"entranceCondition": {
@@ -536,6 +538,7 @@
536538
"note": "Tank a hit or use a pause abuse with a reserve refill."
537539
},
538540
{
541+
"id": 69,
539542
"link": [1, 1],
540543
"name": "Mockball Entry, Quick Kill",
541544
"entranceCondition": {
@@ -800,6 +803,7 @@
800803
]
801804
},
802805
{
806+
"id": 70,
803807
"link": [1, 5],
804808
"name": "Morph Entry, Precise Dodge",
805809
"entranceCondition": {
@@ -819,6 +823,7 @@
819823
]
820824
},
821825
{
826+
"id": 71,
822827
"link": [1, 5],
823828
"name": "Mockball Entry, Precise Dodge",
824829
"entranceCondition": {
@@ -1278,7 +1283,7 @@
12781283
"note": "Place the Power Bomb, then exit g-mode before the bomb goes off."
12791284
}
12801285
],
1281-
"nextStratId": 67,
1286+
"nextStratId": 72,
12821287
"notables": [],
12831288
"nextNotableId": 1
12841289
}

region/crateria/central/Climb.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,36 +2137,44 @@
21372137
]},
21382138
{"or": [
21392139
{"and": [
2140-
{"resetRoom": {"nodes": [1]}},
2140+
{"resetRoom": {
2141+
"nodes": [1]
2142+
}},
21412143
{"cycleFrames": 2350}
21422144
]},
21432145
{"and": [
2144-
{"resetRoom": {"nodes": [2]}},
2146+
{"resetRoom": {
2147+
"nodes": [2]
2148+
}},
21452149
{"or": [
21462150
"h_canUseMorphBombs",
21472151
"ScrewAttack"
21482152
]},
21492153
{"cycleFrames": 2270}
21502154
]},
21512155
{"and": [
2152-
{"resetRoom": {"nodes": [3]}},
2156+
{"resetRoom": {
2157+
"nodes": [3]
2158+
}},
21532159
"h_canUseMorphBombs",
21542160
{"cycleFrames": 2695}
21552161
]},
21562162
{"and": [
2157-
{"resetRoom": {"nodes": [4]}},
2163+
{"resetRoom": {
2164+
"nodes": [4]
2165+
}},
21582166
"h_canUseMorphBombs",
21592167
{"cycleFrames": 2480}
21602168
]},
21612169
{"and": [
2162-
{"resetRoom": {"nodes": [5]}},
2170+
{"resetRoom": {
2171+
"nodes": [5]
2172+
}},
21632173
{"cycleFrames": 1905}
21642174
]}
21652175
]}
21662176
],
2167-
"farmCycleDrops": [
2168-
{"enemy": "Grey Space Pirate (wall)", "count": 11}
2169-
],
2177+
"farmCycleDrops": [{"enemy": "Grey Space Pirate (wall)", "count": 11}],
21702178
"resetsObstacles": ["A", "B"],
21712179
"devNote": [
21722180
"FIXME: Shinesparking can also be a viable option, in case it is patched to not cost energy."

region/crateria/central/Crateria Power Bomb Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
{"and": [
9494
{"or": [
9595
"ScrewAttack",
96-
{"ammo": {"type": "Missile", "count": 3}}
96+
{"ammo": {"type": "Missile", "count": 3}}
9797
]},
9898
{"cycleFrames": 575}
9999
]},

region/crateria/central/Flyway.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@
213213
]}
214214
]}
215215
],
216-
"farmCycleDrops": [
217-
{"enemy": "Mellow", "count": 12}
218-
]
216+
"farmCycleDrops": [{"enemy": "Mellow", "count": 12}]
219217
},
220218
{
221219
"id": 9,

region/crateria/central/Pit Room.json

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,12 @@
420420
"requires": [
421421
"Morph",
422422
"Missile",
423-
{"resetRoom": {"nodes": [1]}},
424-
{"resetRoom": {"nodes": [2]}},
423+
{"resetRoom": {
424+
"nodes": [1]
425+
}},
426+
{"resetRoom": {
427+
"nodes": [2]
428+
}},
425429
{"cycleFrames": 930}
426430
],
427431
"farmCycleDrops": [
@@ -431,14 +435,19 @@
431435
"resetsObstacles": ["A"]
432436
},
433437
{
438+
"id": 29,
434439
"link": [2, 2],
435440
"name": "Space Pirate Farm (Single Door)",
436441
"requires": [
437442
"Morph",
438443
"Missile",
439444
{"or": [
440-
{"resetRoom": {"nodes": [1]}},
441-
{"resetRoom": {"nodes": [2]}}
445+
{"resetRoom": {
446+
"nodes": [1]
447+
}},
448+
{"resetRoom": {
449+
"nodes": [2]
450+
}}
442451
]},
443452
{"cycleFrames": 930}
444453
],
@@ -623,7 +632,7 @@
623632
]
624633
}
625634
],
626-
"nextStratId": 29,
635+
"nextStratId": 30,
627636
"notables": [],
628637
"nextNotableId": 1
629638
}

region/crateria/east/Bowling Alley Path.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,12 @@
230230
"link": [1, 1],
231231
"name": "Waver and Choot Farm (Both Doors)",
232232
"requires": [
233-
{"resetRoom": {"nodes": [1]}},
234-
{"resetRoom": {"nodes": [2]}},
233+
{"resetRoom": {
234+
"nodes": [1]
235+
}},
236+
{"resetRoom": {
237+
"nodes": [2]
238+
}},
235239
{"or": [
236240
{"and": [
237241
"ScrewAttack",
@@ -268,10 +272,13 @@
268272
]
269273
},
270274
{
275+
"id": 43,
271276
"link": [1, 1],
272277
"name": "Waver and Choot Farm (Single Door)",
273278
"requires": [
274-
{"resetRoom": {"nodes": [1, 2]}},
279+
{"resetRoom": {
280+
"nodes": [1, 2]
281+
}},
275282
{"cycleFrames": 100},
276283
{"or": [
277284
{"and": [
@@ -1000,7 +1007,7 @@
10001007
"flashSuitChecked": true
10011008
}
10021009
],
1003-
"nextStratId": 43,
1010+
"nextStratId": 44,
10041011
"notables": [
10051012
{
10061013
"id": 1,

0 commit comments

Comments
 (0)