From a91fa9780d642a070dc14acda1bd7405d52a6393 Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Thu, 17 Jul 2025 09:08:41 -0230 Subject: [PATCH 1/2] Croc Area Farms --- region/norfair/crocomire/Cosine Room.json | 32 +++++++- .../crocomire/Grapple Tutorial Room 3.json | 8 +- .../norfair/crocomire/Indiana Jones Room.json | 81 ++++++++++++++++--- .../Post Crocomire Farming Room.json | 6 +- .../crocomire/Post Crocomire Shaft.json | 45 ++++++++++- 5 files changed, 152 insertions(+), 20 deletions(-) diff --git a/region/norfair/crocomire/Cosine Room.json b/region/norfair/crocomire/Cosine Room.json index 511066969e..d30ed55137 100644 --- a/region/norfair/crocomire/Cosine Room.json +++ b/region/norfair/crocomire/Cosine Room.json @@ -127,6 +127,20 @@ "flashSuitChecked": true, "devNote": ["Leniency is not included, because a farm is available."] }, + { + "link": [1, 1], + "name": "Metaree Farm", + "requires": [ + {"resetRoom": {"nodes": [1]}}, + "ScrewAttack", + {"cycleFrames": 255}, + {"obstaclesNotCleared": ["A"]} + ], + "farmCycleDrops": [ + {"enemy": "Metaree", "count": 2} + ], + "resetsObstacles": ["A"] + }, { "id": 3, "link": [1, 2], @@ -249,8 +263,22 @@ "link": [2, 2], "name": "Gamet Farm", "requires": [ - {"obstaclesNotCleared": ["A"]}, - {"refill": ["Energy", "Missile", "Super", "PowerBomb"]} + {"or": [ + {"and": [ + {"simpleCycleFrames": 140}, + {"cycleFrames": 20} + ]}, + {"and": [ + "canFarmWhileShooting", + "canUseGrapple", + {"simpleCycleFrames": 100}, + {"cycleFrames": 35} + ]} + ]}, + {"obstaclesNotCleared": ["A"]} + ], + "farmCycleDrops": [ + {"enemy": "Gamet", "count": 5} ] } ], diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json index 3599b90044..79368f7fd4 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 3.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 3.json @@ -163,12 +163,14 @@ ] }, { - "id": 3, "link": [1, 1], "name": "Gamet Farm", "requires": [ - {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}, - {"obstaclesNotCleared": ["B"]} + {"simpleCycleFrames": 100}, + {"cycleFrames": 20} + ], + "farmCycleDrops": [ + {"enemy": "Gamet", "count": 5} ] }, { diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json index c5fb8db4a5..30a5fcabbb 100644 --- a/region/norfair/crocomire/Indiana Jones Room.json +++ b/region/norfair/crocomire/Indiana Jones Room.json @@ -203,6 +203,29 @@ ], "clearsObstacles": ["E"] }, + { + "link": [1, 1], + "name": "Ripper Farm", + "requires": [ + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 880} + ]}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + "Morph", + {"cycleFrames": 1640} + ]} + ]}, + "SpaceJump", + "ScrewAttack" + ], + "farmCycleDrops": [ + {"enemy": "Ripper 2 (green)", "count": 4} + ], + "resetsObstacles": ["A", "B", "C", "D", "E"] + }, { "id": 3, "link": [1, 2], @@ -678,18 +701,56 @@ "name": "Mella Farm", "requires": [ {"or": [ - "canDodgeWhileShooting", - "ScrewAttack", - "Ice", + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 1020}, + "Morph", + {"or": [ + "SpaceJump", + {"and": [ + "HiJump", + "SpeedBooster", + "canWalljump", + {"cycleFrames": 120} + ]}, + {"and": [ + "HiJump", + "canSpringBallJumpMidAir", + "h_doubleEquipmentScreenCycleFrames", + {"cycleFrames": 540} + ]}, + {"and": [ + "canJumpIntoIBJ", + {"cycleFrames": 1400} + ]} + ]} + ]}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"cycleFrames": 240} + ]} + ]}, + {"or": [ + "Grapple", "Wave", "Spazer", - "Plasma" - ]}, - {"resetRoom": { - "nodes": [2] - }}, - {"partialRefill": {"type": "Energy", "limit": 240}}, - {"partialRefill": {"type": "Missile", "limit": 16}} + "Plasma", + {"and": [ + "ScrewAttack", + {"cycleFrames": 60} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"cycleFrames": 300} + ]}, + {"and": [ + "canFarmWhileShooting", + {"cycleFrames": 120} + ]} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Mella", "count": 5} ], "resetsObstacles": ["A", "B", "C", "D", "E"], "note": "Shoot the Mellas when they first begin to come on screen, and they will not move." diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index 0c2a354812..588bdf2770 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -879,7 +879,11 @@ "link": [3, 3], "name": "Gamet Farm", "requires": [ - {"refill": ["Energy", "Missile", "Super", "PowerBomb"]} + {"simpleCycleFrames": 100}, + {"cycleFrames": 20} + ], + "farmCycleDrops": [ + {"enemy": "Gamet", "count": 5} ] }, { diff --git a/region/norfair/crocomire/Post Crocomire Shaft.json b/region/norfair/crocomire/Post Crocomire Shaft.json index 974d3110e5..281d3f4265 100644 --- a/region/norfair/crocomire/Post Crocomire Shaft.json +++ b/region/norfair/crocomire/Post Crocomire Shaft.json @@ -541,10 +541,47 @@ "link": [3, 3], "name": "Viola Farm", "requires": [ - {"resetRoom": { - "nodes": [2, 3] - }}, - {"refill": ["PowerBomb"]} + {"or": [ + {"and": [ + {"resetRoom": { + "nodes": [1, 4] + }}, + {"cycleFrames": 760}, + {"or": [ + "canConsecutiveWalljump", + {"and": [ + "SpaceJump", + {"cycleFrames": 300} + ]} + ]}, + {"or": [ + "canMoonfall", + {"cycleFrames": 40} + ]} + ]}, + {"and": [ + {"resetRoom": { + "nodes": [2] + }}, + {"cycleFrames": 400} + ]}, + {"and": [ + {"resetRoom": { + "nodes": [3] + }}, + {"cycleFrames": 320} + ]} + ]}, + {"or": [ + "Grapple", + "Wave", + "Plasma", + "Spazer", + {"cycleFrames": 60} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Viola", "count": 4} ] }, { From 2aa8fccc67b8d830d55011dec603f00d5897a99e Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Fri, 18 Jul 2025 20:36:39 -0230 Subject: [PATCH 2/2] Update region/norfair/crocomire/Post Crocomire Farming Room.json Co-authored-by: Brent Kerby --- region/norfair/crocomire/Post Crocomire Farming Room.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index 588bdf2770..b2216e46bd 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -879,7 +879,7 @@ "link": [3, 3], "name": "Gamet Farm", "requires": [ - {"simpleCycleFrames": 100}, + {"simpleCycleFrames": 90}, {"cycleFrames": 20} ], "farmCycleDrops": [