Skip to content

Commit e981192

Browse files
osse101osse101
authored
Merge pull request #2189 from blkerby/pink-maridia-farms-2
Pink Maridia farms part 2: Botwoon Hallway, etc.
2 parents 13610b4 + dc95eb2 commit e981192

3 files changed

Lines changed: 492 additions & 36 deletions

File tree

‎region/maridia/inner-pink/Botwoon Hallway.json‎

Lines changed: 159 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,95 @@
108108
"requires": [
109109
{"resetRoom": {"nodes": [1]}},
110110
{"or": [
111-
"canDodgeWhileShooting",
112-
"Wave",
113-
"Spazer",
114-
"Plasma",
115-
"canUseGrapple",
116111
{"and": [
117-
"ScrewAttack",
118-
"Gravity"
112+
"Gravity",
113+
{"or": [
114+
{"and": [
115+
{"or": [
116+
"Grapple",
117+
"Plasma",
118+
"Wave",
119+
"Spazer",
120+
"ScrewAttack"
121+
]},
122+
{"cycleFrames": 160}
123+
]},
124+
{"and": [
125+
"canPseudoScrew",
126+
{"cycleFrames": 210}
127+
]},
128+
{"and": [
129+
"canDodgeWhileShooting",
130+
{"cycleFrames": 300}
131+
]}
132+
]}
133+
]},
134+
{"and": [
135+
"Grapple",
136+
{"cycleFrames": 180}
137+
]},
138+
{"and": [
139+
{"or":[
140+
"Plasma",
141+
"Wave",
142+
"Spazer"
143+
]},
144+
{"cycleFrames": 240}
145+
]},
146+
{"and": [
147+
"canDodgeWhileShooting",
148+
{"cycleFrames": 360}
119149
]}
120-
]},
121-
{"partialRefill": {"type": "Super", "limit": 4}},
122-
{"partialRefill": {"type": "Energy", "limit": 200}},
123-
{"partialRefill": {"type": "Missile", "limit": 10}}
150+
]}
151+
],
152+
"farmCycleDrops": [
153+
{"enemy": "Mochtroid", "count": 2}
154+
]
155+
},
156+
{
157+
"link": [1, 1],
158+
"name": "Puyo Farm",
159+
"requires": [
160+
{"resetRoom": {"nodes": [1]}},
161+
{"or": [
162+
{"and": [
163+
"Gravity",
164+
{"or": [
165+
{"and": [
166+
{"or": [
167+
"Plasma",
168+
"Wave",
169+
"Spazer"
170+
]},
171+
{"cycleFrames": 720}
172+
]},
173+
{"and": [
174+
"Grapple",
175+
{"cycleFrames": 770}
176+
]},
177+
{"and": [
178+
"ScrewAttack",
179+
{"cycleFrames": 770}
180+
]},
181+
{"and": [
182+
"canDodgeWhileShooting",
183+
{"cycleFrames": 1020}
184+
]}
185+
]}
186+
]},
187+
{"and": [
188+
"HiJump",
189+
{"cycleFrames": 1650}
190+
]},
191+
{"and": [
192+
"canTrickyJump",
193+
"h_crouchJumpDownGrab",
194+
{"cycleFrames": 2280}
195+
]}
196+
]}
197+
],
198+
"farmCycleDrops": [
199+
{"enemy": "Puyo", "count": 2}
124200
]
125201
},
126202
{
@@ -790,6 +866,78 @@
790866
}
791867
}
792868
},
869+
{
870+
"link": [2, 2],
871+
"name": "Mochtroid and Puyo Farm",
872+
"requires": [
873+
{"resetRoom": {"nodes": [2]}},
874+
{"or": [
875+
{"and": [
876+
"Gravity",
877+
{"or": [
878+
{"and": [
879+
"Plasma",
880+
{"cycleFrames": 720}
881+
]},
882+
{"and": [
883+
"Wave",
884+
{"cycleFrames": 760}
885+
]},
886+
{"and": [
887+
"Spazer",
888+
{"cycleFrames": 785}
889+
]},
890+
{"and": [
891+
"Grapple",
892+
{"cycleFrames": 800}
893+
]},
894+
{"and": [
895+
"ScrewAttack",
896+
{"cycleFrames": 820}
897+
]},
898+
{"and": [
899+
"canDodgeWhileShooting",
900+
{"cycleFrames": 1060}
901+
]}
902+
]},
903+
{"or": [
904+
"canWalljump",
905+
"h_crouchJumpDownGrab",
906+
{"cycleFrames": 150}
907+
]}
908+
]},
909+
{"and": [
910+
{"or": [
911+
{"and": [
912+
{"or": [
913+
"Plasma",
914+
"Wave",
915+
"Spazer",
916+
"Grapple"
917+
]},
918+
{"cycleFrames": 1710}
919+
]},
920+
{"and": [
921+
"canDodgeWhileShooting",
922+
{"cycleFrames": 2010}
923+
]}
924+
]},
925+
{"or": [
926+
"HiJump",
927+
{"and": [
928+
"canTrickyJump",
929+
"h_crouchJumpDownGrab",
930+
{"cycleFrames": 315}
931+
]}
932+
]}
933+
]}
934+
]}
935+
],
936+
"farmCycleDrops": [
937+
{"enemy": "Mochtroid", "count": 1},
938+
{"enemy": "Puyo", "count": 2}
939+
]
940+
},
793941
{
794942
"id": 31,
795943
"link": [2, 2],

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

Lines changed: 177 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,75 @@
138138
{
139139
"id": 3,
140140
"link": [1, 1],
141-
"name": "Mochtroid Farm",
141+
"name": "Mochtroid Farm (1 Mochtroid)",
142+
"requires": [
143+
{"resetRoom": {"nodes": [1]}},
144+
{"or": [
145+
{"and": [
146+
"Plasma",
147+
{"cycleFrames": 70}
148+
]},
149+
{"and": [
150+
"Grapple",
151+
{"cycleFrames": 70}
152+
]},
153+
{"and": [
154+
"ScrewAttack",
155+
{"cycleFrames": 75}
156+
]},
157+
{"and": [
158+
"Wave",
159+
{"cycleFrames": 80}
160+
]},
161+
{"and": [
162+
"Spazer",
163+
{"cycleFrames": 90}
164+
]},
165+
{"and": [
166+
"canDodgeWhileShooting",
167+
{"cycleFrames": 120}
168+
]}
169+
]}
170+
],
171+
"farmCycleDrops": [
172+
{"enemy": "Mochtroid", "count": 1}
173+
]
174+
},
175+
{
176+
"link": [1, 1],
177+
"name": "Mochtroid Farm (4 Mochtroids)",
142178
"requires": [
143179
{"resetRoom": {"nodes": [1]}},
144180
"SpaceJump",
145-
"ScrewAttack",
146-
{"partialRefill": {"type": "Super", "limit": 4}},
147-
{"partialRefill": {"type": "Energy", "limit": 200}},
148-
{"partialRefill": {"type": "Missile", "limit": 10}}
181+
{"or": [
182+
{"and": [
183+
"Plasma",
184+
{"cycleFrames": 1035}
185+
]},
186+
{"and": [
187+
"Grapple",
188+
{"cycleFrames": 1050}
189+
]},
190+
{"and": [
191+
"ScrewAttack",
192+
{"cycleFrames": 1080}
193+
]},
194+
{"and": [
195+
"Wave",
196+
{"cycleFrames": 1090}
197+
]},
198+
{"and": [
199+
"Spazer",
200+
{"cycleFrames": 1150}
201+
]},
202+
{"and": [
203+
"canDodgeWhileShooting",
204+
{"cycleFrames": 1260}
205+
]}
206+
]}
207+
],
208+
"farmCycleDrops": [
209+
{"enemy": "Mochtroid", "count": 4}
149210
]
150211
},
151212
{
@@ -950,6 +1011,43 @@
9501011
"Maintain a half-tile gap between the Mochtroid and the runway in order to extend it as much as possible."
9511012
]
9521013
},
1014+
{
1015+
"link": [2, 2],
1016+
"name": "Mochtroid Farm (1 Mochtroid)",
1017+
"requires": [
1018+
{"resetRoom": {"nodes": [2]}},
1019+
{"or": [
1020+
{"and": [
1021+
"Plasma",
1022+
{"cycleFrames": 95}
1023+
]},
1024+
{"and": [
1025+
"Grapple",
1026+
{"cycleFrames": 95}
1027+
]},
1028+
{"and": [
1029+
"Gravity",
1030+
"ScrewAttack",
1031+
{"cycleFrames": 95}
1032+
]},
1033+
{"and": [
1034+
"Wave",
1035+
{"cycleFrames": 105}
1036+
]},
1037+
{"and": [
1038+
"Spazer",
1039+
{"cycleFrames": 115}
1040+
]},
1041+
{"and": [
1042+
"canDodgeWhileShooting",
1043+
{"cycleFrames": 145}
1044+
]}
1045+
]}
1046+
],
1047+
"farmCycleDrops": [
1048+
{"enemy": "Mochtroid", "count": 1}
1049+
]
1050+
},
9531051
{
9541052
"id": 38,
9551053
"link": [2, 2],
@@ -2549,6 +2647,80 @@
25492647
"then roll from right to down-right to enter the transition (at horizontal positon 1771)."
25502648
]
25512649
},
2650+
{
2651+
"link": [3, 3],
2652+
"name": "Mochtroid Farm (1 Mochtroid)",
2653+
"requires": [
2654+
{"resetRoom": {"nodes": [3]}},
2655+
{"or": [
2656+
{"and": [
2657+
"Plasma",
2658+
{"cycleFrames": 70}
2659+
]},
2660+
{"and": [
2661+
"Grapple",
2662+
{"cycleFrames": 70}
2663+
]},
2664+
{"and": [
2665+
"ScrewAttack",
2666+
{"cycleFrames": 75}
2667+
]},
2668+
{"and": [
2669+
"Wave",
2670+
{"cycleFrames": 80}
2671+
]},
2672+
{"and": [
2673+
"Spazer",
2674+
{"cycleFrames": 90}
2675+
]},
2676+
{"and": [
2677+
"canDodgeWhileShooting",
2678+
{"cycleFrames": 120}
2679+
]}
2680+
]}
2681+
],
2682+
"farmCycleDrops": [
2683+
{"enemy": "Mochtroid", "count": 1}
2684+
]
2685+
},
2686+
{
2687+
"link": [3, 3],
2688+
"name": "Mochtroid Farm (3 Mochtroids)",
2689+
"requires": [
2690+
{"resetRoom": {"nodes": [3]}},
2691+
"SpaceJump",
2692+
{"or": [
2693+
{"and": [
2694+
"ScrewAttack",
2695+
{"cycleFrames": 710}
2696+
]},
2697+
{"and": [
2698+
"Plasma",
2699+
{"cycleFrames": 730}
2700+
]},
2701+
{"and": [
2702+
"Grapple",
2703+
{"cycleFrames": 770}
2704+
]},
2705+
{"and": [
2706+
"Wave",
2707+
{"cycleFrames": 810}
2708+
]},
2709+
{"and": [
2710+
"Spazer",
2711+
{"cycleFrames": 855}
2712+
]},
2713+
{"and": [
2714+
"canDodgeWhileShooting",
2715+
"canTrickyJump",
2716+
{"cycleFrames": 1140}
2717+
]}
2718+
]}
2719+
],
2720+
"farmCycleDrops": [
2721+
{"enemy": "Mochtroid", "count": 3}
2722+
]
2723+
},
25522724
{
25532725
"id": 83,
25542726
"link": [3, 3],

0 commit comments

Comments
 (0)