Merge pull request #2120 from kjbranch/g-tourian

Tourian G-Mode: Second Pass

Author: kjbranch

region/tourian/main/Tourian Escape Room 1.json

@@ -18,6 +18,8 @@
       "nodeAddress": "0x001aae0",
       "doorOrientation": "right",
       "doorEnvironments": [{"physics": "air"}],
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false,
       "locks": [
         {
           "name": "Tourian Escape 1 Lock (to Mother Brain)",
@@ -89,6 +91,86 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Carry Direct G-Mode Back Through",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        "h_openTourianEscape1RightDoor"
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": "free",
+      "flashSuitChecked": true,
+      "devNote": "In vanilla, the doorway remains open in indirect but not in direct G-mode."
+    },
+    {
+      "link": [1, 1],
+      "name": "Carry Direct G-Mode Morph Back Through",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_openTourianEscape1RightDoor"
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": true
+        }
+      },
+      "bypassesDoorShell": "free",
+      "flashSuitChecked": true,
+      "devNote": "In vanilla, the doorway remains open in indirect but not in direct G-mode."
+    },
+    {
+      "link": [1, 1],
+      "name": "Carry Indirect G-Mode Back Through",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": false
+        }
+      },
+      "requires": [],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": "free",
+      "flashSuitChecked": true,
+      "devNote": "In vanilla, the doorway remains open in indirect but not in direct G-mode."
+    },
+    {
+      "link": [1, 1],
+      "name": "Carry Indirect G-Mode Morph Back Through",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": true
+        }
+      },
+      "requires": [],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": true
+        }
+      },
+      "bypassesDoorShell": "free",
+      "flashSuitChecked": true,
+      "devNote": "In vanilla, the doorway remains open in indirect but not in direct G-mode."
+    },
     {
       "id": 3,
       "link": [1, 2],
@@ -136,7 +218,7 @@
       "flashSuitChecked": true,
       "devNote": [
         "Direct G-mode will have an open door and Samus will fall. Indirect will require a doorlock bypass in the room below.",
-        "If there is any type of door here, the strat won't work."
+        "If there is any type of door on the right, the strat won't work. In vanilla, the right doorway remains open when coming from below."
       ]
     },
     {

region/tourian/main/Tourian Escape Room 4.json

@@ -416,10 +416,36 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "IBJ and use 10 PBs to kill the pirates and get to the top. Exit gmode and fall to the bottom.",
+        "IBJ and use 10 PBs to kill the pirates and get to the top. Exit G-mode and fall to the bottom.",
         "Note that there is a path up to the right that doesn't need wall jumps, but a crouch jump down grab is needed to get to the final platform."
       ]
     },
+    {
+      "link": [1, 4],
+      "name": "G-Mode Morph Bomb Boost Spring Ball, Pirate Avoid",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "canCameraManip",
+        "canInsaneJump",
+        "h_artificialMorphSpringBallBombJump",
+        "h_additionalBomb",
+        "h_additionalBomb",
+        "h_additionalBomb",
+        "h_additionalBomb"
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Spring Ball bomb jump up to the top, then exit G-mode and fall to the bottom.",
+        "It is recommended to stay near the right wall with the camera positioned so that the left wall pirates are off camera.",
+        "Avoid touching any of the pirates' stationary, invisible lasers, which they place when they jump to the opposite wall."
+      ],
+      "devNote": "FIXME: This is likely possible with just Bombs, but seems very difficult, a diagonal bomb jump around th overhangs might make it feasible."
+    },
     {
       "id": 10,
       "link": [1, 4],

region/tourian/main/Tourian Hopper Room.json

@@ -175,7 +175,7 @@
       "bypassesDoorShell": "free",
       "flashSuitChecked": true,
       "note": "Immediately on entry Spring Ball Bomb Jump. Be sure not to land left of the pillar below the door or it is harder to get up in time.",
-      "devNote": "FIXME: This could be possible with Bombs by luring the hoppers to the left."
+      "devNote": "FIXME: This is possible with Bombs by luring the hoppers to the left, but it is dependent on hopper RNG."
     },
     {
       "id": 7,