Skip to content

Commit fc5e791

Browse files
nn357nn357
authored
Merge branch 'master' into spikesuit_cleanup
2 parents dfce80b + a6ec4b7 commit fc5e791

File tree

71 files changed

+2682
-199
lines changed

Some content is hidden

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

71 files changed

+2682
-199
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@
509509
},
510510
"flashSuitChecked": true
511511
},
512-
{
512+
{
513513
"id": 14,
514514
"link": [1, 1],
515515
"name": "Geemer, Skree, and Reo Farm",
@@ -576,7 +576,7 @@
576576
"Kill the Geemers for Reserves, or else Crystal Flash. Damage down and use the Reo to interrupt a shinespark wind-up."
577577
]
578578
},
579-
{
579+
{
580580
"id": 17,
581581
"link": [1, 1],
582582
"name": "Crystal Flash",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
"requires": [
181181
"Morph",
182182
{"or": [
183-
"h_CrystalFlash",
183+
"h_CrystalFlashForReserveEnergy",
184184
{"and": [
185185
"h_bombThings",
186186
"h_RModeCanRefillReserves",
@@ -426,7 +426,7 @@
426426
},
427427
"requires": [
428428
{"or": [
429-
"h_CrystalFlash",
429+
"h_CrystalFlashForReserveEnergy",
430430
{"and": [
431431
"h_RModeCanRefillReserves",
432432
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@
10491049
"h_crouchJumpDownGrab"
10501050
]},
10511051
{"or": [
1052-
"h_CrystalFlash",
1052+
"h_CrystalFlashForReserveEnergy",
10531053
{"and": [
10541054
{"disableEquipment": "ETank"},
10551055
{"resourceAvailable": [{"type": "Energy", "count": 80}]},

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@
584584
"link": [2, 2],
585585
"name": "Crystal Flash",
586586
"requires": [
587+
{"obstaclesNotCleared": ["R-Mode"]},
587588
"h_CrystalFlash"
588589
],
589590
"flashSuitChecked": true
@@ -775,7 +776,7 @@
775776
{"canShineCharge": {"usedTiles": 20, "openEnd": 1}},
776777
"canShinechargeMovementTricky",
777778
{"thornHits": 1},
778-
"canTrickySpikeSuit",
779+
"canRiskySpikeSuit",
779780
{"shinespark": {"frames": 12, "excessFrames": 12}}
780781
],
781782
"flashSuitChecked": true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
},
193193
"requires": [
194194
{"or": [
195-
"h_CrystalFlash",
195+
"h_CrystalFlashForReserveEnergy",
196196
{"and": [
197197
"h_RModeCanRefillReserves",
198198
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
@@ -302,7 +302,7 @@
302302
},
303303
"requires": [
304304
{"or": [
305-
"h_CrystalFlash",
305+
"h_CrystalFlashForReserveEnergy",
306306
{"and": [
307307
"h_RModeCanRefillReserves",
308308
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4516,6 +4516,7 @@
45164516
"link": [9, 9],
45174517
"name": "Crystal Flash",
45184518
"requires": [
4519+
{"obstaclesNotCleared": ["R-Mode"]},
45194520
"h_CrystalFlash"
45204521
],
45214522
"flashSuitChecked": true
@@ -4806,6 +4807,7 @@
48064807
"link": [10, 10],
48074808
"name": "Crystal Flash",
48084809
"requires": [
4810+
{"obstaclesNotCleared": ["R-Mode"]},
48094811
"h_CrystalFlash"
48104812
],
48114813
"flashSuitChecked": true
@@ -5185,7 +5187,7 @@
51855187
{"obstaclesCleared": ["R-Mode"]},
51865188
{"obstaclesNotCleared": ["A"]},
51875189
{"or": [
5188-
"h_CrystalFlash",
5190+
"h_CrystalFlashForReserveEnergy",
51895191
{"and": [
51905192
{"disableEquipment": "ETank"},
51915193
{"or": [
@@ -5299,6 +5301,7 @@
52995301
"link": [12, 12],
53005302
"name": "Crystal Flash",
53015303
"requires": [
5304+
{"obstaclesNotCleared": ["R-Mode"]},
53025305
"h_CrystalFlash"
53035306
],
53045307
"flashSuitChecked": true
@@ -5385,7 +5388,7 @@
53855388
{"obstaclesCleared": ["R-Mode"]},
53865389
{"notable": "Bottom Ice Clip"},
53875390
{"or": [
5388-
"h_CrystalFlash",
5391+
"h_CrystalFlashForReserveEnergy",
53895392
{"and": [
53905393
{"obstaclesCleared": ["A"]},
53915394
"h_RModeCanRefillReserves",
@@ -5475,6 +5478,7 @@
54755478
"link": [13, 13],
54765479
"name": "Crystal Flash",
54775480
"requires": [
5481+
{"obstaclesNotCleared": ["R-Mode"]},
54785482
"h_CrystalFlash"
54795483
],
54805484
"clearsObstacles": ["A"],

‎region/brinstar/green/Noob Bridge.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
},
8585
"requires": [
8686
{"or": [
87-
"h_CrystalFlash",
87+
"h_CrystalFlashForReserveEnergy",
8888
{"and": [
8989
"h_RModeCanRefillReserves",
9090
{"resourceMissingAtMost": [{"type": "Super", "count": 1}]},
@@ -407,7 +407,7 @@
407407
},
408408
"requires": [
409409
{"or": [
410-
"h_CrystalFlash",
410+
"h_CrystalFlashForReserveEnergy",
411411
{"and": [
412412
"h_RModeCanRefillReserves",
413413
{"resourceMissingAtMost": [{"type": "Super", "count": 1}]},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
},
103103
"requires": [
104104
{"or": [
105-
"h_CrystalFlash",
105+
"h_CrystalFlashForReserveEnergy",
106106
{"and": [
107107
"canTrickyDodgeEnemies",
108108
"h_RModeCanRefillReserves",
@@ -368,7 +368,7 @@
368368
},
369369
"requires": [
370370
{"or": [
371-
"h_CrystalFlash",
371+
"h_CrystalFlashForReserveEnergy",
372372
{"and": [
373373
"h_RModeCanRefillReserves",
374374
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
]}
213213
]},
214214
{"or": [
215-
"h_CrystalFlash",
215+
"h_CrystalFlashForReserveEnergy",
216216
{"and": [
217217
"h_RModeCanRefillReserves",
218218
{"or": [
@@ -649,7 +649,7 @@
649649
]}
650650
]},
651651
{"or": [
652-
"h_CrystalFlash",
652+
"h_CrystalFlashForReserveEnergy",
653653
{"and": [
654654
"h_RModeCanRefillReserves",
655655
{"or": [

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"requires": [
264264
{"not": "f_DefeatedKraid"},
265265
"canRiskPermanentLossOfAccess",
266-
"h_CrystalFlash",
266+
"h_CrystalFlashForReserveEnergy",
267267
"canXMode",
268268
"h_XModeThornHit",
269269
"h_shinechargeMaxRunway",
@@ -558,7 +558,7 @@
558558
]}
559559
]},
560560
{"or": [
561-
"h_CrystalFlash",
561+
"h_CrystalFlashForReserveEnergy",
562562
{"and": [
563563
{"or": [
564564
"canBeVeryPatient",
@@ -945,4 +945,4 @@
945945
"notables": [],
946946
"nextStratId": 42,
947947
"nextNotableId": 1
948-
}
948+
}

0 commit comments

Comments
 (0)