feedback update

Author: kjbranch

region/maridia/inner-yellow/Watering Hole.json

@@ -224,98 +224,6 @@
       },
       "flashSuitChecked": true
     },
-    {
-      "id": 23,
-      "link": [1, 1],
-      "name": "G-Mode Morph - Remote Acquire Left Item",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true
-        }
-      },
-      "requires": [
-        "canOffScreenMovement",
-        {"or": [
-          {"and": [
-            "canTrickyJump",
-            "h_canArtificialMorphSpringBall"
-          ]},
-          {"and": [
-            "h_canArtificialMorphPowerBomb",
-            {"or": [
-              "canTrickyJump",
-              "h_canArtificialMorphSpringBall",
-              {"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
-            ]}
-          ]},
-          "canInsaneJump"
-        ]},
-        {"or": [
-          {"and": [
-            "Gravity",
-            {"or": [
-              "h_canArtificialMorphIBJ",
-              "h_canArtificialMorphSpringBallBombJump"
-            ]}
-          ]},
-          "h_canArtificialMorphDoubleSpringBallJump"
-        ]}
-      ],
-      "collectsItems": [2],
-      "flashSuitChecked": true,
-      "note": [
-        "Carefully avoid or kill the Zebs and the Choot. The Choot can be killed with a Power Bomb or with Bombs by staying against the left wall.",
-        "With a double spring ball jump it is possible to avoid the Choot and escape under it to the left wall while it is in the air."
-      ],
-      "devNote": "It is possible but unreasonable to collect both items simultaneously."
-    },
-    {
-      "id": 24,
-      "link": [1, 1],
-      "name": "G-Mode Morph - Remote Acquire Right Item",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true
-        }
-      },
-      "requires": [
-        "canOffScreenMovement",
-        {"or": [
-          {"and": [
-            "canTrickyJump",
-            "h_canArtificialMorphSpringBall"
-          ]},
-          {"and": [
-            "h_canArtificialMorphPowerBomb",
-            {"or": [
-              "canTrickyJump",
-              "h_canArtificialMorphSpringBall",
-              {"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
-            ]}
-          ]},
-          "canInsaneJump"
-        ]},
-        {"or": [
-          {"and": [
-            "Gravity",
-            {"or": [
-              "h_canArtificialMorphIBJ",
-              "h_canArtificialMorphSpringBallBombJump"
-            ]}
-          ]},
-          "h_canArtificialMorphDoubleSpringBallJump"
-        ]}
-      ],
-      "collectsItems": [3],
-      "flashSuitChecked": true,
-      "note": [
-        "Carefully avoid or kill the Zebs and the Choot. The Choot can be killed with a Power Bomb or with Bombs by staying against the left wall.",
-        "With a double spring ball jump it is possible to avoid the Choot and escape under it to the left wall while it is in the air."
-      ],
-      "devNote": "It is possible but unreasonable to collect both items simultaneously."
-    },
     {
       "id": 10,
       "link": [1, 2],

region/norfair/east/Lava Dive Room.json

@@ -343,6 +343,28 @@
         "Then X-ray climb to get up to the door transition, without needing to open the door."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "G-Mode Morph, Triple Spring Ball Jump",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"notable": "Artificial Morph, Triple Spring Ball Jump"},
+        "h_canArtificialMorphDoubleSpringBallJump",
+        "canInsaneJump",
+        {"gravitylessLavaFrames": 640},
+        {"heatFrames": 50}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Triple Spring Ball jump through the Lava Dive. Delay the second jump as much as possible, and get all of the pauses close to as early as possible."
+      ],
+      "devNote": "FIXME: The heat frames here are for opening the door and leaving the room. It might need to be reworked to match other heated g-mode strats."
+    },
     {
       "id": 11,
       "link": [2, 2],
@@ -442,27 +464,6 @@
         "Then Walljump again to exit the Lava and reach the left ledge."
       ]
     },
-    {
-      "link": [2, 3],
-      "name": "G-Mode Morph, Triple Spring Ball Jump",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "any",
-          "morphed": true
-        }
-      },
-      "requires": [
-        {"notable": "Artificial Morph, Triple Spring Ball Jump"},
-        "h_canArtificialMorphDoubleSpringBallJump",
-        "canInsaneJump",
-        {"gravitylessLavaFrames": 640},
-        {"heatFrames": 0}
-      ],
-      "flashSuitChecked": true,
-      "note": [
-        "Triple Spring Ball jump through the Lava Dive. Delay the second jump as much as possible, and get all of the pauses close to as early as possible."
-      ]
-    },
     {
       "id": 16,
       "link": [2, 4],