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
38 changes: 34 additions & 4 deletions region/brinstar/green/Brinstar Pre-Map Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@
},
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Zeela Farm",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 120}
],
"farmCycleDrops": [
{"enemy": "Zeela", "count": 1}
],
"resetsObstacles": ["A"]
},
{
"id": 2,
"link": [1, 1],
Expand Down Expand Up @@ -433,12 +445,30 @@
{"resetRoom": {
"nodes": [2]
}},
{"partialRefill": {"type": "Energy", "limit": 240}},
{"partialRefill": {"type": "Missile", "limit": 20}},
{"partialRefill": {"type": "Super", "limit": 4}}
{"cycleFrames": 320},
{"or": [
"canDodgeWhileShooting",
"Plasma",
{"and": [
"Wave",
"Spazer"
]},
{"and": [
"Ice",
"Wave"
]},
{"and": [
"Ice",
"Spazer"
]}
]}
],
"resetsObstacles": ["A"],
"flashSuitChecked": true
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Zeela", "count": 2},
{"enemy": "Sm. Sidehopper", "count": 1}
]
},
{
"id": 24,
Expand Down
39 changes: 39 additions & 0 deletions region/brinstar/green/Early Supers Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,45 @@
"leaveWithTemporaryBlue": {}
}
},
{
"link": [2, 2],
"name": "Waver and Sidehopper Farm",
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.

The zeb farm is fast enough that if it used farm cycles, it would probably say you can get PBs.

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.

Yeah, it will depend on the settings (farm multiplier, buffed drops, patience tech) but I would expect a Zeb farm will typically give some logical PBs now, just a limited amount of them. The Waver + Sidehopper farm is still useful since you may not be able to return from dropping down the crumble block (e.g. if the left door is locked).

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 was subtly pointing out "Zeb Farm" is still written in the "refill": ["Energy", "Missile", "Super"] style. 🐱

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.

Ah, I missed that. Thanks, fixed now.

"requires": [
{"resetRoom": {"nodes": [2]}},
{"or": [
"canWalljump",
"canCrouchJump"
]},
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 600}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 700}
]},
{"and": [
{"or": [
"Wave",
"Spazer"
]},
{"cycleFrames": 750}
]},
{"and": [
"canDodgeWhileShooting",
{"cycleFrames": 1050}
]}
]}
],
"farmCycleDrops": [
{"enemy": "Waver", "count": 4},
{"enemy": "Sm. Sidehopper", "count": 3}
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"flashSuitChecked": true
},
{
"id": 30,
"link": [2, 2],
Expand Down
62 changes: 55 additions & 7 deletions region/brinstar/green/Etecoon Energy Tank Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,38 @@
],
"devNote": "This does not require canRiskPermanentLossOfAccess if Samus returns through the crumble blocks."
},
{
"link": [3, 3],
"name": "Zebbo and Beetom Farm",
"requires": [
"Morph",
{"resetRoom": {
"nodes": [3]
}},
{"cycleFrames": 630},
{"or": [
{"enemyKill": {
"enemies": [["Beetom", "Beetom"]],
"explicitWeapons": ["ScrewAttack", "Missile", "PowerBomb"]
}},
{"and": [
"h_useMorphBombs",
{"or": [
"Ice",
"canTrickyDodgeEnemies"
]},
{"cycleFrames": 400}
]}
]}
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Beetom", "count": 2},
{"enemy": "Zebbo", "count": 1}
]
},
{
"id": 75,
"link": [3, 4],
Expand Down Expand Up @@ -1549,25 +1581,41 @@
{"resetRoom": {
"nodes": [4]
}},
{"enemyKill": {
"enemies": [["Beetom"]]
}},
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
{"cycleFrames": 530},
{"or": [
{"enemyKill": {
"enemies": [["Beetom", "Beetom"]],
"explicitWeapons": ["ScrewAttack", "Missile", "PowerBomb"]
}},
{"and": [
{"or": [
"Ice",
"canTrickyDodgeEnemies"
]},
"h_useMorphBombs"
]}
]}
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"flashSuitChecked": true,
"devNote": ["FIXME: Node 3 could be used to reset the room, with additional requirements."]
"farmCycleDrops": [
{"enemy": "Beetom", "count": 2},
{"enemy": "Zebbo", "count": 2}
]
},
{
"id": 52,
"link": [4, 4],
"name": "Zebbo Farm",
"requires": [
{"obstaclesCleared": ["A"]},
{"refill": ["Energy", "Missile", "Super"]}
{"cycleFrames": 115}
],
"flashSuitChecked": true
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Zebbo", "count": 1}
]
},
{
"id": 80,
Expand Down
27 changes: 23 additions & 4 deletions region/brinstar/green/Green Brinstar Beetom Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,35 @@
"nodes": [1, 2]
}},
{"or": [
"ScrewAttack",
{"and": [
"ScrewAttack",
{"cycleFrames": 180}
]},
{"and": [
"Ice",
"h_useMorphBombs"
"h_useMorphBombs",
Comment thread
osse101 marked this conversation as resolved.
{"cycleFrames": 300}
]},
{"and": [
{"or": [
"Ice",
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
]},
{"or": [
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
{"resourceAvailable": [{"type": "PowerBomb", "count": 4}]}
]},
"h_usePowerBomb",
{"cycleFrames": 210}
]}
]},
{"refill": ["PowerBomb"]}
]}
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Beetom", "count": 4}
],
"note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.",
"devNote": [
"Using an adjacent 2-tile runway doesn't seem workable since heat frames may be too much to maintain energy.",
Expand Down
21 changes: 17 additions & 4 deletions region/brinstar/green/Green Brinstar Fireflea Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,23 @@
"link": [1, 1],
"name": "Fireflea Farm",
"requires": [
{"resetRoom": {
"nodes": [1, 2]
}},
{"refill": ["Energy", "PowerBomb"]}
{"or": [
{"and": [
{"resetRoom": {
"nodes": [1]
}},
{"cycleFrames": 630}
]},
{"and": [
{"resetRoom": {
"nodes": [2]
}},
{"cycleFrames": 900}
]}
]}
],
"farmCycleDrops": [
{"enemy": "Fireflea", "count": 5}
Comment thread
osse101 marked this conversation as resolved.
],
"flashSuitChecked": true
},
Expand Down
87 changes: 83 additions & 4 deletions region/brinstar/green/Green Brinstar Main Shaft.json
Original file line number Diff line number Diff line change
Expand Up @@ -5009,14 +5009,68 @@
"link": [12, 12],
"name": "Zeela Farm",
"requires": [
{"resetRoom": {
"nodes": [1, 2, 3, 4, 5, 6]
}},
{"refill": ["Energy", "Missile", "Super"]}
{"or": [
{"and": [
{"resetRoom": {
"nodes": [2, 3, 4]
}},
{"cycleFrames": 660}
]},
{"and": [
{"resetRoom": {
"nodes": [5, 6]
}},
{"cycleFrames": 760}
]},
{"and": [
{"resetRoom": {
"nodes": [1]
}},
{"cycleFrames": 1700}
]}
]},
{"or": [
"Wave",
"Spazer",
"Plasma",
{"cycleFrames": 120}
]}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [
{"enemy": "Zeela", "count": 4}
Comment thread
osse101 marked this conversation as resolved.
],
"flashSuitChecked": true
},
{
"link": [12, 12],
"name": "Ripper Farm",
"requires": [
"ScrewAttack",
{"or": [
{"and": [
{"resetRoom": {"nodes": [2, 3]}},
{"cycleFrames": 375}
]},
{"and": [
{"resetRoom": {"nodes": [4]}},
{"cycleFrames": 445}
]},
{"and": [
{"resetRoom": {"nodes": [5, 6]}},
{"cycleFrames": 600}
]},
{"and": [
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 1530}
]}
]}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [
{"enemy": "Ripper 2 (red)", "count": 2}
]
},
{
"id": 229,
"link": [12, 12],
Expand Down Expand Up @@ -5124,6 +5178,31 @@
"The pixel window is larger and higher with Morph and an X-Ray Stand Up."
]
},
{
"link": [13, 13],
"name": "Zeela Farm",
"requires": [
{"or": [
{"and": [
{"resetRoom": {
"nodes": [7]
}},
{"cycleFrames": 270}
]},
{"and": [
{"resetRoom": {
"nodes": [8]
}},
{"cycleFrames": 620}
]}
]}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [
{"enemy": "Zeela", "count": 1}
],
"flashSuitChecked": true
},
{
"id": 237,
"link": [13, 13],
Expand Down
Loading