Skip to content

Commit dea538b

Browse files
osse101osse101
authored
Merge pull request #2207 from blkerby/yellow-maridia-farm-1
Yellow Maridia farms part 1: Butterfly Room, etc.
2 parents 1d2626e + c32882d commit dea538b

7 files changed

Lines changed: 307 additions & 47 deletions

File tree

‎region/crateria/west/Green Pirates Shaft.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,8 @@
391391
"link": [2, 2],
392392
"name": "Pirate Farm",
393393
"requires": [
394-
{"and": [
395-
{"resetRoom": {"nodes": [2, 3, 4]}},
396-
{"cycleFrames": 850}
397-
]},
394+
{"resetRoom": {"nodes": [2, 3, 4]}},
395+
{"cycleFrames": 850},
398396
{"or": [
399397
"ScrewAttack",
400398
"Wave",

‎region/lowernorfair/east/Ridley's Room.json‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -832,23 +832,25 @@
832832
"name": "IBJ",
833833
"requires": [
834834
"h_heatProof",
835-
{"and": [
836-
"canJumpIntoIBJ",
837-
"canTrickyJump",
838-
{"or": [
839-
"canLongIBJ",
840-
"HiJump"
841-
]}
842-
]},
843-
{"and": [
844-
"f_DefeatedRidley",
845-
{"or": [
846-
"canLongIBJ",
847-
{"and": [
848-
"canJumpIntoIBJ",
835+
{"or": [
836+
{"and": [
837+
"canJumpIntoIBJ",
838+
"canTrickyJump",
839+
{"or": [
840+
"canLongIBJ",
849841
"HiJump"
850842
]}
851-
]}
843+
]},
844+
{"and": [
845+
"f_DefeatedRidley",
846+
{"or": [
847+
"canLongIBJ",
848+
{"and": [
849+
"canJumpIntoIBJ",
850+
"HiJump"
851+
]}
852+
]}
853+
]}
852854
]}
853855
]
854856
},

‎region/maridia/inner-green/East Sand Hall.json‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,18 +1416,16 @@
14161416
}},
14171417
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
14181418
]},
1419-
{"and": [
1420-
"canPlayInSand",
1421-
{"or": [
1422-
"canWalljump",
1423-
"HiJump",
1424-
"canUseFrozenEnemies",
1425-
"canGravityJump",
1426-
{"and": [
1427-
"canTrickyJump",
1428-
"can4HighMidAirMorph",
1429-
"canTrickySpringBallJump"
1430-
]}
1419+
"canPlayInSand",
1420+
{"or": [
1421+
"canWalljump",
1422+
"HiJump",
1423+
"canUseFrozenEnemies",
1424+
"canGravityJump",
1425+
{"and": [
1426+
"canTrickyJump",
1427+
"can4HighMidAirMorph",
1428+
"canTrickySpringBallJump"
14311429
]}
14321430
]}
14331431
]

‎region/maridia/inner-yellow/Butterfly Room.json‎

Lines changed: 83 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,26 @@
163163
{
164164
"id": 3,
165165
"link": [1, 1],
166-
"name": "Zoa Farm",
166+
"name": "Zoa Farm (From Ledge)",
167167
"requires": [
168-
{"refill": ["Energy", "Missile", "Super"]}
169-
]
168+
{"or": [
169+
{"and": [
170+
"Grapple",
171+
{"cycleFrames": 180}
172+
]},
173+
{"and": [
174+
{"cycleFrames": 300},
175+
{"or": [
176+
"Spazer",
177+
"Wave",
178+
"Plasma",
179+
"canDodgeWhileShooting",
180+
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
181+
]}
182+
]}
183+
]}
184+
],
185+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
170186
},
171187
{
172188
"id": 36,
@@ -688,10 +704,71 @@
688704
{
689705
"id": 30,
690706
"link": [2, 2],
691-
"name": "Zoa Farm",
707+
"name": "Zoa Farm (From Ledge)",
692708
"requires": [
693-
{"refill": ["Energy", "Missile", "Super"]}
694-
]
709+
{"or": [
710+
{"and": [
711+
"Grapple",
712+
{"cycleFrames": 180}
713+
]},
714+
{"and": [
715+
{"cycleFrames": 270},
716+
{"or": [
717+
"Spazer",
718+
"Wave",
719+
"Plasma",
720+
"canDodgeWhileShooting",
721+
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
722+
]}
723+
]}
724+
]}
725+
],
726+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
727+
},
728+
{
729+
"link": [2, 2],
730+
"name": "Zoa Farm (In Sand, Strong Weapon)",
731+
"requires": [
732+
{"or": [
733+
"HiJump",
734+
"Gravity",
735+
"canEscapeSand"
736+
]},
737+
{"or": [
738+
"Spazer",
739+
"Wave",
740+
"Plasma",
741+
"Grapple",
742+
{"and": [
743+
"Gravity",
744+
"ScrewAttack",
745+
{"cycleFrames": 30}
746+
]}
747+
]},
748+
{"or": [
749+
"canDodgeWhileShooting",
750+
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
751+
]},
752+
{"cycleFrames": 130}
753+
],
754+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
755+
},
756+
{
757+
"link": [2, 2],
758+
"name": "Zoa Farm (In Sand, Power Beam)",
759+
"requires": [
760+
{"or": [
761+
"HiJump",
762+
"Gravity",
763+
"canEscapeSand"
764+
]},
765+
{"or": [
766+
"canTrickyDodgeEnemies",
767+
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
768+
]},
769+
{"cycleFrames": 165}
770+
],
771+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
695772
},
696773
{
697774
"id": 31,

‎region/maridia/inner-yellow/Kassiuz Room.json‎

Lines changed: 117 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,85 @@
111111
"requires": [
112112
{"resetRoom": {"nodes": [1]}},
113113
{"or": [
114-
"Spazer",
115-
"Wave",
116-
"Plasma",
117-
"canUseGrapple",
118-
"ScrewAttack"
114+
{"and": [
115+
"Grapple",
116+
{"cycleFrames": 180}
117+
]},
118+
{"and": [
119+
{"or": [
120+
"Plasma",
121+
"Wave",
122+
"Spazer",
123+
"ScrewAttack"
124+
]},
125+
{"cycleFrames": 210}
126+
]},
127+
{"and": [
128+
"canFarmWhileShooting",
129+
{"cycleFrames": 330}
130+
]},
131+
{"cycleFrames": 400}
132+
]}
133+
],
134+
"farmCycleDrops": [{"enemy": "Puyo", "count": 2}]
135+
},
136+
{
137+
"link": [1, 1],
138+
"name": "Puyo and Choot Farm",
139+
"requires": [
140+
{"or": [
141+
{"resetRoom": {"nodes": [1]}},
142+
{"and": [
143+
{"resetRoom": {"nodes": [2]}},
144+
{"cycleFrames": 120}
145+
]}
146+
]},
147+
{"or": [
148+
"canWalljump",
149+
{"and": [
150+
"SpaceJump",
151+
{"cycleFrames": 300}
152+
]},
153+
{"and": [
154+
"canTrickySpringBallJump",
155+
{"cycleFrames": 320},
156+
"h_doubleEquipmentScreenCycleFrames",
157+
"h_doubleEquipmentScreenCycleFrames",
158+
"h_doubleEquipmentScreenCycleFrames"
159+
]}
160+
]},
161+
"canDodgeWhileShooting",
162+
{"or": [
163+
{"and": [
164+
"Plasma",
165+
{"cycleFrames": 820}
166+
]},
167+
{"and": [
168+
"Grapple",
169+
{"cycleFrames": 900}
170+
]},
171+
{"and": [
172+
"ScrewAttack",
173+
{"cycleFrames": 1000}
174+
]},
175+
{"and": [
176+
"Wave",
177+
{"cycleFrames": 1080}
178+
]},
179+
{"and": [
180+
"Spazer",
181+
{"cycleFrames": 1140}
182+
]},
183+
{"cycleFrames": 2040}
119184
]},
120-
{"partialRefill": {"type": "Energy", "limit": 200}},
121-
{"partialRefill": {"type": "Missile", "limit": 12}},
122-
{"partialRefill": {"type": "PowerBomb", "limit": 6}}
185+
{"or": [
186+
"canFarmWhileShooting",
187+
{"cycleFrames": 500}
188+
]}
189+
],
190+
"farmCycleDrops": [
191+
{"enemy": "Puyo", "count": 4},
192+
{"enemy": "Choot", "count": 3}
123193
]
124194
},
125195
{
@@ -558,6 +628,45 @@
558628
},
559629
"devNote": "Max extra run speed $0.8"
560630
},
631+
{
632+
"link": [2, 2],
633+
"name": "Choot Farm",
634+
"requires": [
635+
{"resetRoom": {"nodes": [2]}},
636+
{"or": [
637+
{"and": [
638+
"Grapple",
639+
{"cycleFrames": 100}
640+
]},
641+
{"and": [
642+
"Plasma",
643+
{"cycleFrames": 160}
644+
]},
645+
{"and": [
646+
"Wave",
647+
{"cycleFrames": 170}
648+
]},
649+
{"and": [
650+
"Spazer",
651+
{"cycleFrames": 200}
652+
]},
653+
{"and": [
654+
"ScrewAttack",
655+
{"cycleFrames": 200}
656+
]},
657+
{"and": [
658+
"canPseudoScrew",
659+
{"cycleFrames": 220}
660+
]},
661+
{"and": [
662+
"canFarmWhileShooting",
663+
{"cycleFrames": 250}
664+
]},
665+
{"cycleFrames": 300}
666+
]}
667+
],
668+
"farmCycleDrops": [{"enemy": "Choot", "count": 1}]
669+
},
561670
{
562671
"id": 15,
563672
"link": [2, 2],

0 commit comments

Comments
 (0)