Skip to content

Commit df2846b

Browse files
osse101osse101
authored
Merge pull request #2199 from osse101/UNEast3
More UN East Farms
2 parents 46efb30 + d266368 commit df2846b

4 files changed

Lines changed: 261 additions & 12 deletions

File tree

‎region/norfair/east/Magdollite Tunnel.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@
8888
"name": "Magdollite Farm",
8989
"requires": [
9090
"h_heatProof",
91-
{"refill": ["Energy", "Missile"]}
91+
{"cycleFrames": 310}
9292
],
93+
"farmCycleDrops": [{"enemy": "Magdollite", "count": 3}],
9394
"flashSuitChecked": true
9495
},
9596
{
@@ -678,6 +679,18 @@
678679
],
679680
"flashSuitChecked": true
680681
},
682+
{
683+
"link": [2, 2],
684+
"name": "Double Magdollite Farm",
685+
"requires": [
686+
"h_heatProof",
687+
"canTrickyJump",
688+
{"cycleFrames": 320}
689+
],
690+
"farmCycleDrops": [{"enemy": "Magdollite", "count": 6}],
691+
"flashSuitChecked": true,
692+
"note": "It may help to desynchronize the Magdollites by bringing them on camera at different times."
693+
},
681694
{
682695
"id": 27,
683696
"link": [2, 2],

‎region/norfair/east/Norfair Reserve Tank Room.json‎

Lines changed: 69 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,80 @@
136136
{
137137
"id": 2,
138138
"link": [1, 1],
139-
"name": "Sova Farm",
139+
"name": "Single Sova Farm",
140+
"requires": [
141+
"h_heatProof",
142+
"canCarefulJump",
143+
{"or": [
144+
"Wave",
145+
"Spazer",
146+
"Plasma",
147+
"Grapple",
148+
{"and": [
149+
"canTrickyJump",
150+
{"cycleFrames": 50}
151+
]}
152+
153+
]},
154+
{"cycleFrames": 110}
155+
],
156+
"resetsObstacles": ["A"],
157+
"farmCycleDrops": [{"enemy": "Sova", "count": 1}],
158+
"flashSuitChecked": true
159+
},
160+
{
161+
"link": [1, 1],
162+
"name": "Triple Sova Farm",
140163
"requires": [
141164
"h_heatProof",
142165
{"or": [
143166
"h_lavaProof",
144-
"canDodgeWhileShooting"
167+
"canInsaneJump",
168+
{"and": [
169+
"canDodgeWhileShooting",
170+
"Plasma"
171+
]}
145172
]},
146-
"Plasma",
147-
{"partialRefill": {"type": "Energy", "limit": 120}},
148-
{"partialRefill": {"type": "Super", "limit": 2}},
149-
{"partialRefill": {"type": "Missile", "limit": 6}}
150-
]
173+
{"or": [
174+
"Wave",
175+
"Spazer",
176+
"Plasma"
177+
]},
178+
{"cycleFrames": 470}
179+
],
180+
"resetsObstacles": ["A"],
181+
"farmCycleDrops": [{"enemy": "Sova", "count": 3}],
182+
"flashSuitChecked": true,
183+
"devNote": "Heat scaling makes up the difference in platforming ability."
184+
},
185+
{
186+
"link": [1, 1],
187+
"name": "Full Farm",
188+
"requires": [
189+
"h_heatProof",
190+
"h_lavaProof",
191+
{"resetRoom": {"nodes": [1]}},
192+
{"or": [
193+
"ScrewAttack",
194+
"Plasma",
195+
{"and": [
196+
"canPseudoScrew",
197+
{"or": [
198+
"Wave",
199+
"Spazer",
200+
{"cycleFrames": 420}
201+
]},
202+
{"cycleFrames": 390}
203+
]}
204+
]},
205+
{"cycleFrames": 300}
206+
],
207+
"clearsObstacles": ["A"],
208+
"farmCycleDrops": [
209+
{"enemy": "Sova", "count": 3},
210+
{"enemy": "Dragon", "count": 3}
211+
],
212+
"flashSuitChecked": true
151213
},
152214
{
153215
"id": 3,

‎region/norfair/east/Purple Farming Room.json‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@
121121
"flashSuitChecked": true
122122
},
123123
{
124-
"id": 4,
125124
"link": [2, 2],
126-
"name": "Gamet Farm",
125+
"name": "Approach Farm",
127126
"requires": [
128127
{"or": [
129128
{"and": [
@@ -132,8 +131,23 @@
132131
]},
133132
{"heatFrames": 50}
134133
]},
135-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
136-
]
134+
{"partialRefill": {"type": "RegularEnergy", "limit": 50}}
135+
],
136+
"flashSuitChecked": true,
137+
"note": "Regain some energy in order to use the Gamet Farm."
138+
},
139+
{
140+
"id": 4,
141+
"link": [2, 2],
142+
"name": "Gamet Farm",
143+
"requires": [
144+
{"simpleHeatFrames": 100},
145+
{"heatFrames": 20},
146+
{"simpleCycleFrames": 100},
147+
{"cycleFrames": 20}
148+
],
149+
"farmCycleDrops": [{"enemy": "Gamet", "count": 5}],
150+
"flashSuitChecked": true
137151
}
138152
],
139153
"notables": [],

‎region/norfair/east/Red Pirate Shaft.json‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,86 @@
9797
],
9898
"devNote": "This strat is not useful in-room, but can satisfy a strat in the room before with an exit shinespark."
9999
},
100+
{
101+
"link": [1, 1],
102+
"name": "Pirate and Geemer Farm",
103+
"requires": [
104+
{"resetRoom": {"nodes": [1]}},
105+
{"or": [
106+
{"and": [
107+
"Plasma",
108+
{"cycleFrames": 510}
109+
]},
110+
{"and": [
111+
"ScrewAttack",
112+
{"cycleFrames": 630}
113+
]}
114+
]}
115+
],
116+
"farmCycleDrops": [
117+
{"enemy": "Geemer (grey)", "count": 4},
118+
{"enemy": "Red Space Pirate (standing)", "count": 3}
119+
]
120+
},
121+
{
122+
"link": [1, 1],
123+
"name": "Pirate Farm",
124+
"requires": [
125+
{"resetRoom": {"nodes": [1]}},
126+
{"or": [
127+
{"and": [
128+
"canPseudoScrew",
129+
{"cycleFrames": 480}
130+
]},
131+
{"and": [
132+
"Ice",
133+
{"cycleFrames": 560}
134+
]},
135+
{"and": [
136+
"Wave",
137+
{"cycleFrames": 560}
138+
]},
139+
{"and": [
140+
"Spazer",
141+
{"cycleFrames": 560}
142+
]}
143+
]}
144+
],
145+
"farmCycleDrops": [{"enemy": "Red Space Pirate (standing)", "count": 3}]
146+
},
147+
{
148+
"link": [1, 1],
149+
"name": "Geemer Farm",
150+
"requires": [
151+
{"resetRoom": {"nodes": [1]}},
152+
{"or": [
153+
{"and": [
154+
"Grapple",
155+
{"cycleFrames": 480}
156+
]},
157+
{"and": [
158+
"h_useMorphBombs",
159+
{"cycleFrames": 690}
160+
]}
161+
]},
162+
{"or": [
163+
"HiJump",
164+
{"and": [
165+
"canWalljump",
166+
{"cycleFrames": 60}
167+
]},
168+
{"and": [
169+
"SpaceJump",
170+
{"cycleFrames": 120}
171+
]},
172+
{"and": [
173+
"canTrickyJump",
174+
{"cycleFrames": 200}
175+
]}
176+
]}
177+
],
178+
"farmCycleDrops": [{"enemy": "Geemer (grey)", "count": 4}]
179+
},
100180
{
101181
"id": 3,
102182
"link": [1, 1],
@@ -240,6 +320,86 @@
240320
},
241321
"note": "Knock a Geemer off with a Super then follow it back to the top. Grey Geemers can only be frozen with Plasma."
242322
},
323+
{
324+
"link": [2, 2],
325+
"name": "Pirate and Geemer Farm",
326+
"requires": [
327+
{"resetRoom": {"nodes": [2]}},
328+
{"or": [
329+
{"and": [
330+
"Plasma",
331+
{"cycleFrames": 540}
332+
]},
333+
{"and": [
334+
"ScrewAttack",
335+
{"cycleFrames": 570}
336+
]}
337+
]}
338+
],
339+
"farmCycleDrops": [
340+
{"enemy": "Geemer (grey)", "count": 4},
341+
{"enemy": "Red Space Pirate (standing)", "count": 3}
342+
]
343+
},
344+
{
345+
"link": [2, 2],
346+
"name": "Geemer Farm",
347+
"requires": [
348+
{"resetRoom": {"nodes": [2]}},
349+
{"or": [
350+
{"and": [
351+
"Grapple",
352+
{"cycleFrames": 440}
353+
]},
354+
{"and": [
355+
"h_useMorphBombs",
356+
{"cycleFrames": 960}
357+
]}
358+
]},
359+
{"or": [
360+
"HiJump",
361+
{"and": [
362+
"canWalljump",
363+
{"cycleFrames": 60}
364+
]},
365+
{"and": [
366+
"SpaceJump",
367+
{"cycleFrames": 120}
368+
]},
369+
{"and": [
370+
"canTrickyJump",
371+
{"cycleFrames": 200}
372+
]}
373+
]}
374+
],
375+
"farmCycleDrops": [{"enemy": "Geemer (grey)", "count": 4}]
376+
},
377+
{
378+
"link": [2, 2],
379+
"name": "Pirate Farm",
380+
"requires": [
381+
{"resetRoom": {"nodes": [2]}},
382+
{"or": [
383+
{"and": [
384+
"canPseudoScrew",
385+
{"cycleFrames": 570}
386+
]},
387+
{"and": [
388+
"Ice",
389+
{"cycleFrames": 640}
390+
]},
391+
{"and": [
392+
"Wave",
393+
{"cycleFrames": 570}
394+
]},
395+
{"and": [
396+
"Spazer",
397+
{"cycleFrames": 640}
398+
]}
399+
]}
400+
],
401+
"farmCycleDrops": [{"enemy": "Red Space Pirate (standing)", "count": 3}]
402+
},
243403
{
244404
"id": 12,
245405
"link": [2, 2],

0 commit comments

Comments
 (0)