Skip to content

Commit e4ada90

Browse files
kjbranchkjbranch
authored
Crystal Spark - normalization and Crateria (#2625)
1 parent eda9a59 commit e4ada90

40 files changed

Lines changed: 143 additions & 272 deletions

‎region/brinstar/blue/Billy Mays Room.json‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,6 @@
7171
"flashSuitChecked": true,
7272
"blueSuitChecked": true
7373
},
74-
{
75-
"id": 7,
76-
"link": [1, 1],
77-
"name": "Come in Shinecharging, Crystal Spark",
78-
"entranceCondition": {
79-
"comeInShinecharging": {
80-
"length": 2,
81-
"openEnd": 0
82-
},
83-
"comesInHeated": "no"
84-
},
85-
"requires": [
86-
"h_CrystalSpark"
87-
],
88-
"flashSuitChecked": true,
89-
"blueSuitChecked": true
90-
},
9174
{
9275
"id": 3,
9376
"link": [1, 2],

‎region/brinstar/blue/Construction Zone.json‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -114,23 +114,6 @@
114114
"flashSuitChecked": true,
115115
"blueSuitChecked": true
116116
},
117-
{
118-
"id": 55,
119-
"link": [1, 1],
120-
"name": "Come in Shinecharging, Crystal Spark",
121-
"entranceCondition": {
122-
"comeInShinecharging": {
123-
"length": 2,
124-
"openEnd": 0
125-
},
126-
"comesInHeated": "no"
127-
},
128-
"requires": [
129-
"h_CrystalSpark"
130-
],
131-
"flashSuitChecked": true,
132-
"blueSuitChecked": true
133-
},
134117
{
135118
"id": 2,
136119
"link": [1, 1],
@@ -557,23 +540,6 @@
557540
"flashSuitChecked": true,
558541
"blueSuitChecked": true
559542
},
560-
{
561-
"id": 56,
562-
"link": [2, 2],
563-
"name": "Come in Shinecharging, Crystal Spark",
564-
"entranceCondition": {
565-
"comeInShinecharging": {
566-
"length": 2,
567-
"openEnd": 0
568-
},
569-
"comesInHeated": "no"
570-
},
571-
"requires": [
572-
"h_CrystalSpark"
573-
],
574-
"flashSuitChecked": true,
575-
"blueSuitChecked": true
576-
},
577543
{
578544
"id": 21,
579545
"link": [2, 2],

‎region/brinstar/pink/Spore Spawn Farming Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@
460460
{
461461
"id": 24,
462462
"link": [2, 2],
463-
"name": "Gain Blue Suit (Crystal Spark)",
463+
"name": "Crystal Spark",
464464
"requires": [
465465
{"canShineCharge": {"usedTiles": 21, "steepUpTiles": 2, "openEnd": 0}},
466466
"h_CrystalSpark"

‎region/crateria/central/230 Missile Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
{
8686
"id": 5,
8787
"link": [1, 1],
88-
"name": "Gain Blue Suit (Come in Shinecharging, Crystal Spark)",
88+
"name": "Come in Shinecharging, Crystal Spark",
8989
"entranceCondition": {
9090
"comeInShinecharging": {
9191
"length": 9,

‎region/crateria/central/Blue Brinstar Elevator Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
{
7575
"id": 14,
7676
"link": [1, 1],
77-
"name": "Gain Blue Suit (Come in Shinecharging, Crystal Spark)",
77+
"name": "Come in Shinecharging, Crystal Spark",
7878
"entranceCondition": {
7979
"comeInShinecharging": {
8080
"length": 13,
@@ -91,7 +91,7 @@
9191
{
9292
"id": 15,
9393
"link": [1, 1],
94-
"name": "Gain Blue Suit (In-Room Crystal Spark)",
94+
"name": "In-Room Crystal Spark",
9595
"requires": [
9696
{"or": [
9797
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}},

‎region/crateria/central/Bomb Torizo Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@
397397
{
398398
"id": 22,
399399
"link": [1, 1],
400-
"name": "Gain Blue Suit (In-Room Crystal Spark)",
400+
"name": "In-Room Crystal Spark",
401401
"requires": [
402402
"f_DefeatedBombTorizo",
403403
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}},

‎region/crateria/central/Climb Supers Room.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,22 @@
191191
},
192192
"flashSuitChecked": true
193193
},
194+
{
195+
"link": [1, 1],
196+
"name": "Come in Shinecharging, Crystal Spark",
197+
"entranceCondition": {
198+
"comeInShinecharging": {
199+
"length": 5,
200+
"openEnd": 0
201+
},
202+
"comesInHeated": "no"
203+
},
204+
"requires": [
205+
"h_CrystalSpark"
206+
],
207+
"flashSuitChecked": true,
208+
"blueSuitChecked": true
209+
},
194210
{
195211
"id": 75,
196212
"link": [1, 1],
@@ -1236,6 +1252,16 @@
12361252
"clearsObstacles": ["A"],
12371253
"flashSuitChecked": true
12381254
},
1255+
{
1256+
"link": [2, 2],
1257+
"name": "Crystal Spark",
1258+
"requires": [
1259+
"h_shinechargeMaxRunway",
1260+
"h_CrystalSpark"
1261+
],
1262+
"flashSuitChecked": true,
1263+
"blueSuitChecked": true
1264+
},
12391265
{
12401266
"id": 77,
12411267
"link": [2, 2],

‎region/crateria/central/Climb.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,22 @@
16881688
"blueSuitChecked": true,
16891689
"devNote": "It is sometimes possible to beat the lava, but it depends how you get here."
16901690
},
1691+
{
1692+
"link": [4, 4],
1693+
"name": "Come in Shinecharging, Crystal Spark",
1694+
"entranceCondition": {
1695+
"comeInShinecharging": {
1696+
"length": 3,
1697+
"openEnd": 0
1698+
},
1699+
"comesInHeated": "no"
1700+
},
1701+
"requires": [
1702+
"h_CrystalSpark"
1703+
],
1704+
"flashSuitChecked": true,
1705+
"blueSuitChecked": true
1706+
},
16911707
{
16921708
"id": 59,
16931709
"link": [4, 4],
@@ -2946,7 +2962,7 @@
29462962
{
29472963
"id": 115,
29482964
"link": [6, 6],
2949-
"name": "Gain Blue Suit (Crystal Spark)",
2965+
"name": "Crystal Spark",
29502966
"requires": [
29512967
{"obstaclesCleared": ["A"]},
29522968
{"or": [

‎region/crateria/central/Crateria Map Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
{
6363
"id": 5,
6464
"link": [1, 1],
65-
"name": "Gain Blue Suit (Come in Shinecharging, Crystal Spark)",
65+
"name": "Come in Shinecharging, Crystal Spark",
6666
"entranceCondition": {
6767
"comeInShinecharging": {
6868
"length": 3,
69-
"openEnd": 1
69+
"openEnd": 0
7070
},
7171
"comesInHeated": "no"
7272
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
{
219219
"id": 7,
220220
"link": [1, 1],
221-
"name": "Gain Blue Suit (Come in Shinecharging, Crystal Spark)",
221+
"name": "Come in Shinecharging, Crystal Spark",
222222
"entranceCondition": {
223223
"comeInShinecharging": {
224224
"length": 3,

0 commit comments

Comments
 (0)