Skip to content

Commit a9d50f8

Browse files
osse101osse101
authored
Merge pull request #2817 from kjbranch/ss-un-e
Norfair East shinesparks: split speed and general cleanup
2 parents ca84888 + ee5c8be commit a9d50f8

18 files changed

Lines changed: 174 additions & 107 deletions

‎region/norfair/east/Bat Cave.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,8 @@
296296
},
297297
"requires": [
298298
"canShinechargeMovementComplex",
299-
"canMidairShinespark",
300-
{"heatFrames": 300},
301-
{"shinespark": {"frames": 14, "excessFrames": 3}}
299+
{"shinespark": {"frames": 14, "excessFrames": 3}},
300+
{"heatFrames": 300}
302301
],
303302
"flashSuitChecked": true,
304303
"blueSuitChecked": true,
@@ -314,9 +313,8 @@
314313
"requires": [
315314
{"shineChargeFrames": 80},
316315
"canShinechargeMovementComplex",
317-
"canMidairShinespark",
318-
{"heatFrames": 270},
319-
{"shinespark": {"frames": 13, "excessFrames": 3}}
316+
{"shinespark": {"frames": 13, "excessFrames": 3}},
317+
{"heatFrames": 270}
320318
],
321319
"flashSuitChecked": true,
322320
"blueSuitChecked": true,
@@ -482,7 +480,7 @@
482480
"requires": [
483481
"canShinechargeMovementTricky",
484482
{"heatFrames": 165},
485-
{"shinespark": {"frames": 15}}
483+
{"shinespark": {"frames": 15, "excessFrames": 0}}
486484
],
487485
"exitCondition": {
488486
"leaveWithSpark": {}
@@ -506,7 +504,7 @@
506504
{"shineChargeFrames": 115},
507505
"canShinechargeMovementTricky",
508506
{"heatFrames": 165},
509-
{"shinespark": {"frames": 15}}
507+
{"shinespark": {"frames": 15, "excessFrames": 0}}
510508
],
511509
"exitCondition": {
512510
"leaveWithSpark": {}

‎region/norfair/east/Bubble Mountain.json‎

Lines changed: 63 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,7 @@
10271027
}
10281028
},
10291029
"requires": [
1030+
"canHorizontalShinespark",
10301031
{"shinespark": {"frames": 27, "excessFrames": 2}}
10311032
],
10321033
"flashSuitChecked": true,
@@ -1041,6 +1042,7 @@
10411042
},
10421043
"requires": [
10431044
{"shineChargeFrames": 50},
1045+
"canHorizontalShinespark",
10441046
{"shinespark": {"frames": 27, "excessFrames": 2}}
10451047
],
10461048
"flashSuitChecked": true,
@@ -1054,10 +1056,9 @@
10541056
"comeInShinecharged": {}
10551057
},
10561058
"requires": [
1057-
{"shineChargeFrames": 22},
1058-
"canShinechargeMovement",
1059+
{"shineChargeFrames": 25},
10591060
"canMidairShinespark",
1060-
{"shinespark": {"frames": 19}}
1061+
{"shinespark": {"frames": 20, "excessFrames": 4}}
10611062
],
10621063
"flashSuitChecked": true,
10631064
"blueSuitChecked": true
@@ -1098,7 +1099,7 @@
10981099
"HiJump",
10991100
"SpaceJump",
11001101
"canShinechargeMovementComplex",
1101-
{"shinespark": {"frames": 20, "excessFrames": 0}}
1102+
{"shinespark": {"frames": 10, "excessFrames": 0}}
11021103
],
11031104
"exitCondition": {
11041105
"leaveWithSpark": {}
@@ -1821,7 +1822,13 @@
18211822
}
18221823
},
18231824
"requires": [
1824-
{"shinespark": {"frames": 22, "excessFrames": 2}}
1825+
{"or": [
1826+
{"shinespark": {"frames": 22, "excessFrames": 2}},
1827+
{"and": [
1828+
"canMidairShinespark",
1829+
{"shinespark": {"frames": 14, "excessFrames": 3}}
1830+
]}
1831+
]}
18251832
],
18261833
"flashSuitChecked": true,
18271834
"blueSuitChecked": true
@@ -1875,11 +1882,25 @@
18751882
"comeInShinecharged": {}
18761883
},
18771884
"requires": [
1878-
{"shineChargeFrames": 125},
1885+
{"or": [
1886+
{"and": [
1887+
"canSpeedyJump",
1888+
{"shineChargeFrames": 125}
1889+
]},
1890+
{"and": [
1891+
{"shineChargeFrames": 160},
1892+
{"enemyDamage": {"enemy": "Waver", "type": "contact", "hits": 1}}
1893+
]}
1894+
]},
1895+
"canHeroShot",
18791896
"HiJump",
18801897
"canWalljump",
18811898
"canShinechargeMovementTricky",
1882-
{"shinespark": {"frames": 27, "excessFrames": 0}}
1899+
{"shinespark": {"frames": 27, "excessFrames": 0}},
1900+
{"or": [
1901+
"canBeLucky",
1902+
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}}
1903+
]}
18831904
],
18841905
"exitCondition": {
18851906
"leaveWithSpark": {}
@@ -2437,7 +2458,7 @@
24372458
},
24382459
"requires": [
24392460
"canShinechargeMovementComplex",
2440-
{"shinespark": {"frames": 26}}
2461+
{"shinespark": {"frames": 26, "excessFrames": 3}}
24412462
],
24422463
"flashSuitChecked": true,
24432464
"blueSuitChecked": true,
@@ -2453,7 +2474,7 @@
24532474
"requires": [
24542475
{"shineChargeFrames": 100},
24552476
"canShinechargeMovementComplex",
2456-
{"shinespark": {"frames": 26}}
2477+
{"shinespark": {"frames": 26, "excessFrames": 3}}
24572478
],
24582479
"flashSuitChecked": true,
24592480
"blueSuitChecked": true,
@@ -3043,7 +3064,7 @@
30433064
"requires": [
30443065
{"shineChargeFrames": 40},
30453066
"canShinechargeMovement",
3046-
{"shinespark": {"frames": 9}}
3067+
{"shinespark": {"frames": 9, "excessFrames": 0}}
30473068
],
30483069
"exitCondition": {
30493070
"leaveWithSpark": {}
@@ -3159,7 +3180,6 @@
31593180
},
31603181
"requires": [
31613182
{"shineChargeFrames": 115},
3162-
"canMidairShinespark",
31633183
"canShinechargeMovementComplex",
31643184
{"shinespark": {"frames": 30, "excessFrames": 6}}
31653185
],
@@ -3177,7 +3197,6 @@
31773197
}
31783198
},
31793199
"requires": [
3180-
"canMidairShinespark",
31813200
"canShinechargeMovementComplex",
31823201
{"shinespark": {"frames": 30, "excessFrames": 6}}
31833202
],
@@ -3553,9 +3572,8 @@
35533572
},
35543573
"requires": [
35553574
{"shineChargeFrames": 120},
3556-
"canMidairShinespark",
35573575
"canShinechargeMovementComplex",
3558-
{"shinespark": {"frames": 15}}
3576+
{"shinespark": {"frames": 15, "excessFrames": 0}}
35593577
],
35603578
"exitCondition": {
35613579
"leaveWithSpark": {}
@@ -3575,11 +3593,30 @@
35753593
"comeInShinecharged": {}
35763594
},
35773595
"requires": [
3578-
{"shineChargeFrames": 80},
35793596
"HiJump",
3580-
"canMidairShinespark",
35813597
"canShinechargeMovementComplex",
3582-
{"shinespark": {"frames": 11}}
3598+
{"or": [
3599+
{"and": [
3600+
"canWalljump",
3601+
"canSpeedyJump",
3602+
{"shineChargeFrames": 80},
3603+
{"shinespark": {"frames": 11, "excessFrames": 0}}
3604+
]},
3605+
{"and": [
3606+
"canWalljump",
3607+
{"shineChargeFrames": 95},
3608+
{"shinespark": {"frames": 10, "excessFrames": 0}}
3609+
]},
3610+
{"and": [
3611+
"canSpeedyJump",
3612+
{"shineChargeFrames": 95},
3613+
{"shinespark": {"frames": 15, "excessFrames": 0}}
3614+
]},
3615+
{"and": [
3616+
{"shineChargeFrames": 110},
3617+
{"shinespark": {"frames": 17, "excessFrames": 0}}
3618+
]}
3619+
]}
35833620
],
35843621
"exitCondition": {
35853622
"leaveWithSpark": {}
@@ -3745,8 +3782,11 @@
37453782
"requires": [
37463783
{"shineChargeFrames": 100},
37473784
"canShinechargeMovementComplex",
3748-
"canMidairShinespark",
37493785
"canCarefulJump",
3786+
{"or": [
3787+
"canBeLucky",
3788+
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}}
3789+
]},
37503790
{"shinespark": {"frames": 30, "excessFrames": 6}}
37513791
],
37523792
"flashSuitChecked": true,
@@ -3768,8 +3808,11 @@
37683808
},
37693809
"requires": [
37703810
"canShinechargeMovementComplex",
3771-
"canMidairShinespark",
37723811
"canCarefulJump",
3812+
{"or": [
3813+
"canBeLucky",
3814+
{"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}}
3815+
]},
37733816
{"shinespark": {"frames": 30, "excessFrames": 6}}
37743817
],
37753818
"flashSuitChecked": true,
@@ -3791,7 +3834,6 @@
37913834
},
37923835
"requires": [
37933836
"canShinechargeMovementComplex",
3794-
"canMidairShinespark",
37953837
"canTrickyJump",
37963838
"canHeroShot",
37973839
{"shinespark": {"frames": 25}},
@@ -4235,7 +4277,7 @@
42354277
},
42364278
"requires": [
42374279
{"shineChargeFrames": 105},
4238-
{"shinespark": {"frames": 5}}
4280+
{"shinespark": {"frames": 5, "excessFrames": 0}}
42394281
],
42404282
"exitCondition": {
42414283
"leaveWithSpark": {}

‎region/norfair/east/Cathedral.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@
459459
},
460460
"requires": [
461461
"canShinechargeMovementTricky",
462-
"canHorizontalShinespark",
463462
{"heatFrames": 225},
464463
{"shinespark": {"frames": 53, "excessFrames": 0}},
465464
{"heatFrames": 105}

0 commit comments

Comments
 (0)