Skip to content

UN East Farms Part 2 #2187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blkerby merged 3 commits into from
Aug 1, 2025
Merged

UN East Farms Part 2 #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
283becb
UN East Farms Part 2
osse101 Jul 31, 2025
0dbed74
Cleanup
osse101 Jul 31, 2025
8d2eb2b
Conversion Error
osse101 Aug 1, 2025
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
36 changes: 30 additions & 6 deletions region/norfair/east/Cathedral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,15 +763,39 @@
{
"id": 26,
"link": [4, 4],
"name": "Sova Farm",
"name": "Sova and Geruta Farm",
"requires": [
{"resetRoom": {"nodes": [1, 2]}},
"h_heatProof",
{"partialRefill": {"type": "Energy", "limit": 300}},
{"partialRefill": {"type": "Super", "limit": 6}},
{"partialRefill": {"type": "Missile", "limit": 14}}
{"or": [
{"and": [
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 1080}
]},
{"and": [
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 1230}
]}
]},
{"or": [
"Plasma",
"Wave",
{"and": [
"ScrewAttack",
{"cycleFrames": 150}
]},
{"and": [
"Spazer",
{"cycleFrames": 60}
]},
{"cycleFrames": 700}
]}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [
{"enemy": "Sova", "count": 4},
{"enemy": "Geruta", "count": 3}
],
"resetsObstacles": ["A"]
"flashSuitChecked": true
},
{
"id": 27,
Expand Down
84 changes: 79 additions & 5 deletions region/norfair/east/Double Chamber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,27 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Ripper Farm",
"requires": [
"h_heatProof",
"SpaceJump",
"ScrewAttack",
{"or": [
{"and": [
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 660}
]},
{"and": [
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 810}
]}
]}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 1}]
},
{
"id": 3,
"link": [1, 2],
Expand Down Expand Up @@ -1980,6 +2001,21 @@
],
"flashSuitChecked": true
},
{
"link": [3, 3],
"name": "Ripper Farm",
"requires": [
"h_heatProof",
"SpaceJump",
"ScrewAttack",
{"resetRoom": {"nodes": [3]}},
{"cycleFrames": 230}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 1}],
"flashSuitChecked": true,
"devNote": "FIXME: It is possible but risky to farm using hijump, walljump, and crumble jumps."
},
{
"id": 44,
"link": [3, 3],
Expand Down Expand Up @@ -3083,13 +3119,51 @@
"requires": [
"h_heatProof",
"Morph",
{"resetRoom": {"nodes": [2]}},
{"partialRefill": {"type": "PowerBomb", "limit": 4}},
{"partialRefill": {"type": "Super", "limit": 4}},
{"refill": ["Energy", "Missile"]}
{"or": [
{"and": [
{"resetRoom": {"nodes": [1]}},
{"or": [
{"and": [
"SpaceJump",
{"cycleFrames": 1060}
]},
{"and": [
"HiJump",
"SpeedBooster",
{"cycleFrames": 940}
]}
]}
]},
{"and": [
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 830}
]},
{"and": [
{"resetRoom": {"nodes": [3]}},
{"or": [
{"and": [
"SpaceJump",
{"cycleFrames": 1160}
]},
{"and": [
"HiJump",
"SpeedBooster",
{"or": [
"Grapple",
"canWalljump"
]},
{"cycleFrames": 1190}
]}
]}
]}
]}
],
"resetsObstacles": ["A"],
"devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
"farmCycleDrops": [
{"enemy": "Kago", "count": 1}
],
"flashSuitChecked": true,
"devNote": "FIXME: There are more possible item combinations."
},
{
"id": 78,
Expand Down
39 changes: 26 additions & 13 deletions region/norfair/east/Frog Speedway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,35 +85,48 @@
{
"id": 2,
"link": [1, 1],
"name": "Beetom Farm",
"name": "Beetom Farm (Speed Booster)",
"requires": [
"SpeedBooster",
{"or": [
{"resetRoom": {"nodes": [1]}},
{"and": [
{"resetRoom": {"nodes": [2]}},
"SpeedBooster"
{"cycleFrames": 40}
]}
]},
"h_getBlueSpeedMaxRunway",
{"cycleFrames": 330}
],
"farmCycleDrops": [{"enemy": "Beetom", "count": 6}],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Beetom Farm",
"requires": [
{"resetRoom": {"nodes": [1]}},
{"or": [
"ScrewAttack",
"h_getBlueSpeedMaxRunway",
{"and": [
"ScrewAttack",
{"cycleFrames": 370}
]},
{"and": [
"Ice",
"h_useMorphBombs"
"h_useMorphBombs",
{"cycleFrames": 480}
]},
{"and": [
"Morph",
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
{"or": [
{"ammo": {"type": "PowerBomb", "count": 1}},
{"ammo": {"type": "Missile", "count": 1}},
{"ammo": {"type": "Super", "count": 1}}
]}
"h_usePowerBomb",
{"cycleFrames": 460}
]}
]},
{"refill": ["PowerBomb"]}
]}
],
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
"farmCycleDrops": [{"enemy": "Beetom", "count": 3}],
"flashSuitChecked": true,
"note": "Kill the Beetoms with Screw Attack or by freezing and using Bombs or Power Bombs.",
"devNote": [
"Health Bomb ends at 50 energy.",
"One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."
Expand Down
88 changes: 88 additions & 0 deletions region/norfair/east/Green Bubbles Tunnel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,58 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Geruta Farm (Morph)",
"requires": [
"h_heatProof",
"canMidAirMorph",
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 320},
{"or": [
"Plasma",
{"and": [
"Spazer",
{"cycleFrames": 20}
]},
{"and": [
"Ice",
{"cycleFrames": 40}
]},
{"and": [
"Wave",
{"cycleFrames": 15}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 30}
]},
{"cycleFrames": 200}
]}
],
"collectsItems": [3],
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Geruta Farm (Grapple)",
"requires": [
"h_heatProof",
"Grapple",
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 300},
{"or": [
"Plasma",
"Spazer",
"Ice",
"Wave",
{"cycleFrames": 90}
]}
],
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
"flashSuitChecked": true
},
{
"id": 3,
"link": [1, 2],
Expand Down Expand Up @@ -353,6 +405,42 @@
],
"flashSuitChecked": true
},
{
"link": [2, 2],
"name": "Geruta Farm",
"requires": [
"h_heatProof",
{"resetRoom": {"nodes": [2]}},
{"or": [
{"and": [
{"or": [
"ScrewAttack",
"Plasma"
]},
{"cycleFrames": 90}
]},
{"and": [
{"or": [
"Ice",
"Spazer",
"Wave",
"canPseudoScrew"
]},
{"cycleFrames": 110}
]},
{"and": [
"h_lavaProof",
{"cycleFrames": 210}
]},
{"and": [
"canTrickyJump",
{"cycleFrames": 270}
]}
]}
],
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
"flashSuitChecked": true
},
{
"id": 20,
"link": [2, 2],
Expand Down
66 changes: 63 additions & 3 deletions region/norfair/east/Kronic Boost Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,33 @@
],
"flashSuitChecked": true
},
{
"link": [2, 2],
"name": "Viola Farm",
"requires": [
"h_heatProof",
"Morph",
{"resetRoom": {"nodes": [2]}},
{"or": [
{"and": [
{"or": [
"Plasma",
"Wave",
"Spazer"
]},
{"cycleFrames": 630}
]},
{"and": [
"Grapple",
{"cycleFrames": 680}
]},
{"cycleFrames": 770}
]}
],
"resetsObstacles": ["A"],
"farmCycleDrops": [{"enemy": "Viola", "count": 4}],
"flashSuitChecked": true
},
{
"id": 13,
"link": [2, 3],
Expand Down Expand Up @@ -707,11 +734,44 @@
"name": "Viola Farm",
"requires": [
"h_heatProof",
{"resetRoom": {"nodes": [1, 3, 4]}},
{"refill": ["PowerBomb"]}
{"or": [
{"and": [
{"resetRoom": {"nodes": [1, 4]}},
{"or": [
{"and": [
{"or": [
"Plasma",
"Wave",
"Spazer"
]},
{"cycleFrames": 450}
]},
{"and": [
"Grapple",
{"cycleFrames": 530}
]},
{"cycleFrames": 660}
]}
]},
{"and": [
{"resetRoom": {"nodes": [3]}},
{"or": [
{"and": [
{"or": [
"Plasma",
"Wave",
"Spazer"
]},
{"cycleFrames": 450}
]},
{"cycleFrames": 500}
]}
]}
]}
],
"resetsObstacles": ["A"],
"devNote": "FIXME: Resetting the room using door node 2 would also be possible if the obstacle is cleared."
"farmCycleDrops": [{"enemy": "Viola", "count": 4}],
"flashSuitChecked": true
},
{
"id": 19,
Expand Down
Loading