Skip to content

Commit ec4154b

Browse files
osse101osse101
authored
Merge pull request #2121 from blkerby/crateria-farms
Rest of Crateria farms
2 parents 1a70710 + d1b7345 commit ec4154b

13 files changed

Lines changed: 640 additions & 111 deletions

‎region/crateria/central/Parlor and Alcatraz.json‎

Lines changed: 79 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,17 @@
14931493
}
14941494
}
14951495
},
1496+
{
1497+
"link": [5, 5],
1498+
"name": "Ripper Farm",
1499+
"requires": [
1500+
"ScrewAttack",
1501+
{"cycleFrames": 180}
1502+
],
1503+
"farmCycleDrops": [
1504+
{"enemy": "Ripper", "count": 1}
1505+
]
1506+
},
14961507
{
14971508
"id": 57,
14981509
"link": [5, 5],
@@ -2858,13 +2869,75 @@
28582869
"name": "Geemer Farm",
28592870
"requires": [
28602871
"h_ZebesIsAwake",
2861-
{"resetRoom": {
2862-
"nodes": [3, 4, 6, 7]
2863-
}},
2864-
{"refill": ["Missile"]},
2865-
{"partialRefill": {"type": "Energy", "limit": 250}}
2872+
{"cycleFrames": 1860},
2873+
{"or": [
2874+
{"resetRoom": {
2875+
"nodes": [3, 4, 6, 7]
2876+
}},
2877+
{"and": [
2878+
{"resetRoom": {
2879+
"nodes": [1]
2880+
}},
2881+
{"cycleFrames": 420},
2882+
{"or": [
2883+
"ScrewAttack",
2884+
"h_useMorphBombs",
2885+
{"and": [
2886+
{"getBlueSpeed": {
2887+
"usedTiles": 25,
2888+
"steepUpTiles": 3,
2889+
"steepDownTiles": 3,
2890+
"openEnd": 1
2891+
}},
2892+
"canCarefulJump"
2893+
]}
2894+
]}
2895+
]},
2896+
{"and": [
2897+
{"resetRoom": {
2898+
"nodes": [2]
2899+
}},
2900+
{"cycleFrames": 240},
2901+
"Morph"
2902+
]},
2903+
{"and": [
2904+
"Morph",
2905+
{"resetRoom": {
2906+
"nodes": [5]
2907+
}},
2908+
{"cycleFrames": 420},
2909+
{"or": [
2910+
"h_bombThings",
2911+
{"and": [
2912+
"SpaceJump",
2913+
"canMidAirMorph",
2914+
"canCarefulJump"
2915+
]},
2916+
{"and": [
2917+
{"notable": "Alcatraz Escape"},
2918+
"canPreciseWalljump",
2919+
"canConsecutiveWalljump",
2920+
"canWallJumpInstantMorph"
2921+
]},
2922+
{"and": [
2923+
"canTrickySpringBallJump",
2924+
"canTrickyJump"
2925+
]},
2926+
{"and": [
2927+
"HiJump",
2928+
"canTrickyDashJump",
2929+
"canMidAirMorph"
2930+
]}
2931+
]}
2932+
]}
2933+
]}
28662934
],
2867-
"devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
2935+
"farmCycleDrops": [
2936+
{"enemy": "Geemer (blue)", "count": 11}
2937+
],
2938+
"devNote": [
2939+
"A two-way farming strat could be added, e.g. if it is possible to reset the room at both the top-right and the bottom."
2940+
]
28682941
},
28692942
{
28702943
"id": 120,

‎region/crateria/central/Pre-Map Flyway.json‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,36 @@
155155
"link": [1, 1],
156156
"name": "Mellow and Reo Farm",
157157
"requires": [
158-
{"resetRoom": {
159-
"nodes": [1, 2]
160-
}},
161-
{"partialRefill": {"type": "Energy", "limit": 160}},
162-
{"partialRefill": {"type": "Missile", "limit": 8}}
158+
{"or": [
159+
{"resetRoom": {"nodes": [1]}},
160+
{"and": [
161+
{"resetRoom": {"nodes": [2]}},
162+
{"cycleFrames": 60}
163+
]}
164+
]},
165+
{"or": [
166+
{"and": [
167+
"Plasma",
168+
{"cycleFrames": 330}
169+
]},
170+
{"and": [
171+
"Wave",
172+
{"cycleFrames": 355}
173+
]},
174+
{"and": [
175+
"ScrewAttack",
176+
{"cycleFrames": 355}
177+
]},
178+
{"and": [
179+
"Spazer",
180+
{"cycleFrames": 360}
181+
]},
182+
{"cycleFrames": 390}
183+
]}
184+
],
185+
"farmCycleDrops": [
186+
{"enemy": "Reo", "count": 1},
187+
{"enemy": "Mellow", "count": 3}
163188
]
164189
},
165190
{

‎region/crateria/east/Crab Maze.json‎

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,45 @@
133133
]
134134
},
135135
{
136-
"id": 2,
137136
"link": [1, 1],
138-
"name": "Sciser Farm",
137+
"name": "Sciser Farm (One Sciser)",
139138
"requires": [
140139
{"resetRoom": {
141140
"nodes": [1]
142141
}},
142+
{"cycleFrames": 1080}
143+
],
144+
"farmCycleDrops": [
145+
{"enemy": "Sciser", "count": 1}
146+
]
147+
},
148+
{
149+
"link": [1, 1],
150+
"name": "Sciser Farm (Full Clear)",
151+
"requires": [
143152
"Morph",
153+
{"resetRoom": {
154+
"nodes": [1]
155+
}},
156+
{"cycleFrames": 2700},
157+
{"or": [
158+
"Gravity",
159+
{"cycleFrames": 700}
160+
]},
144161
{"or": [
145162
"Wave",
146-
"Plasma",
147163
"Spazer",
148-
"canUseGrapple"
149-
]},
150-
{"partialRefill": {"type": "PowerBomb", "limit": 5}},
151-
{"partialRefill": {"type": "Energy", "limit": 200}}
164+
"Plasma",
165+
"canUseGrapple",
166+
{"and": [
167+
"Ice",
168+
{"cycleFrames": 560}
169+
]},
170+
{"cycleFrames": 1550}
171+
]}
172+
],
173+
"farmCycleDrops": [
174+
{"enemy": "Sciser", "count": 8}
152175
]
153176
},
154177
{
@@ -505,22 +528,42 @@
505528
{"resetRoom": {
506529
"nodes": [2]
507530
}},
531+
{"cycleFrames": 270},
508532
{"or": [
533+
"Gravity",
534+
{"cycleFrames": 270}
535+
]},
536+
{"or": [
537+
"Grapple",
509538
{"and": [
510-
{"partialRefill": {"type": "Energy", "limit": 240}},
511-
{"partialRefill": {"type": "PowerBomb", "limit": 6}}
539+
"Wave",
540+
{"cycleFrames": 50}
512541
]},
513542
{"and": [
514-
{"refill": ["Energy", "PowerBomb"]},
515-
{"or": [
516-
"Gravity",
517-
"Spazer",
518-
"Wave",
519-
"Plasma",
520-
"canUseGrapple"
521-
]}
522-
]}
543+
"Plasma",
544+
{"cycleFrames": 50}
545+
]},
546+
{"and": [
547+
"ScrewAttack",
548+
{"cycleFrames": 80}
549+
]},
550+
{"and": [
551+
"Spazer",
552+
{"cycleFrames": 150}
553+
]},
554+
{"and": [
555+
"canPseudoScrew",
556+
{"cycleFrames": 180}
557+
]},
558+
{"and": [
559+
"Ice",
560+
{"cycleFrames": 270}
561+
]},
562+
{"cycleFrames": 420}
523563
]}
564+
],
565+
"farmCycleDrops": [
566+
{"enemy": "Sciser", "count": 3}
524567
]
525568
},
526569
{

‎region/crateria/east/Crateria Kihunter Room.json‎

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -337,33 +337,55 @@
337337
{
338338
"id": 17,
339339
"link": [2, 2],
340-
"name": "Sciser Farm",
340+
"name": "Sciser and Kihunter Farm",
341341
"requires": [
342-
{"resetRoom": {
343-
"nodes": [1, 2, 3]
344-
}},
345-
{"partialRefill": {"type": "Energy", "limit": 140}},
346-
{"partialRefill": {"type": "PowerBomb", "limit": 4}}
347-
]
348-
},
349-
{
350-
"id": 28,
351-
"link": [2, 2],
352-
"name": "Faster Sciser Farm",
353-
"requires": [
354-
{"resetRoom": {
355-
"nodes": [1, 2, 3]
356-
}},
357342
{"or": [
358-
"Wave",
359-
"Spazer",
360-
"Plasma",
361-
"canUseGrapple",
362-
"canPseudoScrew",
363-
"ScrewAttack"
343+
{"and": [
344+
{"resetRoom": {
345+
"nodes": [1, 2]
346+
}},
347+
"canCameraManip"
348+
]},
349+
{"resetRoom": {"nodes": [3]}}
364350
]},
365-
{"partialRefill": {"type": "Energy", "limit": 300}},
366-
{"partialRefill": {"type": "PowerBomb", "limit": 8}}
351+
{"or": [
352+
{"and": [
353+
"ScrewAttack",
354+
{"cycleFrames": 720}
355+
]},
356+
{"and": [
357+
"Plasma",
358+
{"cycleFrames": 770}
359+
]},
360+
{"and": [
361+
"canPseudoScrew",
362+
{"cycleFrames": 1000}
363+
]},
364+
{"and": [
365+
"canUseGrapple",
366+
{"cycleFrames": 1020}
367+
]},
368+
{"and": [
369+
"Wave",
370+
{"cycleFrames": 1050}
371+
]},
372+
{"and": [
373+
"Spazer",
374+
{"cycleFrames": 1080}
375+
]},
376+
{"and": [
377+
"Ice",
378+
{"cycleFrames": 1170}
379+
]},
380+
{"and": [
381+
"canDodgeWhileShooting",
382+
{"cycleFrames": 1440}
383+
]}
384+
]}
385+
],
386+
"farmCycleDrops": [
387+
{"enemy": "Sciser", "count": 2},
388+
{"enemy": "Kihunter (green)", "count": 2}
367389
]
368390
},
369391
{

0 commit comments

Comments
 (0)