Merge pull request #1702 from osse101/SmallFarms

Change enemy farms to use partialRefill throughout
vg-json-data · Nov 3, 2024 · 4cae7d3 · 4cae7d3
2 parents 38fb732 + d6533c9
commit 4cae7d3
Show file tree

Hide file tree

Showing 27 changed files with 219 additions and 34 deletions.
diff --git a/region/brinstar/green/Brinstar Pre-Map Room.json b/region/brinstar/green/Brinstar Pre-Map Room.json
@@ -453,7 +453,9 @@
           "nodes": [2],
           "mustStayPut": false
         }},
-        {"refill": ["Missile", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 240}},
+        {"partialRefill": {"type": "Missile", "limit": 20}},
+        {"partialRefill": {"type": "Super", "limit": 4}}
       ],
       "flashSuitChecked": true
     },

diff --git a/region/brinstar/pink/Dachora Room.json b/region/brinstar/pink/Dachora Room.json
@@ -157,7 +157,8 @@
           "nodes": [1],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Super", "limit": 8}},
+        {"refill": ["Energy", "Missile"]}
       ]
     },
     {

diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json
@@ -479,7 +479,8 @@
           "nodes": [1, 2],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 100}},
+        {"partialRefill": {"type": "Super", "limit": 5}}
       ]
     },
     {

diff --git a/region/crateria/east/Crateria Kihunter Room.json b/region/crateria/east/Crateria Kihunter Room.json
@@ -340,7 +340,28 @@
           "nodes": [1, 2, 3],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "PowerBomb"]}
+        {"partialRefill": {"type": "Energy", "limit": 140}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 4}}
+      ]
+    },
+    {
+      "link": [2, 2],
+      "name": "Faster Sciser Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [1, 2, 3],
+          "mustStayPut": false
+        }},
+        {"or": [
+          "Wave",
+          "Spazer",
+          "Plasma",
+          "canUseGrapple",
+          "canPseudoScrew",
+          "ScrewAttack"
+        ]},
+        {"partialRefill": {"type": "Energy", "limit": 300}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 8}}
       ]
     },
     {

diff --git a/region/crateria/east/Forgotten Highway Kago Room.json b/region/crateria/east/Forgotten Highway Kago Room.json
@@ -68,14 +68,28 @@
       }
     },
     {
-      "id": 2,
       "link": [1, 1],
       "name": "Kago Farm",
       "requires": [
         {"resetRoom": {
           "nodes": [1, 2],
           "mustStayPut": false
         }},
+        {"partialRefill": {"type": "Super", "limit": 8}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 8}},
+        {"refill": ["Energy", "Missile"]}
+      ]
+    },
+    {
+      "id": 2,
+      "link": [1, 1],
+      "name": "Kago Full Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [1, 2],
+          "mustStayPut": false
+        }},
+        "canBePatient",
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
       ]
     },

diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
@@ -2676,6 +2676,19 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [13, 13],
+      "name": "Ripper2 Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [1, 4, 5],
+          "mustStayPut": false
+        }},
+        "ScrewAttack",
+        {"partialRefill": {"type": "Super", "limit": 4}},
+        {"partialRefill": {"type": "Energy", "limit": 80}}
+      ]
+    },
     {
       "id": 126,
       "link": [14, 10],

diff --git a/region/crateria/west/Green Pirates Shaft.json b/region/crateria/west/Green Pirates Shaft.json
@@ -305,9 +305,27 @@
           "Spazer",
           "Plasma"
         ]},
-        {"refill": ["Energy", "Missile"]}
+        {"partialRefill": {"type": "Energy", "limit": 400}},
+        {"partialRefill": {"type": "Missile", "limit": 20}}
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "Beetom Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [2],
+          "mustStayPut": false
+        }},
+        "h_canUsePowerBombs",
+        {"or": [
+          "canMidAirMorph",
+          "h_canUseSpringBall"
+        ]},
+        {"partialRefill": {"type": "PowerBomb", "limit": 6}}
+      ],
+      "devNote": "Killing the beetoms will also clear the top pirate for small health gain."
+    },
     {
       "id": 10,
       "link": [2, 2],

diff --git a/region/crateria/west/Lower Mushrooms.json b/region/crateria/west/Lower Mushrooms.json
@@ -81,6 +81,20 @@
           "nodes": [1, 2],
           "mustStayPut": false
         }},
+        {"partialRefill": {"type": "Super", "limit": 8}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 8}},
+        {"refill": ["Energy", "Missile"]}
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Kago Full Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [1, 2],
+          "mustStayPut": false
+        }},
+        "canBePatient",
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
       ]
     },

diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json
@@ -284,7 +284,7 @@
     {
       "id": 6,
       "link": [2, 2],
-      "name": "Fireflea Farm",
+      "name": "Fireflea and Fune Farm",
       "requires": [
         {"or": [
           "SpaceJump",
@@ -298,7 +298,9 @@
           ]}
         ]},
         "h_canUsePowerBombs",
-        {"refill": ["Energy", "PowerBomb"]}
+        {"partialRefill": {"type": "Energy", "limit": 340}},
+        {"partialRefill": {"type": "Missile", "limit": 6}},
+        {"refill": ["PowerBomb"]}
       ]
     },
     {

diff --git a/region/lowernorfair/east/Metal Pirates Room.json b/region/lowernorfair/east/Metal Pirates Room.json
@@ -862,7 +862,8 @@
         "h_heatProof",
         "canDodgeWhileShooting",
         "Plasma",
-        {"refill": ["Energy", "Super"]}
+        {"refill": ["Energy", "Super"]},
+        {"partialRefill": {"type": "Missile", "limit": 14}}
       ]
     },
     {
@@ -875,7 +876,8 @@
         "canDodgeWhileShooting",
         "canUseSpeedEchoes",
         "canHitbox",
-        {"refill": ["Energy", "Super"]}
+        {"refill": ["Energy", "Super"]},
+        {"partialRefill": {"type": "Missile", "limit": 14}}
       ],
       "note": [
         "Use the Echoes created by shinesparking to defeat the Metal Pirates.",

diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json
@@ -539,7 +539,9 @@
           "nodes": [1, 3, 4],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 10}},
+        {"partialRefill": {"type": "Super", "limit": 4}}
       ]
     },
     {

diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json
@@ -140,7 +140,9 @@
           "nodes": [1],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 10}},
+        {"partialRefill": {"type": "Super", "limit": 4}}
       ]
     },
     {

diff --git a/region/maridia/inner-green/East Pants Room.json b/region/maridia/inner-green/East Pants Room.json
@@ -117,7 +117,9 @@
           "nodes": [1],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Missile", "PowerBomb"]}
+        {"partialRefill": {"type": "Energy", "limit": 160}},
+        {"partialRefill": {"type": "Missile", "limit": 6}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 2}}
       ],
       "note": "Stand (don't crouch) next to the door and shoot diagonally down into the sand until the puyos are killed."
     },

diff --git a/region/maridia/inner-pink/Botwoon Hallway.json b/region/maridia/inner-pink/Botwoon Hallway.json
@@ -114,13 +114,15 @@
           "Wave",
           "Spazer",
           "Plasma",
-          "Grapple",
+          "canUseGrapple",
           {"and": [
             "ScrewAttack",
             "Gravity"
           ]}
         ]},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Super", "limit": 4}},
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 10}}
       ]
     },
     {

diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json
@@ -135,7 +135,9 @@
         }},
         "SpaceJump",
         "ScrewAttack",
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Super", "limit": 4}},
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 10}}
       ]
     },
     {

diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json
@@ -1247,7 +1247,9 @@
           "nodes": [1, 2, 4],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Super", "limit": 4}},
+        {"partialRefill": {"type": "Energy", "limit": 200}},
+        {"partialRefill": {"type": "Missile", "limit": 10}}
       ]
     },
     {

diff --git a/region/maridia/inner-pink/West Cactus Alley Room.json b/region/maridia/inner-pink/West Cactus Alley Room.json
@@ -89,7 +89,8 @@
           "nodes": [1],
           "mustStayPut": false
         }},
-        {"refill": ["Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 140}},
+        {"partialRefill": {"type": "Super", "limit": 8}}
       ]
     },
     {
@@ -102,7 +103,30 @@
           "nodes": [1],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 300}},
+        {"partialRefill": {"type": "Super", "limit": 16}}
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Cacatac Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [1, 2],
+          "mustStayPut": false
+        }},
+        "Gravity",
+        {"or": [
+          "h_canCrouchJumpDownGrab",
+          "canUseFrozenEnemies",
+          "canGravityJump",
+          "canWalljump",
+          "HiJump",
+          "canSpringBallJumpMidAir",
+          "h_canFly",
+          "canSpringBallBombJump"
+        ]},
+        {"refill": ["Super", "Energy"]}
       ]
     },
     {
@@ -707,7 +731,8 @@
           "nodes": [2],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 300}},
+        {"partialRefill": {"type": "Super", "limit": 16}}
       ]
     },
     {

diff --git a/region/maridia/inner-yellow/Pseudo Plasma Spark Room.json b/region/maridia/inner-yellow/Pseudo Plasma Spark Room.json
@@ -284,7 +284,30 @@
           "nodes": [1],
           "mustStayPut": false
         }},
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"partialRefill": {"type": "Energy", "limit": 140}},
+        {"partialRefill": {"type": "Super", "limit": 4}},
+        {"partialRefill": {"type": "Missile", "limit": 20}}
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Fast Choot Farm",
+      "requires": [
+        {"resetRoom": {
+          "nodes": [1],
+          "mustStayPut": false
+        }},
+        {"or": [
+          "Wave",
+          "Spazer",
+          "Plasma",
+          "ScrewAttack",
+          "canUseGrapple",
+          "canPseudoScrew"
+        ]},
+        {"partialRefill": {"type": "Energy", "limit": 300}},
+        {"partialRefill": {"type": "Super", "limit": 4}},
+        {"refill": ["Missile"]}
       ]
     },
     {

diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
@@ -1916,7 +1916,8 @@
           "nodes": [3],
           "mustStayPut": false
         }},
-        {"refill": ["PowerBomb"]}
+        {"partialRefill": {"type": "Energy", "limit": 100}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 4}}
       ]
     },
     {
@@ -2585,7 +2586,8 @@
           "nodes": [4],
           "mustStayPut": false
         }},
-        {"refill": ["PowerBomb"]}
+        {"partialRefill": {"type": "Energy", "limit": 100}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 4}}
       ]
     },
     {
@@ -3164,7 +3166,8 @@
           "nodes": [1, 2],
           "mustStayPut": false
         }},
-        {"refill": ["PowerBomb"]}
+        {"partialRefill": {"type": "Energy", "limit": 100}},
+        {"partialRefill": {"type": "PowerBomb", "limit": 4}}
       ]
     },
     {