Skip to content

Commit 60d4a3b

Browse files
kjbranchkjbranch
committed
fix it so h_enemyDrops strats are again possible with lenience
1 parent 9088873 commit 60d4a3b

14 files changed

Lines changed: 224 additions & 64 deletions

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,13 @@
262262
"comesInHeated": "no"
263263
},
264264
"requires": [
265-
"h_enemyDrops",
266-
"h_CrystalSparkWithoutLenience"
265+
{"or": [
266+
{"and": [
267+
"h_enemyDrops",
268+
"h_CrystalSparkWithoutLenience"
269+
]},
270+
"h_CrystalSpark"
271+
]}
267272
],
268273
"flashSuitChecked": true,
269274
"blueSuitChecked": true,
@@ -337,15 +342,20 @@
337342
"link": [2, 2],
338343
"name": "Crystal Spark",
339344
"requires": [
340-
"h_enemyDrops",
341345
{"or": [
342346
{"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
343347
{"and": [
344348
{"doorUnlockedAtNode": 2},
345349
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}}
346350
]}
347351
]},
348-
"h_CrystalSparkWithoutLenience"
352+
{"or": [
353+
{"and": [
354+
"h_enemyDrops",
355+
"h_CrystalSparkWithoutLenience"
356+
]},
357+
"h_CrystalSpark"
358+
]}
349359
],
350360
"unlocksDoors": [{"nodeId": 2, "types": ["ammo"], "requires": []}],
351361
"flashSuitChecked": true,
@@ -364,8 +374,13 @@
364374
"comesInHeated": "no"
365375
},
366376
"requires": [
367-
"h_enemyDrops",
368-
"h_CrystalSparkWithoutLenience"
377+
{"or": [
378+
{"and": [
379+
"h_enemyDrops",
380+
"h_CrystalSparkWithoutLenience"
381+
]},
382+
"h_CrystalSpark"
383+
]}
369384
],
370385
"flashSuitChecked": true,
371386
"blueSuitChecked": true,

‎region/brinstar/pink/Waterway Energy Tank Room.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,15 @@
377377
"link": [1, 1],
378378
"name": "Crystal Spark",
379379
"requires": [
380-
"h_enemyDrops",
381380
"Gravity",
382381
"h_shinechargeMaxRunway",
383-
"h_CrystalSparkWithoutLenience"
382+
{"or": [
383+
{"and": [
384+
"h_enemyDrops",
385+
"h_CrystalSparkWithoutLenience"
386+
]},
387+
"h_CrystalSpark"
388+
]}
384389
],
385390
"flashSuitChecked": true,
386391
"blueSuitChecked": true,
@@ -894,7 +899,6 @@
894899
"link": [3, 3],
895900
"name": "Crystal Spark (With Zero Farming)",
896901
"requires": [
897-
"h_enemyDrops",
898902
{"or": [
899903
"SpaceJump",
900904
"canPreciseWalljump",
@@ -906,7 +910,13 @@
906910
]}
907911
]},
908912
{"canShineCharge": {"usedTiles": 32, "openEnd": 1}},
909-
"h_CrystalSparkWithoutLenience"
913+
{"or": [
914+
{"and": [
915+
"h_enemyDrops",
916+
"h_CrystalSparkWithoutLenience"
917+
]},
918+
"h_CrystalSpark"
919+
]}
910920
],
911921
"flashSuitChecked": true,
912922
"blueSuitChecked": true,

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,13 @@
860860
"comesInHeated": "no"
861861
},
862862
"requires": [
863-
"h_enemyDrops",
864-
"h_CrystalSparkWithoutLenience"
863+
{"or": [
864+
{"and": [
865+
"h_enemyDrops",
866+
"h_CrystalSparkWithoutLenience"
867+
]},
868+
"h_CrystalSpark"
869+
]}
865870
],
866871
"clearsObstacles": ["B"],
867872
"flashSuitChecked": true,
@@ -1645,8 +1650,13 @@
16451650
"comesInHeated": "no"
16461651
},
16471652
"requires": [
1648-
"h_enemyDrops",
1649-
"h_CrystalSparkWithoutLenience"
1653+
{"or": [
1654+
{"and": [
1655+
"h_enemyDrops",
1656+
"h_CrystalSparkWithoutLenience"
1657+
]},
1658+
"h_CrystalSpark"
1659+
]}
16501660
],
16511661
"flashSuitChecked": true,
16521662
"blueSuitChecked": true,

‎region/brinstar/red/Red Brinstar Fireflea Room.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -962,8 +962,13 @@
962962
"comesInHeated": "no"
963963
},
964964
"requires": [
965-
"h_enemyDrops",
966-
"h_CrystalSparkWithoutLenience"
965+
{"or": [
966+
{"and": [
967+
"h_enemyDrops",
968+
"h_CrystalSparkWithoutLenience"
969+
]},
970+
"h_CrystalSpark"
971+
]}
967972
],
968973
"flashSuitChecked": true,
969974
"blueSuitChecked": true,

‎region/brinstar/red/Red Tower.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,8 +1550,13 @@
15501550
"comesInHeated": "no"
15511551
},
15521552
"requires": [
1553-
"h_enemyDrops",
1554-
"h_CrystalSparkWithoutLenience"
1553+
{"or": [
1554+
{"and": [
1555+
"h_enemyDrops",
1556+
"h_CrystalSparkWithoutLenience"
1557+
]},
1558+
"h_CrystalSpark"
1559+
]}
15551560
],
15561561
"clearsObstacles": ["A"],
15571562
"flashSuitChecked": true,

‎region/crateria/east/Crab Maze.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -880,15 +880,20 @@
880880
"link": [2, 2],
881881
"name": "In-Room Crystal Spark, Gravity",
882882
"requires": [
883-
"h_enemyDrops",
884883
"Gravity",
885884
{"canShineCharge": {
886885
"usedTiles": 29,
887886
"steepUpTiles": 5,
888887
"steepDownTiles": 1,
889888
"openEnd": 0
890889
}},
891-
"h_CrystalSparkWithoutLenience"
890+
{"or": [
891+
{"and": [
892+
"h_enemyDrops",
893+
"h_CrystalSparkWithoutLenience"
894+
]},
895+
"h_CrystalSpark"
896+
]}
892897
],
893898
"flashSuitChecked": true,
894899
"blueSuitChecked": true,
@@ -899,10 +904,15 @@
899904
"link": [2, 2],
900905
"name": "In-Room Crystal Spark, Suitless",
901906
"requires": [
902-
"h_enemyDrops",
903907
"canWaterShineCharge",
904908
{"canShineCharge": {"usedTiles": 20, "openEnd": 1}},
905-
"h_underwaterCrystalSparkWithoutLenience"
909+
{"or": [
910+
{"and": [
911+
"h_enemyDrops",
912+
"h_underwaterCrystalSparkWithoutLenience"
913+
]},
914+
"h_underwaterCrystalSpark"
915+
]}
906916
],
907917
"flashSuitChecked": true,
908918
"blueSuitChecked": true,

‎region/crateria/west/Lower Mushrooms.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,14 @@
129129
"link": [1, 1],
130130
"name": "Crystal Spark",
131131
"requires": [
132-
"h_enemyDrops",
133132
"h_shinechargeMaxRunway",
134-
"h_CrystalSparkWithoutLenience"
133+
{"or": [
134+
{"and": [
135+
"h_enemyDrops",
136+
"h_CrystalSparkWithoutLenience"
137+
]},
138+
"h_CrystalSpark"
139+
]}
135140
],
136141
"flashSuitChecked": true,
137142
"blueSuitChecked": true,

‎region/norfair/east/Double Chamber.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,14 +1653,19 @@
16531653
"link": [2, 2],
16541654
"name": "Crystal Spark",
16551655
"requires": [
1656-
"h_enemyDrops",
16571656
{"canShineCharge": {
16581657
"usedTiles": 28,
16591658
"gentleUpTiles": 3,
16601659
"gentleDownTiles": 3,
16611660
"openEnd": 0
16621661
}},
1663-
"h_heatedCrystalSparkWithoutLenience"
1662+
{"or": [
1663+
{"and": [
1664+
"h_enemyDrops",
1665+
"h_heatedCrystalSparkWithoutLenience"
1666+
]},
1667+
"h_heatedCrystalSpark"
1668+
]}
16641669
],
16651670
"flashSuitChecked": true,
16661671
"blueSuitChecked": true,

‎region/norfair/east/Frog Speedway.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,14 @@
178178
"link": [1, 1],
179179
"name": "Crystal Spark",
180180
"requires": [
181-
"h_enemyDrops",
182181
"h_shinechargeMaxRunway",
183-
"h_CrystalSparkWithoutLenience"
182+
{"or": [
183+
{"and": [
184+
"h_enemyDrops",
185+
"h_CrystalSparkWithoutLenience"
186+
]},
187+
"h_CrystalSpark"
188+
]}
184189
],
185190
"flashSuitChecked": true,
186191
"blueSuitChecked": true,

‎region/norfair/east/Kronic Boost Room.json‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,13 @@
174174
}
175175
},
176176
"requires": [
177-
"h_enemyDrops",
178-
"h_heatedCrystalSparkWithoutLenience"
177+
{"or": [
178+
{"and": [
179+
"h_enemyDrops",
180+
"h_heatedCrystalSparkWithoutLenience"
181+
]},
182+
"h_heatedCrystalSpark"
183+
]}
179184
],
180185
"flashSuitChecked": true,
181186
"blueSuitChecked": true,
@@ -554,8 +559,13 @@
554559
}
555560
},
556561
"requires": [
557-
"h_enemyDrops",
558-
"h_heatedCrystalSparkWithoutLenience"
562+
{"or": [
563+
{"and": [
564+
"h_enemyDrops",
565+
"h_heatedCrystalSparkWithoutLenience"
566+
]},
567+
"h_heatedCrystalSpark"
568+
]}
559569
],
560570
"flashSuitChecked": true,
561571
"blueSuitChecked": true,
@@ -911,8 +921,13 @@
911921
}
912922
},
913923
"requires": [
914-
"h_enemyDrops",
915-
"h_heatedCrystalSparkWithoutLenience"
924+
{"or": [
925+
{"and": [
926+
"h_enemyDrops",
927+
"h_heatedCrystalSparkWithoutLenience"
928+
]},
929+
"h_heatedCrystalSpark"
930+
]}
916931
],
917932
"flashSuitChecked": true,
918933
"blueSuitChecked": true,
@@ -922,15 +937,20 @@
922937
"link": [3, 3],
923938
"name": "Crystal Spark",
924939
"requires": [
925-
"h_enemyDrops",
926940
{"or": [
927941
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}},
928942
{"and": [
929943
{"doorUnlockedAtNode": 3},
930944
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
931945
]}
932946
]},
933-
"h_heatedCrystalSparkWithoutLenience"
947+
{"or": [
948+
{"and": [
949+
"h_enemyDrops",
950+
"h_heatedCrystalSparkWithoutLenience"
951+
]},
952+
"h_heatedCrystalSpark"
953+
]}
934954
],
935955
"flashSuitChecked": true,
936956
"blueSuitChecked": true,
@@ -1399,8 +1419,13 @@
13991419
}
14001420
},
14011421
"requires": [
1402-
"h_enemyDrops",
1403-
"h_heatedCrystalSparkWithoutLenience"
1422+
{"or": [
1423+
{"and": [
1424+
"h_enemyDrops",
1425+
"h_heatedCrystalSparkWithoutLenience"
1426+
]},
1427+
"h_heatedCrystalSpark"
1428+
]}
14041429
],
14051430
"flashSuitChecked": true,
14061431
"blueSuitChecked": true,

0 commit comments

Comments
 (0)