Merge pull request #2057 from kjbranch/g-green

Refine G-Mode: Green Brinstar

Author: osse101

region/brinstar/green/Brinstar Reserve Tank Room.json

@@ -56,13 +56,7 @@
       ]
     }
   ],
-  "obstacles": [
-    {
-      "id": "A",
-      "name": "G-Mode Morph - Remote Acquire the item",
-      "obstacleType": "abstract"
-    }
-  ],
+  "obstacles": [],
   "enemies": [],
   "links": [
     {
@@ -118,29 +112,9 @@
       ],
       "flashSuitChecked": true
     },
-    {
-      "id": 3,
-      "link": [1, 2],
-      "name": "Base",
-      "requires": [],
-      "flashSuitChecked": true
-    },
-    {
-      "id": 4,
-      "link": [1, 3],
-      "name": "G-mode Morph",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "any",
-          "morphed": true
-        }
-      },
-      "requires": [],
-      "flashSuitChecked": true
-    },
     {
       "id": 5,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "G-mode Morph Remote Acquire",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -157,17 +131,33 @@
           ]}
         ]}
       ],
-      "clearsObstacles": ["A"],
+      "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
-        "Blindly grab the item before PLMs are overloaded, then return and exit g-mode to remotely acquire the item.",
+        "Blindly grab the item before PLMs are overloaded, then return and exit G-mode to remotely acquire the item.",
         "Starting a completely blind IBJ can be somewhat tricky, even if for such a short distance."
-      ],
-      "devNote": [
-        "There would typically be risk of the logic being incorrect if the player exits g-mode, progresses to the right to get the next item,",
-        "then comes back and this obstacle is still set so they can go through the pipe. Fortunately getting the item to the right also requires Morph."
       ]
     },
+    {
+      "id": 3,
+      "link": [1, 2],
+      "name": "Base",
+      "requires": [],
+      "flashSuitChecked": true
+    },
+    {
+      "id": 4,
+      "link": [1, 3],
+      "name": "G-mode Morph",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [],
+      "flashSuitChecked": true
+    },
     {
       "id": 6,
       "link": [1, 4],
@@ -326,16 +316,6 @@
       ],
       "flashSuitChecked": true
     },
-    {
-      "id": 14,
-      "link": [3, 2],
-      "name": "G-mode Morph Remote Acquire Return",
-      "requires": [
-        "canEnterGMode",
-        {"obstaclesCleared": ["A"]}
-      ],
-      "flashSuitChecked": true
-    },
     {
       "id": 15,
       "link": [3, 4],