Skip to content

Commit 99743cb

Browse files
osse101osse101
authored
Merge pull request #2788 from kjbranch/cs-un-e
Add Crystal Sparks throughout Upper Norfair East
2 parents 8bb8006 + 60d4a3b commit 99743cb

38 files changed

Lines changed: 1116 additions & 42 deletions

‎helpers.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,14 @@
384384
"Represents having Speed Booster collected but not being able to use it to gain high dash speed.",
385385
"This is not applicable to the vanilla game but is included to help support modified Speed Booster items in randomizers."
386386
]
387+
},
388+
{
389+
"name": "h_enemyDrops",
390+
"requires": [],
391+
"note": [
392+
"Represents enemy drops being expected. This is intended to be a temporary fix until the enemy drops are documented properly.",
393+
"This is included to help locate the strats that need the drops modeled properly and in case drops are removed by randomizer settings."
394+
]
387395
}
388396
]
389397
},
@@ -1574,6 +1582,13 @@
15741582
"h_CrystalSpark"
15751583
]
15761584
},
1585+
{
1586+
"name": "h_heatedCrystalSparkWithoutLenience",
1587+
"requires": [
1588+
"h_heatProof",
1589+
"h_CrystalSparkWithoutLenience"
1590+
]
1591+
},
15771592
{
15781593
"name": "h_elevatorCrystalFlash",
15791594
"requires": [

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,13 @@
262262
"comesInHeated": "no"
263263
},
264264
"requires": [
265-
"h_CrystalSparkWithoutLenience"
265+
{"or": [
266+
{"and": [
267+
"h_enemyDrops",
268+
"h_CrystalSparkWithoutLenience"
269+
]},
270+
"h_CrystalSpark"
271+
]}
266272
],
267273
"flashSuitChecked": true,
268274
"blueSuitChecked": true,
@@ -343,7 +349,13 @@
343349
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}}
344350
]}
345351
]},
346-
"h_CrystalSparkWithoutLenience"
352+
{"or": [
353+
{"and": [
354+
"h_enemyDrops",
355+
"h_CrystalSparkWithoutLenience"
356+
]},
357+
"h_CrystalSpark"
358+
]}
347359
],
348360
"unlocksDoors": [{"nodeId": 2, "types": ["ammo"], "requires": []}],
349361
"flashSuitChecked": true,
@@ -362,7 +374,13 @@
362374
"comesInHeated": "no"
363375
},
364376
"requires": [
365-
"h_CrystalSparkWithoutLenience"
377+
{"or": [
378+
{"and": [
379+
"h_enemyDrops",
380+
"h_CrystalSparkWithoutLenience"
381+
]},
382+
"h_CrystalSpark"
383+
]}
366384
],
367385
"flashSuitChecked": true,
368386
"blueSuitChecked": true,

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,13 @@
379379
"requires": [
380380
"Gravity",
381381
"h_shinechargeMaxRunway",
382-
"h_CrystalSparkWithoutLenience"
382+
{"or": [
383+
{"and": [
384+
"h_enemyDrops",
385+
"h_CrystalSparkWithoutLenience"
386+
]},
387+
"h_CrystalSpark"
388+
]}
383389
],
384390
"flashSuitChecked": true,
385391
"blueSuitChecked": true,
@@ -904,7 +910,13 @@
904910
]}
905911
]},
906912
{"canShineCharge": {"usedTiles": 32, "openEnd": 1}},
907-
"h_CrystalSparkWithoutLenience"
913+
{"or": [
914+
{"and": [
915+
"h_enemyDrops",
916+
"h_CrystalSparkWithoutLenience"
917+
]},
918+
"h_CrystalSpark"
919+
]}
908920
],
909921
"flashSuitChecked": true,
910922
"blueSuitChecked": true,

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,13 @@
860860
"comesInHeated": "no"
861861
},
862862
"requires": [
863-
"h_CrystalSparkWithoutLenience"
863+
{"or": [
864+
{"and": [
865+
"h_enemyDrops",
866+
"h_CrystalSparkWithoutLenience"
867+
]},
868+
"h_CrystalSpark"
869+
]}
864870
],
865871
"clearsObstacles": ["B"],
866872
"flashSuitChecked": true,
@@ -1644,7 +1650,13 @@
16441650
"comesInHeated": "no"
16451651
},
16461652
"requires": [
1647-
"h_CrystalSparkWithoutLenience"
1653+
{"or": [
1654+
{"and": [
1655+
"h_enemyDrops",
1656+
"h_CrystalSparkWithoutLenience"
1657+
]},
1658+
"h_CrystalSpark"
1659+
]}
16481660
],
16491661
"flashSuitChecked": true,
16501662
"blueSuitChecked": true,
@@ -2155,6 +2167,7 @@
21552167
{"or": [
21562168
"h_CrystalSpark",
21572169
{"and": [
2170+
"h_enemyDrops",
21582171
"canBePatient",
21592172
{"or": [
21602173
"HiJump",
@@ -2450,6 +2463,7 @@
24502463
{"or": [
24512464
"h_CrystalSpark",
24522465
{"and": [
2466+
"h_enemyDrops",
24532467
"canBePatient",
24542468
{"or": [
24552469
"HiJump",
@@ -2476,6 +2490,7 @@
24762490
{"or": [
24772491
"h_CrystalSpark",
24782492
{"and": [
2493+
"h_enemyDrops",
24792494
"canBePatient",
24802495
{"or": [
24812496
"HiJump",

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@
266266
{"or": [
267267
"h_CrystalSpark",
268268
{"and": [
269+
"h_enemyDrops",
269270
"canBePatient",
270271
"h_CrystalSparkWithoutLenience",
271272
{"or": [
@@ -961,7 +962,13 @@
961962
"comesInHeated": "no"
962963
},
963964
"requires": [
964-
"h_CrystalSparkWithoutLenience"
965+
{"or": [
966+
{"and": [
967+
"h_enemyDrops",
968+
"h_CrystalSparkWithoutLenience"
969+
]},
970+
"h_CrystalSpark"
971+
]}
965972
],
966973
"flashSuitChecked": true,
967974
"blueSuitChecked": true,

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@
377377
{"or": [
378378
"h_CrystalSpark",
379379
{"and": [
380+
"h_enemyDrops",
380381
"canBePatient",
381382
"h_CrystalSparkWithoutLenience"
382383
]}
@@ -1549,7 +1550,13 @@
15491550
"comesInHeated": "no"
15501551
},
15511552
"requires": [
1552-
"h_CrystalSparkWithoutLenience"
1553+
{"or": [
1554+
{"and": [
1555+
"h_enemyDrops",
1556+
"h_CrystalSparkWithoutLenience"
1557+
]},
1558+
"h_CrystalSpark"
1559+
]}
15531560
],
15541561
"clearsObstacles": ["A"],
15551562
"flashSuitChecked": true,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@
230230
{"or": [
231231
"h_CrystalSpark",
232232
{"and": [
233+
"h_enemyDrops",
233234
"canBePatient",
234235
"h_CrystalSparkWithoutLenience"
235236
]}

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,13 @@
887887
"steepDownTiles": 1,
888888
"openEnd": 0
889889
}},
890-
"h_CrystalSparkWithoutLenience"
890+
{"or": [
891+
{"and": [
892+
"h_enemyDrops",
893+
"h_CrystalSparkWithoutLenience"
894+
]},
895+
"h_CrystalSpark"
896+
]}
891897
],
892898
"flashSuitChecked": true,
893899
"blueSuitChecked": true,
@@ -900,7 +906,13 @@
900906
"requires": [
901907
"canWaterShineCharge",
902908
{"canShineCharge": {"usedTiles": 20, "openEnd": 1}},
903-
"h_underwaterCrystalSparkWithoutLenience"
909+
{"or": [
910+
{"and": [
911+
"h_enemyDrops",
912+
"h_underwaterCrystalSparkWithoutLenience"
913+
]},
914+
"h_underwaterCrystalSpark"
915+
]}
904916
],
905917
"flashSuitChecked": true,
906918
"blueSuitChecked": true,

‎region/crateria/east/Crateria Kihunter Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
{"or": [
103103
"h_CrystalSpark",
104104
{"and": [
105+
"h_enemyDrops",
105106
"canBePatient",
106107
"h_CrystalSparkWithoutLenience"
107108
]}

‎region/crateria/west/Gauntlet Energy Tank Room.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,8 @@
324324
"length": 6,
325325
"openEnd": 0,
326326
"steepDownTiles": 1
327-
}
327+
},
328+
"comesInHeated": "no"
328329
},
329330
"requires": [
330331
"h_shinechargeMaxRunway",
@@ -336,7 +337,7 @@
336337
{
337338
"id": 66,
338339
"link": [1, 1],
339-
"name": "Come in Getting Blue Speed, Shinecharge, Crystal Spark (Wave)",
340+
"name": "Come in Shinecharging, Crystal Spark (Wave)",
340341
"entranceCondition": {
341342
"comeInShinecharging": {
342343
"length": 14,
@@ -348,7 +349,6 @@
348349
},
349350
"requires": [
350351
"Wave",
351-
"h_shinechargeMaxRunway",
352352
"h_CrystalSpark"
353353
],
354354
"flashSuitChecked": true,

0 commit comments

Comments
 (0)