Merge pull request #2195 from kjbranch/g-n-east-1

Upper Norfair East G-mode: part 1

Author: osse101

region/norfair/east/Bubble Mountain.json

@@ -3943,12 +3943,13 @@
       "requires": [
         {"tech": "canBombHorizontally"},
         "h_artificialMorphPowerBomb",
-        "h_additionalBomb"
+        "h_additionalBomb",
+        "canTrickyDodgeEnemies"
       ],
       "flashSuitChecked": true,
       "note": [
-        "Use one Power Bomb to jump towards the Cacatac then a second to jump over it and down below.",
-        "Do not land where the Cacatac was, or Samus will get hit by its invisible spikes."
+        "Wait for the Waver to pass or quickly use a Power Bomb to boost over the gap towards the Cacatac.",
+        "Use a second Power Bomb to jump over it and down below; hold left as soon as Samus starts moving upward, in order to avoid the invisible Cacatac spikes."
       ]
     },
     {
@@ -4402,7 +4403,7 @@
         {"or": [
           "h_artificialMorphPowerBomb",
           {"and": [
-            "canTrickyJump",
+            "canTrickyDodgeEnemies",
             {"or": [
               "canBePatient",
               "canDoubleBombJump"
@@ -4443,7 +4444,7 @@
         {"or": [
           "h_artificialMorphPowerBomb",
           {"and": [
-            "canTrickyJump",
+            "canTrickyDodgeEnemies",
             "canBePatient",
             {"or": [
               "canBeVeryPatient",

region/norfair/east/Cathedral Entrance.json

@@ -483,7 +483,7 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "Carefully roll under the Sm. Desgeegas or kill them with a Power Bomb (while avoiding killing the Sova).",
+        "Wait for the Sova to pass then carefully roll under the Sm. Desgeegas or kill them with a Power Bomb (while avoiding killing the Sova).",
         "It is possible to kill a Sova on the door and pause abuse to grab its Energy drop on G-mode exit.",
         "The local or global Sova can be used. To use the local one, keep it off camera when possible and horizontally boost to jump over both stairs at once.",
         "With Spring Ball or a moderately good IBJ, Samus should be able to get through the morph tunnel before the global Sova, otherwise it takes just over a minute for it to return."

region/norfair/east/Frog Speedway.json

@@ -304,7 +304,7 @@
         "h_artificialMorphBombs",
         {"or": [
           "h_artificialMorphPowerBomb",
-          "canTrickyJump",
+          "canTrickyDodgeEnemies",
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
           {"and": [
             "Morph",

region/norfair/east/Green Bubbles Tunnel.json

@@ -267,7 +267,7 @@
             {"heatFrames": 130},
             {"enemyKill": {
               "enemies": [["Geruta"]],
-              "explicitWeapons": ["Super", "Missile", "Plasma", "Wave"]
+              "explicitWeapons": ["Super", "Missile", "Plasma", "Wave", "PowerBomb"]
             }}
           ]}
         ]}

region/norfair/east/Lower Norfair Elevator.json

@@ -415,6 +415,11 @@
       "requires": [
         {"heatFrames": 0}
       ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
       "flashSuitChecked": true
     },
     {
@@ -753,6 +758,11 @@
       "requires": [
         {"heatFrames": 0}
       ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
       "flashSuitChecked": true
     },
     {