Skip to content

Commit a399572

Browse files
blkerbyblkerby
authored
Merge pull request #2123 from blkerby/green-brin-farms
Green Brinstar farms
2 parents 4dc7d55 + dae5722 commit a399572

9 files changed

Lines changed: 365 additions & 27 deletions

‎region/brinstar/green/Brinstar Pre-Map Room.json‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@
127127
},
128128
"flashSuitChecked": true
129129
},
130+
{
131+
"link": [1, 1],
132+
"name": "Zeela Farm",
133+
"requires": [
134+
{"resetRoom": {"nodes": [1]}},
135+
{"cycleFrames": 120}
136+
],
137+
"farmCycleDrops": [
138+
{"enemy": "Zeela", "count": 1}
139+
],
140+
"resetsObstacles": ["A"]
141+
},
130142
{
131143
"id": 2,
132144
"link": [1, 1],
@@ -433,12 +445,30 @@
433445
{"resetRoom": {
434446
"nodes": [2]
435447
}},
436-
{"partialRefill": {"type": "Energy", "limit": 240}},
437-
{"partialRefill": {"type": "Missile", "limit": 20}},
438-
{"partialRefill": {"type": "Super", "limit": 4}}
448+
{"cycleFrames": 320},
449+
{"or": [
450+
"canDodgeWhileShooting",
451+
"Plasma",
452+
{"and": [
453+
"Wave",
454+
"Spazer"
455+
]},
456+
{"and": [
457+
"Ice",
458+
"Wave"
459+
]},
460+
{"and": [
461+
"Ice",
462+
"Spazer"
463+
]}
464+
]}
439465
],
440466
"resetsObstacles": ["A"],
441-
"flashSuitChecked": true
467+
"flashSuitChecked": true,
468+
"farmCycleDrops": [
469+
{"enemy": "Zeela", "count": 2},
470+
{"enemy": "Sm. Sidehopper", "count": 1}
471+
]
442472
},
443473
{
444474
"id": 24,

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,10 @@
272272
"link": [1, 1],
273273
"name": "Zeb Farm",
274274
"requires": [
275-
{"refill": ["Energy", "Missile", "Super"]}
275+
{"cycleFrames": 105}
276+
],
277+
"farmCycleDrops": [
278+
{"enemy": "Zeb", "count": 1}
276279
],
277280
"flashSuitChecked": true
278281
},
@@ -802,6 +805,45 @@
802805
"leaveWithTemporaryBlue": {}
803806
}
804807
},
808+
{
809+
"link": [2, 2],
810+
"name": "Waver and Sidehopper Farm",
811+
"requires": [
812+
{"resetRoom": {"nodes": [2]}},
813+
{"or": [
814+
"canWalljump",
815+
"canCrouchJump"
816+
]},
817+
{"or": [
818+
{"and": [
819+
"Plasma",
820+
{"cycleFrames": 600}
821+
]},
822+
{"and": [
823+
"ScrewAttack",
824+
{"cycleFrames": 700}
825+
]},
826+
{"and": [
827+
{"or": [
828+
"Wave",
829+
"Spazer"
830+
]},
831+
{"cycleFrames": 750}
832+
]},
833+
{"and": [
834+
"canDodgeWhileShooting",
835+
{"cycleFrames": 1050}
836+
]}
837+
]}
838+
],
839+
"farmCycleDrops": [
840+
{"enemy": "Waver", "count": 4},
841+
{"enemy": "Sm. Sidehopper", "count": 3}
842+
],
843+
"clearsObstacles": ["A"],
844+
"resetsObstacles": ["B"],
845+
"flashSuitChecked": true
846+
},
805847
{
806848
"id": 30,
807849
"link": [2, 2],

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,38 @@
10401040
],
10411041
"devNote": "This does not require canRiskPermanentLossOfAccess if Samus returns through the crumble blocks."
10421042
},
1043+
{
1044+
"link": [3, 3],
1045+
"name": "Zebbo and Beetom Farm",
1046+
"requires": [
1047+
"Morph",
1048+
{"resetRoom": {
1049+
"nodes": [3]
1050+
}},
1051+
{"cycleFrames": 630},
1052+
{"or": [
1053+
{"enemyKill": {
1054+
"enemies": [["Beetom", "Beetom"]],
1055+
"explicitWeapons": ["ScrewAttack", "Missile", "PowerBomb"]
1056+
}},
1057+
{"and": [
1058+
"h_useMorphBombs",
1059+
{"or": [
1060+
"Ice",
1061+
"canTrickyDodgeEnemies"
1062+
]},
1063+
{"cycleFrames": 400}
1064+
]}
1065+
]}
1066+
],
1067+
"clearsObstacles": ["A"],
1068+
"resetsObstacles": ["B"],
1069+
"flashSuitChecked": true,
1070+
"farmCycleDrops": [
1071+
{"enemy": "Beetom", "count": 2},
1072+
{"enemy": "Zebbo", "count": 1}
1073+
]
1074+
},
10431075
{
10441076
"id": 75,
10451077
"link": [3, 4],
@@ -1549,25 +1581,41 @@
15491581
{"resetRoom": {
15501582
"nodes": [4]
15511583
}},
1552-
{"enemyKill": {
1553-
"enemies": [["Beetom"]]
1554-
}},
1555-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
1584+
{"cycleFrames": 530},
1585+
{"or": [
1586+
{"enemyKill": {
1587+
"enemies": [["Beetom", "Beetom"]],
1588+
"explicitWeapons": ["ScrewAttack", "Missile", "PowerBomb"]
1589+
}},
1590+
{"and": [
1591+
{"or": [
1592+
"Ice",
1593+
"canTrickyDodgeEnemies"
1594+
]},
1595+
"h_useMorphBombs"
1596+
]}
1597+
]}
15561598
],
15571599
"clearsObstacles": ["A"],
15581600
"resetsObstacles": ["B"],
15591601
"flashSuitChecked": true,
1560-
"devNote": ["FIXME: Node 3 could be used to reset the room, with additional requirements."]
1602+
"farmCycleDrops": [
1603+
{"enemy": "Beetom", "count": 2},
1604+
{"enemy": "Zebbo", "count": 2}
1605+
]
15611606
},
15621607
{
15631608
"id": 52,
15641609
"link": [4, 4],
15651610
"name": "Zebbo Farm",
15661611
"requires": [
15671612
{"obstaclesCleared": ["A"]},
1568-
{"refill": ["Energy", "Missile", "Super"]}
1613+
{"cycleFrames": 115}
15691614
],
1570-
"flashSuitChecked": true
1615+
"flashSuitChecked": true,
1616+
"farmCycleDrops": [
1617+
{"enemy": "Zebbo", "count": 1}
1618+
]
15711619
},
15721620
{
15731621
"id": 80,

‎region/brinstar/green/Green Brinstar Beetom Room.json‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,35 @@
182182
"nodes": [1, 2]
183183
}},
184184
{"or": [
185-
"ScrewAttack",
185+
{"and": [
186+
"ScrewAttack",
187+
{"cycleFrames": 180}
188+
]},
186189
{"and": [
187190
"Ice",
188-
"h_useMorphBombs"
191+
"h_useMorphBombs",
192+
{"cycleFrames": 300}
193+
]},
194+
{"and": [
195+
{"or": [
196+
"Ice",
197+
"canTrickyDodgeEnemies",
198+
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
199+
]},
200+
{"or": [
201+
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
202+
{"resourceAvailable": [{"type": "PowerBomb", "count": 4}]}
203+
]},
204+
"h_usePowerBomb",
205+
{"cycleFrames": 210}
189206
]}
190-
]},
191-
{"refill": ["PowerBomb"]}
207+
]}
192208
],
193209
"clearsObstacles": ["A"],
194210
"flashSuitChecked": true,
211+
"farmCycleDrops": [
212+
{"enemy": "Beetom", "count": 4}
213+
],
195214
"note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.",
196215
"devNote": [
197216
"Using an adjacent 2-tile runway doesn't seem workable since heat frames may be too much to maintain energy.",

‎region/brinstar/green/Green Brinstar Fireflea Room.json‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,23 @@
170170
"link": [1, 1],
171171
"name": "Fireflea Farm",
172172
"requires": [
173-
{"resetRoom": {
174-
"nodes": [1, 2]
175-
}},
176-
{"refill": ["Energy", "PowerBomb"]}
173+
{"or": [
174+
{"and": [
175+
{"resetRoom": {
176+
"nodes": [1]
177+
}},
178+
{"cycleFrames": 630}
179+
]},
180+
{"and": [
181+
{"resetRoom": {
182+
"nodes": [2]
183+
}},
184+
{"cycleFrames": 900}
185+
]}
186+
]}
187+
],
188+
"farmCycleDrops": [
189+
{"enemy": "Fireflea", "count": 5}
177190
],
178191
"flashSuitChecked": true
179192
},

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 83 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5009,14 +5009,68 @@
50095009
"link": [12, 12],
50105010
"name": "Zeela Farm",
50115011
"requires": [
5012-
{"resetRoom": {
5013-
"nodes": [1, 2, 3, 4, 5, 6]
5014-
}},
5015-
{"refill": ["Energy", "Missile", "Super"]}
5012+
{"or": [
5013+
{"and": [
5014+
{"resetRoom": {
5015+
"nodes": [2, 3, 4]
5016+
}},
5017+
{"cycleFrames": 660}
5018+
]},
5019+
{"and": [
5020+
{"resetRoom": {
5021+
"nodes": [5, 6]
5022+
}},
5023+
{"cycleFrames": 760}
5024+
]},
5025+
{"and": [
5026+
{"resetRoom": {
5027+
"nodes": [1]
5028+
}},
5029+
{"cycleFrames": 1700}
5030+
]}
5031+
]},
5032+
{"or": [
5033+
"Wave",
5034+
"Spazer",
5035+
"Plasma",
5036+
{"cycleFrames": 120}
5037+
]}
50165038
],
50175039
"resetsObstacles": ["A"],
5040+
"farmCycleDrops": [
5041+
{"enemy": "Zeela", "count": 4}
5042+
],
50185043
"flashSuitChecked": true
50195044
},
5045+
{
5046+
"link": [12, 12],
5047+
"name": "Ripper Farm",
5048+
"requires": [
5049+
"ScrewAttack",
5050+
{"or": [
5051+
{"and": [
5052+
{"resetRoom": {"nodes": [2, 3]}},
5053+
{"cycleFrames": 375}
5054+
]},
5055+
{"and": [
5056+
{"resetRoom": {"nodes": [4]}},
5057+
{"cycleFrames": 445}
5058+
]},
5059+
{"and": [
5060+
{"resetRoom": {"nodes": [5, 6]}},
5061+
{"cycleFrames": 600}
5062+
]},
5063+
{"and": [
5064+
{"resetRoom": {"nodes": [1]}},
5065+
{"cycleFrames": 1530}
5066+
]}
5067+
]}
5068+
],
5069+
"resetsObstacles": ["A"],
5070+
"farmCycleDrops": [
5071+
{"enemy": "Ripper 2 (red)", "count": 2}
5072+
]
5073+
},
50205074
{
50215075
"id": 229,
50225076
"link": [12, 12],
@@ -5124,6 +5178,31 @@
51245178
"The pixel window is larger and higher with Morph and an X-Ray Stand Up."
51255179
]
51265180
},
5181+
{
5182+
"link": [13, 13],
5183+
"name": "Zeela Farm",
5184+
"requires": [
5185+
{"or": [
5186+
{"and": [
5187+
{"resetRoom": {
5188+
"nodes": [7]
5189+
}},
5190+
{"cycleFrames": 270}
5191+
]},
5192+
{"and": [
5193+
{"resetRoom": {
5194+
"nodes": [8]
5195+
}},
5196+
{"cycleFrames": 620}
5197+
]}
5198+
]}
5199+
],
5200+
"resetsObstacles": ["A"],
5201+
"farmCycleDrops": [
5202+
{"enemy": "Zeela", "count": 1}
5203+
],
5204+
"flashSuitChecked": true
5205+
},
51275206
{
51285207
"id": 237,
51295208
"link": [13, 13],

0 commit comments

Comments
 (0)