Feedback and a couple more in HiJump ETank

kjbranch · kjbranch · commit 6ba321ee9d8f · 2025-07-30T00:15:41.000-06:00
diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json
@@ -299,18 +299,19 @@
           {"and": [
             "h_heatedGModePauseAbuse",
             {"or": [
-              "canUseGrapple",
               "canTrickyGMode",
-              {"ammo": {"type": "Super", "count": 1}}
+              {"ammo": {"type": "Super", "count": 2}}
             ]}
           ]}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
-        "Climb the solid crumble blocks.",
-        "It is possible to use a Super to knock a Sova off and kill it by the door and pause abuse to grab its Energy drop on G-mode exit.",
-        "It is also possible to do it without a Super if the Sova drops a large Energy drop."
+        "Climb down using the solid crumble blocks.",
+        "It is possible to use a Super to knock a Sova off and kill it by the door and pause abuse to grab its Energy drop on G-mode exit with a very precise positioning jump or large Energy drop.",
+        "With a second Super it is recommended to bring down the other clockwise Sova as well (at the top of the room), and stack their drops.",
+        "It is also possible to do it without a Super if the Sova drops a large Energy drop. There is a way to do this with two Sova, and if either drops a large Energy, Samus can survive:",
+        "kill both of the bottom two Sova at the bottom right corner of their platforms, stand on the middle of the platform with the second lowest Sova, and hold right when exiting G-mode."
       ]
     },
     {
@@ -650,19 +651,15 @@
           {"and": [
             {"ammo": {"type": "Super", "count": 1}},
             "h_heatedGModePauseAbuse"
-          ]},
-          {"and": [
-            "h_heatedGModePauseAbuse",
-            "canUseGrapple",
-            "canTrickyGMode"
           ]}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Climb the solid crumble blocks.",
-        "It is possible to use a Super to knock a Sova off and follow it to the door and pause abuse to grab its Energy drop on G-mode exit."
-      ]
+        "It is possible to use a Super to knock one or two Sova off and follow it to the door and pause abuse to grab its Energy drop on G-mode exit."
+      ],
+      "devNote": "FIXME: It is possible to use grapple to grab the drop from the top Sova from the doorway, but it is fairly precise and requires a large Energy drop."
     },
     {
       "id": 25,
diff --git a/region/norfair/west/Hi Jump Energy Tank Room.json b/region/norfair/west/Hi Jump Energy Tank Room.json
@@ -251,6 +251,24 @@
       "flashSuitChecked": true,
       "note": "It takes the Sova about 25 seconds to hit Samus."
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Morph Remote Acquire Left Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_artificialMorphSpringBallBombJump",
+        "h_additionalBomb"
+      ],
+      "collectsItems": [4],
+      "flashSuitChecked": true,
+      "note": "Get to the item with two Spring Ball bomb jumps and remote acquire the item back by the left door.",
+      "devNote": "The Power Bombs will solidify the bomb block, preventing remote acquiring on the right. The Power Bombs are not going to overload many PLMs."
+    },
     {
       "id": 5,
       "link": [1, 3],
@@ -401,10 +419,6 @@
       "requires": [
         {"or": [
           "h_artificialMorphIBJ",
-          {"and": [
-            "h_artificialMorphSpringBallBombJump",
-            "h_additionalBomb"
-          ]},
           {"and": [
             "HiJump",
             "h_artificialMorphSpringBall"
@@ -422,8 +436,7 @@
       ],
       "clearsObstacles": ["D"],
       "flashSuitChecked": true,
-      "note": "Get to the item without overloading PLMs by avoiding entering the morph tunnel at the bottom of the room.",
-      "devNote": "Spring Ball bomb jumps with Power Bombs are not going to overload many PLMs."
+      "note": "Get to the item without overloading PLMs by avoiding entering the morph tunnel at the bottom of the room."
     },
     {
       "id": 11,
@@ -592,6 +605,31 @@
       },
       "bypassesDoorShell": true
     },
+    {
+      "link": [2, 1],
+      "name": "G-Mode Morph Remote Acquire Right Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"or": [
+          "h_artificialMorphMovement",
+          {"and": [
+            "h_artificialMorphPowerBomb",
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]}
+      ],
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": [
+        "Touch the item then overload PLMs with it or in the morph tunnel up left of the item, then remote acquire it by the left door.",
+        "The camera will not scroll to the left side of the room."
+      ]
+    },
     {
       "id": 20,
       "link": [2, 2],
@@ -748,12 +786,29 @@
         }
       },
       "requires": [
-        "h_artificialMorphMovement",
-        "canOffScreenMovement"
+        "h_artificialMorphMovement"
       ],
       "flashSuitChecked": true,
       "note": "Overload PLMs using scroll blocks in the morph tunnel. The camera will not scroll to the left side of the room.",
-      "devNote": "This is only useful morphless if the item is Morph."
+      "devNote": "This is only useful if the item is Morph or if Samus has Morph but no way up to this item location."
+    },
+    {
+      "id": 24,
+      "link": [2, 4],
+      "name": "G-Mode through Bomb Blocks, Remote Acquire Right Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_artificialMorphMovement"
+      ],
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": "Touch the right item then overload PLMs using it or the scroll blocks in the morph tunnel. The camera will not scroll to the left side of the room.",
+      "devNote": "This is only useful if the item is Morph or if Samus has Morph but no way up to this item location."
     },
     {
       "id": 25,
diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json
@@ -1068,10 +1068,6 @@
       "requires": [
         "h_artificialMorphMovement",
         {"or": [
-          {"and": [
-            "h_artificialMorphPowerBomb",
-            "h_additionalBomb"
-          ]},
           {"and": [
             "h_artificialMorphPowerBomb",
             "canInsaneJump"
@@ -1085,7 +1081,8 @@
       "flashSuitChecked": true,
       "note": [
         "It is tricky but possible to cross the room without any damage by utilizing Samus' i-frames on room entry.",
-        "jumping over the Small Dessgeega on room entry then using a Power Bomb to kill several enemies.",
+        "After morphing, immediately roll to the right, through the Small Dessgeega.",
+        "Either precisely dodge all of the enemies or quickly place a Power Bomb to kill several of them.",
         "Note that crossing the room damageless is easier in indirect G-Mode.",
         "After crossing the room, use a Power Bomb then quickly exit G-Mode before it explodes in order to break the bomb and Power Bomb blocks above.",
         "Without Spring Ball, it is still possible to place the Power Bomb high enough to break all the blocks above from an IBJ and still exit G-Mode before it explodes."
