Skip to content

Commit 46efb30

Browse files
osse101osse101
authored
Merge pull request #2196 from blkerby/pink-maridia-farms-3
Rest of Pink Maridia farms
2 parents 0154821 + 0783e1c commit 46efb30

3 files changed

Lines changed: 388 additions & 45 deletions

File tree

‎region/maridia/inner-pink/East Cactus Alley.json‎

Lines changed: 126 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -172,31 +172,93 @@
172172
{
173173
"id": 2,
174174
"link": [1, 1],
175-
"name": "Cacatac Farm",
175+
"name": "Cacatac Farm (1 Cacatac)",
176176
"requires": [
177+
{"resetRoom": {"nodes": [1]}},
177178
{"or": [
178179
{"and": [
179180
"Gravity",
180181
{"or": [
181-
"SpaceJump",
182182
{"and": [
183-
"canPreciseWalljump",
184-
"canConsecutiveWalljump"
183+
"HiJump",
184+
"SpeedBooster",
185+
"canCarefulJump",
186+
{"cycleFrames": 300}
185187
]},
186188
{"and": [
187189
"HiJump",
188-
"canWalljump"
190+
"canWalljump",
191+
{"cycleFrames": 310}
192+
]},
193+
{"and": [
194+
"SpaceJump",
195+
{"cycleFrames": 360}
196+
]},
197+
{"and": [
198+
"canTrickyWalljump",
199+
{"cycleFrames": 380}
200+
]},
201+
{"and": [
202+
"canSpringBallJumpMidAir",
203+
{"or": [
204+
"HiJump",
205+
"canSpringwall",
206+
{"and": [
207+
"canTrickySpringBallJump",
208+
"canTrickyJump"
209+
]}
210+
]},
211+
{"cycleFrames": 340},
212+
"h_doubleEquipmentScreenCycleFrames"
213+
]},
214+
{"and": [
215+
"canDoubleBombJump",
216+
{"cycleFrames": 830}
189217
]}
190218
]}
191219
]},
192220
{"and": [
193-
"canSpaceJumpWaterBounce",
194-
"canWalljump"
221+
"canSuitlessMaridia",
222+
{"or": [
223+
{"and": [
224+
"HiJump",
225+
"canTrickyJump",
226+
"canMidairWiggle",
227+
"canTrickyWalljump",
228+
{"cycleFrames": 360}
229+
]},
230+
{"and": [
231+
"HiJump",
232+
"canSpaceJumpWaterBounce",
233+
"canWalljump",
234+
{"cycleFrames": 390}
235+
]},
236+
{"and": [
237+
"HiJump",
238+
"canSpaceJumpWaterEscape",
239+
{"cycleFrames": 430}
240+
]},
241+
{"and": [
242+
{"notable": "Suitless Bootless Space Jump"},
243+
"canSpaceJumpWaterBounce",
244+
"canWalljump",
245+
{"cycleFrames": 440}
246+
]},
247+
{"and": [
248+
"HiJump",
249+
"canTrickySpringBallJump",
250+
{"or": [
251+
"canTrickyJump",
252+
"canFlatleyJump"
253+
]},
254+
{"cycleFrames": 360},
255+
"h_doubleEquipmentScreenCycleFrames"
256+
]}
257+
]}
195258
]}
196-
]},
197-
{"resetRoom": {"nodes": [1]}},
198-
{"refill": ["Super"]}
199-
]
259+
]}
260+
],
261+
"farmCycleDrops": [{"enemy": "Cacatac", "count": 1}]
200262
},
201263
{
202264
"id": 68,
@@ -556,25 +618,68 @@
556618
{
557619
"id": 16,
558620
"link": [2, 2],
559-
"name": "Cacatac Farm",
621+
"name": "Cacatac Farm (2 Cacatacs)",
560622
"requires": [
623+
{"resetRoom": {"nodes": [2]}},
561624
{"or": [
562625
{"and": [
563626
"Gravity",
564627
{"or": [
565-
"SpaceJump",
566-
"canWalljump"
628+
{"and": [
629+
"canWalljump",
630+
{"cycleFrames": 740}
631+
]},
632+
{"and": [
633+
"SpaceJump",
634+
{"cycleFrames": 790}
635+
]},
636+
{"and": [
637+
"HiJump",
638+
"canTrickyDashJump",
639+
{"cycleFrames": 795}
640+
]},
641+
{"and": [
642+
"canSpringBallJumpMidAir",
643+
{"or": [
644+
"HiJump",
645+
"canSpringFling"
646+
]},
647+
{"cycleFrames": 920},
648+
"h_doubleEquipmentScreenCycleFrames"
649+
]},
650+
{"and": [
651+
"canDiagonalBombJump",
652+
{"cycleFrames": 1380}
653+
]}
567654
]}
568655
]},
569656
{"and": [
570-
"HiJump",
571-
"canSpaceJumpWaterBounce",
572-
"canWalljump"
657+
"canSuitlessMaridia",
658+
{"or": [
659+
{"and": [
660+
"HiJump",
661+
"canSpaceJumpWaterBounce",
662+
"canWalljump",
663+
{"cycleFrames": 810}
664+
]},
665+
{"and": [
666+
"HiJump",
667+
"canSpaceJumpWaterEscape",
668+
{"cycleFrames": 850}
669+
]},
670+
{"and": [
671+
"HiJump",
672+
"h_maxHeightSpringBallJump",
673+
"canTrickyJump",
674+
"canStationaryLateralMidAirMorph",
675+
{"cycleFrames": 1070},
676+
"h_doubleEquipmentScreenCycleFrames"
677+
]}
678+
]}
573679
]}
574-
]},
575-
{"resetRoom": {"nodes": [2]}},
576-
{"refill": ["Energy", "Super"]}
577-
]
680+
]}
681+
],
682+
"farmCycleDrops": [{"enemy": "Cacatac", "count": 2}]
578683
},
579684
{
580685
"id": 17,

‎region/maridia/inner-pink/Halfie Climb Room.json‎

Lines changed: 161 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,41 @@
241241
],
242242
"devNote": "There are many other ways to get into position, but they would require manipulating the Mochtroid as much as canMochtroidIceClimb expects."
243243
},
244+
{
245+
"link": [1, 1],
246+
"name": "Mochtroid Farm (1 Mochtroid)",
247+
"requires": [
248+
{"resetRoom": {"nodes": [1]}},
249+
{"or": [
250+
{"and": [
251+
"Grapple",
252+
{"cycleFrames": 75}
253+
]},
254+
{"and": [
255+
"Plasma",
256+
{"cycleFrames": 75}
257+
]},
258+
{"and": [
259+
"Gravity",
260+
"ScrewAttack",
261+
{"cycleFrames": 75}
262+
]},
263+
{"and": [
264+
"Wave",
265+
{"cycleFrames": 85}
266+
]},
267+
{"and": [
268+
"Spazer",
269+
{"cycleFrames": 90}
270+
]},
271+
{"and": [
272+
"canDodgeWhileShooting",
273+
{"cycleFrames": 135}
274+
]}
275+
]}
276+
],
277+
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 1}]
278+
},
244279
{
245280
"id": 3,
246281
"link": [1, 1],
@@ -1748,29 +1783,107 @@
17481783
}
17491784
}
17501785
},
1786+
{
1787+
"link": [2, 2],
1788+
"name": "Mochtroid Farm (1 Mochtroid)",
1789+
"requires": [
1790+
{"resetRoom": {"nodes": [2]}},
1791+
{"or": [
1792+
{"and": [
1793+
"Grapple",
1794+
{"cycleFrames": 80}
1795+
]},
1796+
{"and": [
1797+
"Plasma",
1798+
{"cycleFrames": 80}
1799+
]},
1800+
{"and": [
1801+
"Gravity",
1802+
"ScrewAttack",
1803+
{"cycleFrames": 80}
1804+
]},
1805+
{"and": [
1806+
"Wave",
1807+
{"cycleFrames": 85}
1808+
]},
1809+
{"and": [
1810+
"Spazer",
1811+
{"cycleFrames": 90}
1812+
]},
1813+
{"and": [
1814+
"canDodgeWhileShooting",
1815+
{"cycleFrames": 135}
1816+
]}
1817+
]}
1818+
],
1819+
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 1}]
1820+
},
17511821
{
17521822
"id": 53,
17531823
"link": [2, 2],
1754-
"name": "Mochtroid Farm",
1824+
"name": "Mochtroid Farm (3 Mochtroids)",
17551825
"requires": [
17561826
"Gravity",
1827+
{"cycleFrames": 330},
17571828
{"or": [
1758-
"SpaceJump",
1759-
"Grapple",
1760-
"canConsecutiveWalljump"
1829+
{"resetRoom": {"nodes": [2]}},
1830+
{"and": [
1831+
{"resetRoom": {"nodes": [4]}},
1832+
{"cycleFrames": 70}
1833+
]},
1834+
{"and": [
1835+
{"resetRoom": {"nodes": [1]}},
1836+
{"cycleFrames": 90}
1837+
]},
1838+
{"and": [
1839+
{"resetRoom": {"nodes": [3]}},
1840+
"Morph",
1841+
{"cycleFrames": 1210}
1842+
]}
17611843
]},
17621844
{"or": [
1763-
"canDodgeWhileShooting",
1764-
"ScrewAttack",
1765-
"Wave",
1766-
"Spazer",
1767-
"Plasma",
1768-
"Grapple"
1845+
"canConsecutiveWalljump",
1846+
{"and": [
1847+
"SpaceJump",
1848+
{"cycleFrames": 40}
1849+
]},
1850+
{"and": [
1851+
"Grapple",
1852+
{"cycleFrames": 150}
1853+
]},
1854+
{"and": [
1855+
"canGravityJump",
1856+
{"cycleFrames": 120},
1857+
"h_doubleEquipmentScreenCycleFrames"
1858+
]}
17691859
]},
1770-
{"resetRoom": {"nodes": [1, 2, 4]}},
1771-
{"partialRefill": {"type": "Super", "limit": 4}},
1772-
{"partialRefill": {"type": "Energy", "limit": 200}},
1773-
{"partialRefill": {"type": "Missile", "limit": 10}}
1860+
{"or": [
1861+
"ScrewAttack",
1862+
{"and": [
1863+
"Grapple",
1864+
{"cycleFrames": 40}
1865+
]},
1866+
{"and": [
1867+
"Plasma",
1868+
{"cycleFrames": 20}
1869+
]},
1870+
{"and": [
1871+
"Wave",
1872+
{"cycleFrames": 160}
1873+
]},
1874+
{"and": [
1875+
"Spazer",
1876+
{"cycleFrames": 180}
1877+
]},
1878+
{"and": [
1879+
"canDodgeWhileShooting",
1880+
{"cycleFrames": 315}
1881+
]}
1882+
]}
1883+
],
1884+
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 3}],
1885+
"devNote": [
1886+
"FIXME: other options for this are possible (e.g. suitless)"
17741887
]
17751888
},
17761889
{
@@ -3910,6 +4023,40 @@
39104023
],
39114024
"devNote": "There are many other ways to get into position, but they would require manipulating the Mochtroid as much as canMochtroidIceClimb expects."
39124025
},
4026+
{
4027+
"link": [4, 4],
4028+
"name": "Mochtroid Farm (1 Mochtroid)",
4029+
"requires": [
4030+
{"resetRoom": {"nodes": [4]}},
4031+
{"or": [
4032+
{"and": [
4033+
"Grapple",
4034+
{"cycleFrames": 80}
4035+
]},
4036+
{"and": [
4037+
"Plasma",
4038+
{"cycleFrames": 80}
4039+
]},
4040+
{"and": [
4041+
"ScrewAttack",
4042+
{"cycleFrames": 80}
4043+
]},
4044+
{"and": [
4045+
"Wave",
4046+
{"cycleFrames": 85}
4047+
]},
4048+
{"and": [
4049+
"Spazer",
4050+
{"cycleFrames": 90}
4051+
]},
4052+
{"and": [
4053+
"canDodgeWhileShooting",
4054+
{"cycleFrames": 120}
4055+
]}
4056+
]}
4057+
],
4058+
"farmCycleDrops": [{"enemy": "Mochtroid", "count": 1}]
4059+
},
39134060
{
39144061
"id": 127,
39154062
"link": [4, 4],

0 commit comments

Comments
 (0)