Skip to content

Commit aec2c94

Browse files
kjbranchkjbranch
committed
LN East shinesparks: split speed and general cleanup
1 parent 8a61566 commit aec2c94

11 files changed

Lines changed: 59 additions & 36 deletions

‎region/lowernorfair/east/Amphitheatre.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,7 @@
11751175
"Gravity",
11761176
"canSuitlessLavaDive",
11771177
{"canShineCharge": {"usedTiles": 13, "openEnd": 1}},
1178-
{"shinespark": {"frames": 55}},
1178+
{"shinespark": {"frames": 55, "excessFrames": 0}},
11791179
{"acidFrames": 600}
11801180
],
11811181
"unlocksDoors": [

‎region/lowernorfair/east/Fast Pillars Setup Room.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,9 +1053,15 @@
10531053
"comeInShinecharged": {}
10541054
},
10551055
"requires": [
1056-
{"shineChargeFrames": 70},
10571056
"HiJump",
10581057
"canShinechargeMovementComplex",
1058+
{"or": [
1059+
{"shineChargeFrames": 75},
1060+
{"and": [
1061+
"canSpeedyJump",
1062+
{"shineChargeFrames": 70}
1063+
]}
1064+
]},
10591065
"canDodgeWhileShooting",
10601066
{"heatFrames": 105},
10611067
{"shinespark": {"frames": 12, "excessFrames": 0}}
@@ -1781,7 +1787,7 @@
17811787
"requires": [
17821788
{"shineChargeFrames": 10},
17831789
{"heatFrames": 60},
1784-
{"shinespark": {"frames": 21}}
1790+
{"shinespark": {"frames": 21, "excessFrames": 0}}
17851791
],
17861792
"exitCondition": {
17871793
"leaveWithSpark": {}
@@ -2164,7 +2170,7 @@
21642170
"requires": [
21652171
{"shineChargeFrames": 10},
21662172
{"heatFrames": 60},
2167-
{"shinespark": {"frames": 21}}
2173+
{"shinespark": {"frames": 21, "excessFrames": 0}}
21682174
],
21692175
"exitCondition": {
21702176
"leaveWithSpark": {}

‎region/lowernorfair/east/Lower Norfair Farming Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
},
278278
"requires": [
279279
{"shineChargeFrames": 15},
280-
"canMidairShinespark",
280+
"canHorizontalMidairShinespark",
281281
{"shinespark": {"frames": 57, "excessFrames": 4}},
282282
{"heatFrames": 230}
283283
],
@@ -429,7 +429,7 @@
429429
"requires": [
430430
{"shineChargeFrames": 15},
431431
"h_navigateHeatRooms",
432-
"canMidairShinespark",
432+
"canHorizontalMidairShinespark",
433433
{"shinespark": {"frames": 59, "excessFrames": 5}},
434434
{"heatFrames": 190}
435435
],

‎region/lowernorfair/east/Lower Norfair Fireflea Room.json‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,12 +1869,21 @@
18691869
"openEnd": 1
18701870
}},
18711871
{"or": [
1872+
{"shinespark": {"frames": 21, "excessFrames": 4}},
18721873
{"and": [
18731874
"canMidairShinespark",
1874-
"canShinechargeMovement",
1875-
{"shinespark": {"frames": 9, "excessFrames": 4}}
1875+
{"shinespark": {"frames": 13, "excessFrames": 4}}
18761876
]},
1877-
{"shinespark": {"frames": 21, "excessFrames": 4}}
1877+
{"and": [
1878+
"HiJump",
1879+
"canMidairShinespark",
1880+
{"shinespark": {"frames": 9, "excessFrames": 3}}
1881+
]},
1882+
{"and": [
1883+
"canShinechargeMovementComplex",
1884+
"canSpeedyJump",
1885+
{"shinespark": {"frames": 9, "excessFrames": 3}}
1886+
]}
18781887
]}
18791888
],
18801889
"flashSuitChecked": true,
@@ -1894,7 +1903,7 @@
18941903
{
18951904
"id": 85,
18961905
"link": [7, 7],
1897-
"name": "Gain Flash Suit - Shinespark up.",
1906+
"name": "Gain Flash Suit - Shinespark Up",
18981907
"requires": [
18991908
"canUseFlashSuitInitialSpark",
19001909
{"canShineCharge": {

‎region/lowernorfair/east/Lower Norfair Spring Ball Maze.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,7 +1657,7 @@
16571657
{"obstaclesCleared": ["A", "C"]},
16581658
{"heatFrames": 390},
16591659
"canShinechargeMovement",
1660-
{"shinespark": {"frames": 35}}
1660+
{"shinespark": {"frames": 35, "excessFrames": 0}}
16611661
],
16621662
"exitCondition": {
16631663
"leaveWithSpark": {
@@ -1693,7 +1693,7 @@
16931693
{"heatFrames": 390},
16941694
"canTrickyJump",
16951695
"canShinechargeMovementComplex",
1696-
{"shinespark": {"frames": 30}}
1696+
{"shinespark": {"frames": 30, "excessFrames": 0}}
16971697
],
16981698
"exitCondition": {
16991699
"leaveWithSpark": {}
@@ -1728,7 +1728,7 @@
17281728
"canTrickyJump",
17291729
"canShinechargeMovementComplex",
17301730
"canHeroShot",
1731-
{"shinespark": {"frames": 31}},
1731+
{"shinespark": {"frames": 31, "excessFrames": 0}},
17321732
{"doorUnlockedAtNode": 3}
17331733
],
17341734
"exitCondition": {

‎region/lowernorfair/east/Main Hall.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,7 @@
403403
"requires": [
404404
{"shineChargeFrames": 16},
405405
"h_navigateHeatRooms",
406-
"canShinechargeMovement",
407-
"canMidairShinespark",
406+
"canHorizontalMidairShinespark",
408407
{"shinespark": {"frames": 75, "excessFrames": 10}},
409408
{"heatFrames": 270}
410409
],
@@ -791,8 +790,7 @@
791790
"link": [4, 1],
792791
"name": "Shinespark",
793792
"requires": [
794-
"canMidairShinespark",
795-
"canShinechargeMovement",
793+
"canHorizontalMidairShinespark",
796794
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
797795
{"shinespark": {"frames": 75, "excessFrames": 5}},
798796
{"heatFrames": 380}
@@ -930,8 +928,7 @@
930928
},
931929
"requires": [
932930
"canOffScreenMovement",
933-
"canMidairShinespark",
934-
"canShinechargeMovement",
931+
"canHorizontalMidairShinespark",
935932
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
936933
{"shinespark": {"frames": 75, "excessFrames": 5}},
937934
"h_heatedGModeOffCameraDoor"

‎region/lowernorfair/east/Pillar Room.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
},
274274
"requires": [
275275
{"heatFrames": 150},
276-
"canMidairShinespark",
276+
"canHorizontalMidairShinespark",
277277
{"or": [
278278
{"and": [
279279
{"shinespark": {"frames": 66, "excessFrames": 5}},
@@ -315,7 +315,7 @@
315315
"requires": [
316316
{"shineChargeFrames": 65},
317317
{"heatFrames": 135},
318-
"canMidairShinespark",
318+
"canHorizontalMidairShinespark",
319319
{"or": [
320320
{"and": [
321321
{"shinespark": {"frames": 66, "excessFrames": 5}},
@@ -938,8 +938,7 @@
938938
}
939939
},
940940
"requires": [
941-
"canShinechargeMovement",
942-
"canHorizontalShinespark",
941+
"canHorizontalMidairShinespark",
943942
{"or": [
944943
{"and": [
945944
{"heatFrames": 105},
@@ -1000,8 +999,7 @@
1000999
"comeInShinecharged": {}
10011000
},
10021001
"requires": [
1003-
"canShinechargeMovement",
1004-
"canHorizontalShinespark",
1002+
"canHorizontalMidairShinespark",
10051003
{"shineChargeFrames": 65},
10061004
{"heatFrames": 135},
10071005
{"or": [

‎region/lowernorfair/east/Red Kihunter Shaft.json‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,17 @@
349349
"comeInShinecharged": {}
350350
},
351351
"requires": [
352-
{"shineChargeFrames": 10},
352+
{"or": [
353+
{"and": [
354+
{"shineChargeFrames": 20},
355+
{"heatFrames": 10}
356+
]},
357+
{"and": [
358+
"canShinechargeMovementComplex",
359+
{"shineChargeFrames": 10}
360+
]}
361+
]},
353362
{"heatFrames": 60},
354-
"canShinechargeMovementComplex",
355363
{"shinespark": {"frames": 22, "excessFrames": 0}}
356364
],
357365
"exitCondition": {
@@ -1215,9 +1223,17 @@
12151223
"comeInShinecharged": {}
12161224
},
12171225
"requires": [
1218-
{"shineChargeFrames": 10},
1226+
{"or": [
1227+
{"and": [
1228+
{"shineChargeFrames": 20},
1229+
{"heatFrames": 10}
1230+
]},
1231+
{"and": [
1232+
"canShinechargeMovementComplex",
1233+
{"shineChargeFrames": 10}
1234+
]}
1235+
]},
12191236
{"heatFrames": 60},
1220-
"canShinechargeMovementComplex",
12211237
{"shinespark": {"frames": 22, "excessFrames": 0}}
12221238
],
12231239
"exitCondition": {

‎region/lowernorfair/east/The Worst Room In The Game.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,6 @@
768768
},
769769
"requires": [
770770
{"shineChargeFrames": 60},
771-
"canShinechargeMovement",
772771
"canMidairShinespark",
773772
{"or": [
774773
{"and": [
@@ -781,9 +780,9 @@
781780
{"shinespark": {"frames": 36, "excessFrames": 3}}
782781
]},
783782
{"and": [
784-
{"enemyDamage": {"enemy": "Namihe", "type": "fireball", "hits": 1}},
785783
{"shineChargeFrames": 10},
786-
{"shinespark": {"frames": 22}},
784+
{"shinespark": {"frames": 22, "excessFrames": 0}},
785+
{"enemyDamage": {"enemy": "Namihe", "type": "fireball", "hits": 1}},
787786
{"heatFrames": 25}
788787
]}
789788
]},
@@ -809,7 +808,6 @@
809808
}
810809
},
811810
"requires": [
812-
"canShinechargeMovement",
813811
"canMidairShinespark",
814812
{"or": [
815813
{"and": [
@@ -821,8 +819,8 @@
821819
{"shinespark": {"frames": 33, "excessFrames": 3}}
822820
]},
823821
{"and": [
822+
{"shinespark": {"frames": 22, "excessFrames": 0}},
824823
{"enemyDamage": {"enemy": "Namihe", "type": "fireball", "hits": 1}},
825-
{"shinespark": {"frames": 22}},
826824
{"heatFrames": 25}
827825
]}
828826
]},

‎region/lowernorfair/east/Wasteland.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,6 @@
778778
{"enemyDamage": {"enemy": "Dessgeega", "type": "contact", "hits": 1}},
779779
"canUseIFrames",
780780
"canShinechargeMovementComplex",
781-
"canHorizontalShinespark",
782781
{"shinespark": {"frames": 40}},
783782
{"heatFrames": 330}
784783
],
@@ -2085,7 +2084,6 @@
20852084
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
20862085
{"enemyDamage": {"enemy": "Dessgeega", "type": "contact", "hits": 1}},
20872086
"canUseIFrames",
2088-
"canMidairShinespark",
20892087
"canShinechargeMovementComplex",
20902088
{"shinespark": {"frames": 40}},
20912089
{"heatFrames": 310}

0 commit comments

Comments
 (0)