diff --git a/region/maridia/inner-green/East Pants Room.json b/region/maridia/inner-green/East Pants Room.json index 40a4b3c687..891e009bea 100644 --- a/region/maridia/inner-green/East Pants Room.json +++ b/region/maridia/inner-green/East Pants Room.json @@ -123,11 +123,32 @@ "requires": [ "canDodgeWhileShooting", {"resetRoom": {"nodes": [1]}}, - {"partialRefill": {"type": "Energy", "limit": 160}}, - {"partialRefill": {"type": "Missile", "limit": 6}}, - {"partialRefill": {"type": "PowerBomb", "limit": 2}} + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 200} + ]}, + {"and": [ + "Gravity", + "ScrewAttack", + {"cycleFrames": 200} + ]}, + {"and": [ + {"or": [ + "Plasma", + "Wave", + "Spazer" + ]}, + {"cycleFrames": 330} + ]}, + {"cycleFrames": 360} + ]} ], - "note": "Stand (don't crouch) next to the door and shoot diagonally down into the sand until the puyos are killed." + "farmCycleDrops": [{"enemy": "Puyo", "count": 2}], + "note": "Stand (don't crouch) next to the door and shoot diagonally down into the sand until the Puyos are killed.", + "devNote": [ + "One or both of the Puyos above the shot block could also be farmed, but it doesn't seem worth modeling." + ] }, { "id": 3, @@ -351,6 +372,119 @@ } } }, + { + "link": [2, 2], + "name": "Puyo Farm (1 Puyo)", + "requires": [ + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 85} + ]}, + {"and": [ + "Grapple", + {"cycleFrames": 95} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 105} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 110} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 125} + ]}, + {"cycleFrames": 155} + ]} + ]}, + {"and": [ + "canSuitlessMaridia", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 135} + ]}, + {"and": [ + {"or": [ + "Plasma", + "Wave" + ]}, + {"cycleFrames": 175} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 185} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"cycleFrames": 220} + ]} + ]} + ]} + ]} + ], + "farmCycleDrops": [{"enemy": "Puyo", "count": 1}] + }, + { + "link": [2, 2], + "name": "Puyo Farm (3 Puyos)", + "requires": [ + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 230} + ]}, + {"and": [ + "Grapple", + {"cycleFrames": 270} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 300} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 330} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"cycleFrames": 650} + ]} + ]} + ]}, + {"and": [ + "canSuitlessMaridia", + "canDodgeWhileShooting", + {"or": [ + "h_crouchJumpDownGrab", + "HiJump" + ]}, + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 530} + ]}, + {"cycleFrames": 890} + ]} + ]} + ]} + ], + "farmCycleDrops": [{"enemy": "Puyo", "count": 3}], + "devNote": [ + "More Puyos could be farmed at the bottom of the room, but it doesn't seem worth modeling." + ] + }, { "id": 16, "link": [2, 2], diff --git a/region/maridia/inner-green/Lonely Crab Room.json b/region/maridia/inner-green/Lonely Crab Room.json index 021004c8d4..d00277749b 100644 --- a/region/maridia/inner-green/Lonely Crab Room.json +++ b/region/maridia/inner-green/Lonely Crab Room.json @@ -130,12 +130,69 @@ "link": [1, 1], "name": "Sciser Farm", "requires": [ - "h_navigateUnderwater", - {"resetRoom": {"nodes": [1, 2]}}, - {"partialRefill": {"type": "Energy", "limit": 100}}, - {"partialRefill": {"type": "PowerBomb", "limit": 3}} + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "canSuitlessMaridia", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 180} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 280} + ]}, + {"and": [ + {"or": [ + "Wave", + "Spazer" + ]}, + {"cycleFrames": 290} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 320} + ]}, + {"cycleFrames": 330} + ]} + ]}, + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 115} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 130} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 130} + ]}, + {"and": [ + {"or": [ + "Wave", + "Spazer" + ]}, + {"cycleFrames": 160} + ]}, + {"and": [ + "canPseudoScrew", + {"cycleFrames": 170} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 230} + ]}, + {"cycleFrames": 265} + ]} + ]} + ]} ], - "devNote": "Farm cycle: 6seconds." + "farmCycleDrops": [{"enemy": "Sciser", "count": 1}] }, { "id": 4, @@ -1162,6 +1219,76 @@ "gModeRegainMobility": {}, "flashSuitChecked": true }, + { + "link": [2, 2], + "name": "Sciser Farm", + "requires": [ + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "canSuitlessMaridia", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 90} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 100} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 115} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 135} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 220} + ]}, + {"cycleFrames": 340} + ]} + ]}, + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 70} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 70} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 80} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 105} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 115} + ]}, + {"and": [ + "canPseudoScrew", + {"cycleFrames": 130} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 190} + ]}, + {"cycleFrames": 255} + ]} + ]} + ]} + ], + "farmCycleDrops": [{"enemy": "Sciser", "count": 1}] + }, { "id": 41, "link": [2, 3], diff --git a/region/maridia/inner-green/Pants Room.json b/region/maridia/inner-green/Pants Room.json index cf05211831..5613be63fa 100644 --- a/region/maridia/inner-green/Pants Room.json +++ b/region/maridia/inner-green/Pants Room.json @@ -164,7 +164,8 @@ { "id": 4, "devNote": "This link assumes the grapple block has been broken from below." - } + }, + {"id": 5} ] } ], @@ -814,6 +815,23 @@ "link": [5, 4], "name": "Base", "requires": [] + }, + { + "link": [5, 5], + "name": "Menu Farm", + "requires": [ + {"resetRoom": {"nodes": [1, 3]}}, + "Grapple", + "Gravity", + "SpaceJump", + "ScrewAttack", + "canConsecutiveWalljump", + {"cycleFrames": 1120} + ], + "farmCycleDrops": [{"enemy": "Menu", "count": 6}], + "devNote": [ + "FIXME: Many other options are possible for movement and weapons." + ] } ], "notables": [ diff --git a/region/maridia/inner-green/Shaktool Room.json b/region/maridia/inner-green/Shaktool Room.json index cb503e50ea..e08de3d308 100644 --- a/region/maridia/inner-green/Shaktool Room.json +++ b/region/maridia/inner-green/Shaktool Room.json @@ -159,6 +159,77 @@ }, "flashSuitChecked": true }, + { + "link": [1, 1], + "name": "Shaktool Farm", + "requires": [ + {"or": [ + {"resetRoom": {"nodes": [1]}}, + {"and": [ + "f_ShaktoolDoneDigging", + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "canSuitlessMaridia", + {"cycleFrames": 275} + ]}, + {"and": [ + "Gravity", + {"cycleFrames": 180} + ]} + ]} + ]} + ]}, + {"or": [ + {"and": [ + "canSuitlessMaridia", + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 280} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 420} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 420} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 450} + ]}, + {"cycleFrames": 570} + ]} + ]}, + {"and": [ + "Gravity", + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 160} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 250} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 330} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 350} + ]}, + {"cycleFrames": 510} + ]} + ]} + ]} + ], + "farmCycleDrops": [{"enemy": "Shaktool", "count": 1}], + "resetsObstacles": ["A", "B"] + }, { "id": 5, "link": [1, 1], @@ -597,6 +668,50 @@ }, "flashSuitChecked": true }, + { + "link": [2, 2], + "name": "Yard Farm", + "requires": [ + {"or": [ + "h_ShaktoolCameraFix", + "f_ShaktoolDoneDigging" + ]}, + "h_useMorphBombs", + "canDodgeWhileShooting", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "canSuitlessMaridia", + {"cycleFrames": 350} + ]}, + {"and": [ + "Gravity", + {"cycleFrames": 280} + ]} + ]} + ]}, + {"and": [ + "f_ShaktoolDoneDigging", + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "canSuitlessMaridia", + "canTrickyDodgeEnemies", + {"cycleFrames": 1150} + ]}, + {"and": [ + "Gravity", + {"cycleFrames": 770} + ]} + ]} + ]} + ]} + ], + "farmCycleDrops": [{"enemy": "Yard", "count": 2}], + "resetsObstacles": ["A", "B"] + }, { "id": 27, "link": [2, 2],