feedback update

Author: kjbranch

helpers.json

@@ -1138,8 +1138,15 @@
         {
           "name": "h_heatedGModePauseAbuse",
           "requires": [
-            "h_heatedGMode",
-            "canPauseAbuse"
+            "canEnterGMode",
+            "canPauseAbuse",
+            {"or": [
+              "h_heatProof",
+              {"and": [
+                "canComplexGMode",
+                "canHeatedGMode"
+              ]}
+            ]}
           ]
         },
         {

region/lowernorfair/east/Amphitheatre.json

@@ -358,7 +358,7 @@
           "HiJump",
           "SpaceJump",
           "canSpringBallJumpMidAir",
-          "canComplexGMode",
+          "canInsaneJump",
           {"and": [
             "Charge",
             "canTrickyUseFrozenEnemies",

region/lowernorfair/east/Fast Pillars Setup Room.json

@@ -1013,7 +1013,7 @@
         {"ammo": {"type": "PowerBomb", "count": 3}},
         "h_artificialMorphIBJ",
         {"or": [
-          "canComplexGMode",
+          "canInsaneJump",
           {"ammo": {"type": "PowerBomb", "count": 3}}
         ]},
         {"heatFrames": 70}

region/lowernorfair/east/Plowerhouse Room.json

@@ -362,24 +362,12 @@
       "requires": [
         {"or": [
           "ScrewAttack",
-          "canTrickyGMode",
+          "canInsaneJump",
           {"and": [
             "canTrickyDodgeEnemies",
-            "Plasma",
-            {"or": [
-              "Wave",
-              "Ice"
-            ]}
-          ]},
-          {"and": [
-            "canComplexGMode",
             "Plasma"
           ]},
-          {"enemyDamage": {"enemy": "Holtz", "type": "contact", "hits": 1}},
-          {"and": [
-            "canComplexGMode",
-            {"enemyDamage": {"enemy": "Zebbo", "type": "contact", "hits": 1}}
-          ]}
+          {"enemyDamage": {"enemy": "Holtz", "type": "contact", "hits": 1}}
         ]},
         {"or": [
           "h_heatedGModePauseAbuse",
@@ -389,7 +377,8 @@
       "flashSuitChecked": true,
       "note": [
         "Kill or dodge the Holtz while crossing the room. With Plasma and Wave or Ice, it is possible to quickly kill the Holtz while at the left door.",
-        "Otherwise, jump immediately on entry while Samus still has i-frames to get to the left of the first Zebbo and kill it.",
+        "Otherwise, in direct G-mode, jump immediately on entry while Samus still has i-frames to get to the left of the first Zebbo and kill it,",
+        "and in indirect G-mode, move to the left then run under the Holtzes.",
         "Carefully cross the room while killing the Holtz without luring them, or dodge them.",
         "It is possible to kill a Zebbo by the door and pause abuse to grab its Energy drop on G-mode exit, which requires not killing the right Zebbo until it is in location."
       ]
@@ -684,7 +673,7 @@
             ]}
           ]},
           "Plasma",
-          "canComplexGMode",
+          "canInsaneJump",
           {"enemyDamage": {"enemy": "Zebbo", "type": "contact", "hits": 1}}
         ]},
         "h_heatedGModePauseAbuse"

region/lowernorfair/east/Ridley's Room.json

@@ -423,7 +423,7 @@
       },
       "requires": [
         {"notable": "G-Mode Crystal Flash Stuck Ridley"},
-        "canTrickyGMode",
+        "canComplexGMode",
         "h_heatedGMode",
         "h_CrystalFlash",
         "h_usePowerBomb",
@@ -728,7 +728,7 @@
       },
       "requires": [
         {"notable": "G-Mode Crystal Flash Stuck Ridley"},
-        "canTrickyGMode",
+        "canComplexGMode",
         "h_heatedGMode",
         "h_CrystalFlash",
         "h_usePowerBomb",

region/lowernorfair/east/Three Musketeers' Room.json

@@ -528,11 +528,9 @@
         }
       },
       "requires": [
+        "canInsaneJump",
         {"or": [
-          {"and": [
-            "canComplexGMode",
-            "h_artificialMorphJumpIntoIBJ"
-          ]},
+          "h_artificialMorphJumpIntoIBJ",
           {"and": [
             "canTrickyGMode",
             "h_artificialMorphSpringFling"

region/lowernorfair/east/Wasteland.json

@@ -561,9 +561,12 @@
       },
       "requires": [
         "Morph",
-        "canTrickyJump",
         {"or": [
           "canComplexGMode",
+          "Wave"
+        ]},
+        {"or": [
+          "canInsaneJump",
           {"ammo": {"type": "Super", "count": 1}},
           {"ammo": {"type": "Missile", "count": 1}},
           "Charge",

region/lowernorfair/west/Golden Torizo's Room.json

@@ -647,7 +647,7 @@
             {"or": [
               "h_artificialMorphJumpIntoIBJ",
               "h_artificialMorphDoubleBombJump",
-              "canComplexGMode"
+              "canInsaneJump"
             ]}
           ]}
         ]},
@@ -891,7 +891,7 @@
             {"or": [
               "h_artificialMorphJumpIntoIBJ",
               "h_artificialMorphDoubleBombJump",
-              "canComplexGMode"
+              "canInsaneJump"
             ]}
           ]}
         ]},
@@ -1020,7 +1020,7 @@
         {"or": [
           "f_DefeatedGoldenTorizo",
           {"and": [
-            "canComplexGMode",
+            "canInsaneJump",
             "h_artificialMorphJumpIntoIBJ"
           ]},
           {"and": [