Skip to content

Commit baba4b0

Browse files
github-actions[bot]github-actions[bot]
authored
Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter (#2407)
1 parent bac89f5 commit baba4b0

26 files changed

Lines changed: 322 additions & 196 deletions

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,7 @@
972972
"devNote": "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required."
973973
},
974974
{
975+
"id": 101,
975976
"link": [3, 2],
976977
"name": "Come in Shinecharged - Gain Blue Suit (X-Mode Super Jump)",
977978
"entranceCondition": {
@@ -985,8 +986,9 @@
985986
"canXModeBlueSuit"
986987
],
987988
"flashSuitChecked": true
988-
},
989+
},
989990
{
991+
"id": 102,
990992
"link": [3, 2],
991993
"name": "Gain Blue Suit (Double X-Mode Super Jump)",
992994
"requires": [
@@ -1061,6 +1063,7 @@
10611063
]
10621064
},
10631065
{
1066+
"id": 103,
10641067
"link": [3, 3],
10651068
"name": "Gain Flash Suit (X-Mode Spikesuit)",
10661069
"requires": [
@@ -1070,6 +1073,7 @@
10701073
"flashSuitChecked": true
10711074
},
10721075
{
1076+
"id": 104,
10731077
"link": [3, 3],
10741078
"name": "Come in Shinecharged - Gain Blue Suit (X-Mode)",
10751079
"entranceCondition": {
@@ -1080,8 +1084,9 @@
10801084
"h_thornXModeBlueSuit"
10811085
],
10821086
"flashSuitChecked": true
1083-
},
1087+
},
10841088
{
1089+
"id": 105,
10851090
"link": [3, 3],
10861091
"name": "Gain Blue Suit (Double X-Mode)",
10871092
"requires": [
@@ -1814,6 +1819,7 @@
18141819
]
18151820
},
18161821
{
1822+
"id": 106,
18171823
"link": [4, 4],
18181824
"name": "Come in Shinecharged - Gain Blue Suit (X-Mode)",
18191825
"entranceCondition": {
@@ -1824,7 +1830,7 @@
18241830
"h_thornXModeBlueSuit"
18251831
],
18261832
"flashSuitChecked": true
1827-
},
1833+
},
18281834
{
18291835
"id": 88,
18301836
"link": [4, 5],
@@ -2331,7 +2337,7 @@
23312337
]
23322338
}
23332339
],
2334-
"nextStratId": 101,
2340+
"nextStratId": 107,
23352341
"nextNotableId": 8,
23362342
"devNote": ["FIXME: add a strat to take temporary blue from the top to the bottom-right."]
23372343
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@
357357
]
358358
},
359359
{
360+
"id": 17,
360361
"link": [2, 2],
361362
"name": "Gain Blue Suit (X-Mode)",
362363
"requires": [
@@ -389,6 +390,6 @@
389390
}
390391
],
391392
"notables": [],
392-
"nextStratId": 17,
393+
"nextStratId": 18,
393394
"nextNotableId": 1
394395
}

‎region/brinstar/green/Spore Spawn Kihunter Room.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
],
9595
"strats": [
9696
{
97+
"id": 24,
9798
"link": [1, 1],
9899
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
99100
"entranceCondition": {
@@ -358,6 +359,7 @@
358359
"flashSuitChecked": true
359360
},
360361
{
362+
"id": 25,
361363
"link": [2, 2],
362364
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
363365
"entranceCondition": {
@@ -582,6 +584,6 @@
582584
]
583585
}
584586
],
585-
"nextStratId": 24,
587+
"nextStratId": 26,
586588
"nextNotableId": 2
587589
}

‎region/brinstar/kraid/Baby Kraid Room.json‎

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -164,62 +164,50 @@
164164
]
165165
},
166166
{
167+
"id": 41,
167168
"link": [1, 1],
168169
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
169170
"entranceCondition": {
170171
"comeInWithRMode": {}
171172
},
172173
"requires": [
173-
{"or":[
174+
{"or": [
174175
"canTrickyJump",
175-
{"and":[
176+
{"and": [
176177
"canCarefulJump",
177178
{"enemyKill": {
178-
"enemies": [
179-
[
180-
"Green Space Pirate (standing)",
181-
"Green Space Pirate (standing)"
182-
]
183-
],
179+
"enemies": [["Green Space Pirate (standing)", "Green Space Pirate (standing)"]],
184180
"explicitWeapons": ["Missile", "Super", "Plasma"]
185181
}}
186182
]},
187-
{"and":[
183+
{"and": [
188184
"canDodgeWhileShooting",
189185
{"enemyKill": {
190-
"enemies": [
191-
[
192-
"Green Space Pirate (standing)",
193-
"Green Space Pirate (standing)"
194-
]
195-
],
186+
"enemies": [["Green Space Pirate (standing)", "Green Space Pirate (standing)"]],
196187
"excludedWeapons": ["Bombs", "PowerBomb"]
197188
}}
198189
]},
199190
"ScrewAttack"
200191
]},
201-
{"or":[
192+
{"or": [
202193
{"getBlueSpeed": {"usedTiles": 29, "openEnd": 2}},
203194
"ScrewAttack",
204-
{"and":[
205-
{"or":[
195+
{"and": [
196+
{"or": [
206197
"canDodgeWhileShooting",
207-
{"enemyDamage": { "enemy": "Mini-Kraid", "type": "spike", "hits": 1 } }
198+
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}}
208199
]},
209-
{"or":[
200+
{"or": [
210201
{"enemyKill": {
211-
"enemies": [ [ "Mini-Kraid" ] ],
212-
"excludedWeapons": [ "PowerBeam", "Ice", "Wave", "Spazer", "Bombs", "Charge" ]
213-
}
214-
},
202+
"enemies": [["Mini-Kraid"]],
203+
"excludedWeapons": ["PowerBeam", "Ice", "Wave", "Spazer", "Bombs", "Charge"]
204+
}},
215205
{"and": [
216-
{"enemyKill": {
217-
"enemies": [ [ "Mini-Kraid" ] ]
218-
}
219-
},
220-
{"enemyDamage": { "enemy": "Mini-Kraid", "type": "spike", "hits": 3 }}
221-
]
222-
}
206+
{"enemyKill": {
207+
"enemies": [["Mini-Kraid"]]
208+
}},
209+
{"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 3}}
210+
]}
223211
]}
224212
]}
225213
]},
@@ -603,13 +591,14 @@
603591
"devNote": "FIXME: Power Bombs only sometimes work on mini kraid. It was mentioned that it may require moving left while the PB explodes. This should be tested and applied to the logic."
604592
},
605593
{
594+
"id": 42,
606595
"link": [2, 1],
607596
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
608597
"entranceCondition": {
609598
"comeInWithRMode": {}
610599
},
611600
"requires": [
612-
{"or":[
601+
{"or": [
613602
{"enemyKill": {
614603
"enemies": [["Mini-Kraid"]],
615604
"excludedWeapons": ["PowerBeam", "Ice", "Wave", "Spazer", "Bombs", "Charge"]
@@ -1093,6 +1082,6 @@
10931082
}
10941083
],
10951084
"notables": [],
1096-
"nextStratId": 41,
1085+
"nextStratId": 43,
10971086
"nextNotableId": 1
10981087
}

‎region/brinstar/kraid/Kraid Eye Door Room.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
"flashSuitChecked": true
152152
},
153153
{
154+
"id": 62,
154155
"link": [1, 1],
155156
"name": "X-Mode - R-Mode Spark Interrupt (Gain Blue Suit)",
156157
"entranceCondition": {
@@ -665,6 +666,7 @@
665666
"flashSuitChecked": true
666667
},
667668
{
669+
"id": 63,
668670
"link": [2, 1],
669671
"name": "X-Mode - R-Mode Spark Interrupt (Gain Blue Suit)",
670672
"entranceCondition": {
@@ -680,9 +682,7 @@
680682
],
681683
"flashSuitChecked": true,
682684
"blueSuitChecked": true,
683-
"note": [
684-
"Use thorns for Spike X-Mode and gain shinecharge."
685-
]
685+
"note": ["Use thorns for Spike X-Mode and gain shinecharge."]
686686
},
687687
{
688688
"id": 21,
@@ -950,6 +950,7 @@
950950
]
951951
},
952952
{
953+
"id": 64,
953954
"link": [3, 1],
954955
"name": "X-Mode - R-Mode Spark Interrupt (Gain Blue Suit)",
955956
"entranceCondition": {
@@ -965,9 +966,7 @@
965966
],
966967
"flashSuitChecked": true,
967968
"blueSuitChecked": true,
968-
"note": [
969-
"Use thorns for Spike X-Mode and gain shinecharge."
970-
]
969+
"note": ["Use thorns for Spike X-Mode and gain shinecharge."]
971970
},
972971
{
973972
"id": 32,
@@ -1400,6 +1399,6 @@
14001399
}
14011400
],
14021401
"notables": [],
1403-
"nextStratId": 62,
1402+
"nextStratId": 65,
14041403
"nextNotableId": 1
14051404
}

‎region/brinstar/kraid/Kraid Room.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
"flashSuitChecked": true
255255
},
256256
{
257+
"id": 36,
257258
"link": [1, 1],
258259
"name": "X-Mode + Crystal Flash (Kraid Alive) - R-Mode Spark Interrupt (Gain Blue Suit)",
259260
"entranceCondition": {
@@ -280,6 +281,7 @@
280281
]
281282
},
282283
{
284+
"id": 37,
283285
"link": [1, 1],
284286
"name": "X-Mode (Kraid Alive) - R-Mode Spark Interrupt (Gain Blue Suit)",
285287
"entranceCondition": {
@@ -501,6 +503,7 @@
501503
"note": "Door is not reachable mid-fight"
502504
},
503505
{
506+
"id": 38,
504507
"link": [2, 1],
505508
"name": "X-Mode (Kraid Alive) - R-Mode Spark Interrupt (Gain Blue Suit)",
506509
"entranceCondition": {
@@ -882,6 +885,6 @@
882885
}
883886
],
884887
"notables": [],
885-
"nextStratId": 36,
888+
"nextStratId": 39,
886889
"nextNotableId": 1
887890
}

‎region/brinstar/pink/Big Pink.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@
685685
"devNote": "With Morph, Bombs, or Spring Ball, 1->15->12 will be used instead."
686686
},
687687
{
688+
"id": 182,
688689
"link": [1, 13],
689690
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
690691
"entranceCondition": {
@@ -969,6 +970,7 @@
969970
"devNote": "With Morph, Bombs, or Spring Ball, 2->15->12 will be used instead."
970971
},
971972
{
973+
"id": 183,
972974
"link": [2, 13],
973975
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
974976
"entranceCondition": {
@@ -1227,6 +1229,7 @@
12271229
"flashSuitChecked": true
12281230
},
12291231
{
1232+
"id": 184,
12301233
"link": [3, 13],
12311234
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
12321235
"entranceCondition": {
@@ -1681,6 +1684,7 @@
16811684
"detailNote": "It is possible to save one Power Bomb by placing 6 of them up against the ceiling, then the 7th low to kill the Sidehoppers."
16821685
},
16831686
{
1687+
"id": 185,
16841688
"link": [4, 13],
16851689
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
16861690
"entranceCondition": {
@@ -1888,6 +1892,7 @@
18881892
"flashSuitChecked": true
18891893
},
18901894
{
1895+
"id": 186,
18911896
"link": [5, 13],
18921897
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
18931898
"entranceCondition": {
@@ -2149,6 +2154,7 @@
21492154
"note": "Carefully roll off of the edge and land on the platform holding the item. Roll through it until PLMs are overloaded, then roll through the bomb blocks and down below."
21502155
},
21512156
{
2157+
"id": 187,
21522158
"link": [6, 13],
21532159
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
21542160
"entranceCondition": {
@@ -2367,6 +2373,7 @@
23672373
"flashSuitChecked": true
23682374
},
23692375
{
2376+
"id": 188,
23702377
"link": [7, 13],
23712378
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
23722379
"entranceCondition": {
@@ -2789,6 +2796,7 @@
27892796
"devNote": "With more items, the strat with camera scroll blocks will be used."
27902797
},
27912798
{
2799+
"id": 189,
27922800
"link": [8, 13],
27932801
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
27942802
"entranceCondition": {
@@ -3094,6 +3102,7 @@
30943102
"flashSuitChecked": true
30953103
},
30963104
{
3105+
"id": 190,
30973106
"link": [9, 13],
30983107
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
30993108
"entranceCondition": {
@@ -3116,6 +3125,7 @@
31163125
]
31173126
},
31183127
{
3128+
"id": 191,
31193129
"link": [9, 13],
31203130
"name": "Charge Escape Clip + R-Mode Spark Interrupt (Gain Blue Suit)",
31213131
"entranceCondition": {
@@ -4647,6 +4657,6 @@
46474657
]
46484658
}
46494659
],
4650-
"nextStratId": 182,
4660+
"nextStratId": 192,
46514661
"nextNotableId": 14
46524662
}

0 commit comments

Comments
 (0)