Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
92 changes: 92 additions & 0 deletions region/maridia/inner-yellow/Maridia Swiss Cheese Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,53 @@
}
}
},
{
"link": [1, 1],
"name": "Menu Farm",
"requires": [
{"resetRoom": {"nodes": [1]}},
"canDodgeWhileShooting",
Comment thread
osse101 marked this conversation as resolved.
{"or": [
{"and": [
"Grapple",
{"cycleFrames": 220}
]},
{"and": [
"Plasma",
{"cycleFrames": 280}
]},
{"and": [
"Wave",
{"cycleFrames": 290}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 290}
]},
{"and": [
"Spazer",
{"cycleFrames": 330}
]},
{"and": [
"canPseudoScrew",
{"cycleFrames": 435}
]},
{"and": [
"canTrickyJump",
{"cycleFrames": 500}
]}
]},
{"or": [
"canFarmWhileShooting",
{"cycleFrames": 400}
]}
],
"farmCycleDrops": [{"enemy": "Menu", "count": 2}],
"resetsObstacles": ["A"],
"devNote": [
"FIXME: By dropping down, it would be possible to farm 4 or 5 Menus and also Owtches."
]
},
{
"id": 2,
"link": [1, 1],
Expand Down Expand Up @@ -395,6 +442,51 @@
],
"clearsObstacles": ["A"]
},
{
"link": [2, 2],
"name": "Menu Farm",
"requires": [
{"resetRoom": {"nodes": [2]}},
"canDodgeWhileShooting",
{"or": [
{"and": [
"ScrewAttack",
{"cycleFrames": 210}
]},
{"and": [
"Plasma",
{"cycleFrames": 220}
]},
{"and": [
"Grapple",
{"cycleFrames": 240}
]},
{"and": [
"Wave",
{"cycleFrames": 260}
]},
{"and": [
"Spazer",
{"cycleFrames": 285}
]},
{"and": [
{"or": [
"canTrickyDodgeEnemies",
{"and": [
"Gravity",
"canTrickyJump"
]}
]},
{"cycleFrames": 360}
]}
]}
],
"farmCycleDrops": [{"enemy": "Menu", "count": 2}],
"clearsObstacles": ["A"],
"devNote": [
"FIXME: It is also posssible to farm Owtches and/or additional Menus."
]
},
{
"id": 16,
"link": [2, 2],
Expand Down
73 changes: 67 additions & 6 deletions region/maridia/inner-yellow/Plasma Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,79 @@
{
"id": 7,
"link": [1, 1],
"name": "Space Pirate Farm",
"name": "Pirate Farm (All Pirates)",
"requires": [
"SpaceJump",
{"resetRoom": {"nodes": [1]}},
{"or": [
{"and": [
"HiJump",
"SpaceJump",
{"cycleFrames": 930}
]},
{"and": [
"HiJump",
"canTrickyWalljump",
{"cycleFrames": 960}
]},
{"and": [
"SpaceJump",
{"cycleFrames": 1220}
]},
{"and": [
"canSpringwall",
{"cycleFrames": 1035},
"h_doubleEquipmentScreenCycleFrames"
]},
{"and": [
"HiJump",
"canSpringBallJumpMidAir",
{"cycleFrames": 910},
"h_doubleEquipmentScreenCycleFrames"
]},
{"and": [
"canDoubleBombJump",
"canWalljump",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"canWalljump",
"canWallJumpBombBoost",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

What is the "canWallJumpBombBoost" for?

The idea behind "canWalljump" was just to be able to more quickly collect the right wall Pirate's drop, and to more quickly get up from the bottom standing Pirate.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I figured it was to help bomb jump out by getting half-way up with walljumps but that isn't actually possible.
You can crouch jump up from the bottom pirate and crouch jump to the right pirate drop so I don't see it helping there. I'm getting under 22s both ways with plasma, but walljump was 2s faster with screw (its closer if killing right pirates from above).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Nice, didn't realize the crouch jump worked there. Added that as an option now. I figure it's ok if there's some extra lenience for the double bomb jump variants since it's probably expected to fall down sometimes. And it seemed too complicated to look at the interaction between weapon and movement. But feel free to make code suggestions or a follow-up PR if there's stuff you want to add/change here.

{"cycleFrames": 1410}
]},
{"and": [
"canDoubleBombJump",
{"cycleFrames": 1560}
]}
]},
{"or": [
"ScrewAttack",
"Plasma"
]},
]}
],
"clearsObstacles": ["A"],
"farmCycleDrops": [
{"enemy": "Pink Space Pirate (standing)", "count": 4},
{"enemy": "Pink Space Pirate (wall)", "count": 2}
],
"devNote": [
"FIXME: Add option to kill the Pirates with speed echoes, and possibly to get back up with a shinespark."
]
},
{
"link": [1, 1],
"name": "Pirate Farm (Single Pirate)",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"partialRefill": {"type": "Energy", "limit": 200}},
{"partialRefill": {"type": "Missile", "limit": 12}}
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 210}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 255}
]}
]}
],
"clearsObstacles": ["A"]
"resetsObstacles": ["A"],
"farmCycleDrops": [
{"enemy": "Pink Space Pirate (standing)", "count": 1}
]
},
{
"id": 8,
Expand Down
179 changes: 173 additions & 6 deletions region/maridia/inner-yellow/Plasma Spark Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,90 @@
"FIXME: This is also possible using Spring Ball jumps (with pause remorphs) instead of HiJump."
]
},
{
"link": [1, 1],
"name": "Choot Farm (Single Choot)",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"or": [
{"and": [
"Grapple",
{"cycleFrames": 130}
]},
{"and": [
"Plasma",
{"cycleFrames": 150}
]},
{"and": [
{"or": [
"Wave",
"Spazer"
]},
{"cycleFrames": 160}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 170}
]},
{"and": [
"canPseudoScrew",
{"cycleFrames": 180}
]},
{"cycleFrames": 220}
]}
],
"farmCycleDrops": [{"enemy": "Choot", "count": 1}]
},
{
"link": [1, 1],
"name": "Choot Farm (3 Choots)",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"or": [
"canWalljump",
"HiJump",
{"and": [
"SpaceJump",
{"cycleFrames": 300}
]},
{"and": [
"canTrickySpringBallJump",
{"cycleFrames": 360},
"h_doubleEquipmentScreenCycleFrames",
"h_doubleEquipmentScreenCycleFrames",
"h_doubleEquipmentScreenCycleFrames"
]},
{"and": [
"canDoubleBombJump",
{"cycleFrames": 930}
]}
]},
{"or": [
{"and": [
{"or": [
"Grapple",
"Wave",
"Plasma"
]},
{"cycleFrames": 750}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 820}
]},
{"and": [
"Spazer",
{"cycleFrames": 850}
]},
{"and": [
"canPseudoScrew",
{"cycleFrames": 870}
]},
{"cycleFrames": 1080}
]}
],
"farmCycleDrops": [{"enemy": "Choot", "count": 3}]
},
{
"id": 3,
"link": [1, 1],
Expand Down Expand Up @@ -930,6 +1014,33 @@
"but not by enough to remove the need for the canLongChainTemporaryBlue requirement."
]
},
{
"link": [2, 2],
"name": "Skultera Farm",
"requires": [
"canSuitlessMaridia",
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 1660}
]},
{"and": [
"Wave",
{"cycleFrames": 1860}
]},
{"and": [
"Spazer",
{"cycleFrames": 2100}
]},
{"cycleFrames": 2500}
]}
],
"farmCycleDrops": [{"enemy": "Skultera", "count": 2}],
"devNote": [
"With Gravity the Choot farm would be used instead.",
"FIXME: The Owtches could also be farmed, though they are not worth much."
]
},
{
"id": 16,
"link": [2, 2],
Expand Down Expand Up @@ -1394,12 +1505,68 @@
"link": [3, 3],
"name": "Choot Farm",
"requires": [
"canBePatient",
{"resetRoom": {"nodes": [3]}},
{"partialRefill": {"type": "Super", "limit": 5}},
{"partialRefill": {"type": "Missile", "limit": 10}},
{"partialRefill": {"type": "Energy", "limit": 140}}
]
{"or": [
{"resetRoom": {"nodes": [3]}},
{"and": [
{"resetRoom": {"nodes": [2]}},
{"or": [
{"and": [
"Gravity",
{"cycleFrames": 835}
]},
{"and": [
"canSuitlessMaridia",
"HiJump",
{"cycleFrames": 1540}
]}
]}
]},
{"and": [
{"resetRoom": {"nodes": [4]}},
{"or": [
{"and": [
"HiJump",
"SpaceJump",
{"cycleFrames": 230}
]},
{"and": [
"canTrickyWalljump",
Comment thread
blkerby marked this conversation as resolved.
{"cycleFrames": 310}
]},
{"and": [
"SpaceJump",
{"cycleFrames": 400}
]}
]}
]}
]},
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 320}
]},
{"and": [
"Wave",
{"cycleFrames": 340}
]},
{"and": [
"Grapple",
{"cycleFrames": 360}
]},
{"and": [
"Spazer",
"canFarmWhileShooting",
{"cycleFrames": 390}
]},
{"and": [
"ScrewAttack",
"canDodgeWhileShooting",
{"cycleFrames": 500}
]},
{"cycleFrames": 640}
]}
],
"farmCycleDrops": [{"enemy": "Choot", "count": 2}]
},
{
"id": 37,
Expand Down