Merge pull request #1784 from osse101/FishFarm

osse101 · web-flow · commit 7b6f3057d4af · 2024-11-24T12:28:15.000-06:00
Convert remaining enemy farms to partial farms where appropriate
diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json
@@ -401,7 +401,8 @@
         {"resetRoom": {
           "nodes": [1]
         }},
-        {"refill": ["Energy", "Missile"]}
+        {"refill": ["Missile"]},
+        {"partialRefill": { "type": "Energy", "limit": 200 }}
       ]
     },
     {
diff --git a/region/brinstar/blue/Construction Zone.json b/region/brinstar/blue/Construction Zone.json
@@ -93,7 +93,8 @@
         {"resetRoom": {
           "nodes": [1, 2]
         }},
-        {"refill": ["Energy", "Missile"]}
+        { "partialRefill": { "type": "Missile", "limit": 10 } },
+        { "partialRefill": { "type": "Energy", "limit": 100 } }
       ]
     },
     {
diff --git a/region/brinstar/kraid/Warehouse Energy Tank Room.json b/region/brinstar/kraid/Warehouse Energy Tank Room.json
@@ -96,17 +96,13 @@
             {"or": [
               "h_canUseMorphBombs",
               {"and": [
+                "Morph",
                 {"resourceAvailable": [{"type": "Energy", "count": 50}]},
                 {"or": [
                   {"ammo": {"type": "Missile", "count": 1}},
                   {"ammo": {"type": "Super", "count": 1}},
                   {"ammo": {"type": "PowerBomb", "count": 1}}
-                ]},
-                {"partialRefill": {
-                  "type": "PowerBomb",
-                  "limit": 1
-                }},
-                "h_canUsePowerBombs"
+                ]}
               ]}
             ]}
           ]}
diff --git a/region/brinstar/pink/Waterway Energy Tank Room.json b/region/brinstar/pink/Waterway Energy Tank Room.json
@@ -133,7 +133,13 @@
       "name": "Zero Farm",
       "requires": [
         "h_heatProof",
-        {"refill": ["PowerBomb"]}
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"refill": ["PowerBomb"]}
+          ]},
+          {"partialRefill": {"type": "PowerBomb", "limit": 6}}
+        ]}
       ],
       "devNote": [
         "FIXME: The h_heatProof requirement is because Zeros only drop small energy, not enough to guarantee progress if the neighboring room is heated",
diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json
@@ -714,7 +714,14 @@
         {"resetRoom": {
           "nodes": [2]
         }},
-        {"refill": ["Energy", "PowerBomb"]}
+        {"refill": ["PowerBomb"]},
+        {"or": [
+          {"and": [
+            "canDodgeWhileShooting",
+            {"refill": ["Energy"]}
+          ]},
+          {"partialRefill": {"type": "Energy", "limit": 260}}
+        ]}
       ],
       "resetsObstacles": ["A"]
     },
diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json
@@ -3130,7 +3130,8 @@
         {"resetRoom": {
           "nodes": [3, 4, 6, 7]
         }},
-        {"refill": ["Energy", "Missile"]}
+        {"refill": ["Missile"]},
+        {"partialRefill": {"type": "Energy", "limit": 250}}
       ],
       "devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
     },
diff --git a/region/crateria/central/Pre-Map Flyway.json b/region/crateria/central/Pre-Map Flyway.json
@@ -148,7 +148,8 @@
         {"resetRoom": {
           "nodes": [1, 2]
         }},
-        {"refill": ["Energy", "Missile"]}
+        {"partialRefill": {"type": "Energy", "limit": 160}},
+        {"partialRefill": {"type": "Missile", "limit": 8}}
       ]
     },
     {
diff --git a/region/crateria/east/Crab Maze.json b/region/crateria/east/Crab Maze.json
@@ -107,7 +107,15 @@
         {"resetRoom": {
           "nodes": [1]
         }},
-        {"refill": ["Energy", "PowerBomb"]}
+        "Morph",
+        {"or": [
+          "Wave",
+          "Plasma",
+          "Spazer",
+          "canUseGrapple"
+        ]},
+        {"partialRefill": {"type": "PowerBomb", "limit": 5}},
+        {"partialRefill": {"type": "Energy", "limit": 200}}
       ]
     },
     {
diff --git a/region/crateria/west/Terminator Room.json b/region/crateria/west/Terminator Room.json
@@ -110,7 +110,8 @@
         {"resetRoom": {
           "nodes": [1, 2]
         }},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"refill": ["Energy", "Missile"]},
+        {"partialRefill": {"type": "Super", "limit": 10}}
       ]
     },
     {
diff --git a/region/maridia/inner-green/West Sand Hall Tunnel.json b/region/maridia/inner-green/West Sand Hall Tunnel.json
@@ -132,6 +132,25 @@
       ],
       "note": "Get the shinecharge while killing the crab, then move towards and shinespark out the left door."
     },
+    {
+      "link": [1, 1],
+      "name": "Sciser Farm",
+      "requires": [
+        "h_canNavigateUnderwater",
+        {"resetRoom": {
+          "nodes": [1, 2]
+        }},
+        {"partialRefill": {
+          "type": "Energy",
+          "limit": 100
+        }},
+        {"partialRefill": {
+          "type": "PowerBomb",
+          "limit": 3
+        }}
+      ],
+      "devNote": "Farm cycle: 6seconds."
+    },
     {
       "id": 4,
       "link": [1, 1],
diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json
@@ -173,7 +173,22 @@
       "link": [1, 1],
       "name": "Puyo Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "PowerBomb"]}
+        {"resetRoom": {
+          "nodes": [1]
+        }},
+        {"or": [
+          "Spazer",
+          "Wave",
+          "Plasma",
+          "canUseGrapple",
+          {"and": [
+            "Gravity",
+            "ScrewAttack"
+          ]}
+        ]},
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 12}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 6}}
       ]
     },
     {
diff --git a/region/maridia/inner-yellow/Kassiuz Room.json b/region/maridia/inner-yellow/Kassiuz Room.json
@@ -94,7 +94,16 @@
         {"resetRoom": {
           "nodes": [1]
         }},
-        {"refill": ["Energy", "Missile", "PowerBomb"]}
+        {"or": [
+          "Spazer",
+          "Wave",
+          "Plasma",
+          "canUseGrapple",
+          "ScrewAttack"
+        ]},
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 12}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 6}}
       ]
     },
     {
diff --git a/region/maridia/inner-yellow/Plasma Room.json b/region/maridia/inner-yellow/Plasma Room.json
@@ -218,7 +218,8 @@
         {"resetRoom": {
           "nodes": [1]
         }},
-        {"refill": ["Energy", "Missile"]}
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 12}}
       ]
     },
     {
diff --git a/region/maridia/inner-yellow/Plasma Spark Room.json b/region/maridia/inner-yellow/Plasma Spark Room.json
@@ -975,7 +975,9 @@
         {"resetRoom": {
           "nodes": [3]
         }},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Super", "limit": 5}},
+        {"partialRefill": {"type": "Missile", "limit": 10}},
+        {"partialRefill": {"type": "Energy", "limit": 140}}
       ]
     },
     {
diff --git a/region/maridia/outer/Crab Tunnel.json b/region/maridia/outer/Crab Tunnel.json
@@ -171,7 +171,14 @@
         {"resetRoom": {
           "nodes": [1]
         }},
-        {"refill": ["PowerBomb"]}
+        {"partialRefill": {
+          "type": "Energy",
+          "limit": 100
+        }},
+        {"partialRefill": {
+          "type": "PowerBomb",
+          "limit": 3
+        }}
       ]
     },
     {
@@ -443,7 +450,14 @@
         {"resetRoom": {
           "nodes": [2]
         }},
-        {"refill": ["Energy", "PowerBomb"]}
+        {"partialRefill": {
+          "type": "Energy",
+          "limit": 240
+        }},
+        {"partialRefill": {
+          "type": "PowerBomb",
+          "limit": 6
+        }}
       ]
     },
     {
diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json
@@ -1731,21 +1731,16 @@
       "link": [6, 6],
       "name": "Space Pirate Farm",
       "requires": [
-        {"or": [
-          "Gravity",
-          "HiJump"
-        ]},
+        "Gravity",
         {"or": [
           "Plasma",
-          {"and": [
-            "ScrewAttack",
-            "Gravity"
-          ]}
+          "ScrewAttack"
         ]},
         {"resetRoom": {
           "nodes": [2, 3]
         }},
-        {"refill": ["Energy", "Missile"]}
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 8}}
       ]
     },
     {
diff --git a/region/norfair/east/Cathedral.json b/region/norfair/east/Cathedral.json
@@ -726,7 +726,9 @@
           "nodes": [1, 2]
         }},
         "h_heatProof",
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 300}},
+        {"partialRefill": {"type": "Super", "limit": 6}},
+        {"partialRefill": {"type": "Missile", "limit": 14}}
       ]
     },
     {
diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json
@@ -78,22 +78,40 @@
       "link": [1, 1],
       "name": "Beetom Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1]
-        }},
+        {"or": [
+          {"resetRoom": {
+            "nodes": [1]
+          }},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [2]
+            }},
+            "SpeedBooster"
+          ]}
+        ]},
         {"or": [
           "ScrewAttack",
           "h_getBlueSpeedMaxRunway",
           {"and": [
             "Ice",
             "h_canUseMorphBombs"
+          ]},
+          {"and": [
+            "Morph",
+            {"resourceAvailable": [{"type": "Energy", "count": 50}]},
+            {"or": [
+              {"ammo": {"type": "PowerBomb", "count": 1}},
+              {"ammo": {"type": "Missile", "count": 1}},
+              {"ammo": {"type": "Super", "count": 1}}
+            ]}
           ]}
         ]},
         {"refill": ["PowerBomb"]}
       ],
+      "note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
       "devNote": [
-        "FIXME: Resetting the room with door node 2 would also be possible.",
-        "FIXME: Using a Missile, Super, or Power Bomb at the start could be added to the logic to get the first Power Bombs to use for further farming, but this needs a way to express that we're not in health-bomb energy range."
+        "Health Bomb ends at 50 energy.",
+        "One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."
       ]
     },
     {
diff --git a/region/norfair/east/Norfair Reserve Tank Room.json b/region/norfair/east/Norfair Reserve Tank Room.json
@@ -126,10 +126,12 @@
         "h_heatProof",
         {"or": [
           "h_lavaProof",
-          "canCarefulJump"
+          "canDodgeWhileShooting"
         ]},
         "Plasma",
-        {"refill": ["Energy", "Missile"]}
+        {"partialRefill": {"type": "Energy", "limit": 120}},
+        {"partialRefill": {"type": "Super", "limit": 2}},
+        {"partialRefill": {"type": "Missile", "limit": 6}}
       ]
     },
     {
diff --git a/region/norfair/east/Speed Booster Hall.json b/region/norfair/east/Speed Booster Hall.json
@@ -105,14 +105,18 @@
       "name": "Geruta Farm",
       "requires": [
         "h_heatProof",
+        {"resetRoom": {
+          "nodes": [1]
+        }},
         {"or": [
           "ScrewAttack",
           "Ice",
           "Spazer",
           "Wave",
           "Plasma"
         ]},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 140}},
+        {"partialRefill": {"type": "Missile", "limit": 10}}
       ]
     },
     {
diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json
@@ -1533,14 +1533,27 @@
     },
     {
       "id": 40,
+      "link": [5, 5],
+      "name": "Cacatac Super Farm",
+      "requires": [
+        "h_heatProof",
+        {"resetRoom": {
+          "nodes": [1, 3, 4, 5]
+        }},
+        {"partialRefill": {"type": "Super", "limit": 10}}
+      ]
+    },
+    {
       "link": [5, 5],
       "name": "Cacatac Farm",
       "requires": [
         "h_heatProof",
         {"resetRoom": {
           "nodes": [1, 3, 4, 5]
         }},
-        {"refill": ["Energy", "Super"]}
+        {"resourceMissingAtMost": [{"type": "Super", "count": 4}]},
+        {"refill": ["Super"]},
+        {"partialRefill": {"type": "Energy", "limit": 200}}
       ]
     },
     {
diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json
diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json
diff --git a/region/norfair/west/Ice Beam Snake Room.json b/region/norfair/west/Ice Beam Snake Room.json
diff --git a/region/wreckedship/main/Basement.json b/region/wreckedship/main/Basement.json
diff --git a/region/wreckedship/main/Sponge Bath.json b/region/wreckedship/main/Sponge Bath.json
diff --git a/region/wreckedship/main/Wrecked Ship Main Shaft.json b/region/wreckedship/main/Wrecked Ship Main Shaft.json

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,8 @@`
`401`	`401`	`{"resetRoom": {`
`402`	`402`	`"nodes": [1]`
`403`	`403`	`}},`
`404`		`- {"refill": ["Energy", "Missile"]}`
	`404`	`+ {"refill": ["Missile"]},`
	`405`	`+ {"partialRefill": { "type": "Energy", "limit": 200 }}`
`405`	`406`	`]`
`406`	`407`	`},`
`407`	`408`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@`
`93`	`93`	`{"resetRoom": {`
`94`	`94`	`"nodes": [1, 2]`
`95`	`95`	`}},`
`96`		`- {"refill": ["Energy", "Missile"]}`
	`96`	`+ { "partialRefill": { "type": "Missile", "limit": 10 } },`
	`97`	`+ { "partialRefill": { "type": "Energy", "limit": 100 } }`
`97`	`98`	`]`
`98`	`99`	`},`
`99`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,8 @@`
`148`	`148`	`{"resetRoom": {`
`149`	`149`	`"nodes": [1, 2]`
`150`	`150`	`}},`
`151`		`- {"refill": ["Energy", "Missile"]}`
	`151`	`+ {"partialRefill": {"type": "Energy", "limit": 160}},`
	`152`	`+ {"partialRefill": {"type": "Missile", "limit": 8}}`
`152`	`153`	`]`
`153`	`154`	`},`
`154`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@`
`110`	`110`	`{"resetRoom": {`
`111`	`111`	`"nodes": [1, 2]`
`112`	`112`	`}},`
`113`		`- {"refill": ["Energy", "Missile", "Super"]}`
	`113`	`+ {"refill": ["Energy", "Missile"]},`
	`114`	`+ {"partialRefill": {"type": "Super", "limit": 10}}`
`114`	`115`	`]`
`115`	`116`	`},`
`116`	`117`	`{`