diff --git a/region/maridia/outer/Boyon Gate Hall.json b/region/maridia/outer/Boyon Gate Hall.json index cf0427bf21..25031546f2 100644 --- a/region/maridia/outer/Boyon Gate Hall.json +++ b/region/maridia/outer/Boyon Gate Hall.json @@ -1079,7 +1079,33 @@ "link": [3, 3], "name": "Zebbo Farm", "requires": [ - {"refill": ["Energy", "Missile", "Super"]} + {"simpleCycleFrames": 120}, + {"cycleFrames": 30} + ], + "farmCycleDrops": [ + {"enemy": "Zebbo", "count": 1} + ] + }, + { + "link": [3, 3], + "name": "Double Zebbo Farm", + "requires": [ + {"cycleFrames": 185}, + "canDodgeWhileShooting", + "canTrickyJump", + {"or": [ + "Wave", + "Spazer", + "Plasma", + "Grapple", + {"and": [ + "canTrickyDodgeEnemies", + {"cycleFrames": 15} + ]} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Zebbo", "count": 2} ] }, { @@ -1248,7 +1274,11 @@ "link": [4, 4], "name": "Zebbo Farm", "requires": [ - {"refill": ["Energy", "Missile", "Super"]} + {"simpleCycleFrames": 120}, + {"cycleFrames": 30} + ], + "farmCycleDrops": [ + {"enemy": "Zebbo", "count": 1} ] } ], diff --git a/region/maridia/outer/Crab Gate Room.json b/region/maridia/outer/Crab Gate Room.json index 0519345965..3c91ce056c 100644 --- a/region/maridia/outer/Crab Gate Room.json +++ b/region/maridia/outer/Crab Gate Room.json @@ -382,10 +382,48 @@ {"resetRoom": { "nodes": [1] }}, - {"partialRefill": {"type": "Energy", "limit": 100}}, - {"partialRefill": {"type": "PowerBomb", "limit": 3}} + {"or": [ + "Gravity", + {"cycleFrames": 20} + ]}, + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 110} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 120} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 150} + ]}, + {"and": [ + "Gravity", + "ScrewAttack", + {"cycleFrames": 150} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 170} + ]}, + {"and": [ + "Gravity", + "canPseudoScrew", + {"cycleFrames": 200} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 205} + ]}, + {"cycleFrames": 250} + ]} ], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 1} + ] }, { "id": 6, @@ -662,14 +700,51 @@ "link": [2, 2], "name": "Sciser Farm", "requires": [ - "h_navigateUnderwater", {"resetRoom": { "nodes": [2] }}, - {"partialRefill": {"type": "Energy", "limit": 240}}, - {"partialRefill": {"type": "PowerBomb", "limit": 6}} + {"or": [ + "Gravity", + {"cycleFrames": 500} + ]}, + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 540} + ]}, + {"and": [ + "Gravity", + "ScrewAttack", + {"cycleFrames": 600} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 630} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 720} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 900} + ]}, + {"and": [ + "Gravity", + "canPseudoScrew", + {"cycleFrames": 840} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 1260} + ]}, + {"cycleFrames": 1590} + ]} ], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 5} + ] }, { "id": 23, diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json index d16bd3261e..40c049687f 100644 --- a/region/maridia/outer/Crab Hole.json +++ b/region/maridia/outer/Crab Hole.json @@ -168,10 +168,61 @@ "name": "Sciser Farm", "requires": [ "h_navigateUnderwater", - {"resetRoom": { - "nodes": [1, 4] - }}, - {"refill": ["Energy", "PowerBomb"]} + {"or": [ + {"resetRoom": { + "nodes": [1] + }}, + {"and": [ + {"resetRoom": { + "nodes": [4] + }}, + {"cycleFrames": 50} + ]} + ]}, + {"or": [ + {"and": [ + "canUseGrapple", + {"cycleFrames": 120} + ]}, + {"and": [ + "Gravity", + "ScrewAttack", + {"cycleFrames": 225} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 260} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 300} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 330} + ]}, + {"and": [ + "Gravity", + "canPseudoScrew", + {"cycleFrames": 400} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 600} + ]}, + {"and": [ + "canFarmWhileShooting", + {"cycleFrames": 880} + ]}, + {"cycleFrames": 1500} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 3} + ], + "devNote": [ + "One more Sciser could be farmed, but in most scenarios it seems not worth it.", + "Gravity can also slightly speed up some other variants but not enough to be worth modeling." ] }, { @@ -1779,10 +1830,57 @@ "name": "Sciser Farm", "requires": [ "h_navigateUnderwater", - {"resetRoom": { - "nodes": [2, 3] - }}, - {"refill": ["Energy", "PowerBomb"]} + {"or": [ + {"resetRoom": { + "nodes": [2] + }}, + {"and": [ + {"resetRoom": { + "nodes": [3] + }}, + {"cycleFrames": 80} + ]} + ]}, + {"or": [ + {"and": [ + "canUseGrapple", + {"cycleFrames": 95} + ]}, + {"and": [ + "Gravity", + "ScrewAttack", + {"cycleFrames": 120} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 150} + ]}, + {"and": [ + "Gravity", + "canPseudoScrew", + {"cycleFrames": 170} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 180} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 200} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 240} + ]}, + {"cycleFrames": 300} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Sciser", "count": 1} + ], + "devNote": [ + "More than one Sciser could be farmed, but in most scenarios it seems not worth it.", + "Gravity can also slightly speed up some other variants but not enough to be worth modeling." ] }, {