Skip to content

Commit 6cb826e

Browse files
osse101osse101
authored
UN East Farms Part 2 (#2187)
1 parent 3a35e44 commit 6cb826e

6 files changed

Lines changed: 315 additions & 31 deletions

File tree

‎region/norfair/east/Cathedral.json‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,15 +763,39 @@
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+
]}
792+
],
793+
"resetsObstacles": ["A"],
794+
"farmCycleDrops": [
795+
{"enemy": "Sova", "count": 4},
796+
{"enemy": "Geruta", "count": 3}
773797
],
774-
"resetsObstacles": ["A"]
798+
"flashSuitChecked": true
775799
},
776800
{
777801
"id": 27,

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

Lines changed: 79 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,21 @@
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+
"flashSuitChecked": true,
2017+
"devNote": "FIXME: It is possible but risky to farm using hijump, walljump, and crumble jumps."
2018+
},
19832019
{
19842020
"id": 44,
19852021
"link": [3, 3],
@@ -3083,13 +3119,51 @@
30833119
"requires": [
30843120
"h_heatProof",
30853121
"Morph",
3086-
{"resetRoom": {"nodes": [2]}},
3087-
{"partialRefill": {"type": "PowerBomb", "limit": 4}},
3088-
{"partialRefill": {"type": "Super", "limit": 4}},
3089-
{"refill": ["Energy", "Missile"]}
3122+
{"or": [
3123+
{"and": [
3124+
{"resetRoom": {"nodes": [1]}},
3125+
{"or": [
3126+
{"and": [
3127+
"SpaceJump",
3128+
{"cycleFrames": 1060}
3129+
]},
3130+
{"and": [
3131+
"HiJump",
3132+
"SpeedBooster",
3133+
{"cycleFrames": 940}
3134+
]}
3135+
]}
3136+
]},
3137+
{"and": [
3138+
{"resetRoom": {"nodes": [2]}},
3139+
{"cycleFrames": 830}
3140+
]},
3141+
{"and": [
3142+
{"resetRoom": {"nodes": [3]}},
3143+
{"or": [
3144+
{"and": [
3145+
"SpaceJump",
3146+
{"cycleFrames": 1160}
3147+
]},
3148+
{"and": [
3149+
"HiJump",
3150+
"SpeedBooster",
3151+
{"or": [
3152+
"Grapple",
3153+
"canWalljump"
3154+
]},
3155+
{"cycleFrames": 1190}
3156+
]}
3157+
]}
3158+
]}
3159+
]}
30903160
],
30913161
"resetsObstacles": ["A"],
3092-
"devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
3162+
"farmCycleDrops": [
3163+
{"enemy": "Kago", "count": 1}
3164+
],
3165+
"flashSuitChecked": true,
3166+
"devNote": "FIXME: There are more possible item combinations."
30933167
},
30943168
{
30953169
"id": 78,

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

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,35 +85,48 @@
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+
},
104+
{
105+
"link": [1, 1],
106+
"name": "Beetom Farm",
107+
"requires": [
108+
{"resetRoom": {"nodes": [1]}},
97109
{"or": [
98-
"ScrewAttack",
99-
"h_getBlueSpeedMaxRunway",
110+
{"and": [
111+
"ScrewAttack",
112+
{"cycleFrames": 370}
113+
]},
100114
{"and": [
101115
"Ice",
102-
"h_useMorphBombs"
116+
"h_useMorphBombs",
117+
{"cycleFrames": 480}
103118
]},
104119
{"and": [
105120
"Morph",
106121
{"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-
]}
122+
"h_usePowerBomb",
123+
{"cycleFrames": 460}
112124
]}
113-
]},
114-
{"refill": ["PowerBomb"]}
125+
]}
115126
],
116-
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
127+
"farmCycleDrops": [{"enemy": "Beetom", "count": 3}],
128+
"flashSuitChecked": true,
129+
"note": "Kill the Beetoms with Screw Attack or by freezing and using Bombs or Power Bombs.",
117130
"devNote": [
118131
"Health Bomb ends at 50 energy.",
119132
"One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."

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

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,58 @@
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+
"flashSuitChecked": true
139+
},
140+
{
141+
"link": [1, 1],
142+
"name": "Geruta Farm (Grapple)",
143+
"requires": [
144+
"h_heatProof",
145+
"Grapple",
146+
{"resetRoom": {"nodes": [1]}},
147+
{"cycleFrames": 300},
148+
{"or": [
149+
"Plasma",
150+
"Spazer",
151+
"Ice",
152+
"Wave",
153+
{"cycleFrames": 90}
154+
]}
155+
],
156+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
157+
"flashSuitChecked": true
158+
},
107159
{
108160
"id": 3,
109161
"link": [1, 2],
@@ -353,6 +405,42 @@
353405
],
354406
"flashSuitChecked": true
355407
},
408+
{
409+
"link": [2, 2],
410+
"name": "Geruta Farm",
411+
"requires": [
412+
"h_heatProof",
413+
{"resetRoom": {"nodes": [2]}},
414+
{"or": [
415+
{"and": [
416+
{"or": [
417+
"ScrewAttack",
418+
"Plasma"
419+
]},
420+
{"cycleFrames": 90}
421+
]},
422+
{"and": [
423+
{"or": [
424+
"Ice",
425+
"Spazer",
426+
"Wave",
427+
"canPseudoScrew"
428+
]},
429+
{"cycleFrames": 110}
430+
]},
431+
{"and": [
432+
"h_lavaProof",
433+
{"cycleFrames": 210}
434+
]},
435+
{"and": [
436+
"canTrickyJump",
437+
{"cycleFrames": 270}
438+
]}
439+
]}
440+
],
441+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
442+
"flashSuitChecked": true
443+
},
356444
{
357445
"id": 20,
358446
"link": [2, 2],

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

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,33 @@
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+
"flashSuitChecked": true
524+
},
498525
{
499526
"id": 13,
500527
"link": [2, 3],
@@ -707,11 +734,44 @@
707734
"name": "Viola Farm",
708735
"requires": [
709736
"h_heatProof",
710-
{"resetRoom": {"nodes": [1, 3, 4]}},
711-
{"refill": ["PowerBomb"]}
737+
{"or": [
738+
{"and": [
739+
{"resetRoom": {"nodes": [1, 4]}},
740+
{"or": [
741+
{"and": [
742+
{"or": [
743+
"Plasma",
744+
"Wave",
745+
"Spazer"
746+
]},
747+
{"cycleFrames": 450}
748+
]},
749+
{"and": [
750+
"Grapple",
751+
{"cycleFrames": 530}
752+
]},
753+
{"cycleFrames": 660}
754+
]}
755+
]},
756+
{"and": [
757+
{"resetRoom": {"nodes": [3]}},
758+
{"or": [
759+
{"and": [
760+
{"or": [
761+
"Plasma",
762+
"Wave",
763+
"Spazer"
764+
]},
765+
{"cycleFrames": 450}
766+
]},
767+
{"cycleFrames": 500}
768+
]}
769+
]}
770+
]}
712771
],
713772
"resetsObstacles": ["A"],
714-
"devNote": "FIXME: Resetting the room using door node 2 would also be possible if the obstacle is cleared."
773+
"farmCycleDrops": [{"enemy": "Viola", "count": 4}],
774+
"flashSuitChecked": true
715775
},
716776
{
717777
"id": 19,

0 commit comments

Comments
 (0)