Skip to content

Add Crystal Sparks in Croc's Lair #2805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
osse101 merged 2 commits into from
Apr 3, 2026
Merged

Add Crystal Sparks in Croc's Lair #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c5cff8
Add Crystal Sparks in Croc's Lair
kjbranch Mar 30, 2026
cfbbcaf
add grapple 2 crystal spark
kjbranch Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion helpers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,11 @@
{
"name": "h_runOverRespawningEnemies",
"requires": [
"canCarefulJump"
"canCarefulJump",
{"or": [
"h_enemyDrops",
"Wave"
]}
],
"devNote": "canCarefulJump is used to represent leaving the enemy drops, which isn't a propper fit, but it is a tech with a similar difficulty."
},
Expand Down
17 changes: 17 additions & 0 deletions region/norfair/crocomire/Cosine Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,23 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Crystal Spark",
"requires": [
"h_shinechargeMaxRunway",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
},
{
"id": 2,
"link": [1, 1],
Expand Down
28 changes: 28 additions & 0 deletions region/norfair/crocomire/Crocomire's Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,18 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Crystal Spark",
"requires": [
"h_CrocomireCameraFix",
{"canShineCharge": {"usedTiles": 14, "openEnd": 1}},
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": "With Crocomire defeated, the crystal spark will be done at node 4."
},
{
"id": 5,
"link": [1, 3],
Expand Down Expand Up @@ -1346,6 +1358,22 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [4, 4],
"name": "Crystal Spark",
"requires": [
{"or": [
{"and": [
"f_DefeatedCrocomire",
"h_shinechargeMaxRunway"
]},
{"canShineCharge": {"usedTiles": 32, "openEnd": 1}}
]},
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 52,
"link": [4, 4],
Expand Down
16 changes: 16 additions & 0 deletions region/norfair/crocomire/Grapple Beam Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,22 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 9,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 15,
"link": [2, 3],
Expand Down
58 changes: 57 additions & 1 deletion region/norfair/crocomire/Grapple Tutorial Room 1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,41 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 9,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 3,
"link": [1, 2],
"name": "Base",
"requires": [],
"requires": [
{"or": [
"canDash",
"Grapple",
"canWalljump",
"SpaceJump",
"canSpringBallJumpMidAir",
"canBombJumpWaterEscape",
{"and": [
"HiJump",
"canDownGrab"
]},
"canSpringBallBombJump"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
Expand Down Expand Up @@ -397,6 +427,32 @@
},
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [2, 2],
"name": "Crystal Flash",
"requires": [
"h_CrystalFlash"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": "This is only needed here as well, because Samus can't cross left to right with a blue suit."
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 8,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
}
],
"notables": [],
Expand Down
25 changes: 25 additions & 0 deletions region/norfair/crocomire/Grapple Tutorial Room 2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,31 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"canShinechargeMovementTricky",
"canInsaneJump",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": [
"Shinecharge on the edge then quickly jump into the hole and place the Power Bomb on the descent.",
"Alternatively, it is possible to kill the Fune with a Super immediately after shinecharging."
],
"devNote": [
"It not currently possible to represent the Super variant, because the Super would not be muliplied by the lenience factor."
]
},
{
"id": 3,
"link": [1, 2],
Expand Down
40 changes: 40 additions & 0 deletions region/norfair/crocomire/Grapple Tutorial Room 3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,30 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_shinechargeMaxRunway",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
},
{
"id": 4,
"link": [1, 1],
Expand Down Expand Up @@ -981,6 +1005,22 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 33,
"link": [2, 2],
Expand Down
28 changes: 28 additions & 0 deletions region/norfair/crocomire/Indiana Jones Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,22 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 9,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 117,
"link": [1, 1],
Expand Down Expand Up @@ -1159,6 +1175,18 @@
"blueSuitChecked": true,
"note": "Commonly known as a stutter-3, this is also doable as a 4-tap."
},
{
"link": [2, 2],
"name": "Crystal Spark",
"requires": [
{"obstaclesCleared": ["B"]},
"h_shinechargeMaxRunway",
"h_CrystalSpark"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 138,
"link": [2, 2],
Expand Down
87 changes: 87 additions & 0 deletions region/norfair/crocomire/Post Crocomire Farming Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,93 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [3, 3],
"name": "Crystal Spark",
"requires": [
"h_runOverRespawningEnemies",
{"or": [
{"canShineCharge": {
"usedTiles": 18,
"gentleUpTiles": 2,
"gentleDownTiles": 4,
"openEnd": 1
}},
{"and": [
{"doorUnlockedAtNode": 3},
{"canShineCharge": {
"usedTiles": 19,
"gentleUpTiles": 2,
"gentleDownTiles": 4,
"openEnd": 1
}}
]}
]},
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
},
{
"link": [3, 3],
"name": "Come in Getting Blue Speed, Shinecharge, Crystal Spark (Short Runway)",
"entranceCondition": {
"comeInGettingBlueSpeed": {
"length": 10,
"gentleDownTiles": 4,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_shinechargeMaxRunway",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": "Get blue speed before the Gamets.",
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
},
{
"link": [3, 3],
"name": "Come in Shinecharging, Crystal Spark (Wave)",
"entranceCondition": {
"comeInShinecharging": {
"length": 18,
"gentleDownTiles": 4,
"gentleUpTiles": 2,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Wave",
"h_runOverRespawningEnemies",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": ["No lenience, because Power Bombs can be farmed from the Gamets."]
},
{
"id": 95,
"link": [3, 3],
Expand Down
Loading
Loading