Skip to content

Commit 283becb

Browse files
osse101osse101
committed
UN East Farms Part 2
1 parent fa69558 commit 283becb

6 files changed

Lines changed: 311 additions & 30 deletions

File tree

‎region/norfair/east/Cathedral.json‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,15 +763,38 @@
763763
{
764764
"id": 26,
765765
"link": [4, 4],
766-
"name": "Sova Farm",
766+
"name": "Sova and Geruta Farm",
767767
"requires": [
768-
{"resetRoom": {"nodes": [1, 2]}},
769768
"h_heatProof",
770-
{"partialRefill": {"type": "Energy", "limit": 300}},
771-
{"partialRefill": {"type": "Super", "limit": 6}},
772-
{"partialRefill": {"type": "Missile", "limit": 14}}
769+
{"or": [
770+
{"and": [
771+
{"resetRoom": {"nodes": [1]}},
772+
{"cycleFrames": 1080}
773+
]},
774+
{"and": [
775+
{"resetRoom": {"nodes": [2]}},
776+
{"cycleFrames": 1230}
777+
]}
778+
]},
779+
{"or": [
780+
"Plasma",
781+
"Wave",
782+
{"and": [
783+
"ScrewAttack",
784+
{"cycleFrames": 150}
785+
]},
786+
{"and": [
787+
"Spazer",
788+
{"cycleFrames": 60}
789+
]},
790+
{"cycleFrames": 700}
791+
]}
773792
],
774-
"resetsObstacles": ["A"]
793+
"resetsObstacles": ["A"],
794+
"farmCycleDrops": [
795+
{"enemy": "Sova", "count": 4},
796+
{"enemy": "Geruta", "count": 3}
797+
]
775798
},
776799
{
777800
"id": 27,

‎region/norfair/east/Double Chamber.json‎

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,27 @@
215215
],
216216
"flashSuitChecked": true
217217
},
218+
{
219+
"link": [1, 1],
220+
"name": "Ripper Farm",
221+
"requires": [
222+
"h_heatProof",
223+
"SpaceJump",
224+
"ScrewAttack",
225+
{"or": [
226+
{"and": [
227+
{"resetRoom": {"nodes": [1]}},
228+
{"cycleFrames": 660}
229+
]},
230+
{"and": [
231+
{"resetRoom": {"nodes": [2]}},
232+
{"cycleFrames": 810}
233+
]}
234+
]}
235+
],
236+
"resetsObstacles": ["A"],
237+
"farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 1}]
238+
},
218239
{
219240
"id": 3,
220241
"link": [1, 2],
@@ -1980,6 +2001,20 @@
19802001
],
19812002
"flashSuitChecked": true
19822003
},
2004+
{
2005+
"link": [3, 3],
2006+
"name": "Ripper Farm",
2007+
"requires": [
2008+
"h_heatProof",
2009+
"SpaceJump",
2010+
"ScrewAttack",
2011+
{"resetRoom": {"nodes": [3]}},
2012+
{"cycleFrames": 230}
2013+
],
2014+
"resetsObstacles": ["A"],
2015+
"farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 1}],
2016+
"devNote": "FIXME: It is possible but risky to farm using hijump, walljump, and crumble jumps."
2017+
},
19832018
{
19842019
"id": 44,
19852020
"link": [3, 3],
@@ -3083,13 +3118,50 @@
30833118
"requires": [
30843119
"h_heatProof",
30853120
"Morph",
3086-
{"resetRoom": {"nodes": [2]}},
3087-
{"partialRefill": {"type": "PowerBomb", "limit": 4}},
3088-
{"partialRefill": {"type": "Super", "limit": 4}},
3089-
{"refill": ["Energy", "Missile"]}
3121+
{"or": [
3122+
{"and": [
3123+
{"resetRoom": {"nodes": [1]}},
3124+
{"or": [
3125+
{"and": [
3126+
"SpaceJump",
3127+
{"cycleFrames": 510}
3128+
]},
3129+
{"and": [
3130+
"HiJump",
3131+
"SpeedBooster",
3132+
{"cycleFrames": 940}
3133+
]}
3134+
]}
3135+
]},
3136+
{"and": [
3137+
{"resetRoom": {"nodes": [2]}},
3138+
{"cycleFrames": 860}
3139+
]},
3140+
{"and": [
3141+
{"resetRoom": {"nodes": [3]}},
3142+
{"or": [
3143+
{"and": [
3144+
"SpaceJump",
3145+
{"cycleFrames": 1160}
3146+
]},
3147+
{"and": [
3148+
"HiJump",
3149+
"SpeedBooster",
3150+
{"or": [
3151+
"Grapple",
3152+
"canWalljump"
3153+
]},
3154+
{"cycleFrames": 1190}
3155+
]}
3156+
]}
3157+
]}
3158+
]}
30903159
],
30913160
"resetsObstacles": ["A"],
3092-
"devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
3161+
"farmCycleDrops": [
3162+
{"enemy": "Kago", "count": 1}
3163+
],
3164+
"devNote": "FIXME: There are more possible item combinations."
30933165
},
30943166
{
30953167
"id": 78,

‎region/norfair/east/Frog Speedway.json‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,34 +85,52 @@
8585
{
8686
"id": 2,
8787
"link": [1, 1],
88-
"name": "Beetom Farm",
88+
"name": "Beetom Farm (Speed Booster)",
8989
"requires": [
90+
"SpeedBooster",
9091
{"or": [
9192
{"resetRoom": {"nodes": [1]}},
9293
{"and": [
9394
{"resetRoom": {"nodes": [2]}},
94-
"SpeedBooster"
95+
{"cycleFrames": 40}
9596
]}
9697
]},
98+
"h_getBlueSpeedMaxRunway",
99+
{"cycleFrames": 330}
100+
],
101+
"farmCycleDrops": [{"enemy": "Beetom", "count": 6}],
102+
"flashSuitChecked": true,
103+
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
104+
"devNote": [
105+
"Health Bomb ends at 50 energy.",
106+
"One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."
107+
]
108+
},
109+
{
110+
"link": [1, 1],
111+
"name": "Beetom Farm",
112+
"requires": [
113+
{"resetRoom": {"nodes": [1]}},
97114
{"or": [
98-
"ScrewAttack",
99-
"h_getBlueSpeedMaxRunway",
115+
{"and": [
116+
"ScrewAttack",
117+
{"cycleFrames": 370}
118+
]},
100119
{"and": [
101120
"Ice",
102-
"h_useMorphBombs"
121+
"h_useMorphBombs",
122+
{"cycleFrames": 480}
103123
]},
104124
{"and": [
105125
"Morph",
106126
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
107-
{"or": [
108-
{"ammo": {"type": "PowerBomb", "count": 1}},
109-
{"ammo": {"type": "Missile", "count": 1}},
110-
{"ammo": {"type": "Super", "count": 1}}
111-
]}
127+
"h_usePowerBomb",
128+
{"cycleFrames": 460}
112129
]}
113-
]},
114-
{"refill": ["PowerBomb"]}
130+
]}
115131
],
132+
"farmCycleDrops": [{"enemy": "Beetom", "count": 3}],
133+
"flashSuitChecked": true,
116134
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
117135
"devNote": [
118136
"Health Bomb ends at 50 energy.",

‎region/norfair/east/Green Bubbles Tunnel.json‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,56 @@
104104
],
105105
"flashSuitChecked": true
106106
},
107+
{
108+
"link": [1, 1],
109+
"name": "Geruta Farm (Morph)",
110+
"requires": [
111+
"h_heatProof",
112+
"canMidAirMorph",
113+
{"resetRoom": {"nodes": [1]}},
114+
{"cycleFrames": 320},
115+
{"or": [
116+
"Plasma",
117+
{"and": [
118+
"Spazer",
119+
{"cycleFrames": 20}
120+
]},
121+
{"and": [
122+
"Ice",
123+
{"cycleFrames": 40}
124+
]},
125+
{"and": [
126+
"Wave",
127+
{"cycleFrames": 15}
128+
]},
129+
{"and": [
130+
"ScrewAttack",
131+
{"cycleFrames": 30}
132+
]},
133+
{"cycleFrames": 200}
134+
]}
135+
],
136+
"collectsItems": [3],
137+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}]
138+
},
139+
{
140+
"link": [1, 1],
141+
"name": "Geruta Farm (Grapple)",
142+
"requires": [
143+
"h_heatProof",
144+
"Grapple",
145+
{"resetRoom": {"nodes": [1]}},
146+
{"cycleFrames": 300},
147+
{"or": [
148+
"Plasma",
149+
"Spazer",
150+
"Ice",
151+
"Wave",
152+
{"cycleFrames": 90}
153+
]}
154+
],
155+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}]
156+
},
107157
{
108158
"id": 3,
109159
"link": [1, 2],
@@ -353,6 +403,41 @@
353403
],
354404
"flashSuitChecked": true
355405
},
406+
{
407+
"link": [2, 2],
408+
"name": "Geruta Farm",
409+
"requires": [
410+
"h_heatProof",
411+
{"resetRoom": {"nodes": [2]}},
412+
{"or": [
413+
{"and": [
414+
{"or": [
415+
"ScrewAttack",
416+
"Plasma"
417+
]},
418+
{"cycleFrames": 90}
419+
]},
420+
{"and": [
421+
{"or": [
422+
"Ice",
423+
"Spazer",
424+
"Wave",
425+
"canPseudoScrew"
426+
]},
427+
{"cycleFrames": 110}
428+
]},
429+
{"and": [
430+
"h_lavaProof",
431+
{"cycleFrames": 210}
432+
]},
433+
{"and": [
434+
"canTrickyJump",
435+
{"cycleFrames": 270}
436+
]}
437+
]}
438+
],
439+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}]
440+
},
356441
{
357442
"id": 20,
358443
"link": [2, 2],

‎region/norfair/east/Kronic Boost Room.json‎

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,32 @@
495495
],
496496
"flashSuitChecked": true
497497
},
498+
{
499+
"link": [2, 2],
500+
"name": "Viola Farm",
501+
"requires": [
502+
"h_heatProof",
503+
"Morph",
504+
{"resetRoom": {"nodes": [2]}},
505+
{"or": [
506+
{"and": [
507+
{"or": [
508+
"Plasma",
509+
"Wave",
510+
"Spazer"
511+
]},
512+
{"cycleFrames": 630}
513+
]},
514+
{"and": [
515+
"Grapple",
516+
{"cycleFrames": 680}
517+
]},
518+
{"cycleFrames": 770}
519+
]}
520+
],
521+
"resetsObstacles": ["A"],
522+
"farmCycleDrops": [{"enemy": "Viola", "count": 4}]
523+
},
498524
{
499525
"id": 13,
500526
"link": [2, 3],
@@ -707,11 +733,43 @@
707733
"name": "Viola Farm",
708734
"requires": [
709735
"h_heatProof",
710-
{"resetRoom": {"nodes": [1, 3, 4]}},
711-
{"refill": ["PowerBomb"]}
736+
{"or": [
737+
{"and": [
738+
{"resetRoom": {"nodes": [1, 4]}},
739+
{"or": [
740+
{"and": [
741+
{"or": [
742+
"Plasma",
743+
"Wave",
744+
"Spazer"
745+
]},
746+
{"cycleFrames": 450}
747+
]},
748+
{"and": [
749+
"Grapple",
750+
{"cycleFrames": 530}
751+
]},
752+
{"cycleFrames": 660}
753+
]}
754+
]},
755+
{"and": [
756+
{"resetRoom": {"nodes": [3]}},
757+
{"or": [
758+
{"and": [
759+
{"or": [
760+
"Plasma",
761+
"Wave",
762+
"Spazer"
763+
]},
764+
{"cycleFrames": 450}
765+
]},
766+
{"cycleFrames": 500}
767+
]}
768+
]}
769+
]}
712770
],
713771
"resetsObstacles": ["A"],
714-
"devNote": "FIXME: Resetting the room using door node 2 would also be possible if the obstacle is cleared."
772+
"farmCycleDrops": [{"enemy": "Viola", "count": 4}]
715773
},
716774
{
717775
"id": 19,

0 commit comments

Comments
 (0)