Skip to content

Commit f15f4ef

Browse files
osse101osse101
authored
Merge pull request #2216 from blkerby/yellow-maridia-farm-3
Rest of Yellow Maridia farms
2 parents 6ce831e + c2399d7 commit f15f4ef

5 files changed

Lines changed: 367 additions & 101 deletions

File tree

‎region/maridia/inner-yellow/Plasma Tutorial Room.json‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,41 @@
9494
"link": [1, 1],
9595
"name": "Puyo Farm",
9696
"requires": [
97-
{"resetRoom": {"nodes": [1, 2]}},
98-
{"refill": ["Energy", "Missile", "PowerBomb"]}
97+
{"or": [
98+
{"resetRoom": {"nodes": [1]}},
99+
{"and": [
100+
{"resetRoom": {"nodes": [2]}},
101+
{"cycleFrames": 20}
102+
]}
103+
]},
104+
{"or": [
105+
{"and": [
106+
"Plasma",
107+
{"cycleFrames": 85}
108+
]},
109+
{"and": [
110+
"ScrewAttack",
111+
{"cycleFrames": 90}
112+
]},
113+
{"and": [
114+
"Grapple",
115+
{"cycleFrames": 160}
116+
]},
117+
{"and": [
118+
"Wave",
119+
{"cycleFrames": 180}
120+
]},
121+
{"and": [
122+
"Spazer",
123+
{"cycleFrames": 200}
124+
]},
125+
{"cycleFrames": 240}
126+
]}
127+
],
128+
"farmCycleDrops": [{"enemy": "Puyo", "count": 6}],
129+
"note": [
130+
"It helps to crouch and use angle-down shots, to hit many or all of the Puyos at once;",
131+
"this works best from the right side."
99132
]
100133
},
101134
{

‎region/maridia/inner-yellow/The Beach.json‎

Lines changed: 71 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -298,29 +298,48 @@
298298
"link": [1, 1],
299299
"name": "Choot Farm",
300300
"requires": [
301-
{"resetRoom": {"nodes": [1]}},
302-
{"partialRefill": {"type": "Energy", "limit": 140}},
303-
{"partialRefill": {"type": "Super", "limit": 4}},
304-
{"partialRefill": {"type": "Missile", "limit": 20}}
305-
]
306-
},
307-
{
308-
"id": 67,
309-
"link": [1, 1],
310-
"name": "Fast Choot Farm",
311-
"requires": [
312-
{"resetRoom": {"nodes": [1]}},
313301
{"or": [
314-
"Wave",
315-
"Spazer",
316-
"Plasma",
317-
"ScrewAttack",
318-
"canUseGrapple",
319-
"canPseudoScrew"
302+
{"resetRoom": {"nodes": [1]}},
303+
{"and": [
304+
{"resetRoom": {"nodes": [2]}},
305+
"Gravity",
306+
{"or": [
307+
"h_crouchJumpDownGrab",
308+
"canWalljump"
309+
]},
310+
{"cycleFrames": 130}
311+
]}
320312
]},
321-
{"partialRefill": {"type": "Energy", "limit": 300}},
322-
{"partialRefill": {"type": "Super", "limit": 4}},
323-
{"refill": ["Missile"]}
313+
{"or": [
314+
{"and": [
315+
"Plasma",
316+
{"cycleFrames": 740}
317+
]},
318+
{"and": [
319+
"Wave",
320+
{"cycleFrames": 800}
321+
]},
322+
{"and": [
323+
"Spazer",
324+
{"cycleFrames": 860}
325+
]},
326+
{"and": [
327+
"Grapple",
328+
{"cycleFrames": 890}
329+
]},
330+
{"and": [
331+
"ScrewAttack",
332+
{"cycleFrames": 960}
333+
]},
334+
{"cycleFrames": 1500}
335+
]}
336+
],
337+
"farmCycleDrops": [
338+
{"enemy": "Choot", "count": 5}
339+
],
340+
"devNote": [
341+
"There is a sixth Choot on the far right but it's not worth going for.",
342+
"FIXME: add other movement options for reaching the top of the room from node 2."
324343
]
325344
},
326345
{
@@ -711,6 +730,37 @@
711730
},
712731
"note": ["Destroy the Owtch using blue speed."]
713732
},
733+
{
734+
"link": [2, 2],
735+
"name": "Skultera Farm",
736+
"requires": [
737+
{"resetRoom": {"nodes": [2]}},
738+
"canSuitlessMaridia",
739+
{"or": [
740+
{"and": [
741+
"Plasma",
742+
{"cycleFrames": 360}
743+
]},
744+
{"and": [
745+
"Wave",
746+
{"cycleFrames": 420}
747+
]},
748+
{"and": [
749+
"Spazer",
750+
{"cycleFrames": 450}
751+
]},
752+
{"and": [
753+
"Ice",
754+
{"cycleFrames": 530}
755+
]},
756+
{"cycleFrames": 710}
757+
]}
758+
],
759+
"farmCycleDrops": [{"enemy": "Skultera", "count": 2}],
760+
"devNote": [
761+
"If Gravity is available, the Choot farm at the top of the room would be used instead."
762+
]
763+
},
714764
{
715765
"id": 30,
716766
"link": [2, 2],

‎region/maridia/inner-yellow/Thread The Needle Room.json‎

Lines changed: 65 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -416,50 +416,50 @@
416416
}
417417
}
418418
},
419-
{
420-
"id": 17,
421-
"link": [1, 1],
422-
"name": "Basic Choot and Puyo Farm",
423-
"requires": [
424-
{"or": [
425-
"h_hasBeamUpgrade",
426-
"canDodgeWhileShooting",
427-
"Grapple",
428-
"ScrewAttack"
429-
]},
430-
{"resetRoom": {"nodes": [1]}},
431-
{"refill": ["Energy", "Missile"]}
432-
]
433-
},
434419
{
435420
"id": 18,
436421
"link": [1, 1],
437422
"name": "Choot and Puyo Farm",
438423
"requires": [
439-
{"or": [
440-
"Wave",
441-
"Spazer",
442-
"Plasma",
443-
"Grapple",
444-
"ScrewAttack"
445-
]},
446424
{"resetRoom": {"nodes": [1]}},
447-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
448-
]
449-
},
450-
{
451-
"id": 19,
452-
"link": [1, 1],
453-
"name": "Patient Choot and Puyo Farm",
454-
"requires": [
455-
"canBePatient",
456425
{"or": [
457-
"canDodgeWhileShooting",
458-
"Charge",
459-
"Ice"
426+
"Gravity",
427+
{"cycleFrames": 330}
460428
]},
461-
{"resetRoom": {"nodes": [1]}},
462-
{"refill": ["Super", "PowerBomb"]}
429+
{"or": [
430+
{"and": [
431+
"Plasma",
432+
{"cycleFrames": 1110}
433+
]},
434+
{"and": [
435+
"Grapple",
436+
{"cycleFrames": 1240}
437+
]},
438+
{"and": [
439+
"ScrewAttack",
440+
{"cycleFrames": 1330}
441+
]},
442+
{"and": [
443+
"Wave",
444+
{"cycleFrames": 1380}
445+
]},
446+
{"and": [
447+
"Spazer",
448+
{"cycleFrames": 1440}
449+
]},
450+
{"and": [
451+
"Ice",
452+
{"cycleFrames": 2010}
453+
]},
454+
{"and": [
455+
"canDodgeWhileShooting",
456+
{"cycleFrames": 2670}
457+
]}
458+
]}
459+
],
460+
"farmCycleDrops": [
461+
{"enemy": "Choot", "count": 5},
462+
{"enemy": "Puyo", "count": 5}
463463
]
464464
},
465465
{
@@ -942,47 +942,40 @@
942942
{
943943
"id": 47,
944944
"link": [2, 2],
945-
"name": "Basic Choot and Puyo Farm",
946-
"requires": [
947-
{"or": [
948-
"h_hasBeamUpgrade",
949-
"canDodgeWhileShooting",
950-
"Grapple",
951-
"ScrewAttack"
952-
]},
953-
{"resetRoom": {"nodes": [2]}},
954-
{"refill": ["Energy", "Missile"]}
955-
]
956-
},
957-
{
958-
"id": 48,
959-
"link": [2, 2],
960945
"name": "Choot and Puyo Farm",
961946
"requires": [
962-
{"or": [
963-
"Wave",
964-
"Spazer",
965-
"Plasma",
966-
"Grapple",
967-
"ScrewAttack"
968-
]},
969947
{"resetRoom": {"nodes": [2]}},
970-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
971-
]
972-
},
973-
{
974-
"id": 49,
975-
"link": [2, 2],
976-
"name": "Patient Choot and Puyo Farm",
977-
"requires": [
978-
"canBePatient",
979948
{"or": [
980-
"canDodgeWhileShooting",
981-
"Charge",
982-
"Ice"
949+
"Gravity",
950+
{"cycleFrames": 120}
983951
]},
984-
{"resetRoom": {"nodes": [2]}},
985-
{"refill": ["Super", "PowerBomb"]}
952+
{"or": [
953+
{"and": [
954+
"Plasma",
955+
{"cycleFrames": 610}
956+
]},
957+
{"and": [
958+
"Grapple",
959+
{"cycleFrames": 660}
960+
]},
961+
{"and": [
962+
"Wave",
963+
{"cycleFrames": 700}
964+
]},
965+
{"and": [
966+
"ScrewAttack",
967+
{"cycleFrames": 720}
968+
]},
969+
{"and": [
970+
"Spazer",
971+
{"cycleFrames": 820}
972+
]},
973+
{"cycleFrames": 1070}
974+
]}
975+
],
976+
"farmCycleDrops": [
977+
{"enemy": "Choot", "count": 3},
978+
{"enemy": "Puyo", "count": 3}
986979
]
987980
},
988981
{

‎region/maridia/inner-yellow/Watering Hole.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,21 @@
211211
"link": [1, 1],
212212
"name": "Zeb Farm",
213213
"requires": [
214-
{"refill": ["Energy", "Missile", "Super"]}
214+
{"simpleCycleFrames": 80},
215+
{"cycleFrames": 30}
216+
],
217+
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
218+
},
219+
{
220+
"link": [1, 1],
221+
"name": "Double Zeb Farm",
222+
"requires": [
223+
"canTrickyDodgeEnemies",
224+
{"cycleFrames": 170}
225+
],
226+
"farmCycleDrops": [{"enemy": "Zeb", "count": 2}],
227+
"note": [
228+
"Run back and forth between the two Zeb spawners to farm them simultaneously."
215229
]
216230
},
217231
{

0 commit comments

Comments
 (0)