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
37 changes: 35 additions & 2 deletions region/maridia/inner-yellow/Plasma Tutorial Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,41 @@
"link": [1, 1],
"name": "Puyo Farm",
"requires": [
{"resetRoom": {"nodes": [1, 2]}},
{"refill": ["Energy", "Missile", "PowerBomb"]}
{"or": [
{"resetRoom": {"nodes": [1]}},
{"and": [
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 20}
]}
]},
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 85}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 90}
]},
{"and": [
"Grapple",
{"cycleFrames": 160}
]},
{"and": [
"Wave",
{"cycleFrames": 180}
]},
{"and": [
"Spazer",
{"cycleFrames": 200}
]},
{"cycleFrames": 240}
]}
],
"farmCycleDrops": [{"enemy": "Puyo", "count": 6}],
"note": [
"It helps to crouch and use angle-down shots, to hit many or all of the Puyos at once;",
"this works best from the right side."
]
},
{
Expand Down
92 changes: 71 additions & 21 deletions region/maridia/inner-yellow/The Beach.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,29 +298,48 @@
"link": [1, 1],
"name": "Choot Farm",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"partialRefill": {"type": "Energy", "limit": 140}},
{"partialRefill": {"type": "Super", "limit": 4}},
{"partialRefill": {"type": "Missile", "limit": 20}}
]
},
{
"id": 67,
"link": [1, 1],
"name": "Fast Choot Farm",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"or": [
"Wave",
"Spazer",
"Plasma",
"ScrewAttack",
"canUseGrapple",
"canPseudoScrew"
{"resetRoom": {"nodes": [1]}},
{"and": [
{"resetRoom": {"nodes": [2]}},
"Gravity",
{"or": [
"h_crouchJumpDownGrab",
"canWalljump"
]},
{"cycleFrames": 130}
]}
]},
{"partialRefill": {"type": "Energy", "limit": 300}},
{"partialRefill": {"type": "Super", "limit": 4}},
{"refill": ["Missile"]}
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 740}
]},
{"and": [
"Wave",
{"cycleFrames": 800}
]},
{"and": [
"Spazer",
{"cycleFrames": 860}
]},
{"and": [
"Grapple",
{"cycleFrames": 890}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 960}
]},
{"cycleFrames": 1500}
]}
],
"farmCycleDrops": [
{"enemy": "Choot", "count": 5}
],
"devNote": [
"There is a sixth Choot on the far right but it's not worth going for.",
"FIXME: add other movement options for reaching the top of the room from node 2."
]
},
{
Expand Down Expand Up @@ -709,6 +728,37 @@
},
"note": ["Destroy the Owtch using blue speed."]
},
{
"link": [2, 2],
"name": "Skultera Farm",
"requires": [
{"resetRoom": {"nodes": [2]}},
"canSuitlessMaridia",
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 360}
]},
{"and": [
"Wave",
{"cycleFrames": 420}
]},
{"and": [
"Spazer",
{"cycleFrames": 450}
]},
{"and": [
"Ice",
{"cycleFrames": 530}
]},
{"cycleFrames": 710}
]}
],
"farmCycleDrops": [{"enemy": "Skultera", "count": 2}],
"devNote": [
"If Gravity is available, the Choot farm at the top of the room would be used instead."
]
},
{
"id": 30,
"link": [2, 2],
Expand Down
137 changes: 65 additions & 72 deletions region/maridia/inner-yellow/Thread The Needle Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -416,50 +416,50 @@
}
}
},
{
"id": 17,
"link": [1, 1],
"name": "Basic Choot and Puyo Farm",
"requires": [
{"or": [
"h_hasBeamUpgrade",
"canDodgeWhileShooting",
"Grapple",
"ScrewAttack"
]},
{"resetRoom": {"nodes": [1]}},
{"refill": ["Energy", "Missile"]}
]
},
{
"id": 18,
"link": [1, 1],
"name": "Choot and Puyo Farm",
"requires": [
{"or": [
"Wave",
"Spazer",
"Plasma",
"Grapple",
"ScrewAttack"
]},
{"resetRoom": {"nodes": [1]}},
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
]
},
{
"id": 19,
"link": [1, 1],
"name": "Patient Choot and Puyo Farm",
"requires": [
"canBePatient",
{"or": [
"canDodgeWhileShooting",
"Charge",
"Ice"
"Gravity",
{"cycleFrames": 330}
]},
{"resetRoom": {"nodes": [1]}},
{"refill": ["Super", "PowerBomb"]}
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 1110}
]},
{"and": [
"Grapple",
{"cycleFrames": 1240}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 1330}
]},
{"and": [
"Wave",
{"cycleFrames": 1380}
]},
{"and": [
"Spazer",
{"cycleFrames": 1440}
]},
{"and": [
"Ice",
{"cycleFrames": 2010}
]},
{"and": [
"canDodgeWhileShooting",
{"cycleFrames": 2670}
]}
]}
],
"farmCycleDrops": [
{"enemy": "Choot", "count": 5},
{"enemy": "Puyo", "count": 5}
]
},
{
Expand Down Expand Up @@ -942,47 +942,40 @@
{
"id": 47,
"link": [2, 2],
"name": "Basic Choot and Puyo Farm",
"requires": [
{"or": [
"h_hasBeamUpgrade",
"canDodgeWhileShooting",
"Grapple",
"ScrewAttack"
]},
{"resetRoom": {"nodes": [2]}},
{"refill": ["Energy", "Missile"]}
]
},
{
"id": 48,
"link": [2, 2],
"name": "Choot and Puyo Farm",
"requires": [
{"or": [
"Wave",
"Spazer",
"Plasma",
"Grapple",
"ScrewAttack"
]},
{"resetRoom": {"nodes": [2]}},
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
]
},
{
"id": 49,
"link": [2, 2],
"name": "Patient Choot and Puyo Farm",
"requires": [
"canBePatient",
{"or": [
"canDodgeWhileShooting",
"Charge",
"Ice"
"Gravity",
{"cycleFrames": 120}
]},
{"resetRoom": {"nodes": [2]}},
{"refill": ["Super", "PowerBomb"]}
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 610}
]},
{"and": [
"Grapple",
{"cycleFrames": 660}
]},
{"and": [
"Wave",
{"cycleFrames": 700}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 720}
]},
{"and": [
"Spazer",
{"cycleFrames": 820}
]},
{"cycleFrames": 1070}
]}
],
"farmCycleDrops": [
{"enemy": "Choot", "count": 3},
{"enemy": "Puyo", "count": 3}
]
},
{
Expand Down
16 changes: 15 additions & 1 deletion region/maridia/inner-yellow/Watering Hole.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,21 @@
"link": [1, 1],
"name": "Zeb Farm",
"requires": [
{"refill": ["Energy", "Missile", "Super"]}
{"simpleCycleFrames": 80},
{"cycleFrames": 30}
],
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
},
{
"link": [1, 1],
"name": "Double Zeb Farm",
"requires": [
"canTrickyDodgeEnemies",
{"cycleFrames": 170}
],
"farmCycleDrops": [{"enemy": "Zeb", "count": 2}],
"note": [
"Run back and forth between the two Zeb spawners to farm them simultaneously."
]
},
{
Expand Down
Loading