Skip to content

Commit 3a35e44

Browse files
authored
UN East farms part 1 (#2183)
1 parent 6ebefad commit 3a35e44

3 files changed

Lines changed: 390 additions & 29 deletions

File tree

region/norfair/east/Bat Cave.json

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,17 @@
120120
],
121121
"flashSuitChecked": true
122122
},
123+
{
124+
"link": [1, 1],
125+
"name": "Skree Farm",
126+
"requires": [
127+
"h_heatProof",
128+
{"resetRoom": {"nodes": [1]}},
129+
{"cycleFrames": 300}
130+
],
131+
"resetsObstacles": ["A"],
132+
"farmCycleDrops": [{"enemy": "Skree", "count": 3}]
133+
},
123134
{
124135
"id": 3,
125136
"link": [1, 2],
@@ -533,11 +544,16 @@
533544
"link": [2, 3],
534545
"name": "Base",
535546
"requires": [
536-
{"heatFrames": 10}
547+
{"heatFrames": 4},
548+
{"or": [
549+
"canPauseAbuse",
550+
{"heatFrames": 50}
551+
]},
552+
{"partialRefill": {"type": "Energy", "limit": 50}}
537553
],
538554
"devNote": [
539-
"Heat frames here are artifically lower to allow using canPauseAbuse on the farm.",
540-
"This is compensated for by extra heat frames on the farm itself as an alternative to canPauseAbuse."
555+
"The first farm is built into this strat to allow for the pause abuse.",
556+
"Leniency replaces the need for a tech to fire an accurate shot to hit the Gamets."
541557
]
542558
},
543559
{
@@ -586,15 +602,12 @@
586602
"name": "Gamet Farm",
587603
"requires": [
588604
{"obstaclesNotCleared": ["A"]},
589-
{"or": [
590-
{"and": [
591-
{"heatFrames": 0},
592-
"canPauseAbuse"
593-
]},
594-
{"heatFrames": 50}
595-
]},
596-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
597-
]
605+
{"simpleHeatFrames": 90},
606+
{"heatFrames": 20},
607+
{"simpleCycleFrames": 90},
608+
{"cycleFrames": 20}
609+
],
610+
"farmCycleDrops": [{"enemy": "Gamet", "count": 5}]
598611
},
599612
{
600613
"id": 23,
@@ -608,15 +621,12 @@
608621
"h_useMorphBombs",
609622
"Grapple"
610623
]},
611-
{"or": [
612-
{"and": [
613-
{"heatFrames": 0},
614-
"canPauseAbuse"
615-
]},
616-
{"heatFrames": 50}
617-
]},
618-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
624+
{"simpleHeatFrames": 40},
625+
{"heatFrames": 100},
626+
{"simpleCycleFrames": 40},
627+
{"cycleFrames": 100}
619628
],
629+
"farmCycleDrops": [{"enemy": "Gamet", "count": 5}],
620630
"note": "When off-camera, the Gamets still spawn but cannot be destroyed with beams or other projectiles."
621631
}
622632
],

region/norfair/east/Bubble Mountain.json

Lines changed: 238 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,17 @@
391391
],
392392
"flashSuitChecked": true
393393
},
394+
{
395+
"link": [1, 1],
396+
"name": "Waver Farm",
397+
"requires": [
398+
{"resetRoom": {"nodes": [1]}},
399+
{"cycleFrames": 80}
400+
],
401+
"resetsObstacles": ["A"],
402+
"farmCycleDrops": [{"enemy": "Waver", "count": 1}],
403+
"flashSuitChecked": true
404+
},
394405
{
395406
"id": 4,
396407
"link": [1, 1],
@@ -2452,6 +2463,24 @@
24522463
"clearsObstacles": ["A"],
24532464
"flashSuitChecked": true
24542465
},
2466+
{
2467+
"link": [4, 4],
2468+
"name": "Single Sova Farm",
2469+
"requires": [
2470+
{"or": [
2471+
{"and": [
2472+
{"resetRoom": {"nodes": [4]}},
2473+
{"cycleFrames": 155}
2474+
]},
2475+
{"and": [
2476+
{"resetRoom": {"nodes": [5]}},
2477+
{"cycleFrames": 180}
2478+
]}
2479+
]}
2480+
],
2481+
"resetsObstacles": ["A"],
2482+
"farmCycleDrops": [{"enemy": "Sova", "count": 1}]
2483+
},
24552484
{
24562485
"id": 76,
24572486
"link": [4, 4],
@@ -3800,12 +3829,40 @@
38003829
"link": [7, 7],
38013830
"name": "Cacatac and Waver Farm",
38023831
"requires": [
3803-
{"resetRoom": {"nodes": [6, 7]}},
3804-
{"partialRefill": {"type": "Energy", "limit": 160}},
3805-
{"partialRefill": {"type": "Super", "limit": 5}},
3806-
{"partialRefill": {"type": "Missile", "limit": 6}}
3832+
{"or": [
3833+
{"and": [
3834+
{"resetRoom": {"nodes": [1]}},
3835+
{"or": [
3836+
{"and": [
3837+
"Grapple",
3838+
{"cycleFrames": 300}
3839+
]},
3840+
{"and": [
3841+
"SpaceJump",
3842+
{"cycleFrames": 390}
3843+
]},
3844+
{"and": [
3845+
"HiJump",
3846+
"canTrickyWalljump",
3847+
{"cycleFrames": 690}
3848+
]}
3849+
]}
3850+
]},
3851+
{"and": [
3852+
{"resetRoom": {"nodes": [6]}},
3853+
{"cycleFrames": 370}
3854+
]},
3855+
{"and": [
3856+
{"resetRoom": {"nodes": [7]}},
3857+
{"cycleFrames": 360}
3858+
]}
3859+
]}
38073860
],
3808-
"resetsObstacles": ["A"]
3861+
"resetsObstacles": ["A"],
3862+
"farmCycleDrops": [
3863+
{"enemy": "Cacatac", "count": 1},
3864+
{"enemy": "Waver", "count": 1}
3865+
]
38093866
},
38103867
{
38113868
"id": 133,
@@ -4152,11 +4209,183 @@
41524209
"link": [9, 9],
41534210
"name": "Waver Farm",
41544211
"requires": [
4155-
{"resetRoom": {"nodes": [2, 3]}},
4156-
{"partialRefill": {"type": "Energy", "limit": 100}},
4157-
{"partialRefill": {"type": "Missile", "limit": 6}}
4212+
{"or": [
4213+
{"and": [
4214+
{"resetRoom": {"nodes": [2]}},
4215+
{"cycleFrames": 660}
4216+
]},
4217+
{"and": [
4218+
{"resetRoom": {"nodes": [3]}},
4219+
{"cycleFrames": 720}
4220+
]}
4221+
]}
4222+
],
4223+
"resetsObstacles": ["A"],
4224+
"farmCycleDrops": [{"enemy": "Waver", "count": 2}]
4225+
},
4226+
{
4227+
"link": [9, 9],
4228+
"name": "Sova Farm",
4229+
"requires": [
4230+
{"or": [
4231+
{"and": [
4232+
{"resetRoom": {"nodes": [1]}},
4233+
{"or": [
4234+
{"and": [
4235+
"SpaceJump",
4236+
{"cycleFrames": 1500}
4237+
]},
4238+
{"and": [
4239+
"HiJump",
4240+
"canTrickyWalljump",
4241+
{"cycleFrames": 1320}
4242+
]},
4243+
{"and": [
4244+
"HiJump",
4245+
"canSpringBallJumpMidAir",
4246+
{"cycleFrames": 1320},
4247+
"h_doubleEquipmentScreenCycleFrames"
4248+
]}
4249+
]}
4250+
]},
4251+
{"and": [
4252+
{"resetRoom": {"nodes": [2]}},
4253+
{"cycleFrames": 1140}
4254+
]},
4255+
{"and": [
4256+
{"resetRoom": {"nodes": [3]}},
4257+
{"cycleFrames": 1140}
4258+
]},
4259+
{"and": [
4260+
{"resetRoom": {"nodes": [4]}},
4261+
{"cycleFrames": 720}
4262+
]},
4263+
{"and": [
4264+
{"resetRoom": {"nodes": [5]}},
4265+
{"cycleFrames": 730}
4266+
]},
4267+
{"and": [
4268+
{"resetRoom": {"nodes": [6]}},
4269+
{"cycleFrames": 1770},
4270+
{"or": [
4271+
"SpaceJump",
4272+
{"and": [
4273+
"HiJump",
4274+
"canTrickyWalljump"
4275+
]}
4276+
]}
4277+
]},
4278+
{"and": [
4279+
{"resetRoom": {"nodes": [7]}},
4280+
{"cycleFrames": 1740},
4281+
{"or": [
4282+
"SpaceJump",
4283+
{"and": [
4284+
"HiJump",
4285+
"canTrickyWalljump"
4286+
]}
4287+
]}
4288+
]}
4289+
]},
4290+
"h_useMorphBombs"
4291+
],
4292+
"resetsObstacles": ["A"],
4293+
"farmCycleDrops": [{"enemy": "Sova", "count": 3}]
4294+
},
4295+
{
4296+
"link": [9, 9],
4297+
"name": "Cacatac and Waver Farm",
4298+
"requires": [
4299+
{"or": [
4300+
{"resetRoom": {"nodes": [2]}},
4301+
{"and": [
4302+
{"resetRoom": {"nodes": [3]}},
4303+
{"cycleFrames": 60}
4304+
]}
4305+
]},
4306+
{"or": [
4307+
{"and": [
4308+
"SpaceJump",
4309+
{"cycleFrames": 600}
4310+
]},
4311+
{"and": [
4312+
"HiJump",
4313+
"canTrickyWalljump",
4314+
{"cycleFrames": 660}
4315+
]}
4316+
]}
41584317
],
4159-
"resetsObstacles": ["A"]
4318+
"resetsObstacles": ["A"],
4319+
"farmCycleDrops": [
4320+
{"enemy": "Cacatac", "count": 1},
4321+
{"enemy": "Waver", "count": 2}
4322+
]
4323+
},
4324+
{
4325+
"link": [9, 9],
4326+
"name": "Ripper Farm",
4327+
"requires": [
4328+
"ScrewAttack",
4329+
{"or": [
4330+
"canWalljump",
4331+
"HiJump",
4332+
"SpaceJump",
4333+
{"and": [
4334+
"canSpringBallJumpMidAir",
4335+
"h_doubleEquipmentScreenCycleFrames",
4336+
{"cycleFrames": 20}
4337+
]},
4338+
{"and": [
4339+
"canIBJ",
4340+
{"cycleFrames": 600}
4341+
]}
4342+
]},
4343+
{"or": [
4344+
{"and": [
4345+
{"resetRoom": {"nodes": [1]}},
4346+
{"or": [
4347+
{"and": [
4348+
"SpaceJump",
4349+
{"cycleFrames": 1050}
4350+
]},
4351+
{"and": [
4352+
"HiJump",
4353+
"canTrickyWalljump",
4354+
{"cycleFrames": 970}
4355+
]},
4356+
{"and": [
4357+
"HiJump",
4358+
"canSpringBallJumpMidAir",
4359+
{"cycleFrames": 970},
4360+
"h_doubleEquipmentScreenCycleFrames"
4361+
]}
4362+
]}
4363+
]},
4364+
{"and": [
4365+
{"resetRoom": {"nodes": [2]}},
4366+
{"cycleFrames": 840}
4367+
]},
4368+
{"and": [
4369+
{"resetRoom": {"nodes": [3]}},
4370+
{"cycleFrames": 960}
4371+
]},
4372+
{"and": [
4373+
{"resetRoom": {"nodes": [4]}},
4374+
{"cycleFrames": 1800},
4375+
"h_useMorphBombs"
4376+
]},
4377+
{"and": [
4378+
{"resetRoom": {"nodes": [5]}},
4379+
{"cycleFrames": 1800},
4380+
"h_useMorphBombs"
4381+
]}
4382+
]}
4383+
],
4384+
"resetsObstacles": ["A"],
4385+
"farmCycleDrops": [
4386+
{"enemy": "Ripper 2 (red)", "count": 1},
4387+
{"enemy": "Waver", "count": 1}
4388+
]
41604389
},
41614390
{
41624391
"id": 160,

0 commit comments

Comments
 (0)