feedback updates, and hero shot leaveWithSparks

Author: blkerby

region/maridia/outer/Mt. Everest.json

@@ -938,8 +938,7 @@
         {"or": [
           "h_EverestMorphTunnelExpanded",
           "h_artificialMorphPowerBomb",
-          {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}},
-          {"haveBlueSuit": {}}
+          {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}}
         ]}
       ],
       "flashSuitChecked": true,
@@ -4729,7 +4728,7 @@
       "requires": [
         "h_storedSpark",
         {"or": [
-          {"shinespark": {"frames": 44, "excessFrames": 6}},
+          {"shinespark": {"frames": 43, "excessFrames": 6}},
           {"and": [
             "HiJump",
             {"shinespark": {"frames": 40, "excessFrames": 5}}
@@ -5656,14 +5655,28 @@
       "link": [9, 1],
       "name": "Use Stored Spark",
       "requires": [
-        {"disableEquipment": "HiJump"},
         "h_storedSpark",
-        {"shinespark": {"frames": 41, "excessFrames": 8}}
+        {"shinespark": {"frames": 23, "excessFrames": 3}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": "Jump without HiJump, then spark towards the door.",
-      "devNote": "FIXME: It is possible but very precise to spark through the door with a hero shot."
+      "note": "Jump to the left, then spark towards the door; some energy can be saved by diagonal sparking."
+    },
+    {
+      "link": [9, 1],
+      "name": "Use Stored Spark Hero Shot",
+      "requires": [
+        "h_storedSpark",
+        "canHeroShot",
+        "canShinechargeMovementTricky",
+        {"shinespark": {"frames": 57, "excessFrames": 0}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": ["never"]}],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 179,
@@ -5677,18 +5690,23 @@
       "blueSuitChecked": true
     },
     {
-      "id": 238,
       "link": [9, 4],
-      "name": "Use Stored Spark",
+      "name": "Use Stored Spark Hero Shot",
       "requires": [
-        "canDisableEquipment",
         "h_storedSpark",
-        {"shinespark": {"frames": 72, "excessFrames": 7}}
+        "canHeroShot",
+        "canShinechargeMovementTricky",
+        "canInsaneJump",
+        {"shinespark": {"frames": 80, "excessFrames": 0}}
       ],
+      "exitCondition": {
+        "leaveWithSpark": {
+          "position": "bottom"
+        }
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": ["never"]}],
       "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": "Jump without HiJump, then spark towards the door.",
-      "devNote": "FIXME: It is possible but very precise to spark through the door with a hero shot."
+      "blueSuitChecked": true
     },
     {
       "id": 180,
@@ -5881,11 +5899,14 @@
     {
       "id": 188,
       "link": [9, 11],
-      "name": "Suitless Bootless Jump",
+      "name": "Suitless Jump",
       "requires": [
         "canSuitlessMaridia",
         {"disableEquipment": "Gravity"},
-        {"disableEquipment": "HiJump"}
+        {"or": [
+          {"disableEquipment": "HiJump"},
+          "canFlatleyJump"
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,