Skip to content

Commit b62bcca

Browse files
authored
Merge pull request #2140 from blkerby/west-maridia-farms
Some West Maridia farms
2 parents d9c5d90 + 4c64c81 commit b62bcca

3 files changed

Lines changed: 220 additions & 17 deletions

File tree

region/maridia/outer/Boyon Gate Hall.json

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,33 @@
10791079
"link": [3, 3],
10801080
"name": "Zebbo Farm",
10811081
"requires": [
1082-
{"refill": ["Energy", "Missile", "Super"]}
1082+
{"simpleCycleFrames": 120},
1083+
{"cycleFrames": 30}
1084+
],
1085+
"farmCycleDrops": [
1086+
{"enemy": "Zebbo", "count": 1}
1087+
]
1088+
},
1089+
{
1090+
"link": [3, 3],
1091+
"name": "Double Zebbo Farm",
1092+
"requires": [
1093+
{"cycleFrames": 185},
1094+
"canDodgeWhileShooting",
1095+
"canTrickyJump",
1096+
{"or": [
1097+
"Wave",
1098+
"Spazer",
1099+
"Plasma",
1100+
"Grapple",
1101+
{"and": [
1102+
"canTrickyDodgeEnemies",
1103+
{"cycleFrames": 15}
1104+
]}
1105+
]}
1106+
],
1107+
"farmCycleDrops": [
1108+
{"enemy": "Zebbo", "count": 2}
10831109
]
10841110
},
10851111
{
@@ -1248,7 +1274,11 @@
12481274
"link": [4, 4],
12491275
"name": "Zebbo Farm",
12501276
"requires": [
1251-
{"refill": ["Energy", "Missile", "Super"]}
1277+
{"simpleCycleFrames": 120},
1278+
{"cycleFrames": 30}
1279+
],
1280+
"farmCycleDrops": [
1281+
{"enemy": "Zebbo", "count": 1}
12521282
]
12531283
}
12541284
],

region/maridia/outer/Crab Gate Room.json

Lines changed: 82 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,48 @@
382382
{"resetRoom": {
383383
"nodes": [1]
384384
}},
385-
{"partialRefill": {"type": "Energy", "limit": 100}},
386-
{"partialRefill": {"type": "PowerBomb", "limit": 3}}
385+
{"or": [
386+
"Gravity",
387+
{"cycleFrames": 20}
388+
]},
389+
{"or": [
390+
{"and": [
391+
"Grapple",
392+
{"cycleFrames": 110}
393+
]},
394+
{"and": [
395+
"Plasma",
396+
{"cycleFrames": 120}
397+
]},
398+
{"and": [
399+
"Wave",
400+
{"cycleFrames": 150}
401+
]},
402+
{"and": [
403+
"Gravity",
404+
"ScrewAttack",
405+
{"cycleFrames": 150}
406+
]},
407+
{"and": [
408+
"Spazer",
409+
{"cycleFrames": 170}
410+
]},
411+
{"and": [
412+
"Gravity",
413+
"canPseudoScrew",
414+
{"cycleFrames": 200}
415+
]},
416+
{"and": [
417+
"Ice",
418+
{"cycleFrames": 205}
419+
]},
420+
{"cycleFrames": 250}
421+
]}
387422
],
388-
"resetsObstacles": ["A"]
423+
"resetsObstacles": ["A"],
424+
"farmCycleDrops": [
425+
{"enemy": "Sciser", "count": 1}
426+
]
389427
},
390428
{
391429
"id": 6,
@@ -662,14 +700,51 @@
662700
"link": [2, 2],
663701
"name": "Sciser Farm",
664702
"requires": [
665-
"h_navigateUnderwater",
666703
{"resetRoom": {
667704
"nodes": [2]
668705
}},
669-
{"partialRefill": {"type": "Energy", "limit": 240}},
670-
{"partialRefill": {"type": "PowerBomb", "limit": 6}}
706+
{"or": [
707+
"Gravity",
708+
{"cycleFrames": 500}
709+
]},
710+
{"or": [
711+
{"and": [
712+
"Grapple",
713+
{"cycleFrames": 540}
714+
]},
715+
{"and": [
716+
"Gravity",
717+
"ScrewAttack",
718+
{"cycleFrames": 600}
719+
]},
720+
{"and": [
721+
"Plasma",
722+
{"cycleFrames": 630}
723+
]},
724+
{"and": [
725+
"Wave",
726+
{"cycleFrames": 720}
727+
]},
728+
{"and": [
729+
"Spazer",
730+
{"cycleFrames": 900}
731+
]},
732+
{"and": [
733+
"Gravity",
734+
"canPseudoScrew",
735+
{"cycleFrames": 840}
736+
]},
737+
{"and": [
738+
"Ice",
739+
{"cycleFrames": 1260}
740+
]},
741+
{"cycleFrames": 1590}
742+
]}
671743
],
672-
"resetsObstacles": ["A"]
744+
"resetsObstacles": ["A"],
745+
"farmCycleDrops": [
746+
{"enemy": "Sciser", "count": 5}
747+
]
673748
},
674749
{
675750
"id": 23,

region/maridia/outer/Crab Hole.json

Lines changed: 106 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,61 @@
168168
"name": "Sciser Farm",
169169
"requires": [
170170
"h_navigateUnderwater",
171-
{"resetRoom": {
172-
"nodes": [1, 4]
173-
}},
174-
{"refill": ["Energy", "PowerBomb"]}
171+
{"or": [
172+
{"resetRoom": {
173+
"nodes": [1]
174+
}},
175+
{"and": [
176+
{"resetRoom": {
177+
"nodes": [4]
178+
}},
179+
{"cycleFrames": 50}
180+
]}
181+
]},
182+
{"or": [
183+
{"and": [
184+
"canUseGrapple",
185+
{"cycleFrames": 120}
186+
]},
187+
{"and": [
188+
"Gravity",
189+
"ScrewAttack",
190+
{"cycleFrames": 225}
191+
]},
192+
{"and": [
193+
"Plasma",
194+
{"cycleFrames": 260}
195+
]},
196+
{"and": [
197+
"Wave",
198+
{"cycleFrames": 300}
199+
]},
200+
{"and": [
201+
"Spazer",
202+
{"cycleFrames": 330}
203+
]},
204+
{"and": [
205+
"Gravity",
206+
"canPseudoScrew",
207+
{"cycleFrames": 400}
208+
]},
209+
{"and": [
210+
"Ice",
211+
{"cycleFrames": 600}
212+
]},
213+
{"and": [
214+
"canFarmWhileShooting",
215+
{"cycleFrames": 880}
216+
]},
217+
{"cycleFrames": 1500}
218+
]}
219+
],
220+
"farmCycleDrops": [
221+
{"enemy": "Sciser", "count": 3}
222+
],
223+
"devNote": [
224+
"One more Sciser could be farmed, but in most scenarios it seems not worth it.",
225+
"Gravity can also slightly speed up some other variants but not enough to be worth modeling."
175226
]
176227
},
177228
{
@@ -1779,10 +1830,57 @@
17791830
"name": "Sciser Farm",
17801831
"requires": [
17811832
"h_navigateUnderwater",
1782-
{"resetRoom": {
1783-
"nodes": [2, 3]
1784-
}},
1785-
{"refill": ["Energy", "PowerBomb"]}
1833+
{"or": [
1834+
{"resetRoom": {
1835+
"nodes": [2]
1836+
}},
1837+
{"and": [
1838+
{"resetRoom": {
1839+
"nodes": [3]
1840+
}},
1841+
{"cycleFrames": 80}
1842+
]}
1843+
]},
1844+
{"or": [
1845+
{"and": [
1846+
"canUseGrapple",
1847+
{"cycleFrames": 95}
1848+
]},
1849+
{"and": [
1850+
"Gravity",
1851+
"ScrewAttack",
1852+
{"cycleFrames": 120}
1853+
]},
1854+
{"and": [
1855+
"Plasma",
1856+
{"cycleFrames": 150}
1857+
]},
1858+
{"and": [
1859+
"Gravity",
1860+
"canPseudoScrew",
1861+
{"cycleFrames": 170}
1862+
]},
1863+
{"and": [
1864+
"Wave",
1865+
{"cycleFrames": 180}
1866+
]},
1867+
{"and": [
1868+
"Spazer",
1869+
{"cycleFrames": 200}
1870+
]},
1871+
{"and": [
1872+
"Ice",
1873+
{"cycleFrames": 240}
1874+
]},
1875+
{"cycleFrames": 300}
1876+
]}
1877+
],
1878+
"farmCycleDrops": [
1879+
{"enemy": "Sciser", "count": 1}
1880+
],
1881+
"devNote": [
1882+
"More than one Sciser could be farmed, but in most scenarios it seems not worth it.",
1883+
"Gravity can also slightly speed up some other variants but not enough to be worth modeling."
17861884
]
17871885
},
17881886
{

0 commit comments

Comments
 (0)