fix hijump etank

Author: kjbranch

region/norfair/west/Hi Jump Energy Tank Room.json

@@ -476,11 +476,13 @@
         }
       },
       "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."
+      "note": [
+        "Overload PLMs using the camera scroll blocks in the morph tunnel. Samus can fix the camera after exiting G-mode on the left.",
+        "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it."
+      ]
     },
     {
       "id": 13,
@@ -495,22 +497,21 @@
       "requires": [
         {"itemNotCollectedAtNode": 4},
         "canRiskPermanentLossOfAccess",
-        "h_artificialMorphPowerBomb",
-        "canOffScreenMovement"
+        "h_artificialMorphPowerBomb"
       ],
-      "collectsItems": [3, 4],
+      "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
         "Placing a Power Bomb a 0.5 to 1 tile away from the item plinth to bounce Samus onto it (where the right item usually is) while also overloading PLMs as the explosion hits the left item.",
         "Wait for the explosion to completely finish before touching the crumble blocks or they will remain solid.",
-        "The camera will not scroll to the left side of the room."
+        "The camera will not scroll to the left side of the room, but it is possible to kill the Sova with the Power Bomb boost."
       ],
-      "devNote": "FIXME: This item will be remote acquired, but it is ignored here since the strat is canRiskPermanentLossOfAccess."
+      "devNote": "FIXME: It is possible to avoid collecting 3 by using a second Power Bomb to boost through the item after PLMs are overloaded."
     },
     {
       "id": 14,
       "link": [2, 1],
-      "name": "G-Mode Overload PLMs with the Right Item",
+      "name": "G-Mode Remote Acquire the Right Item",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -521,15 +522,19 @@
         {"itemNotCollectedAtNode": 3},
         "canRiskPermanentLossOfAccess",
         {"or": [
-          "h_artificialMorphBombThings",
-          "h_artificialMorphMovement"
-        ]},
-        "canOffScreenMovement"
+          "h_artificialMorphMovement",
+          "h_artificialMorphPowerBomb"
+        ]}
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
-      "note": "Overload PLMs by rolling through the item then go through the crumble blocks. The camera will not scroll to the left side of the room.",
-      "devNote": "FIXME: This item will be remote acquired, but it is ignored here since will require an obstacle and the strat is canRiskPermanentLossOfAccess."
+      "note": [
+        "Touch both the item and the camera scroll blocks in the morph tunnel before PLMs are overloaded, then use either to finish overloading them.",
+        "This will make it so that Samus can fix the camera after exiting G-mode on the left.",
+        "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it.",
+        "With only a Power Bomb boost to touch the item, it is not possible to fix the camera, but it is possible to kill the Sova."
+      ],
+      "devNote": "The only loss of access here is the camera fix, but there is another strat that can be used without."
     },
     {
       "id": 15,
@@ -605,32 +610,6 @@
       },
       "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",
-            {"itemNotCollectedAtNode": 3},
-            "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],
@@ -790,7 +769,10 @@
         "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.",
+      "note": [
+        "Overload PLMs using the camera scroll blocks in the morph tunnel. Samus can fix the camera after exiting G-mode on the left.",
+        "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it."
+      ],
       "devNote": "This is only useful if the item is Morph or if Samus has Morph but no way up to this item location."
     },
     {
@@ -807,7 +789,11 @@
       ],
       "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.",
+      "note": [
+        "Touch both the item and the camera scroll blocks in the morph tunnel before PLMs are overloaded, then use either to finish overloading them.",
+        "This will make it so that Samus can fix the camera after exiting G-mode on the left.",
+        "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it."
+      ],
       "devNote": "This is only useful if the item is Morph or if Samus has Morph but no way up to this item location."
     },
     {