Merge pull request #1809 from kjbranch/door-closed

Rename and Broaden h_EtecoonDoorSpawnFix

Author: osse101

helpers.json

@@ -248,11 +248,13 @@
           ]
         },
         {
-          "name": "h_EtecoonDoorSpawnFix",
+          "name": "h_DoorImmediatelyClosedFix",
           "requires": [ "never" ],
           "devNote": [
-            "In Vanilla, there is a bug placing the door at the top of the Etecoon Shaft in the wrong location.",
-            "This primarily affects the closing animation and prevents return through the door while in direct g-mode."
+            "In Vanilla, there is a bug placing the closing door at the top of the Etecoon Shaft in the wrong location.",
+            "Additionally, the top right door in both Pink Brinstar Power Bomb Room and Halfie Climb Room are immediately closed.",
+            "This affects the closing animation and prevents return through the door while in direct G-mode.",
+            "This also prevents getting doorstuck, although that doesn't seem to be important in any of these locations."
           ]
         },
         {

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

@@ -3960,7 +3960,7 @@
         }
       },
       "requires": [
-        "h_EtecoonDoorSpawnFix"
+        "h_DoorImmediatelyClosedFix"
       ],
       "bypassesDoorShell": true,
       "exitCondition": {
@@ -3981,7 +3981,7 @@
         }
       },
       "requires": [
-        "h_EtecoonDoorSpawnFix"
+        "h_DoorImmediatelyClosedFix"
       ],
       "bypassesDoorShell": true,
       "exitCondition": {

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

@@ -312,6 +312,46 @@
       "gModeRegainMobility": {},
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Carry G-Mode Back through the Door",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        "h_DoorImmediatelyClosedFix"
+      ],
+      "bypassesDoorShell": true,
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "flashSuitChecked": true
+    },
+    {
+      "link": [1, 1],
+      "name": "Carry G-Mode Morph Back through the Door",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_DoorImmediatelyClosedFix"
+      ],
+      "bypassesDoorShell": true,
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": true
+        }
+      },
+      "flashSuitChecked": true
+    },
     {
       "id": 13,
       "link": [1, 4],

region/maridia/inner-pink/Halfie Climb Room.json

@@ -3351,6 +3351,46 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 4],
+      "name": "Carry G-Mode Back through the Door",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        "h_DoorImmediatelyClosedFix"
+      ],
+      "bypassesDoorShell": true,
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "flashSuitChecked": true
+    },
+    {
+      "link": [4, 4],
+      "name": "Carry G-Mode Morph Back through the Door",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_DoorImmediatelyClosedFix"
+      ],
+      "bypassesDoorShell": true,
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": true
+        }
+      },
+      "flashSuitChecked": true
+    },
     {
       "id": 129,
       "link": [4, 4],