feedback updates

Author: blkerby

helpers.json

@@ -1181,6 +1181,21 @@
             "canDownGrab"
           ]
         },
+        {
+          "name": "h_heatedCrouchJumpDownGrab",
+          "requires": [
+            "h_crouchJumpDownGrab",
+            {"or": [
+              {"noBlueSuit": {}},
+              "canXRayCancelShinecharge",
+              {"and": [
+                "canMidAirMorph",
+                {"heatFrames": 30}
+              ]},
+              {"heatFrames": 185}
+            ]}
+          ]
+        },
         {
           "name": "h_underwaterCrouchJump",
           "requires": [

region/norfair/east/Single Chamber.json

@@ -1931,7 +1931,7 @@
             {"heatFrames": 110}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 150}
           ]},
           {"and": [
@@ -2515,7 +2515,7 @@
           "canWalljump",
           "HiJump",
           "SpaceJump",
-          "h_crouchJumpDownGrab",
+          "h_heatedCrouchJumpDownGrab",
           "Wave"
         ]},
         {"heatFrames": 950},
@@ -2629,7 +2629,7 @@
             {"heatFrames": 115}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 150}
           ]},
           {"and": [
@@ -3006,7 +3006,7 @@
             {"heatFrames": 70}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 100}
           ]},
           {"and": [
@@ -3066,7 +3066,7 @@
             {"heatFrames": 60}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 80}
           ]},
           {"and": [
@@ -3356,7 +3356,7 @@
             {"heatFrames": 60}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 110}
           ]},
           {"and": [
@@ -3388,7 +3388,7 @@
             {"heatFrames": 40}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 90}
           ]},
           {"and": [
@@ -3457,11 +3457,13 @@
             {"heatFrames": 110}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 270}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"enemyKill": {
               "enemies": [["Multiviola"]],
               "explicitWeapons": ["Missile", "Super", "Wave", "Plasma"]
@@ -3627,8 +3629,14 @@
             {"heatFrames": 55}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
-            {"heatFrames": 80}
+            "h_heatedCrouchJumpDownGrab",
+            {"heatFrames": 80},
+            {"or": [
+              {"noBlueSuit": {}},
+              "canXRayCancelShinecharge",
+              "canMidAirMorph",
+              {"heatFrames": 60}
+            ]}
           ]},
           {"and": [
             "SpaceJump",
@@ -3690,7 +3698,7 @@
             {"heatFrames": 35}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
             {"heatFrames": 60}
           ]},
           {"and": [
@@ -3767,8 +3775,15 @@
             {"heatFrames": 105}
           ]},
           {"and": [
-            "h_crouchJumpDownGrab",
-            {"heatFrames": 195}
+            "h_heatedCrouchJumpDownGrab",
+            "h_heatedCrouchJumpDownGrab",
+            {"heatFrames": 195},
+            {"or": [
+              {"noBlueSuit": {}},
+              "canXRayCancelShinecharge",
+              "canMidAirMorph",
+              {"heatFrames": 60}
+            ]}
           ]},
           {"and": [
             "SpaceJump",

schema/m3-string-requirements.schema.json

@@ -416,6 +416,7 @@
     "h_heatedBlueGateGlitch",
     "h_heatedGreenGateGlitch",
     "h_crouchJumpDownGrab",
+    "h_heatedCrouchJumpDownGrab",
     "h_underwaterCrouchJump",
     "h_underwaterMaxHeightSpringBallJump",
     "h_underwaterCrouchJumpDownGrab",

tests/asserts/keywords.py

@@ -490,7 +490,7 @@ def process_req_speed_state(req, states, err_fn):
             if not states.issubset(["shinecharging", "shinecharged", "preshinespark"]):
                 err_fn(f"{req} while not shinecharging/shinecharged/preshinespark")
             states = {"normal"}
-        elif req in ["canTemporaryBlue", "canChainTemporaryBlue", "canLongChainTemporaryBlue", "canSpeedball", "canXRayCancelShinecharge"]:
+        elif req in ["canTemporaryBlue", "canChainTemporaryBlue", "canLongChainTemporaryBlue", "canSpeedball"]:
             if not states.issubset(["shinecharging", "blue"]):
                 err_fn(f"{req} while not in blue state")
             states = {"blue"}