Merge pull request #1778 from kjbranch/reset-room-cleanup

resetRoom Remove nodesToAvoid, mustStayPut

Author: osse101

logicalRequirements.md

@@ -557,14 +557,10 @@ __Example:__
 #### resetRoom object
 A `resetRoom` object represents the need for the room to be in an initial state in order to perform a strat. A `resetRoom` object can have the following properties:
 * _nodes:_ An array containing the in-room ID of nodes at which entering the room can work.
-* _nodesToAvoid:_ An array containing the in-room ID of nodes that Samus must not visit after resetting the room. If any of those nodes have to be visited, the `resetRoom` object cannot be fulfilled, regardless of where Samus entered the room.
-* _mustStayPut:_ This property is mutually exclusive with `nodesToAvoid` and is only meaningful for `resetRoom` objects whose only `nodes` is the one they are at. If it is present and `true`, it is equivalent to having a `nodesToAvoid` property containing all other nodes in the room.
 
 In order to fulfill a `resetRoom` object, Samus must be able to do all of the following:
 * Enter the room at one of the listed `nodes`
 * Reach the node where the logic contains the `resetRoom` object
-  * If `mustStayPut` is true, Samus should be entering the room at the correct node and staying there
-* Do this while visiting none of the listed `nodesToAvoid`. However, it's ok if a node to avoid ends up being visited directly afterwards, as a result of fulfilling the `resetRoom` object.
 * If Samus is already in the room and has done one of the actions to avoid, she must be able to exit at one of the listed `nodes` and re-enter, following all other rules.
   * Please note that if fulfilling a `resetRoom` object involves exiting and re-entering, it will indeed reset the room and cause all obstacles to respawn.
 

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

@@ -400,8 +400,7 @@
       "requires": [
         "h_ZebesIsAwake",
         {"resetRoom": {
-          "nodes": [1],
-          "mustStayPut": false
+          "nodes": [1]
         }},
         {"refill": ["Energy", "Missile"]}
       ]

region/brinstar/blue/Construction Zone.json

@@ -92,8 +92,7 @@
       "requires": [
         "h_ZebesIsAwake",
         {"resetRoom": {
-          "nodes": [1, 2],
-          "mustStayPut": false
+          "nodes": [1, 2]
         }},
         {"refill": ["Energy", "Missile"]}
       ]

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

@@ -449,8 +449,7 @@
       "name": "Zeela & Sidehopper Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [2],
-          "mustStayPut": false
+          "nodes": [2]
         }},
         {"partialRefill": {
           "type": "Energy",

region/brinstar/green/Early Supers Room.json

@@ -378,8 +378,7 @@
               "h_canCrouchJumpDownGrab"
             ]},
             {"resetRoom": {
-              "nodes": [1],
-              "mustStayPut": false
+              "nodes": [1]
             }}
           ]
         }
@@ -418,8 +417,7 @@
               "h_canCrouchJumpDownGrab"
             ]},
             {"resetRoom": {
-              "nodes": [1],
-              "mustStayPut": false
+              "nodes": [1]
             }}
           ]
         }

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

@@ -1276,8 +1276,7 @@
       "name": "Zebbo and Beetom Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [4],
-          "mustStayPut": false
+          "nodes": [4]
         }},
         {"enemyKill": {
           "enemies": [["Beetom"]]

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

@@ -183,8 +183,7 @@
       "name": "Beetom Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [1, 2],
-          "mustStayPut": false
+          "nodes": [1, 2]
         }},
         {"or": [
           "ScrewAttack",
@@ -289,8 +288,7 @@
       "name": "10 Power Bomb Crystal Flash",
       "requires": [
         {"resetRoom": {
-          "nodes": [1, 2],
-          "mustStayPut": false
+          "nodes": [1, 2]
         }},
         {"or": [
           {"obstaclesCleared": ["A"]},

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

@@ -176,8 +176,7 @@
       "name": "Fireflea Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [1, 2],
-          "mustStayPut": false
+          "nodes": [1, 2]
         }},
         {"refill": ["Energy", "PowerBomb"]}
       ],

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

@@ -5486,8 +5486,7 @@
       "name": "Zeela Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [1, 2, 3, 4, 5, 6],
-          "mustStayPut": false
+          "nodes": [1, 2, 3, 4, 5, 6]
         }},
         {"refill": ["Energy", "Missile", "Super"]}
       ],

region/brinstar/green/Noob Bridge.json

@@ -196,8 +196,7 @@
       "name": "Cacatac and Zeela Farm",
       "requires": [
         {"resetRoom": {
-          "nodes": [1, 2],
-          "mustStayPut": false
+          "nodes": [1, 2]
         }},
         {"refill": ["Energy", "Missile", "Super"]}
       ],