Skip to content

Commit ef88dee

Browse files
osse101osse101
authored
Merge pull request #2782 from kjbranch/ss-un-w
West Norfair shinesparks: split speed and general cleanup
2 parents c8e369a + 8c00afc commit ef88dee

5 files changed

Lines changed: 129 additions & 57 deletions

File tree

‎region/norfair/west/Business Center.json‎

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,12 @@
372372
"requires": [
373373
"canShinechargeMovementComplex",
374374
{"or": [
375-
{"shinespark": {"frames": 10}},
376-
{"enemyDamage": {"enemy": "Sova", "type": "contact", "hits": 1}}
377-
]},
378-
{"shinespark": {"frames": 2}}
375+
{"shinespark": {"frames": 12, "excessFrames": 0}},
376+
{"and": [
377+
{"enemyDamage": {"enemy": "Sova", "type": "contact", "hits": 1}},
378+
{"shinespark": {"frames": 2, "excessFrames": 0}}
379+
]}
380+
]}
379381
],
380382
"exitCondition": {
381383
"leaveWithSpark": {}
@@ -534,8 +536,11 @@
534536
},
535537
"requires": [
536538
{"shineChargeFrames": 30},
537-
"canMidairShinespark",
538-
{"shinespark": {"frames": 18}}
539+
{"or": [
540+
"canHorizontalMidairShinespark",
541+
"canMoonwalk"
542+
]},
543+
{"shinespark": {"frames": 18, "excessFrames": 0}}
539544
],
540545
"exitCondition": {
541546
"leaveWithSpark": {
@@ -846,10 +851,10 @@
846851
"comeInShinecharged": {}
847852
},
848853
"requires": [
849-
{"shineChargeFrames": 90},
854+
{"shineChargeFrames": 80},
850855
"HiJump",
851856
"canShinechargeMovementComplex",
852-
{"shinespark": {"frames": 6, "excessFrames": 0}}
857+
{"shinespark": {"frames": 8, "excessFrames": 0}}
853858
],
854859
"exitCondition": {
855860
"leaveWithSpark": {}
@@ -1338,10 +1343,16 @@
13381343
"comeInShinecharged": {}
13391344
},
13401345
"requires": [
1341-
{"shineChargeFrames": 80},
1346+
{"or": [
1347+
{"and": [
1348+
"canSpeedyJump",
1349+
{"shineChargeFrames": 70}
1350+
]},
1351+
{"shineChargeFrames": 75}
1352+
]},
13421353
"HiJump",
13431354
"canShinechargeMovementComplex",
1344-
{"shinespark": {"frames": 10, "excessFrames": 0}}
1355+
{"shinespark": {"frames": 11, "excessFrames": 0}}
13451356
],
13461357
"exitCondition": {
13471358
"leaveWithSpark": {
@@ -1629,7 +1640,7 @@
16291640
"requires": [
16301641
"HiJump",
16311642
"canShinechargeMovementTricky",
1632-
{"shinespark": {"frames": 10}}
1643+
{"shinespark": {"frames": 10, "excessFrames": 0}}
16331644
],
16341645
"exitCondition": {
16351646
"leaveWithSpark": {}
@@ -1734,7 +1745,13 @@
17341745
"comeInShinecharged": {}
17351746
},
17361747
"requires": [
1737-
{"shineChargeFrames": 85},
1748+
{"or": [
1749+
{"and": [
1750+
"canSpeedyJump",
1751+
{"shineChargeFrames": 85}
1752+
]},
1753+
{"shineChargeFrames": 90}
1754+
]},
17381755
"HiJump",
17391756
"canShinechargeMovementComplex",
17401757
{"shinespark": {"frames": 8, "excessFrames": 0}}
@@ -2096,7 +2113,7 @@
20962113
},
20972114
"requires": [
20982115
{"shineChargeFrames": 10},
2099-
{"shinespark": {"frames": 21}}
2116+
{"shinespark": {"frames": 21, "excessFrames": 0}}
21002117
],
21012118
"exitCondition": {
21022119
"leaveWithSpark": {}
@@ -2205,7 +2222,7 @@
22052222
"requires": [
22062223
"HiJump",
22072224
"canShinechargeMovementTricky",
2208-
{"shinespark": {"frames": 10}}
2225+
{"shinespark": {"frames": 10, "excessFrames": 0}}
22092226
],
22102227
"exitCondition": {
22112228
"leaveWithSpark": {
@@ -2233,7 +2250,7 @@
22332250
"HiJump",
22342251
"canShinechargeMovementTricky",
22352252
"canInsaneJump",
2236-
{"shinespark": {"frames": 6}}
2253+
{"shinespark": {"frames": 6, "excessFrames": 0}}
22372254
],
22382255
"exitCondition": {
22392256
"leaveWithSpark": {}
@@ -2798,9 +2815,8 @@
27982815
},
27992816
"requires": [
28002817
"HiJump",
2801-
"canMidairShinespark",
28022818
"canShinechargeMovementTricky",
2803-
{"shinespark": {"frames": 6}}
2819+
{"shinespark": {"frames": 6, "excessFrames": 0}}
28042820
],
28052821
"exitCondition": {
28062822
"leaveWithSpark": {}
@@ -2825,10 +2841,9 @@
28252841
},
28262842
"requires": [
28272843
"HiJump",
2828-
"canMidairShinespark",
28292844
"canShinechargeMovementTricky",
28302845
"canInsaneJump",
2831-
{"shinespark": {"frames": 5}}
2846+
{"shinespark": {"frames": 5, "excessFrames": 0}}
28322847
],
28332848
"exitCondition": {
28342849
"leaveWithSpark": {}
@@ -3125,7 +3140,7 @@
31253140
},
31263141
"requires": [
31273142
{"shineChargeFrames": 10},
3128-
{"shinespark": {"frames": 21}}
3143+
{"shinespark": {"frames": 21, "excessFrames": 0}}
31293144
],
31303145
"exitCondition": {
31313146
"leaveWithSpark": {}
@@ -3434,9 +3449,8 @@
34343449
},
34353450
"requires": [
34363451
"HiJump",
3437-
"canMidairShinespark",
34383452
"canShinechargeMovementTricky",
3439-
{"shinespark": {"frames": 10}}
3453+
{"shinespark": {"frames": 10, "excessFrames": 0}}
34403454
],
34413455
"exitCondition": {
34423456
"leaveWithSpark": {
@@ -3463,10 +3477,9 @@
34633477
},
34643478
"requires": [
34653479
"HiJump",
3466-
"canMidairShinespark",
34673480
"canShinechargeMovementTricky",
34683481
"canInsaneJump",
3469-
{"shinespark": {"frames": 6}}
3482+
{"shinespark": {"frames": 6, "excessFrames": 0}}
34703483
],
34713484
"exitCondition": {
34723485
"leaveWithSpark": {}
@@ -3625,7 +3638,7 @@
36253638
},
36263639
"requires": [
36273640
{"shineChargeFrames": 10},
3628-
{"shinespark": {"frames": 21}}
3641+
{"shinespark": {"frames": 21, "excessFrames": 0}}
36293642
],
36303643
"exitCondition": {
36313644
"leaveWithSpark": {
@@ -3648,7 +3661,7 @@
36483661
},
36493662
"requires": [
36503663
{"shineChargeFrames": 65},
3651-
{"shinespark": {"frames": 5}}
3664+
{"shinespark": {"frames": 5, "excessFrames": 0}}
36523665
],
36533666
"exitCondition": {
36543667
"leaveWithSpark": {}
@@ -3872,7 +3885,7 @@
38723885
},
38733886
"requires": [
38743887
"canShinechargeMovementComplex",
3875-
{"shinespark": {"frames": 15}}
3888+
{"shinespark": {"frames": 15, "excessFrames": 0}}
38763889
],
38773890
"exitCondition": {
38783891
"leaveWithSpark": {}
@@ -4390,7 +4403,7 @@
43904403
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
43914404
]},
43924405
"canShinechargeMovementTricky",
4393-
{"shinespark": {"frames": 10}}
4406+
{"shinespark": {"frames": 10, "excessFrames": 0}}
43944407
],
43954408
"exitCondition": {
43964409
"leaveWithSpark": {}
@@ -4571,7 +4584,7 @@
45714584
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
45724585
]},
45734586
"canShinechargeMovementTricky",
4574-
{"shinespark": {"frames": 10}}
4587+
{"shinespark": {"frames": 10, "excessFrames": 0}}
45754588
],
45764589
"exitCondition": {
45774590
"leaveWithSpark": {
@@ -4609,7 +4622,7 @@
46094622
]},
46104623
"canShinechargeMovementTricky",
46114624
"canInsaneJump",
4612-
{"shinespark": {"frames": 6}}
4625+
{"shinespark": {"frames": 6, "excessFrames": 0}}
46134626
],
46144627
"exitCondition": {
46154628
"leaveWithSpark": {}

0 commit comments

Comments
 (0)