Merge remote-tracking branch 'upstream/master' into reset-room-test

Author: blkerby

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 }}
       ],
       "resetsObstacles": ["A", "B", "C", "D"]
     },

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 } }
       ]
     },
     {

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"
+                ]}
               ]}
             ]}
           ]}

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",

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"]
     },

region/crateria/central/Parlor and Alcatraz.json

@@ -2013,7 +2013,8 @@
         "canShinechargeMovementComplex",
         "HiJump",
         "canWalljump",
-        "Morph"
+        "Morph",
+        {"shinespark": {"frames": 5, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {
@@ -2047,7 +2048,8 @@
         "canShinechargeMovementComplex",
         "HiJump",
         "canWalljump",
-        "Morph"
+        "Morph",
+        {"shinespark": {"frames": 3, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {
@@ -3130,7 +3132,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."
     },

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}}
       ]
     },
     {

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}}
       ]
     },
     {

region/crateria/east/East Ocean.json

@@ -844,10 +844,10 @@
     {
       "id": 32,
       "link": [3, 1],
-      "name": "Suitless with SpringBall Jump Mid Air",
+      "name": "Suitless with Spring Ball",
       "requires": [
         "canSuitlessMaridia",
-        "canSpringBallJumpMidAir"
+        "canTrickySpringBallJump"
       ]
     },
     {

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}}
       ]
     },
     {