Skip to content

Commit 89af4cd

Browse files
osse101osse101
authored
Merge pull request #1750 from blkerby/pcjr-shinesparks
PCJR shinesparks
2 parents c74f301 + 8a7ca0f commit 89af4cd

2 files changed

Lines changed: 162 additions & 35 deletions

File tree

‎region/crateria/central/Landing Site.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
"name": "Leave Spinning (Long Runway)",
317317
"requires": [
318318
"canPreciseSpaceJump",
319-
{"obstaclesCleared": ["A", "C"]}
319+
{"obstaclesCleared": ["A"]}
320320
],
321321
"exitCondition": {
322322
"leaveSpinning": {
@@ -336,7 +336,7 @@
336336
"name": "Leave With Mockball (Long Runway)",
337337
"requires": [
338338
"canPreciseSpaceJump",
339-
{"obstaclesCleared": ["A", "C"]}
339+
{"obstaclesCleared": ["A"]}
340340
],
341341
"exitCondition": {
342342
"leaveWithMockball": {
@@ -360,7 +360,7 @@
360360
"name": "Leave With Spring Ball Bounce (Long Runway)",
361361
"requires": [
362362
"canPreciseSpaceJump",
363-
{"obstaclesCleared": ["A", "C"]}
363+
{"obstaclesCleared": ["A"]}
364364
],
365365
"exitCondition": {
366366
"leaveWithSpringBallBounce": {
@@ -385,7 +385,7 @@
385385
"name": "Leave Space Jumping (Long Runway)",
386386
"requires": [
387387
"canPreciseSpaceJump",
388-
{"obstaclesCleared": ["A", "C"]}
388+
{"obstaclesCleared": ["A"]}
389389
],
390390
"exitCondition": {
391391
"leaveSpaceJumping": {
@@ -708,7 +708,8 @@
708708
"unlocksDoors": [
709709
{
710710
"types": ["ammo"],
711-
"requires": []
711+
"requires": [],
712+
"useImplicitRequires": false
712713
}
713714
],
714715
"devNote": [
@@ -842,7 +843,8 @@
842843
"unlocksDoors": [
843844
{
844845
"types": ["ammo"],
845-
"requires": []
846+
"requires": [],
847+
"useImplicitRequires": false
846848
}
847849
],
848850
"note": [
@@ -1030,7 +1032,8 @@
10301032
"unlocksDoors": [
10311033
{
10321034
"types": ["ammo"],
1033-
"requires": []
1035+
"requires": [],
1036+
"useImplicitRequires": false
10341037
}
10351038
],
10361039
"devNote": [
@@ -1095,7 +1098,8 @@
10951098
"unlocksDoors": [
10961099
{
10971100
"types": ["ammo"],
1098-
"requires": []
1101+
"requires": [],
1102+
"useImplicitRequires": false
10991103
}
11001104
],
11011105
"note": [

‎region/norfair/crocomire/Post Crocomire Jump Room.json‎

Lines changed: 150 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
"name": "G-Mode Morph Direct",
7373
"obstacleType": "abstract",
7474
"note": "Samus enters the room in direct G-Mode with artificial morph, in order to be able to remote acquire the item."
75+
},
76+
{
77+
"id": "E",
78+
"name": "Left door open",
79+
"obstacleType": "inanimate"
7580
}
7681
],
7782
"enemies": [
@@ -160,6 +165,14 @@
160165
],
161166
"flashSuitChecked": true
162167
},
168+
{
169+
"link": [1, 1],
170+
"name": "Open Door",
171+
"requires": [
172+
{"doorUnlockedAtNode": 1}
173+
],
174+
"clearsObstacles": ["E"]
175+
},
163176
{
164177
"id": 3,
165178
"link": [1, 2],
@@ -436,7 +449,6 @@
436449
"requires": [
437450
"canWalljump",
438451
"canShinechargeMovementComplex",
439-
"canMidairShinespark",
440452
{"obstaclesCleared": ["B"]},
441453
{"or": [
442454
{"canShineCharge": {
@@ -449,33 +461,50 @@
449461
{"obstaclesCleared": ["A"]}
450462
]}
451463
]},
452-
{"shinespark": {"frames": 90}}
464+
{"shinespark": {"frames": 85}}
453465
],
454466
"note": "Fire off the shinespark at the apex of two consecutive walljumps."
455467
},
456468
{
457469
"id": 19,
458470
"link": [2, 1],
459-
"name": "Big Jump Shinespark",
471+
"name": "Big Jump Horizontal Shinespark",
460472
"requires": [
461473
{"notable": "Big Jump Shinespark"},
462474
"canShinechargeMovementComplex",
463-
"canMidairShinespark",
464475
{"obstaclesCleared": ["B"]},
465-
{"or": [
466-
{"canShineCharge": {
467-
"usedTiles": 32,
468-
"gentleUpTiles": 6,
469-
"openEnd": 1
470-
}},
471-
{"and": [
472-
"h_canShineChargeMaxRunway",
473-
{"obstaclesCleared": ["A"]}
474-
]}
475-
]},
476-
{"shinespark": {"frames": 52}}
476+
{"canShineCharge": {
477+
"usedTiles": 32,
478+
"gentleDownTiles": 6,
479+
"openEnd": 1
480+
}},
481+
{"shinespark": {"frames": 52}},
482+
"canDownGrab"
483+
],
484+
"note": [
485+
"Charge a spark to the right, then come back, run and jump, and do a horizontal spark at the apex.",
486+
"If needed, down-grab onto the ledge."
487+
]
488+
},
489+
{
490+
"link": [2, 1],
491+
"name": "Big Jump Diagonal Shinespark",
492+
"requires": [
493+
{"notable": "Big Jump Shinespark"},
494+
"canShinechargeMovementTricky",
495+
{"obstaclesCleared": ["B"]},
496+
{"canShineCharge": {
497+
"usedTiles": 23,
498+
"gentleDownTiles": 6,
499+
"openEnd": 1
500+
}},
501+
{"shinespark": {"frames": 26}}
477502
],
478-
"note": "Charge a spark to the right, then come back, run and jump, and do a horizontal spark at the apex."
503+
"note": [
504+
"Charge a spark to the right a specific distance of about 6 tiles past the broken Speed blocks.",
505+
"Then turn around, run and jump, and activate a diagonal spark as late as possible.",
506+
"By shortening the jump, it is possible to kill a Ripper and collect its drop while falling."
507+
]
479508
},
480509
{
481510
"id": 20,
@@ -503,13 +532,107 @@
503532
"canCarefulJump",
504533
"HiJump"
505534
]},
506-
{"obstaclesCleared": ["B"]},
507-
{"or": [
508-
"h_canUsePowerBombs",
509-
{"obstaclesCleared": ["A"]}
510-
]}
535+
{"obstaclesCleared": ["A", "B"]}
536+
]
537+
},
538+
{
539+
"link": [2, 1],
540+
"name": "Leave With Spark (Wall Jumps)",
541+
"requires": [
542+
{"obstaclesCleared": ["B", "E"]},
543+
{"canShineCharge": {
544+
"usedTiles": 32,
545+
"gentleUpTiles": 6,
546+
"openEnd": 1
547+
}},
548+
"canWalljump",
549+
"canShinechargeMovementComplex",
550+
{"shinespark": {"frames": 85}}
511551
],
512-
"clearsObstacles": ["A"]
552+
"exitCondition": {
553+
"leaveWithSpark": {}
554+
},
555+
"unlocksDoors": [
556+
{
557+
"types": ["ammo"],
558+
"requires": [],
559+
"useImplicitRequires": false
560+
}
561+
]
562+
},
563+
{
564+
"link": [2, 1],
565+
"name": "Leave With Spark (Short Speedy Jump)",
566+
"requires": [
567+
{"obstaclesCleared": ["B", "E"]},
568+
{"canShineCharge": {
569+
"usedTiles": 32,
570+
"gentleDownTiles": 6,
571+
"openEnd": 1
572+
}},
573+
"canShinechargeMovementComplex",
574+
{"shinespark": {"frames": 57}}
575+
],
576+
"exitCondition": {
577+
"leaveWithSpark": {
578+
"position": "bottom"
579+
}
580+
},
581+
"unlocksDoors": [
582+
{
583+
"types": ["ammo"],
584+
"requires": [],
585+
"useImplicitRequires": false
586+
}
587+
]
588+
},
589+
{
590+
"link": [2, 1],
591+
"name": "Leave With Spark (Short Speedy HiJump)",
592+
"requires": [
593+
"HiJump",
594+
{"obstaclesCleared": ["B", "E"]},
595+
{"canShineCharge": {
596+
"usedTiles": 32,
597+
"gentleDownTiles": 6,
598+
"openEnd": 1
599+
}},
600+
"canShinechargeMovementComplex",
601+
{"shinespark": {"frames": 56}}
602+
],
603+
"exitCondition": {
604+
"leaveWithSpark": {}
605+
},
606+
"unlocksDoors": [
607+
{
608+
"types": ["ammo"],
609+
"requires": [],
610+
"useImplicitRequires": false
611+
}
612+
]
613+
},
614+
{
615+
"link": [2, 1],
616+
"name": "Leave With Spark (Long Speedy Jump)",
617+
"requires": [
618+
{"obstaclesCleared": ["A", "B", "E"]},
619+
"h_canShineChargeMaxRunway",
620+
"canShinechargeMovementComplex",
621+
{"shinespark": {"frames": 53}}
622+
],
623+
"exitCondition": {
624+
"leaveWithSpark": {}
625+
},
626+
"unlocksDoors": [
627+
{
628+
"types": ["ammo"],
629+
"requires": [],
630+
"useImplicitRequires": false
631+
}
632+
],
633+
"note": [
634+
"Store a shinecharge and start running below the left side of the vertical door, to set up the jump in a way that shinesparking at the apex of the jump approximately aligns with the top of the far door."
635+
]
513636
},
514637
{
515638
"id": 22,
@@ -581,7 +704,7 @@
581704
"limit": 16
582705
}}
583706
],
584-
"resetsObstacles": ["A", "B"],
707+
"resetsObstacles": ["A", "B", "C", "D", "E"],
585708
"note": "Shoot the Mellas when they first begin to come on screen, and they will not move."
586709
},
587710
{
@@ -594,7 +717,7 @@
594717
],
595718
"exitCondition": {
596719
"leaveShinecharged": {
597-
"framesRemaining": 130
720+
"framesRemaining": 135
598721
}
599722
},
600723
"flashSuitChecked": true,
@@ -619,7 +742,7 @@
619742
],
620743
"exitCondition": {
621744
"leaveShinecharged": {
622-
"framesRemaining": 100
745+
"framesRemaining": 115
623746
}
624747
},
625748
"flashSuitChecked": true,
@@ -1445,7 +1568,7 @@
14451568
{
14461569
"id": 5,
14471570
"name": "Big Jump Shinespark",
1448-
"note": "Charge a spark to the right, then come back, run and jump, and do a horizontal spark at the apex."
1571+
"note": "Charge a spark to the right, then come back, run and jump, and perform a shinespark (horizontally or diagonally) to reach the ledge."
14491572
},
14501573
{
14511574
"id": 6,

0 commit comments

Comments
 (0)