feedback update

Author: kjbranch

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -420,27 +420,24 @@
         {"itemNotCollectedAtNode": 5},
         "canRiskPermanentLossOfAccess",
         "canOffScreenMovement",
+        "canInsaneJump",
         {"or": [
+          "canTrickyGMode",
           "h_artificialMorphPowerBomb",
           "ScrewAttack",
-          "canTrickyGMode",
-          {"and": [
-            "canInsaneJump",
-            {"or": [
-              "Ice",
-              {"ammo": {"type": "Missile", "count": 1}},
-              {"ammo": {"type": "Super", "count": 1}}
-            ]}
-          ]},
+          "Ice",
+          {"ammo": {"type": "Missile", "count": 1}},
+          {"ammo": {"type": "Super", "count": 1}},
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
         ]}
       ],
       "clearsObstacles": ["B"],
       "collectsItems": [5],
       "flashSuitChecked": true,
       "note": [
-        "Roll through the item to overload PLMs before falling through the crumble blocks.",
-        "Carefully fall to not touch the spikes on the right, then roll through the spikeway.",
+        "Roll through the item to mostly overload PLMs before falling into the pit and fully overloading them with the camera scroll blocks.",
+        "Fully overloading the PLMs before touching the camera scroll blocks will prevent the camera from following Samus after exiting G-mode.",
+        "While falling, carefully avoid touching the thorns on the right, then roll through the spikeway.",
         "After the camera stops scrolling, move another 2-3 tiles then exit G-Mode.",
         "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
       ]
@@ -798,27 +795,24 @@
         "canRiskPermanentLossOfAccess",
         "canOffScreenMovement",
         "h_artificialMorphPowerBomb",
+        "canInsaneJump",
         {"or": [
+          "canTrickyGMode",
           "h_artificialMorphPowerBomb",
           "ScrewAttack",
-          "canTrickyGMode",
-          {"and": [
-            "canInsaneJump",
-            {"or": [
-              "Ice",
-              {"ammo": {"type": "Missile", "count": 1}},
-              {"ammo": {"type": "Super", "count": 1}}
-            ]}
-          ]},
+          "Ice",
+          {"ammo": {"type": "Missile", "count": 1}},
+          {"ammo": {"type": "Super", "count": 1}},
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
         ]}
       ],
       "clearsObstacles": ["B"],
       "collectsItems": [5],
       "flashSuitChecked": true,
       "note": [
-        "Carefully Bomb boost across the pit and roll through the item to overload PLMs before falling through the crumble blocks.",
-        "Carefully fall to not touch the spikes on the right, then roll through the spikeway.",
+        "Carefully Bomb boost across the pit and roll through the item to mostly overload PLMs before falling into the pit and fully overloading them with the camera scroll blocks.",
+        "Fully overloading the PLMs before touching the camera scroll blocks will prevent the camera from following Samus after exiting G-mode.",
+        "While falling, carefully avoid touching the thorns on the right, then roll through the spikeway.",
         "After the camera stops scrolling, move another 2-3 tiles then exit G-Mode.",
         "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
       ],
@@ -1581,18 +1575,6 @@
         {"or": [
           "canTrickyGMode",
           {"and": [
-            {"tech": "canBombHorizontally"},
-            {"ammo": { "type": "PowerBomb", "count": 6}},
-            {"or": [
-              "canInsaneJump",
-              {"ammo": { "type": "PowerBomb", "count": 2}}
-            ]}
-          ]},
-          {"and": [
-            {"or": [
-              "Morph",
-              "h_artificialMorphSpringBall"
-            ]},
             {"ammo": { "type": "PowerBomb", "count": 3}},
             {"or": [
               "canInsaneJump",
@@ -1616,6 +1598,14 @@
             "canBePatient",
             "h_artificialMorphSpringBall",
             "HiJump"
+          ]},
+          {"and": [
+            "canBePatient",
+            "Morph",
+            {"or": [
+              "HiJump",
+              "canWalljump"
+            ]}
           ]}
         ]}
       ],
@@ -1635,10 +1625,7 @@
       "requires": [
         {"itemNotCollectedAtNode": 5},
         "canRiskPermanentLossOfAccess",
-        {"or": [
-          "Morph",
-          "h_artificialMorphSpringBall"
-        ]},
+        "h_artificialMorphMovement",
         {"or": [
           {"and": [
             {"ammo": { "type": "PowerBomb", "count": 3}},
@@ -1664,7 +1651,8 @@
           {"and": [
             "HiJump",
             "canSpringBallJumpMidAir"
-          ]}
+          ]},
+          "h_artificialMorphIBJ"
         ]}
       ],
       "clearsObstacles": ["A"],