Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions region/maridia/inner-green/East Sand Hall.json
Original file line number Diff line number Diff line change
Expand Up @@ -414,14 +414,15 @@
},
"requires": [
"canSuitlessMaridia",
"h_crouchJumpDownGrab",
"canInsaneJump"
],
"flashSuitChecked": true,
"note": [
"The sand does not impede Samus in G-Mode.",
"Carefully jump over the first two Evirs. Crouch against the pillar and wait a brief moment before jumping and down grabbing onto it.",
"Lure the third Evir's projectile by jumping then crouch jump and down grab the second pillar.",
"Getting onto the final pillar is the hardest pard, which requires a subpixel precise jump.",
"Getting onto the final pillar is the hardest part, which requires a subpixel precise jump.",
"Carefully lure the Evir projectile while getting into position, one pixel from the right edge.",
"Stand and spinjump to the right. Note that running before jumping doesn't help."
]
Expand Down Expand Up @@ -1124,14 +1125,21 @@
},
"requires": [
"h_navigateUnderwater",
{"or": [
"canInsaneJump",
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
]},
{"or": [
"Gravity",
"HiJump",
"canSpringBallJumpMidAir"
]}
],
"flashSuitChecked": true,
"note": "The sand does not impede Samus in G-Mode.",
"note": [
"The sand does not impede Samus in G-Mode.",
"Enter the room on the right half of the transition, where both Evirs will be off camera to avoid their projectiles."
],
"devNote": "Only the last jump needs any items."
},
{
Expand All @@ -1147,16 +1155,24 @@
},
"requires": [
"h_navigateUnderwater",
{"or": [
"canInsaneJump",
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
]},
{"or": [
"Gravity",
"HiJump",
"canSpringBallJumpMidAir",
"canTrickyJump"
{"and": [
"h_crouchJumpDownGrab",
"canInsaneJump"
]}
]}
],
"flashSuitChecked": true,
"note": [
"The sand does not impede Samus in G-Mode.",
"Enter the room on the right half of the transition, where both Evirs will be off camera to avoid their projectiles.",
"It is possible to jump to the tall pillar with nothing, requiring a subpixel precise jump.",
"Running before jumping doesn't help. Stand one pixel from the right edge and spinjump to the right."
]
Expand Down
27 changes: 27 additions & 0 deletions region/maridia/inner-green/Oasis.json
Original file line number Diff line number Diff line change
Expand Up @@ -2156,6 +2156,33 @@
"bypassesDoorShell": "free",
"flashSuitChecked": true
},
{
"link": [3, 3],
"name": "Carry G-Mode Back Up, Bomb Into Spring Ball Jump",
"entranceCondition": {
"comeInWithGMode": {
"mode": "direct",
"morphed": true
},
"comesThroughToilet": "any"
},
"requires": [
"h_artificialMorphUnderwaterBombIntoSpringBallJump"
],
"exitCondition": {
"leaveWithGMode": {
"morphed": false
}
},
"bypassesDoorShell": "free",
"flashSuitChecked": true,
"note": [
"Pause and jump just before the fade out finishes. Turn off Spring Ball and place a Bomb just above where Samus' head would be if standing.",
"Pause again between 23-25 frames later and equip Spring Ball; Samus has a three frame window where she has upward momentum from the Bomb and can jump again.",
"The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed.",
"Unmorph at the top of the jump to touch the transition blocks."
]
},
{
"id": 50,
"link": [3, 4],
Expand Down
1 change: 1 addition & 0 deletions region/maridia/inner-green/Shaktool Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@
{"or": [
{"ammo": {"type": "Super", "count": 1}},
{"and": [
"canTrickyGMode",
"canSpecialBeamAttack",
{"ammo": {"type": "PowerBomb", "count": 1}}
]}
Expand Down
28 changes: 19 additions & 9 deletions region/maridia/inner-green/West Sand Hall.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,14 @@
"requires": [
"h_navigateUnderwater",
{"or": [
"canCarefulJump",
"canTrickyDodgeEnemies",
"h_crouchJumpDownGrab",
"HiJump",
"Gravity",
"canSpringBallJumpMidAir"
]},
{"or": [
"canCarefulJump",
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
]}
],
Expand Down Expand Up @@ -559,8 +559,7 @@
}
},
"requires": [
"h_navigateUnderwater",
"canCarefulJump"
"h_navigateUnderwater"
],
"flashSuitChecked": true
},
Expand Down Expand Up @@ -765,18 +764,18 @@
"requires": [
"h_navigateUnderwater",
{"or": [
"canCarefulJump",
"h_crouchJumpDownGrab",
"HiJump",
"Gravity",
"canSpringBallJumpMidAir"
]},
{"or": [
"canCarefulJump",
"canInsaneJump",
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
]}
],
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Dodging the Evirs can be tricky. Enter on the far right side, facing left, and hold left on entry to dodge them reliably."
},
{
"id": 39,
Expand All @@ -790,9 +789,20 @@
"comesThroughToilet": "any"
},
"requires": [
"h_navigateUnderwater"
"h_navigateUnderwater",
{"or": [
"h_crouchJumpDownGrab",
"HiJump",
"Gravity",
"canSpringBallJumpMidAir"
]},
{"or": [
"canInsaneJump",
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
]}
],
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Dodging the Evirs can be tricky. Enter on the far right side, facing left, and hold left on entry to dodge them reliably."
},
{
"id": 40,
Expand Down
50 changes: 42 additions & 8 deletions region/maridia/inner-pink/Botwoon Quicksand Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@
"morphed": false
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
},
{
"id": 4,
Expand All @@ -165,7 +166,8 @@
"morphed": true
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
},
{
"id": 5,
Expand All @@ -179,17 +181,32 @@
"comesThroughToilet": "any"
},
"requires": [
"canInsaneJump",
{"or": [
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}},
"h_artificialMorphPowerBomb"
{"and": [
"h_artificialMorphPowerBomb",
{"or": [
"h_additionalBomb",
"h_artificialMorphMovement"
]}
]}
]}
],
"exitCondition": {
"leaveWithGMode": {
"morphed": true
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": [
"Enter the room on the right side and land on the ledge just below the hidden tunnel then Power Bomb boost to get into the tunnel and kil the Bulls.",
"Alternatively, enter the room near the right with a bit of right momentum and land directly in the tunnel while taking a Bull hit."
],
"devNote": [
"This room does not have water, so Samus can be boosted by bomb boosts without Gravity after PLMs are overloaded.",
"It is possible to do this with 1 Power Bomb, but it is very precise and significantly depends on room entry."
]
},
{
"id": 6,
Expand Down Expand Up @@ -241,17 +258,32 @@
"comesThroughToilet": "any"
},
"requires": [
"canInsaneJump",
{"or": [
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}},
"h_artificialMorphPowerBomb"
{"and": [
"h_artificialMorphPowerBomb",
{"or": [
"h_additionalBomb",
"h_artificialMorphMovement"
]}
]}
]}
],
"exitCondition": {
"leaveWithGMode": {
"morphed": true
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": [
"Enter the room on the left side and land on the ledge just below the hidden tunnel then Power Bomb boost to get into the tunnel and kil the Bulls.",
"Alternatively, enter the room near the left with a bit of left momentum and land directly in the tunnel while taking a Bull hit."
],
"devNote": [
"This room does not have water, so Samus can be boosted by bomb boosts without Gravity after PLMs are overloaded.",
"It is possible to do this with 1 Power Bomb, but it is very precise and significantly depends on room entry."
]
},
{
"id": 10,
Expand Down Expand Up @@ -286,7 +318,8 @@
"morphed": false
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
},
{
"id": 13,
Expand All @@ -305,7 +338,8 @@
"morphed": true
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus falls so quickly that it is unlikely that the Bulls will cause any problem."
},
{
"id": 14,
Expand Down
20 changes: 16 additions & 4 deletions region/maridia/inner-pink/East Aqueduct Quicksand Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,19 @@
},
"comesThroughToilet": "any"
},
"requires": [],
"requires": [
{"or": [
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
]}
],
"exitCondition": {
"leaveWithGMode": {
"morphed": false
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus will fall quickly. Fall through the room slightly left of center to avoid the Bulls."
},
{
"id": 5,
Expand All @@ -118,13 +124,19 @@
},
"comesThroughToilet": "any"
},
"requires": [],
"requires": [
{"or": [
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
]}
],
"exitCondition": {
"leaveWithGMode": {
"morphed": true
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus will fall quickly. Fall through the room slightly left of center to avoid the Bulls."
},
{
"id": 6,
Expand Down
20 changes: 16 additions & 4 deletions region/maridia/inner-pink/West Aqueduct Quicksand Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,19 @@
},
"comesThroughToilet": "any"
},
"requires": [],
"requires": [
{"or": [
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
]}
],
"exitCondition": {
"leaveWithGMode": {
"morphed": false
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus will fall quickly. Fall through the room slightly right of center to avoid the Bulls."
},
{
"id": 5,
Expand All @@ -118,13 +124,19 @@
},
"comesThroughToilet": "any"
},
"requires": [],
"requires": [
{"or": [
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Bull", "type": "contact", "hits": 1}}
]}
],
"exitCondition": {
"leaveWithGMode": {
"morphed": true
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"note": "Samus will fall quickly. Fall through the room slightly right of center to avoid the Bulls."
},
{
"id": 6,
Expand Down
Loading