Skip to content

Add Crystal Sparks in Pink Maridia #2816

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 5 commits into from
Apr 8, 2026
Merged

Add Crystal Sparks in Pink Maridia #2816

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c079eff
Add Crystal Sparks in Pink Maridia
kjbranch Apr 2, 2026
15fb25f
fix errors
kjbranch Apr 2, 2026
98897b4
fix shinecharge error
kjbranch Apr 2, 2026
5981778
Apply suggestions from code review
kjbranch Apr 4, 2026
c9ccee5
feedback update
kjbranch Apr 4, 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
61 changes: 44 additions & 17 deletions region/maridia/inner-green/Lonely Crab Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,50 @@
"blueSuitChecked": true,
"note": "Samus is only able to use about half of the runway and be able to Crystal Spark before the crab reaches her."
},
{
"link": [1, 1],
"name": "Precise Stutter Water Shinecharge, Crystal Spark",
"entranceCondition": {
"comeInStutterShinecharging": {
"minTiles": 2.4375
},
"comesInHeated": "no"
},
"requires": [
"canPreciseStutterWaterShineCharge",
{"or": [
"Wave",
"Spazer",
"Plasma"
]},
{"or": [
{"and": [
"h_enemyDrops",
"h_underwaterCrystalSparkWithoutLenience"
]},
"h_underwaterCrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": [
"With only a runway length of 3 tiles (closed end) in the other room, this requires a precise setup:",
"release forward for 3 or 4 frames, then repress forward on the last possible frame before the transition;",
"alternatively, release forward for 2 frames and repress forward on the second-to-last possible frame before the transition."
],
"detailNote": [
"If a longer runway is available (4 tiles), the timing windows are a bit more lenient:",
"1. Release forward for 3, 4, or 5 frames, repress forward on the last possible frame;",
"2. Release forward for 2 or 3 frames, repress forward on the 2nd-to-last possible frame;",
"3. Release forward for 1 or 2 frames, repress forward on the 3rd-to-last possible frame."
],
"devNote": [
"No lenience, because Power Bombs can be farmed from the Sciser.",
"Killing it with Missiles or a Super is not represented, because it can not currently be multiplied by the lenience factor.",
"FIXME: This is possible with a shorter runway, as low as 1 tile, but it's a lot worse.",
"It would require more duplication and could be very tedious to set up for many attempts."
]
},
{
"link": [1, 1],
"name": "Crystal Spark (In-Room)",
Expand Down Expand Up @@ -1688,23 +1732,6 @@
"The `h_getBlueSpeedMaxRunway` requirement is to satisfy the tests,",
"since we don't have a way to represent that the temporary blue originates from the startsWithShineCharge."
]
},
{
"link": [4, 2],
"name": "Crystal Spark",
"startsWithShineCharge": true,
"requires": [
{"shineChargeFrames": 0},
{"or": [
{"and": [
"h_enemyDrops",
"h_underwaterCrystalSparkWithoutLenience"
]},
"h_underwaterCrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true
}
],
"notables": [],
Expand Down
136 changes: 100 additions & 36 deletions region/maridia/inner-green/Oasis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,56 @@
"and Samus should be in the correct position with subpixels $3FFF."
]
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 12,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Precise Stutter Water Shinecharge, Crystal Spark",
"entranceCondition": {
"comeInStutterShinecharging": {
"minTiles": 2.4375
},
"comesInHeated": "no"
},
"requires": [
"canPreciseStutterWaterShineCharge",
"h_underwaterCrystalSpark"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": [
"With only a runway length of 3 tiles (closed end) in the other room, this requires a precise setup:",
"release forward for 3 or 4 frames, then repress forward on the last possible frame before the transition;",
"alternatively, release forward for 2 frames and repress forward on the second-to-last possible frame before the transition."
],
"detailNote": [
"If a longer runway is available (4 tiles), the timing windows are a bit more lenient:",
"1. Release forward for 3, 4, or 5 frames, repress forward on the last possible frame;",
"2. Release forward for 2 or 3 frames, repress forward on the 2nd-to-last possible frame;",
"3. Release forward for 1 or 2 frames, repress forward on the 3rd-to-last possible frame."
],
"devNote": [
"FIXME: This is possible with a shorter runway, as low as 1 tile, but it's a lot worse.",
"It would require more duplication and could be very tedious to set up for many attempts."
]
},
{
"id": 9,
"link": [1, 1],
Expand Down Expand Up @@ -2376,6 +2426,56 @@
"and Samus should be in the correct position with subpixels $3FFF."
]
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 12,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [2, 2],
"name": "Precise Stutter Water Shinecharge, Crystal Spark",
"entranceCondition": {
"comeInStutterShinecharging": {
"minTiles": 2.4375
},
"comesInHeated": "no"
},
"requires": [
"canPreciseStutterWaterShineCharge",
"h_underwaterCrystalSpark"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": [
"With only a runway length of 3 tiles (closed end) in the other room, this requires a precise setup:",
"release forward for 3 or 4 frames, then repress forward on the last possible frame before the transition;",
"alternatively, release forward for 2 frames and repress forward on the second-to-last possible frame before the transition."
],
"detailNote": [
"If a longer runway is available (4 tiles), the timing windows are a bit more lenient:",
"1. Release forward for 3, 4, or 5 frames, repress forward on the last possible frame;",
"2. Release forward for 2 or 3 frames, repress forward on the 2nd-to-last possible frame;",
"3. Release forward for 1 or 2 frames, repress forward on the 3rd-to-last possible frame."
],
"devNote": [
"FIXME: This is possible with a shorter runway, as low as 1 tile, but it's a lot worse.",
"It would require more duplication and could be very tedious to set up for many attempts."
]
},
{
"id": 38,
"link": [2, 2],
Expand Down Expand Up @@ -3460,24 +3560,6 @@
"since we don't have a way to represent that the temporary blue originates from the startsWithShineCharge."
]
},
{
"link": [7, 1],
"name": "Crystal Spark",
"startsWithShineCharge": true,
"requires": [
{"shineChargeFrames": 0},
{"or": [
{"and": [
"Gravity",
"h_CrystalSpark"
]},
"h_underwaterCrystalSpark"
]}
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 32,
"link": [7, 2],
Expand Down Expand Up @@ -3665,24 +3747,6 @@
"since we don't have a way to represent that the temporary blue originates from the startsWithShineCharge."
]
},
{
"link": [8, 2],
"name": "Crystal Spark",
"startsWithShineCharge": true,
"requires": [
{"shineChargeFrames": 0},
{"or": [
{"and": [
"Gravity",
"h_CrystalSpark"
]},
"h_underwaterCrystalSpark"
]}
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 142,
"link": [8, 4],
Expand Down
38 changes: 38 additions & 0 deletions region/maridia/inner-pink/Aqueduct Save Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,44 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark (Gravity)",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSparkWithoutLenience"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": "No lenience, because reloading from the save is possible."
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 1,
"openEnd": 1
},
"comesInHeated": "no"
},
"requires": [
"h_underwaterCrystalSparkWithoutLenience"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"devNote": [
"No lenience, because reloading from the save is possible.",
"This runway will not add any usable distance; it is only included because it has a save."
]
},
{
"id": 3,
"link": [1, 2],
Expand Down
51 changes: 51 additions & 0 deletions region/maridia/inner-pink/Aqueduct.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,23 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 5,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
Comment thread
kjbranch marked this conversation as resolved.
Outdated
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 3,
"link": [1, 1],
Expand Down Expand Up @@ -1337,6 +1354,40 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [2, 2],
"name": "Crystal Spark",
"requires": [
"Gravity",
"h_shinechargeMaxRunway",
"h_CrystalSpark"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [2, 2],
"name": "Water Shinecharge, Crystal Spark",
"entranceCondition": {
"comeInRunning": {
"speedBooster": "yes",
"minTiles": 0.4375
},
"comesInHeated": "no"
},
"requires": [
"canWaterShineCharge",
"h_shinechargeMaxRunway",
"h_underwaterCrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": [
"Enter this room while holding dash in the previous room, before the door transition.",
"Do not release dash in the water or Samus will not be able to get blue speed."
]
},
{
"id": 29,
"link": [2, 2],
Expand Down
18 changes: 18 additions & 0 deletions region/maridia/inner-pink/Below Botwoon Energy Tank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,24 @@
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"link": [1, 1],
"name": "Crystal Spark",
"requires": [
{"obstaclesCleared": ["A"]},
"Gravity",
{"canShineCharge": {
"usedTiles": 23,
"gentleUpTiles": 2,
"gentleDownTiles": 2,
"steepUpTiles": 1,
"openEnd": 1
}},
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 11,
"link": [1, 1],
Expand Down
Loading
Loading