Skip to content

Add Crystal Sparks in Green Maridia #2802

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
kjbranch merged 4 commits into from
Mar 30, 2026
Merged

Add Crystal Sparks in Green Maridia #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00a8d20
Add Crystal Sparks in Green Maridia
kjbranch Mar 30, 2026
68de5db
add 0 shineChargeFrames
kjbranch Mar 30, 2026
39c5573
lonely crab in room
kjbranch Mar 30, 2026
741af1b
Update region/maridia/inner-green/Shaktool Room.json
kjbranch Mar 30, 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
19 changes: 19 additions & 0 deletions region/maridia/inner-green/East Pants Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,25 @@
],
"flashSuitChecked": true
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 4,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": "Use the first half of the runway in order to avoid the Puyo jumping into Samus.",
"devNote": "It doesn't seem reasonable to use blue speed to kill the Puyo without falling through the crumbles."
},
{
"id": 17,
"link": [2, 2],
Expand Down
34 changes: 34 additions & 0 deletions region/maridia/inner-green/East Sand Hall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,23 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 3,
"link": [1, 1],
Expand Down Expand Up @@ -1458,6 +1475,23 @@
],
"flashSuitChecked": true
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 39,
"link": [2, 2],
Expand Down
124 changes: 124 additions & 0 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 @@ -425,6 +425,90 @@
"and Samus should be in the correct position with subpixels $3FFF."
]
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark (Short Runway)",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": "Only using a small portion of the runway will ensure that the crab dies before it reaches Samus."
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 6,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"canInsaneJump",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"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": "Crystal Spark (In-Room)",
"requires": [
"Gravity",
{"or": [
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
{"and": [
{"or": [
{"doorUnlockedAtNode": 1},
{"doorUnlockedAtNode": 2}
]},
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
]},
{"and": [
{"doorUnlockedAtNode": 1},
{"doorUnlockedAtNode": 2},
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
]}
]},
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"unlocksDoors": [
{"nodeId": 1, "types": ["ammo"], "requires": []},
{"nodeId": 2, "types": ["ammo"], "requires": []}
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 5,
"link": [1, 1],
Expand Down Expand Up @@ -1193,6 +1277,29 @@
"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",
{"or": [
{"and": [
"h_enemyDrops",
"h_CrystalSparkWithoutLenience"
]},
"h_CrystalSpark"
]}
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 30,
"link": [2, 2],
Expand Down Expand Up @@ -1581,6 +1688,23 @@
"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
65 changes: 65 additions & 0 deletions region/maridia/inner-green/Oasis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3279,6 +3279,35 @@
"clearsObstacles": ["A"],
"flashSuitChecked": true
},
{
"link": [5, 5],
"name": "Crystal Spark (In-Room)",
"requires": [
"Gravity",
{"or": [
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
{"and": [
{"or": [
{"doorUnlockedAtNode": 1},
{"doorUnlockedAtNode": 2}
]},
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
]},
{"and": [
{"doorUnlockedAtNode": 1},
{"doorUnlockedAtNode": 2},
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
]}
]},
"h_CrystalSpark"
],
"unlocksDoors": [
{"nodeId": 1, "types": ["ammo"], "requires": []},
{"nodeId": 2, "types": ["ammo"], "requires": []}
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 61,
"link": [5, 6],
Expand Down Expand Up @@ -3431,6 +3460,24 @@
"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 @@ -3618,6 +3665,24 @@
"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
16 changes: 16 additions & 0 deletions region/maridia/inner-green/Shaktool Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,22 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Crystal Spark",
"requires": [
{"obstaclesCleared": ["A", "B"]},
{"or": [
"Gravity",
Comment thread
kjbranch marked this conversation as resolved.
"canWaterShineCharge"
]},
"h_shinechargeMaxRunway",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
"note": "Time the shinecharge for when the water is low."
},
{
"id": 6,
"link": [1, 1],
Expand Down
16 changes: 16 additions & 0 deletions region/maridia/inner-green/Spring Ball Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,22 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 6,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 3,
"link": [1, 2],
Expand Down
35 changes: 35 additions & 0 deletions region/maridia/inner-green/West Sand Hall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,23 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 3,
"link": [1, 2],
Expand Down Expand Up @@ -858,6 +875,24 @@
],
"flashSuitChecked": true
},
{
"link": [2, 2],
"name": "Come in Shinecharging, Crystal Spark",
"entranceCondition": {
"comeInShinecharging": {
"length": 3,
"openEnd": 0
},
"comesInHeated": "no"
},
"requires": [
"Gravity",
"canInsaneJump",
"h_CrystalSpark"
],
"flashSuitChecked": true,
"blueSuitChecked": true
},
{
"id": 29,
"link": [2, 2],
Expand Down
Loading