Skip to content

Commit f65bf31

Browse files
osse101osse101
authored
Merge pull request #2228 from blkerby/green-maridia-farm-2
Rest of Green Maridia farms: Shaktool Room, etc.
2 parents 6119d0f + ae893a4 commit f65bf31

4 files changed

Lines changed: 404 additions & 10 deletions

File tree

‎region/maridia/inner-green/East Pants Room.json‎

Lines changed: 138 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,32 @@
123123
"requires": [
124124
"canDodgeWhileShooting",
125125
{"resetRoom": {"nodes": [1]}},
126-
{"partialRefill": {"type": "Energy", "limit": 160}},
127-
{"partialRefill": {"type": "Missile", "limit": 6}},
128-
{"partialRefill": {"type": "PowerBomb", "limit": 2}}
126+
{"or": [
127+
{"and": [
128+
"Grapple",
129+
{"cycleFrames": 200}
130+
]},
131+
{"and": [
132+
"Gravity",
133+
"ScrewAttack",
134+
{"cycleFrames": 200}
135+
]},
136+
{"and": [
137+
{"or": [
138+
"Plasma",
139+
"Wave",
140+
"Spazer"
141+
]},
142+
{"cycleFrames": 330}
143+
]},
144+
{"cycleFrames": 360}
145+
]}
129146
],
130-
"note": "Stand (don't crouch) next to the door and shoot diagonally down into the sand until the puyos are killed."
147+
"farmCycleDrops": [{"enemy": "Puyo", "count": 2}],
148+
"note": "Stand (don't crouch) next to the door and shoot diagonally down into the sand until the Puyos are killed.",
149+
"devNote": [
150+
"One or both of the Puyos above the shot block could also be farmed, but it doesn't seem worth modeling."
151+
]
131152
},
132153
{
133154
"id": 3,
@@ -351,6 +372,119 @@
351372
}
352373
}
353374
},
375+
{
376+
"link": [2, 2],
377+
"name": "Puyo Farm (1 Puyo)",
378+
"requires": [
379+
{"resetRoom": {"nodes": [2]}},
380+
{"or": [
381+
{"and": [
382+
"Gravity",
383+
{"or": [
384+
{"and": [
385+
"Plasma",
386+
{"cycleFrames": 85}
387+
]},
388+
{"and": [
389+
"Grapple",
390+
{"cycleFrames": 95}
391+
]},
392+
{"and": [
393+
"ScrewAttack",
394+
{"cycleFrames": 105}
395+
]},
396+
{"and": [
397+
"Wave",
398+
{"cycleFrames": 110}
399+
]},
400+
{"and": [
401+
"Spazer",
402+
{"cycleFrames": 125}
403+
]},
404+
{"cycleFrames": 155}
405+
]}
406+
]},
407+
{"and": [
408+
"canSuitlessMaridia",
409+
{"or": [
410+
{"and": [
411+
"Grapple",
412+
{"cycleFrames": 135}
413+
]},
414+
{"and": [
415+
{"or": [
416+
"Plasma",
417+
"Wave"
418+
]},
419+
{"cycleFrames": 175}
420+
]},
421+
{"and": [
422+
"Spazer",
423+
{"cycleFrames": 185}
424+
]},
425+
{"and": [
426+
"canDodgeWhileShooting",
427+
{"cycleFrames": 220}
428+
]}
429+
]}
430+
]}
431+
]}
432+
],
433+
"farmCycleDrops": [{"enemy": "Puyo", "count": 1}]
434+
},
435+
{
436+
"link": [2, 2],
437+
"name": "Puyo Farm (3 Puyos)",
438+
"requires": [
439+
{"resetRoom": {"nodes": [2]}},
440+
{"or": [
441+
{"and": [
442+
"Gravity",
443+
{"or": [
444+
{"and": [
445+
"Plasma",
446+
{"cycleFrames": 230}
447+
]},
448+
{"and": [
449+
"Grapple",
450+
{"cycleFrames": 270}
451+
]},
452+
{"and": [
453+
"Wave",
454+
{"cycleFrames": 300}
455+
]},
456+
{"and": [
457+
"Spazer",
458+
{"cycleFrames": 330}
459+
]},
460+
{"and": [
461+
"canDodgeWhileShooting",
462+
{"cycleFrames": 650}
463+
]}
464+
]}
465+
]},
466+
{"and": [
467+
"canSuitlessMaridia",
468+
"canDodgeWhileShooting",
469+
{"or": [
470+
"h_crouchJumpDownGrab",
471+
"HiJump"
472+
]},
473+
{"or": [
474+
{"and": [
475+
"Grapple",
476+
{"cycleFrames": 530}
477+
]},
478+
{"cycleFrames": 890}
479+
]}
480+
]}
481+
]}
482+
],
483+
"farmCycleDrops": [{"enemy": "Puyo", "count": 3}],
484+
"devNote": [
485+
"More Puyos could be farmed at the bottom of the room, but it doesn't seem worth modeling."
486+
]
487+
},
354488
{
355489
"id": 16,
356490
"link": [2, 2],

‎region/maridia/inner-green/Lonely Crab Room.json‎

Lines changed: 132 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,69 @@
130130
"link": [1, 1],
131131
"name": "Sciser Farm",
132132
"requires": [
133-
"h_navigateUnderwater",
134-
{"resetRoom": {"nodes": [1, 2]}},
135-
{"partialRefill": {"type": "Energy", "limit": 100}},
136-
{"partialRefill": {"type": "PowerBomb", "limit": 3}}
133+
{"resetRoom": {"nodes": [1]}},
134+
{"or": [
135+
{"and": [
136+
"canSuitlessMaridia",
137+
{"or": [
138+
{"and": [
139+
"Grapple",
140+
{"cycleFrames": 180}
141+
]},
142+
{"and": [
143+
"Plasma",
144+
{"cycleFrames": 280}
145+
]},
146+
{"and": [
147+
{"or": [
148+
"Wave",
149+
"Spazer"
150+
]},
151+
{"cycleFrames": 290}
152+
]},
153+
{"and": [
154+
"Ice",
155+
{"cycleFrames": 320}
156+
]},
157+
{"cycleFrames": 330}
158+
]}
159+
]},
160+
{"and": [
161+
"Gravity",
162+
{"or": [
163+
{"and": [
164+
"Grapple",
165+
{"cycleFrames": 115}
166+
]},
167+
{"and": [
168+
"Plasma",
169+
{"cycleFrames": 130}
170+
]},
171+
{"and": [
172+
"ScrewAttack",
173+
{"cycleFrames": 130}
174+
]},
175+
{"and": [
176+
{"or": [
177+
"Wave",
178+
"Spazer"
179+
]},
180+
{"cycleFrames": 160}
181+
]},
182+
{"and": [
183+
"canPseudoScrew",
184+
{"cycleFrames": 170}
185+
]},
186+
{"and": [
187+
"Ice",
188+
{"cycleFrames": 230}
189+
]},
190+
{"cycleFrames": 265}
191+
]}
192+
]}
193+
]}
137194
],
138-
"devNote": "Farm cycle: 6seconds."
195+
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}]
139196
},
140197
{
141198
"id": 4,
@@ -1162,6 +1219,76 @@
11621219
"gModeRegainMobility": {},
11631220
"flashSuitChecked": true
11641221
},
1222+
{
1223+
"link": [2, 2],
1224+
"name": "Sciser Farm",
1225+
"requires": [
1226+
{"resetRoom": {"nodes": [2]}},
1227+
{"or": [
1228+
{"and": [
1229+
"canSuitlessMaridia",
1230+
{"or": [
1231+
{"and": [
1232+
"Grapple",
1233+
{"cycleFrames": 90}
1234+
]},
1235+
{"and": [
1236+
"Plasma",
1237+
{"cycleFrames": 100}
1238+
]},
1239+
{"and": [
1240+
"Wave",
1241+
{"cycleFrames": 115}
1242+
]},
1243+
{"and": [
1244+
"Spazer",
1245+
{"cycleFrames": 135}
1246+
]},
1247+
{"and": [
1248+
"Ice",
1249+
{"cycleFrames": 220}
1250+
]},
1251+
{"cycleFrames": 340}
1252+
]}
1253+
]},
1254+
{"and": [
1255+
"Gravity",
1256+
{"or": [
1257+
{"and": [
1258+
"Grapple",
1259+
{"cycleFrames": 70}
1260+
]},
1261+
{"and": [
1262+
"ScrewAttack",
1263+
{"cycleFrames": 70}
1264+
]},
1265+
{"and": [
1266+
"Plasma",
1267+
{"cycleFrames": 80}
1268+
]},
1269+
{"and": [
1270+
"Wave",
1271+
{"cycleFrames": 105}
1272+
]},
1273+
{"and": [
1274+
"Spazer",
1275+
{"cycleFrames": 115}
1276+
]},
1277+
{"and": [
1278+
"canPseudoScrew",
1279+
{"cycleFrames": 130}
1280+
]},
1281+
{"and": [
1282+
"Ice",
1283+
{"cycleFrames": 190}
1284+
]},
1285+
{"cycleFrames": 255}
1286+
]}
1287+
]}
1288+
]}
1289+
],
1290+
"farmCycleDrops": [{"enemy": "Sciser", "count": 1}]
1291+
},
11651292
{
11661293
"id": 41,
11671294
"link": [2, 3],

‎region/maridia/inner-green/Pants Room.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@
164164
{
165165
"id": 4,
166166
"devNote": "This link assumes the grapple block has been broken from below."
167-
}
167+
},
168+
{"id": 5}
168169
]
169170
}
170171
],
@@ -814,6 +815,23 @@
814815
"link": [5, 4],
815816
"name": "Base",
816817
"requires": []
818+
},
819+
{
820+
"link": [5, 5],
821+
"name": "Menu Farm",
822+
"requires": [
823+
{"resetRoom": {"nodes": [1, 3]}},
824+
"Grapple",
825+
"Gravity",
826+
"SpaceJump",
827+
"ScrewAttack",
828+
"canConsecutiveWalljump",
829+
{"cycleFrames": 1120}
830+
],
831+
"farmCycleDrops": [{"enemy": "Menu", "count": 6}],
832+
"devNote": [
833+
"FIXME: Many other options are possible for movement and weapons."
834+
]
817835
}
818836
],
819837
"notables": [

0 commit comments

Comments
 (0)