More tricyjump, movement and kill adjustments

Author: aquanight

region/lowernorfair/east/Lower Norfair Spring Ball Maze.json

@@ -629,33 +629,16 @@
         {"heatFrames": 100},
         "h_heatedCrystalFlashForReserveEnergy",
         "canCeilingClip",
-        {"or": [
-          "canTrivialMidAirMorph",
-          {"and": ["h_useSpringBall", "HiJump"]}
-        ]},
+        "canTrivialMidAirMorph",
         {"heatFrames": 240},
         {"or": [
           {"enemyKill": {"enemies": [["Alcoon"]], "explicitWeapons": ["Missile", "Super", "Charge+Plasma", "Wave+Plasma"]}},
-          {"and": [
-            {"enemyKill": {"enemies": [["Alcoon"]], "explicitWeapons": ["Wave", "Ice+Spazer", "Plasma", "ScrewAttack", "PseudoScrew"]}},
-            {"heatFrames": 180}
-          ]},
-          {"and": [
-            {"heatFrames": 200},
-            {"or": [
-              "canDodgeWhileShooting",
-              "Morph"
-            ]}
-          ]},
-          {"and": [
-            {"heatFrames": 160},
-            {"enemyDamage": {"enemy": "Alcoon", "type": "fireball", "hits": 1}}
-          ]}
+          {"heatFrames": 200}
         ]},
         {"canShineCharge": {"usedTiles": 27, "gentleUpTiles": 2, "openEnd": 0}},
         {"or": [
           "canDownBack",
-          "canCarefulJump"
+          "canTrickyJump"
         ]},
         {"heatFrames": 120},
         {"autoReserveTrigger": {"maxReserveEnergy": 95}},
@@ -1230,13 +1213,15 @@
           {"and": ["canSpringBallBombJump", {"heatFrames": 60}]},
           {"and": [
             "canIBJ",
+            "canBombHorizontally",
+            "canJumpIntoIBJ",
+            {"heatFrames": 110},
             {"or": [
-              {"and": ["canBombHorizontally", {"heatFrames": 660}]},
-              {"and": ["canJumpIntoIBJ", "canDoubleBombJump", {"heatFrames": 110}]},
-              {"and": ["canJumpIntoIBJ", {"heatFrames": 300}]}
+              "canDoubleBombJump",
+              {"heatFrames": 190}
             ]}
           ]},
-          {"and": ["canTrickyDashJump", {"heatFrames": 20}]},
+          {"and": ["canTrickyDashJump", "canInsaneJump", {"heatFrames": 20}]},
           {"and": ["canUseFrozenEnemies", "canInsaneJump", {"heatFrames": 150}]}
         ]},
         {"or": [
@@ -1246,20 +1231,10 @@
             {"heatFrames": 120}
           ]},
           {"and": [
-            {"enemyKill": {"enemies": [["Alcoon"]], "explicitWeapons": ["Missile", "Super", "Wave", "Ice+Spazer", "Plasma", "ScrewAttack", "PseudoScrew", "PowerBomb"]}},
+            {"enemyKill": {"enemies": [["Alcoon"]], "explicitWeapons": ["Wave", "Ice+Spazer", "Plasma", "ScrewAttack", "PseudoScrew", "PowerBomb"]}},
             {"heatFrames": 180}
           ]},
-          {"and": [
-            {"heatFrames": 200},
-            {"or": [
-              "canDodgeWhileShooting",
-              "Morph"
-            ]}
-          ]},
-          {"and": [
-            {"heatFrames": 160},
-            {"enemyDamage": {"enemy": "Alcoon", "type": "fireball", "hits": 1}}
-          ]}
+          {"heatFrames": 200}
         ]},
         {"or": [
           {"resourceAvailable": [{"type": "ReserveEnergy", "count": 1}]},
@@ -1281,7 +1256,7 @@
         {"canShineCharge": {"usedTiles": 27, "gentleUpTiles": 2, "openEnd": 0}},
         {"or": [
           "canDownBack",
-          "canCarefulJump"
+          "canTrickyJump"
         ]},
         {"heatFrames": 120},
         {"autoReserveTrigger": {"maxReserveEnergy": 95}},