diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index c2ad384626..7c5865047b 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1110,23 +1110,84 @@ "FIXME: It may be possible to avoid the Super use, if Space Jump is available to follow a Sciser all the way around the ceiling." ] }, + { + "link": [2, 2], + "name": "Sciser Farm (1 Sciser)", + "requires": [ + {"resetRoom": {"nodes": [2]}}, + {"cycleFrames": 900} + ], + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 1} + ], + "devNote": [ + "This case is just for if items and tech are not available to kill the first Sciser before it climbs too high." + ] + }, { "id": 30, "link": [2, 2], - "name": "Sciser Farm", - "requires": [ - {"or": [ - "h_navigateUnderwater", - "Ice", - "Wave", - "Spazer", - "Plasma" - ]}, + "name": "Sciser Farm (2 Scisers)", + "requires": [ {"resetRoom": {"nodes": [2]}}, - {"partialRefill": {"type": "Energy", "limit": 140}}, - {"partialRefill": {"type": "PowerBomb", "limit": 6}} + {"or": [ + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 365} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 400} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 420} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 450} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 510} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 630} + ]}, + {"cycleFrames": 710} + ]} + ]}, + {"and": [ + "Grapple", + {"cycleFrames": 840} + ]}, + {"and": [ + {"or": [ + "Plasma", + "Wave", + "Spazer" + ]}, + {"cycleFrames": 920} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 1040} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"cycleFrames": 1200} + ]} + ]} ], - "resetsObstacles": ["A", "B"] + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 2} + ] }, { "id": 31, @@ -1951,6 +2012,79 @@ "leaveNormally": {} } }, + { + "link": [3, 3], + "name": "Sciser Farm (1 Sciser)", + "requires": [ + {"resetRoom": {"nodes": [3]}}, + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 90} + ]}, + {"and": [ + {"or": [ + {"and": [ + "Gravity", + {"or": [ + "canWalljump", + "HiJump", + {"and": [ + "canSpringBallJumpMidAir", + "h_doubleEquipmentScreenCycleFrames" + ]}, + {"and": [ + {"or": [ + "Plasma", + "Wave" + ]}, + "canDodgeWhileShooting" + ]} + ]} + ]}, + {"and": [ + "canGravityJump", + "h_doubleEquipmentScreenCycleFrames", + {"cycleFrames": 60} + ]}, + {"and": [ + "HiJump", + "canSpringBallJumpMidAir", + "h_doubleEquipmentScreenCycleFrames", + {"cycleFrames": 170} + ]} + ]}, + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 120} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 150} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 165} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 200} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 280} + ]}, + {"cycleFrames": 330} + ]} + ]} + ]} + ], + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 1} + ] + }, { "id": 242, "link": [3, 3], @@ -3594,6 +3728,47 @@ }, "devNote": "This depends on how far the Morph tunnel is expanded, but this is both the minimum distance and the distance Map Rando has expanded." }, + { + "link": [6, 6], + "name": "Sciser Farm (1 Sciser)", + "requires": [ + "h_EverestMorphTunnelExpanded", + "canDodgeWhileShooting", + {"resetRoom": {"nodes": [6]}}, + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 180} + ]}, + {"and": [ + "Gravity", + {"or": [ + "ScrewAttack", + "canPseudoScrew", + "Ice", + "Wave", + "Spazer", + "Plasma" + ]}, + {"cycleFrames": 220} + ]}, + {"and": [ + {"or": [ + "Ice", + "Wave", + "Spazer", + "Plasma", + "canFarmWhileShooting" + ]}, + {"cycleFrames": 290} + ]} + ]} + ], + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 1} + ] + }, { "id": 136, "link": [6, 6], @@ -3938,18 +4113,251 @@ { "id": 151, "link": [7, 7], - "name": "Powamp Farm", + "name": "Powamp Farm (Gravity)", "requires": [ "Gravity", {"or": [ - "HiJump", - "SpaceJump", - "Grapple" + {"and": [ + "SpaceJump", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 1280} + ]}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"cycleFrames": 1065} + ]}, + {"and": [ + {"resetRoom": {"nodes": [3]}}, + {"cycleFrames": 1000} + ]}, + {"and": [ + {"resetRoom": {"nodes": [4]}}, + {"cycleFrames": 1240} + ]}, + {"and": [ + {"resetRoom": {"nodes": [5]}}, + {"cycleFrames": 1000} + ]}, + {"and": [ + {"resetRoom": {"nodes": [6]}}, + "Morph", + {"cycleFrames": 1385} + ]} + ]} + ]}, + {"and": [ + "HiJump", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 1235} + ]}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"cycleFrames": 1250} + ]}, + {"and": [ + {"resetRoom": {"nodes": [3]}}, + {"cycleFrames": 1170} + ]}, + {"and": [ + {"resetRoom": {"nodes": [4]}}, + "canGravityJump", + {"cycleFrames": 1510}, + "h_doubleEquipmentScreenCycleFrames", + {"or": [ + "canPreciseWalljump", + "h_doubleEquipmentScreenCycleFrames" + ]} + ]}, + {"and": [ + {"resetRoom": {"nodes": [5]}}, + "canGravityJump", + {"cycleFrames": 1000}, + "h_doubleEquipmentScreenCycleFrames", + {"or": [ + "canTrickyJump", + "h_doubleEquipmentScreenCycleFrames" + ]} + ]}, + {"and": [ + {"resetRoom": {"nodes": [6]}}, + "Morph", + {"cycleFrames": 1410} + ]} + ]} + ]}, + {"and": [ + "Grapple", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 1210} + ]}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"cycleFrames": 1125}, + {"or": [ + "canWalljump", + {"and": [ + "canGravityJump", + {"cycleFrames": 55}, + "h_doubleEquipmentScreenCycleFrames" + ]}, + {"and": [ + "h_crouchJumpDownGrab", + "canTrickyJump", + {"cycleFrames": 50} + ]} + ]} + ]}, + {"and": [ + {"resetRoom": {"nodes": [3]}}, + {"cycleFrames": 1145}, + {"or": [ + "canWalljump", + {"and": [ + "canGravityJump", + {"cycleFrames": 80}, + "h_doubleEquipmentScreenCycleFrames" + ]} + ]} + ]}, + {"and": [ + {"resetRoom": {"nodes": [4]}}, + {"cycleFrames": 1885} + ]}, + {"and": [ + {"resetRoom": {"nodes": [5]}}, + {"cycleFrames": 1570} + ]}, + {"and": [ + {"resetRoom": {"nodes": [6]}}, + "Morph", + {"cycleFrames": 1400}, + {"or": [ + "canWalljump", + {"and": [ + "canGravityJump", + {"cycleFrames": 55}, + "h_doubleEquipmentScreenCycleFrames" + ]}, + {"and": [ + "h_crouchJumpDownGrab", + "canTrickyJump", + {"cycleFrames": 50} + ]} + ]} + ]} + ]} + ]} + ]} + ], + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [{"enemy": "Powamp", "count": 3}], + "devNote": "Other movement options are possible, though slower (e.g. Gravity jump everywhere)." + }, + { + "link": [7, 7], + "name": "Sciser Farm (5 Scisers, Gravity)", + "requires": [ + "Gravity", + {"or": [ + "canWalljump", + "SpaceJump" ]}, - {"resetRoom": {"nodes": [1, 2, 3]}}, - {"partialRefill": {"type": "Super", "limit": 10}} + {"or": [ + {"resetRoom": {"nodes": [2]}}, + {"and": [ + {"resetRoom": {"nodes": [6]}}, + "Morph", + {"cycleFrames": 45} + ]}, + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 370} + ]}, + {"and": [ + {"resetRoom": {"nodes": [3]}}, + {"cycleFrames": 70} + ]}, + {"and": [ + {"resetRoom": {"nodes": [5]}}, + "SpaceJump", + {"cycleFrames": 330} + ]}, + {"and": [ + {"resetRoom": {"nodes": [4]}}, + "SpaceJump", + {"cycleFrames": 530} + ]} + ]}, + {"or": [ + {"and": [ + {"or": [ + "ScrewAttack", + "canPseudoScrew" + ]}, + {"cycleFrames": 980} + ]}, + {"and": [ + "Grapple", + {"cycleFrames": 1010} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 1090} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 1220} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 1390} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 2045} + ]}, + {"cycleFrames": 2740} + ]} ], - "resetsObstacles": ["A", "B"] + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [{"enemy": "Sciser", "count": 5}], + "devNote": [ + "FIXME: Other, slower options are also possible." + ] + }, + { + "link": [7, 7], + "name": "Sciser Farm (3 Scisers, Grapple)", + "requires": [ + "Grapple", + "canTrickyJump", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 2615} + ]}, + {"and": [ + {"resetRoom": {"nodes": [5]}}, + {"cycleFrames": 2340} + ]}, + {"and": [ + {"resetRoom": {"nodes": [4]}}, + {"cycleFrames": 2740} + ]} + ]} + ], + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [{"enemy": "Sciser", "count": 3}], + "note": [ + "Use Grapple on the Powamps to climb back up the room after farming the crabs.", + "Caution may be needed to avoid falling down to the bottom parts of the room." + ] }, { "id": 152, diff --git a/region/maridia/outer/Red Fish Room.json b/region/maridia/outer/Red Fish Room.json index 7ae4f837f8..8453f7cc6e 100644 --- a/region/maridia/outer/Red Fish Room.json +++ b/region/maridia/outer/Red Fish Room.json @@ -122,8 +122,34 @@ "link": [1, 1], "name": "Zebbo Farm", "requires": [ - {"refill": ["Energy", "Missile", "Super"]} - ] + {"or": [ + {"and": [ + "ScrewAttack", + {"simpleCycleFrames": 80}, + {"cycleFrames": 50} + ]}, + {"and": [ + "Plasma", + {"simpleCycleFrames": 115}, + {"cycleFrames": 30} + ]}, + {"and": [ + "Grapple", + {"simpleCycleFrames": 120}, + {"cycleFrames": 30} + ]}, + {"and": [ + {"or": [ + "Wave", + "Spazer" + ]}, + {"simpleCycleFrames": 125}, + {"cycleFrames": 30} + ]}, + {"cycleFrames": 195} + ]} + ], + "farmCycleDrops": [{"enemy": "Zebbo", "count": 3}] }, { "id": 4, @@ -317,6 +343,59 @@ "note": "Enter on the left side of the doorway to reduce the amount of energy used.", "devNote": "This strat is not useful in-room, but can satisfy a strat in the room before with an exit shinespark." }, + { + "link": [2, 2], + "name": "Skultera Farm", + "requires": [ + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "ScrewAttack", + {"cycleFrames": 100} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 100} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 160} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 210} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 260} + ]}, + {"cycleFrames": 300} + ]} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 130} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 220} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 250} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 290} + ]}, + {"cycleFrames": 330} + ]} + ], + "farmCycleDrops": [{"enemy": "Skultera", "count": 1}] + }, { "id": 13, "link": [2, 2],