Skip to content

Commit 73c4f57

Browse files
osse101osse101
authored
Merge pull request #2177 from blkerby/pink-maridia-farms
Pink Maridia farms part 1: Aqueduct, etc.
2 parents fa69558 + a3645bb commit 73c4f57

3 files changed

Lines changed: 183 additions & 16 deletions

File tree

‎region/maridia/inner-pink/Aqueduct.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,24 @@
13041304
"but not by enough to remove the need for the canLongChainTemporaryBlue requirement."
13051305
]
13061306
},
1307+
{
1308+
"link": [2, 2],
1309+
"name": "Yard Farm (2 Yards)",
1310+
"requires": [
1311+
{"resetRoom": {"nodes": [2]}},
1312+
"h_useMorphBombs",
1313+
"canDodgeWhileShooting",
1314+
{"or": [
1315+
{"and": [
1316+
"Gravity",
1317+
{"cycleFrames": 430}
1318+
]},
1319+
{"cycleFrames": 1045}
1320+
]}
1321+
],
1322+
"resetsObstacles": ["A"],
1323+
"farmCycleDrops": [{"enemy": "Yard", "count": 2}]
1324+
},
13071325
{
13081326
"id": 28,
13091327
"link": [2, 2],
@@ -2136,6 +2154,24 @@
21362154
}
21372155
}
21382156
},
2157+
{
2158+
"link": [5, 5],
2159+
"name": "Yard Farm (1 Yard)",
2160+
"requires": [
2161+
{"resetRoom": {"nodes": [5]}},
2162+
"h_useMorphBombs",
2163+
"canDodgeWhileShooting",
2164+
{"or": [
2165+
{"and": [
2166+
"Gravity",
2167+
{"cycleFrames": 220}
2168+
]},
2169+
{"cycleFrames": 260}
2170+
]}
2171+
],
2172+
"resetsObstacles": ["A"],
2173+
"farmCycleDrops": [{"enemy": "Yard", "count": 1}]
2174+
},
21392175
{
21402176
"id": 79,
21412177
"link": [5, 5],
@@ -2772,6 +2808,35 @@
27722808
"Use at least a small amount of momentum before jumping over towards the snail."
27732809
]
27742810
},
2811+
{
2812+
"link": [6, 6],
2813+
"name": "Yard Farm (2 Yards)",
2814+
"requires": [
2815+
{"resetRoom": {"nodes": [6]}},
2816+
"h_useMorphBombs",
2817+
"canDodgeWhileShooting",
2818+
{"or": [
2819+
{"and": [
2820+
"Gravity",
2821+
{"cycleFrames": 2805}
2822+
]},
2823+
{"and": [
2824+
"HiJump",
2825+
{"cycleFrames": 2870}
2826+
]},
2827+
{"and": [
2828+
"canCrouchJump",
2829+
{"or": [
2830+
"canTrickyJump",
2831+
"canMorphTurnaround"
2832+
]},
2833+
{"cycleFrames": 3405}
2834+
]}
2835+
]}
2836+
],
2837+
"resetsObstacles": ["A"],
2838+
"farmCycleDrops": [{"enemy": "Yard", "count": 2}]
2839+
},
27752840
{
27762841
"id": 107,
27772842
"link": [6, 7],

‎region/maridia/inner-pink/Below Botwoon Energy Tank.json‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,28 @@
149149
"link": [1, 1],
150150
"name": "Zoa Farm",
151151
"requires": [
152-
{"refill": ["Energy", "Missile", "Super"]}
153-
]
152+
"h_navigateUnderwater",
153+
{"or": [
154+
{"and": [
155+
{"or": [
156+
"Gravity",
157+
"Grapple",
158+
"canPlayInSand"
159+
]},
160+
{"simpleCycleFrames": 85},
161+
{"cycleFrames": 30}
162+
]},
163+
{"cycleFrames": 200}
164+
]},
165+
{"or": [
166+
"Wave",
167+
"Spazer",
168+
"Plasma",
169+
"Grapple",
170+
{"cycleFrames": 25}
171+
]}
172+
],
173+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
154174
},
155175
{
156176
"id": 4,

‎region/maridia/inner-pink/Botwoon Energy Tank Room.json‎

Lines changed: 96 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,20 +248,48 @@
248248
"requires": [
249249
{"resetRoom": {"nodes": [1]}},
250250
{"or": [
251-
"Spazer",
252-
"Wave",
253-
"Plasma",
254-
"canUseGrapple",
251+
"Gravity",
252+
{"cycleFrames": 250}
253+
]},
254+
{"or": [
255+
{"and": [
256+
"Plasma",
257+
{"cycleFrames": 360}
258+
]},
255259
{"and": [
256260
"Gravity",
257-
"ScrewAttack"
261+
"ScrewAttack",
262+
{"cycleFrames": 375}
263+
]},
264+
{"and": [
265+
"Wave",
266+
{"cycleFrames": 390}
267+
]},
268+
{"and": [
269+
"Grapple",
270+
{"cycleFrames": 400}
271+
]},
272+
{"and": [
273+
"Spazer",
274+
{"cycleFrames": 415}
275+
]},
276+
{"and": [
277+
"Gravity",
278+
"canPseudoScrew",
279+
{"cycleFrames": 540}
280+
]},
281+
{"and": [
282+
"Ice",
283+
{"cycleFrames": 580}
284+
]},
285+
{"and": [
286+
"canDodgeWhileShooting",
287+
{"cycleFrames": 810}
258288
]}
259-
]},
260-
{"partialRefill": {"type": "Energy", "limit": 200}},
261-
{"partialRefill": {"type": "Missile", "limit": 12}},
262-
{"partialRefill": {"type": "PowerBomb", "limit": 6}}
289+
]}
263290
],
264-
"resetsObstacles": ["A", "B"]
291+
"resetsObstacles": ["A", "B"],
292+
"farmCycleDrops": [{"enemy": "Puyo", "count": 4}]
265293
},
266294
{
267295
"id": 3,
@@ -1944,8 +1972,47 @@
19441972
"link": [4, 4],
19451973
"name": "Zoa Farm",
19461974
"requires": [
1947-
{"refill": ["Energy", "Missile", "Super"]}
1948-
]
1975+
{"or": [
1976+
{"and": [
1977+
"Gravity",
1978+
{"or": [
1979+
{"and": [
1980+
"Grapple",
1981+
{"simpleCycleFrames": 105},
1982+
{"cycleFrames": 20}
1983+
]},
1984+
{"and": [
1985+
{"or": [
1986+
"Plasma",
1987+
"Wave",
1988+
"Spazer"
1989+
]},
1990+
{"simpleCycleFrames": 115},
1991+
{"cycleFrames": 20}
1992+
]},
1993+
{"and": [
1994+
{"simpleCycleFrames": 115},
1995+
{"cycleFrames": 30}
1996+
]}
1997+
]}
1998+
]},
1999+
{"and": [
2000+
"Grapple",
2001+
{"simpleCycleFrames": 115},
2002+
{"cycleFrames": 20}
2003+
]},
2004+
{"and": [
2005+
{"or": [
2006+
"Plasma",
2007+
"Wave",
2008+
"Spazer"
2009+
]},
2010+
{"cycleFrames": 235}
2011+
]},
2012+
{"cycleFrames": 275}
2013+
]}
2014+
],
2015+
"farmCycleDrops": [{"enemy": "Zoa", "count": 5}]
19492016
},
19502017
{
19512018
"id": 72,
@@ -2415,8 +2482,23 @@
24152482
"link": [6, 6],
24162483
"name": "Zoa Farm",
24172484
"requires": [
2418-
{"refill": ["Energy"]}
2419-
]
2485+
{"or": [
2486+
{"and": [
2487+
"Grapple",
2488+
{"cycleFrames": 285}
2489+
]},
2490+
{"and": [
2491+
"canDodgeWhileShooting",
2492+
{"or": [
2493+
"Wave",
2494+
"Spazer",
2495+
"canMidairWiggle"
2496+
]},
2497+
{"cycleFrames": 525}
2498+
]}
2499+
]}
2500+
],
2501+
"farmCycleDrops": [{"enemy": "Zoa", "count": 5}]
24202502
},
24212503
{
24222504
"id": 110,

0 commit comments

Comments
 (0)