Merge pull request #2247 from kjbranch/misc-fixes

Misc Small Changes

Author: osse101

region/brinstar/green/Green Hill Zone.json

@@ -1241,7 +1241,9 @@
           "morphed": false
         }
       },
-      "requires": [],
+      "requires": [
+        "canComplexGMode"
+      ],
       "flashSuitChecked": true,
       "note": [
         "In direct G-mode, overload PLMs by shooting the gate then position Samus a few pixels away from the gate to where upward diagonal shots go through it.",

region/crateria/west/Statues Room.json

@@ -221,7 +221,6 @@
       "name": "Underwater Bomb into SpringBall Jump",
       "requires": [
         "f_TourianOpen",
-        "canDoubleSpringBallJumpMidAir",
         "canUnderwaterBombIntoSpringBallJump"
       ],
       "note": [

region/norfair/east/Double Chamber.json

@@ -2588,6 +2588,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedGMode",
         {"or": [
           "SpaceJump",
@@ -2619,6 +2620,10 @@
         "In indirect G-mode, stand where the gate will spawn and exit G-mode to open the gate.",
         "In direct G-mode, overload PLMs by shooting the gate then position Samus a few pixels away from the gate to where upward diagonal shots go through it.",
         "Crouch then shoot diagonally and quickly exit G-mode (3-7 frames later) to open the gate on G-mode exit."
+      ],
+      "devNote": [
+        "The canComplexGMode is only used here to describe opening the gate in direct G-mode without gate glitching.",
+        "However, the indirect variant still requires canHeatedGMode or Varia - with Varia, indirect strats can instead be used to go to the top left door and return."
       ]
     },
     {
@@ -2632,6 +2637,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedGMode",
         {"or": [
           "ScrewAttack",
@@ -2650,6 +2656,10 @@
         "In indirect G-mode, stand where the gate will spawn and exit G-mode to open the gate.",
         "In direct G-mode, overload PLMs by shooting the gate then position Samus a few pixels away from the gate to where upward diagonal shots go through it.",
         "Crouch then shoot diagonally and quickly exit G-mode (3-7 frames later) to open the gate on G-mode exit."
+      ],
+      "devNote": [
+        "The canComplexGMode is only used here to describe opening the gate in direct G-mode without gate glitching.",
+        "However, the indirect variant still requires canHeatedGMode or Varia - with Varia, indirect strats can instead be used to go to the top left door and return."
       ]
     },
     {
@@ -2663,6 +2673,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedGMode",
         {"or": [
           "h_artificialMorphCeilingBombJump",
@@ -2688,7 +2699,11 @@
         "In direct G-mode, overload PLMs by shooting the gate then position Samus a few pixels away from the gate to where upward diagonal shots go through it.",
         "Crouch then shoot diagonally and quickly exit G-mode (3-7 frames later) to open the gate on G-mode exit."
       ],
-      "devNote": "Artificial morph strats can be useful, for instance, in indirect G-mode without heat protection, where Samus needs to collect the item."
+      "devNote": [
+        "Artificial morph strats can be useful, for instance, in indirect G-mode without heat protection, where Samus needs to collect the item.",
+        "The canComplexGMode is only used here to describe opening the gate in direct G-mode without gate glitching.",
+        "However, the indirect variant still requires canHeatedGMode or Varia - with Varia, indirect strats can instead be used to go to the top left door and return."
+      ]
     },
     {
       "id": 60,

region/norfair/east/Green Bubbles Tunnel.json

@@ -472,7 +472,6 @@
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
-      "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
         "On entry, wait for the Geruta to swoop under the door runway, then spin jump up into the alcove on the ceiling above the end of the runway.",

region/tourian/main/Metroid Room 1.json

@@ -637,7 +637,7 @@
     {
       "id": 59,
       "link": [1, 2],
-      "name": "Fearless Dive",
+      "name": "Acid Dip",
       "requires": [
         {"or": [
           {"and": [
@@ -1083,7 +1083,7 @@
     {
       "id": 68,
       "link": [2, 1],
-      "name": "Fearless Dive",
+      "name": "Acid Dip",
       "requires": [
         {"or": [
           {"and": [

tech.json

@@ -2606,6 +2606,12 @@
                 "For low-energy G-mode setups, turn around after reserves finish filling but before knockback frames expire (a 4-frame window when entering G-mode with 4 reserve energy).",
                 "For high-energy (immobile) setups, instead turn around while taking knockback from the enemy that returns control to Samus (a 5-frame window)",
                 "This results in Samus entering a morph ball state without needing to have collected or equipped Morph."
+              ],
+              "detailNote": [
+                "There are some unintuitive ways in which Samus can move while artificially morphed:",
+                "It is possible to perform a double Spring Ball jump underwater from the ground; Gravity jump with Spring Ball or a Bomb boost;",
+                "Spring Fling with high horizontal momentum, by pausing and jumping just before the screen is black, and disabling Spring Ball;",
+                "and break blocks with a Bomb or Power Bomb, even after PLMs are overloaded, by unmorphing and quickly exiting G-mode before it explodes."
               ]
             },
             {