Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions region/crateria/west/Green Pirates Shaft.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,8 @@
"link": [2, 2],
"name": "Pirate Farm",
"requires": [
{"and": [
{"resetRoom": {"nodes": [2, 3, 4]}},
{"cycleFrames": 850}
]},
{"resetRoom": {"nodes": [2, 3, 4]}},
{"cycleFrames": 850},
{"or": [
"ScrewAttack",
"Wave",
Expand Down
32 changes: 17 additions & 15 deletions region/lowernorfair/east/Ridley's Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -832,23 +832,25 @@
"name": "IBJ",
"requires": [
"h_heatProof",
{"and": [
"canJumpIntoIBJ",
"canTrickyJump",
{"or": [
"canLongIBJ",
"HiJump"
]}
]},
{"and": [
"f_DefeatedRidley",
{"or": [
"canLongIBJ",
{"and": [
"canJumpIntoIBJ",
{"or": [
{"and": [
"canJumpIntoIBJ",
"canTrickyJump",
{"or": [
"canLongIBJ",
"HiJump"
]}
]}
]},
{"and": [
"f_DefeatedRidley",
{"or": [
"canLongIBJ",
{"and": [
"canJumpIntoIBJ",
"HiJump"
]}
]}
]}
]}
]
},
Expand Down
22 changes: 10 additions & 12 deletions region/maridia/inner-green/East Sand Hall.json
Original file line number Diff line number Diff line change
Expand Up @@ -1416,18 +1416,16 @@
}},
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}}
]},
{"and": [
"canPlayInSand",
{"or": [
"canWalljump",
"HiJump",
"canUseFrozenEnemies",
"canGravityJump",
{"and": [
"canTrickyJump",
"can4HighMidAirMorph",
"canTrickySpringBallJump"
]}
"canPlayInSand",
{"or": [
"canWalljump",
"HiJump",
"canUseFrozenEnemies",
"canGravityJump",
{"and": [
"canTrickyJump",
"can4HighMidAirMorph",
"canTrickySpringBallJump"
]}
]}
]
Expand Down
89 changes: 83 additions & 6 deletions region/maridia/inner-yellow/Butterfly Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,26 @@
{
"id": 3,
"link": [1, 1],
"name": "Zoa Farm",
"name": "Zoa Farm (From Ledge)",
"requires": [
{"refill": ["Energy", "Missile", "Super"]}
]
{"or": [
{"and": [
"Grapple",
{"cycleFrames": 180}
]},
{"and": [
{"cycleFrames": 300},
{"or": [
"Spazer",
"Wave",
"Plasma",
"canDodgeWhileShooting",
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
]}
]}
]}
],
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
},
{
"id": 36,
Expand Down Expand Up @@ -688,10 +704,71 @@
{
"id": 30,
"link": [2, 2],
"name": "Zoa Farm",
"name": "Zoa Farm (From Ledge)",
"requires": [
{"refill": ["Energy", "Missile", "Super"]}
]
{"or": [
{"and": [
"Grapple",
{"cycleFrames": 180}
]},
{"and": [
{"cycleFrames": 270},
{"or": [
"Spazer",
"Wave",
"Plasma",
"canDodgeWhileShooting",
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
]}
]}
]}
],
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
},
{
"link": [2, 2],
"name": "Zoa Farm (In Sand, Strong Weapon)",
"requires": [
{"or": [
"HiJump",
"Gravity",
"canEscapeSand"
]},
{"or": [
"Spazer",
"Wave",
"Plasma",
"Grapple",
{"and": [
"Gravity",
"ScrewAttack",
{"cycleFrames": 30}
]}
]},
{"or": [
"canDodgeWhileShooting",
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
]},
{"cycleFrames": 130}
],
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
},
{
"link": [2, 2],
"name": "Zoa Farm (In Sand, Power Beam)",
"requires": [
{"or": [
"HiJump",
"Gravity",
"canEscapeSand"
]},
{"or": [
"canTrickyDodgeEnemies",
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 1}}
]},
{"cycleFrames": 165}
],
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
},
{
"id": 31,
Expand Down
125 changes: 117 additions & 8 deletions region/maridia/inner-yellow/Kassiuz Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,85 @@
"requires": [
{"resetRoom": {"nodes": [1]}},
{"or": [
"Spazer",
"Wave",
"Plasma",
"canUseGrapple",
"ScrewAttack"
{"and": [
"Grapple",
{"cycleFrames": 180}
]},
{"and": [
{"or": [
"Plasma",
"Wave",
"Spazer",
"ScrewAttack"
]},
{"cycleFrames": 210}
]},
{"and": [
"canFarmWhileShooting",
{"cycleFrames": 330}
]},
{"cycleFrames": 400}
]}
],
"farmCycleDrops": [{"enemy": "Puyo", "count": 2}]
},
{
"link": [1, 1],
"name": "Puyo and Choot Farm",
"requires": [
{"or": [
{"resetRoom": {"nodes": [1]}},
{"and": [
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 120}
]}
]},
{"or": [
"canWalljump",
{"and": [
"SpaceJump",
{"cycleFrames": 300}
]},
{"and": [
"canTrickySpringBallJump",
{"cycleFrames": 320},
"h_doubleEquipmentScreenCycleFrames",
"h_doubleEquipmentScreenCycleFrames",
"h_doubleEquipmentScreenCycleFrames"
]}
]},
"canDodgeWhileShooting",
{"or": [
{"and": [
"Plasma",
{"cycleFrames": 820}
]},
{"and": [
"Grapple",
{"cycleFrames": 900}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 1000}
]},
{"and": [
"Wave",
{"cycleFrames": 1080}
]},
{"and": [
"Spazer",
{"cycleFrames": 1140}
]},
{"cycleFrames": 2040}
]},
{"partialRefill": {"type": "Energy", "limit": 200}},
{"partialRefill": {"type": "Missile", "limit": 12}},
{"partialRefill": {"type": "PowerBomb", "limit": 6}}
{"or": [
"canFarmWhileShooting",
{"cycleFrames": 500}
]}
],
"farmCycleDrops": [
{"enemy": "Puyo", "count": 4},
{"enemy": "Choot", "count": 3}
]
},
{
Expand Down Expand Up @@ -558,6 +628,45 @@
},
"devNote": "Max extra run speed $0.8"
},
{
"link": [2, 2],
"name": "Choot Farm",
"requires": [
{"resetRoom": {"nodes": [2]}},
{"or": [
{"and": [
"Grapple",
{"cycleFrames": 100}
]},
{"and": [
"Plasma",
{"cycleFrames": 160}
]},
{"and": [
"Wave",
{"cycleFrames": 170}
]},
{"and": [
"Spazer",
{"cycleFrames": 200}
]},
{"and": [
"ScrewAttack",
{"cycleFrames": 200}
]},
{"and": [
"canPseudoScrew",
{"cycleFrames": 220}
]},
{"and": [
"canFarmWhileShooting",
{"cycleFrames": 250}
]},
{"cycleFrames": 300}
]}
],
"farmCycleDrops": [{"enemy": "Choot", "count": 1}]
},
{
"id": 15,
"link": [2, 2],
Expand Down
Loading