Merge pull request #1796 from blkerby/reset-room-test

Obstacle tests for resetRoom

Author: osse101

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -403,7 +403,8 @@
         }},
         {"refill": ["Missile"]},
         {"partialRefill": { "type": "Energy", "limit": 200 }}
-      ]
+      ],
+      "resetsObstacles": ["A", "B", "C", "D"]
     },
     {
       "id": 15,

region/brinstar/green/Brinstar Pre-Map Room.json

@@ -460,6 +460,7 @@
         }},
         {"partialRefill": {"type": "Super", "limit": 4}}
       ],
+      "resetsObstacles": ["A"],
       "flashSuitChecked": true
     },
     {

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1283,6 +1283,8 @@
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
       ],
       "flashSuitChecked": true,
+      "resetsObstacles": ["B"],
+      "clearsObstacles": ["A"],
       "devNote": [
         "FIXME: Node 3 could be used to reset the room, with additional requirements."
       ]

region/brinstar/green/Green Brinstar Beetom Room.json

@@ -193,6 +193,7 @@
         ]},
         {"refill": ["PowerBomb"]}
       ],
+      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
       "note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.",
       "devNote": [
@@ -299,6 +300,7 @@
         ]},
         "h_can10PowerBombCrystalFlash"
       ],
+      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
       "devNote": "The resetRoom requirement is in case you need to farm a bit to get above health-bomb energy"
     },

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -5488,6 +5488,7 @@
         }},
         {"refill": ["Energy", "Missile", "Super"]}
       ],
+      "resetsObstacles": ["A"],
       "flashSuitChecked": true
     },
     {

region/brinstar/kraid/Baby Kraid Room.json

@@ -624,6 +624,7 @@
         ]},
         {"refill": ["Energy", "Missile", "Super"]}
       ],
+      "clearsObstacles": ["A"],
       "devNote": "These two farms are combined, to allow an option of using using Supers farmed from Mini-Kraid to kill the Pirates."
     },
     {

region/brinstar/kraid/Warehouse Energy Tank Room.json

@@ -109,6 +109,7 @@
         ]},
         {"refill": ["PowerBomb"]}
       ],
+      "clearsObstacles": ["A"],
       "note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
       "devNote": [
         "Health Bomb ends at 50 energy.",
@@ -282,6 +283,7 @@
         }},
         "h_can10PowerBombCrystalFlash"
       ],
+      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
       "devNote": "Resetting the room could be required to farm a bit of energy to get above health-bomb range, to ensure a Power Bomb drop."
     },

region/brinstar/kraid/Warehouse Zeela Room.json

@@ -107,6 +107,7 @@
         }},
         {"refill": ["Energy", "Missile", "Super"]}
       ],
+      "resetsObstacles": ["A"],
       "devNote": [
         "FIXME: Node 3 could be used to reset the room, with additional requirements."
       ]

region/brinstar/pink/Dachora Room.json

@@ -157,7 +157,8 @@
         }},
         {"partialRefill": {"type": "Super", "limit": 8}},
         {"refill": ["Energy", "Missile"]}
-      ]
+      ],
+      "resetsObstacles": ["A"]
     },
     {
       "id": 5,

region/brinstar/red/Caterpillar Room.json

@@ -1382,10 +1382,12 @@
       "name": "Zero Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [3]
+          "nodes": [2, 3]
         }},
         {"refill": ["PowerBomb"]}
       ],
+      "resetsObstacles": ["A"],
+      "clearsObstacles": ["B"],
       "devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
     },
     {
@@ -1812,6 +1814,7 @@
         }},
         {"refill": ["Energy", "Super"]}
       ],
+      "resetsObstacles": ["A", "B"],
       "devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
     },
     {
@@ -2046,8 +2049,10 @@
         {"resetRoom": {
           "nodes": [5]
         }},
-        {"refill": ["Energy", "Super", "PowerBomb"]}
+        {"refill": ["Energy", "PowerBomb"]},
+        {"partialRefill": { "type": "Super", "limit": 10 }}
       ],
+      "resetsObstacles": ["A", "B"],
       "devNote": "It is possible to roll off of the platform above to avoid a mid-air morph."
     },
     {