Merge pull request #2098 from kjbranch/v-g-setups

Second pass at upward G-mode setups

Author: osse101

region/crateria/east/Crab Maze.json

@@ -189,22 +189,25 @@
       "link": [1, 1],
       "name": "G-Mode Setup - Frozen Sciser",
       "requires": [
+        "Morph",
+        "canCameraManip",
         "canUpwardGModeSetup",
         "canTrickyUseFrozenEnemies",
-        "h_useSpringBall",
-        "canBePatient"
+        "canBeVeryPatient"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
       "note": [
         "The nearby Global crab can be used to exit on the left side of the door.",
-        "Exiting on the right will require travelling the Morph maze to find a local crab or two."
+        "Exiting on the right will require travelling the Morph maze to find a local crab or two from the far left side of the room.",
+        "Without Spring Ball, freeze the crab as low as possible to where Samus can still spin jump onto it.",
+        "land on the edge of it, X-Ray turnaround or crouch, then press forward when it is about to thaw to trigger the transition."
       ],
       "devNote": [
-        "There is a Morphless way to jump on the crab with aim down but it feels too precise to include.",
-        "Global Crab (left side) takes 40 seconds, local crab (Right side) is 180.  Finding two left side crabs to use together is faster."
+        "Global Crab (left side) takes 40 seconds, local crab (Right side) is 140. Finding two left side crabs to use together is faster.",
+        "FIXME: Adding a variant that can only be done on the left side of the door would remove many of these requirements."
       ]
     },
     {

region/maridia/inner-pink/Aqueduct.json

@@ -2671,14 +2671,13 @@
       "name": "G-Mode Setup - Snail Platform",
       "requires": [
         "canUpwardGModeSetup",
-        "h_navigateUnderwater",
-        "canTwoTileSqueeze"
+        "h_navigateUnderwater"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "note": ["The two snails together can setup G-Mode on either side of the door."]
+      "note": ["Use a clockwise or counter-clockwise snail to setup G-Mode on either side of the door."]
     },
     {
       "id": 103,

region/maridia/outer/Mt. Everest.json

@@ -3253,18 +3253,22 @@
       "link": [5, 5],
       "name": "G-Mode Setup - Frozen Sciser",
       "requires": [
+        "canBePatient",
         {"or": [
           {"and": [
             "Gravity",
             "SpaceJump"
           ]},
+          {"and": [
+            "Gravity",
+            "HiJump",
+            "canPreciseGrapple"
+          ]},
           {"and": [
             "HiJump",
             "canPreciseGrapple",
-            {"or": [
-              "Gravity",
-              "canSpringBallJumpMidAir"
-            ]}
+            "canSpringBallJumpMidAir",
+            "canBeVeryPatient"
           ]},
           {"and": [
             "HiJump",
@@ -3276,13 +3280,23 @@
         "canTrickyUseFrozenEnemies",
         {"or": [
           "Morph",
-          "canTwoTileSqueeze"
+          "canTrickyGMode"
         ]}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "Lure the crab to the top of the room and freeze it close enough to the corner that it will be able to hit Samus after it thaws.",
+        "Without Morph, this is much trickier, requiring fairly precise freeze positioning and movement to get onto the crab.",
+        "Aim down before landing on the crab to avoid triggering the transition.",
+        "Be sure to touch the transition before it thaws or Samus will be in a falling pose, but late enough that it will be able to rotate around the corner and hit Samus in time."
+      ],
+      "devNote": [
+        "Without Morph, this is not difficult enough to require canTrickyGMode, but it is easy to fail and the setup is very slow.",
+        "The patience requirements for these strats are lenient, but there is a good chance of not getting the setup or entering G-mode first try."
+      ]
     },
     {
       "id": 129,

region/norfair/crocomire/Post Crocomire Jump Room.json

@@ -840,6 +840,26 @@
         "It also makes it possible to gain more speed by running a few tiles further, which is needed for certain strats."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Frozen Mella",
+      "requires": [
+        "canManipulateMellas",
+        "canUpwardGModeSetup",
+        "canTrickyUseFrozenEnemies",
+        "canInsaneJump"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "The easiest way to set up G-mode is to lure a low Mella to the door, take a hit, then jump and aim down and freeze it while it is high enough and still rising.",
+        "If the Mella is not moving upwards, there is a good chance that Samus will be in a falling state as she is hit through the transition and can't use X-Ray.",
+        "If Samus does not stay on the Mella, she can spin jump or midair morph directly onto the Mella without touching the transition.",
+        "It may be worthwhile to keep the other Mellas alive so that on a failed attempt, Samus can freeze the Mella to go farm some of the others in room."
+      ]
+    },
     {
       "id": 36,
       "link": [2, 2],
@@ -917,9 +937,10 @@
           "h_preciseIceClip",
           "h_highPixelIceClip"
         ]},
+        "canInsaneJump",
         {"or": [
           "Morph",
-          "canInsaneJump",
+          "canTrickyGMode",
           {"enemyDamage": {"enemy": "Mella", "type": "contact", "hits": 1}}
         ]}
       ],

region/norfair/crocomire/Post Crocomire Shaft.json

@@ -660,7 +660,6 @@
       "requires": [
         "canTrickyUseFrozenEnemies",
         {"ammo": {"type": "Super", "count": 1}},
-        "h_useSpringBall",
         "canUpwardGModeSetup",
         {"or": [
           "canConsecutiveWalljump",
@@ -675,7 +674,10 @@
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
       "flashSuitChecked": true,
       "note": [
-        "Knock a Viola off of its platform and keep it on camera as it climbs to the top of the room."
+        "Knock a Viola off of its platform and keep it on camera as it climbs to the top of the room.",
+        "Freeze the Viola when it is only partially overhanging the door and midair morph, run jump and aim down directly onto it,",
+        "or spin jump and down aim just before landing and quickly release inputs.",
+        "With Morph or a down aim, Samus can jump directly onto the Viola without touching the transition."
       ]
     },
     {

region/wreckedship/main/Basement.json

@@ -534,7 +534,6 @@
       "name": "G-Mode Setup - Frozen Atomic",
       "requires": [
         "canUpwardGModeSetup",
-        "canTwoTileSqueeze",
         "canTrickyUseFrozenEnemies",
         "f_DefeatedPhantoon"
       ],
@@ -543,7 +542,8 @@
       },
       "flashSuitChecked": true,
       "note": [
-        "Stand on one frozen Atomic to bring a second Atomic to the correct height to use as a crouch platform."
+        "Bring two atomics to the doorway.",
+        "Stand on one frozen Atomic to freeze a second Atomic at the correct height to use as a platform."
       ]
     },
     {

region/wreckedship/main/Wrecked Ship Main Shaft.json

@@ -418,7 +418,6 @@
       "name": "G-Mode Setup - Frozen Atomic",
       "requires": [
         "canUpwardGModeSetup",
-        "canTwoTileSqueeze",
         "canTrickyUseFrozenEnemies",
         "f_DefeatedPhantoon",
         {"enemyDamage": {"enemy": "Atomic", "type": "contact", "hits": 1}}
@@ -429,7 +428,7 @@
       "flashSuitChecked": true,
       "note": [
         "Bring two atomics to the top of the room.",
-        "Stand on one frozen Atomic to bring a second Atomic to the correct height to use as a crouch platform."
+        "Stand on one frozen Atomic to freeze a second Atomic at the correct height to use as a platform."
       ]
     },
     {

tech.json

@@ -2542,15 +2542,20 @@
               "id": 166,
               "name": "canUpwardGModeSetup",
               "techRequires": [
-                "canEnterRMode"
+                "canEnterRMode",
+                "canTwoTileSqueeze"
               ],
               "otherRequires": [],
               "note": [
                 "Ability to setup an R-mode or G-mode through an upward door.",
                 "Samus needs to be in a standing or walking position with no vertical speed on the first frame in the next room, while taking damage through the transition.",
-                "This is typically done by using an enemy as a platform beneath the door and instantly standing up by pressing forward while crouched.",
-                "Getting Samus into the crouch position can usually be down by spinjumping (beneath the transition tiles) then aiming down to stand on the enemy.",
-                "Unmorphing when on top of the enemy will also put Samus in a crouch."
+                "This is typically done by standing or crouching on an enemy as a platform beneath the transition and pressing forward to activate the transition.",
+                "Getting Samus onto the enemy without activating the transition can usually be done by spin jumping against the enemy and quickly releasing jump and forward once on top of it.",
+                "If the vertical space between the enemy and transition is 2 tiles or fewer, Samus needs to aim down before landing to prevent touching the transition as she lands.",
+                "it is also possible to get onto the enemy by jumping and aiming down with horizontal momentum while avoiding hitting the side of the enemy or the transition above.",
+                "This may also be done more easily with Spring Ball or a room geometry that makes it easy to midair morph directly onto the enemy.",
+                "Unmorphing when on top of the enemy will put Samus in a crouch, where a forward press will stand up and activate the transition.",
+                "If Samus is completely against the wall, an X-Ray turnaround or crouch is necessary to be able to activate the transition tiles with a forward press."
               ]
             }
           ]