Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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
23 changes: 23 additions & 0 deletions region/brinstar/red/Beta Power Bomb Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,29 @@
"clearsObstacles": ["A"],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Come in with Blue Speed",
"entranceCondition": {
"comeInGettingBlueSpeed": {
"minExtraRunSpeed": "$1.1",
"length": 21,
"openEnd": 0
}
},
"requires": [
"canShinechargeMovementComplex",
{"canShineCharge": {"usedTiles": 24, "openEnd": 0}},
{"shinespark": {"frames": 6}},
{"thornHits": 2}
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"note": [
"Run into the leftmost Sidehopper with blue speed.",
"Then turn around and shinespark the remaining hoppers together."
]
},
{
"id": 15,
"link": [1, 1],
Expand Down
5 changes: 4 additions & 1 deletion region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,8 @@
"h_navigateHeatRooms",
"ScrewAttack",
{"or": [
"canCarefulJump",
"canDownBack",
"canTrickyJump",
{"heatFrames": 40}
]},
{"heatFrames": 100}
Expand Down Expand Up @@ -1513,6 +1514,7 @@
{"canShineCharge": {"usedTiles": 27, "gentleUpTiles": 2, "openEnd": 1}},
{"obstaclesCleared": ["A", "C"]},
{"heatFrames": 390},
"canTrickyJump",
"canShinechargeMovementComplex",
{"shinespark": {"frames": 30}}
],
Expand Down Expand Up @@ -1545,6 +1547,7 @@
{"canShineCharge": {"usedTiles": 27, "gentleUpTiles": 2, "openEnd": 1}},
{"obstaclesCleared": ["A"]},
{"heatFrames": 370},
"canTrickyJump",
"canShinechargeMovementComplex",
"canHeroShot",
{"shinespark": {"frames": 31}},
Expand Down
11 changes: 7 additions & 4 deletions region/lowernorfair/east/Metal Pirates Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1284,10 +1284,13 @@
"Charge",
"Spazer",
{"or": [
{"heatFramesWithEnergyDrops": {
"frames": 4400,
"drops": [{"enemy": "Space Pirate (fighting)", "count": 12}]
}},
{"and": [
"canBePatient",
{"heatFramesWithEnergyDrops": {
"frames": 4400,
"drops": [{"enemy": "Space Pirate (fighting)", "count": 12}]
}}
]},
{"and": [
"Ice",
{"heatFramesWithEnergyDrops": {
Expand Down
10 changes: 10 additions & 0 deletions region/lowernorfair/east/Pillar Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,16 @@
"Gravity",
{"heatFrames": 810},
{"acidFrames": 55}
]},
{"and": [
"canSuitlessLavaDive",
"canTrickyJump",
{"heatFrames": 705},
{"acidFrames": 45}
]},
{"and": [
"canInsaneJump",
{"heatFrames": 695}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

]}
]},
{"or": [
Expand Down
69 changes: 35 additions & 34 deletions region/maridia/inner-yellow/Thread The Needle Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -505,11 +505,17 @@
"requires": [
{"or": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would split this into two strats.
strat 1:

  • wave, spazer, plasma, grapple, or Screw+Space+careful jump, 2 PBs
  • h_navigateUnderwater or puyo hit

strat 2:

  • tricky jump, patient, missiles, ice, charge, or screw, (maybe morph?)
  • h_navigateUnderwater or puyo hit
  • canDodgeWhileShooting or puyo hit

"h_hasBeamUpgrade",
"canDodgeWhileShooting",
"canTrickyDodgeEnemies",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would only bump this up to a canTrickyJump. Mostly for knowing how to dodge the puyos and to move while shooting to have shots hit enemies reliably. Charge doesn't help a lot, but it does make it so you dont have to be moving forward to hit enemies, so i think its fine.

Suggested change
"canTrickyDodgeEnemies",
"canTrickyJump",

"canUseGrapple",
"ScrewAttack",
"canBePatient",
{"resourceCapacity": [{"type": "Missile", "count": 1}]},
{"and": [
{"ammo": {"type": "Missile", "count": 6}},
{"or": [
"canDodgeWhileShooting",
"Gravity"
]}
]},
"h_usePowerBomb"
]}
],
Expand All @@ -520,33 +526,23 @@
"link": [1, 2],
"name": "Morph Dodge",
"requires": [
"h_navigateUnderwater",
"Morph",
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
{"or": [
"canCarefulJump",
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
]}
"Gravity",
"Morph"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so even on Hard, Morph wont help you unless you have Gravity?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, on the left I wouldn't say it helps at all. You can't roll past the first and big hill Puyos.

],
"flashSuitChecked": true,
"note": [
"Safely kill the first Choot, then roll through the bottom of the room after passing the two Puyos.",
"Expects one to two Puyo hits while crossing the room."
"Roll through the bottom of the room."
]
},
{
"id": 24,
"link": [1, 2],
"name": "Lenient Dodge",
"name": "Tank the Damage",
"requires": [
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}},
{"or": [
"canCarefulJump",
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
]}
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 3}},
{"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 3}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a lot of damage. I only find the Puyos to be scary and unpredictable.

Suggested change
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 3}},
{"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 3}}
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 4}},
{"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 1}}

],
"flashSuitChecked": true,
"note": "Dodge the Puyos and kill the Choots. Expects two to three Puyo hits."
"flashSuitChecked": true
},
{
"id": 25,
Expand Down Expand Up @@ -636,11 +632,17 @@
"requires": [
{"or": [
"h_hasBeamUpgrade",
"canDodgeWhileShooting",
"canTrickyDodgeEnemies",
"canUseGrapple",
"ScrewAttack",
"canBePatient",
{"resourceCapacity": [{"type": "Missile", "count": 1}]},
{"and": [
{"ammo": {"type": "Missile", "count": 6}},
{"or": [
"canDodgeWhileShooting",
"Gravity"
]}
]},
"h_usePowerBomb"
]}
],
Expand All @@ -652,32 +654,31 @@
"name": "Morph Dodge",
"requires": [
"h_navigateUnderwater",
"canDodgeWhileShooting",
"Morph",
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
{"or": [
"canCarefulJump",
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
{"resourceCapacity": [{"type": "Missile", "count": 1}]},
{"ammo": {"type": "Super", "count": 1}},
"canTrickyJump",
"Gravity"
]}
],
"flashSuitChecked": true,
"note": [
"Safely kill the first Choot, then roll through the bottom of the room after passing the two Puyos.",
"Expects one to two Puyo hits while crossing the room."
"Roll through the bottom of the room, killing the three Puyos in the middle.",
"It helps to start rolling from as close to the edge of the water as possible to build speed while the Puyos are inactive."
]
},
{
"id": 31,
"link": [2, 1],
"name": "Lenient Dodge",
"name": "Tank the Damage",
"requires": [
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}},
{"or": [
"canCarefulJump",
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}
]}
{"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 3}},
{"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 3}}
],
"flashSuitChecked": true,
"note": "Dodge the Puyos and kill the Choots. Expects two to three Puyo hits."
"flashSuitChecked": true
},
{
"id": 32,
Expand Down
71 changes: 70 additions & 1 deletion region/norfair/east/Lava Grapple Tunnel.json
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,37 @@
"press jump, then release dash to exit X-mode while jumping."
]
},
{
"link": [1, 2],
"name": "Pause Abuse Damage Boosts",
"requires": [
{"noFlashSuit": {}},
{"notable": "Pause Abuse Damage Boosts"},
{"or": [
{"and": [
{"disableEquipment": "SpeedBooster"},
"Gravity"
]},
{"and": [
"canInsaneJump",
{"notable": "Suitless Damage Boosts"}
]}
]},
"canHorizontalDamageBoost",
"canPauseAbuse",
{"resourceAvailable": [{"type": "RegularEnergy", "count": 99}, {"type": "ReserveEnergy", "count": 100}]},
{"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]},
{"lavaFrames": 30},
{"heatFrames": 340}
],
"flashSuitChecked": true,
"note": [
"Pause abuse the spike and lava damage to cross the room while losing minimal Energy."
],
"devNote": [
"Energy ineffeciency is necessary and is represented by extra heatFrames."
]
},
{
"id": 17,
"link": [2, 1],
Expand Down Expand Up @@ -1378,6 +1409,37 @@
"press jump, then release dash to exit X-mode while jumping."
]
},
{
"link": [2, 1],
"name": "Pause Abuse Damage Boosts",
"requires": [
{"noFlashSuit": {}},
{"notable": "Pause Abuse Damage Boosts"},
{"or": [
{"and": [
{"disableEquipment": "SpeedBooster"},
"Gravity"
]},
{"and": [
"canInsaneJump",
{"notable": "Suitless Damage Boosts"}
]}
]},
"canHorizontalDamageBoost",
"canPauseAbuse",
{"resourceAvailable": [{"type": "RegularEnergy", "count": 99}, {"type": "ReserveEnergy", "count": 100}]},
{"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]},
{"lavaFrames": 30},
{"heatFrames": 340}
],
"flashSuitChecked": true,
"note": [
"Pause abuse the spike and lava damage to cross the room while losing minimal Energy."
],
"devNote": [
"Energy ineffeciency is necessary and is represented by extra heatFrames."
]
},
{
"id": 35,
"link": [2, 2],
Expand Down Expand Up @@ -1428,10 +1490,17 @@
"id": 2,
"name": "Suitless Damage Boosts",
"note": "Delay the damage boost from the spikes slightly in order to rise above the lava before moving."
},
{
"id": 3,
"name": "Pause Abuse Damage Boosts",
"note": [
"Pause abuse spike and lava damage to cross the room while losing minimal Energy."
]
}
],
"nextStratId": 69,
"nextNotableId": 3,
"nextNotableId": 4,
"devNote": [
"Add `comeInSpinning` Space Jump strats, with variants for different run speeds.",
"Add more spring ball bounce variants, for different run speeds and combinations of Gravity and/or HiJump."
Expand Down