Merge pull request #1807 from blkerby/shinecharge-tests

Shinecharge tests

Author: blkerby

region/crateria/east/West Ocean.json

@@ -466,6 +466,7 @@
         "HiJump",
         "canTrickyDashJump",
         "canWalljump",
+        {"canShineCharge": {"usedTiles": 25, "openEnd": 1, "steepUpTiles": 4}},
         "canShinechargeMovementComplex",
         {"shineChargeFrames": 125}
       ],
@@ -481,8 +482,9 @@
       "requires": [
         "HiJump",
         "SpaceJump",
+        {"canShineCharge": {"usedTiles": 25, "openEnd": 1, "steepUpTiles": 4}},
         "canShinechargeMovementComplex",
-        {"shineChargeFrames": 150}
+        {"shineChargeFrames": 135}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
@@ -495,9 +497,10 @@
       "name": "Leave Shinecharged (HiJump)",
       "requires": [
         "HiJump",
+        {"canShineCharge": {"usedTiles": 23, "openEnd": 1, "steepUpTiles": 4}},
         "canTrickyDashJump",
         "canShinechargeMovementComplex",
-        {"shineChargeFrames": 160}
+        {"shineChargeFrames": 150}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
@@ -507,16 +510,40 @@
     {
       "id": 11,
       "link": [2, 2],
-      "name": "Leave With Spark",
+      "name": "Leave With Spark (Tricky Dash Jump, Wall Jump)",
       "requires": [
+        {"canShineCharge": {"usedTiles": 32, "openEnd": 1, "steepUpTiles": 4}},
         "canTrickyDashJump",
         "canWalljump",
-        "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 20}}
+        "canShinechargeMovementTricky",
+        {"shinespark": {"frames": 10}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
-      }
+      },
+      "note": [
+        "Gain a shinecharge while bonking the door below the top-right door.",
+        "Then turn around, run a precise distance of 7 tiles, and jump and walljump to approach the top-right door and shinespark out."
+      ]
+    },
+    {
+      "link": [2, 2],
+      "name": "Leave Shinecharged (Tricky Dash Jump, Wall Jump)",
+      "requires": [
+        {"canShineCharge": {"usedTiles": 18, "openEnd": 1, "steepUpTiles": 4}},
+        "canTrickyDashJump",
+        "canWalljump",
+        "canShinechargeMovementTricky",
+        "canInsaneJump",
+        {"shineChargeFrames": 170}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "note": [
+        "Gain a shinecharge while running left-to-right.",
+        "Continue running right for a precise distance of 7 tiles, then jump and walljump to reach the top-right door with shinecharge frames remaining."
+      ]
     },
     {
       "id": 12,

region/crateria/west/Gauntlet Energy Tank Room.json

@@ -922,6 +922,7 @@
       "requires": [
         {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]},
+        "h_canShineChargeMaxRunway",
         {"shineChargeFrames": 0}
       ],
       "exitCondition": {

region/lowernorfair/east/Plowerhouse Room.json

@@ -180,6 +180,7 @@
       "link": [1, 2],
       "name": "Acid Leave Shinecharged",
       "requires": [
+        {"canShineCharge": {"usedTiles": 38, "openEnd": 0}},
         {"heatFrames": 300},
         {"acidFrames": 133},
         "Gravity",
@@ -461,6 +462,7 @@
       "link": [2, 1],
       "name": "Acid Leave Shinecharged",
       "requires": [
+        {"canShineCharge": {"usedTiles": 38, "openEnd": 0}},
         {"heatFrames": 390},
         {"acidFrames": 133},
         "Gravity",

region/norfair/crocomire/Post Crocomire Jump Room.json

@@ -660,6 +660,7 @@
       "name": "Leave with Shinecharge - Power Bomb Blocks Destroyed",
       "requires": [
         {"obstaclesCleared": ["A", "B"]},
+        {"canShineCharge": {"usedTiles": 38, "openEnd": 2, "gentleDownTiles": 6}},
         "canShinechargeMovement",
         {"shineChargeFrames": 45}
       ],

tests/asserts/keywords.py

@@ -262,6 +262,18 @@ def check_shinespark_req(req):
         if "or" in req:
             return all(check_shinespark_req(v) for v in req["or"])
 
+def check_shinecharge_req(req):
+    if isinstance(req, str):
+        if req in ["h_canShineChargeMaxRunway", "canStutterWaterShineCharge"]:
+            return True
+    if isinstance(req, dict):
+        if "canShineCharge" in req:
+            return True
+        if "and" in req:
+            return any(check_shinecharge_req(v) for v in req["and"])
+        if "or" in req:
+            return all(check_shinecharge_req(v) for v in req["or"])
+
 def check_heat_req(req):
     if isinstance(req, str):
         if req in ["h_heatProof", "h_canHeatedCrystalFlash", "h_canHeatedLavaCrystalFlash", "h_LowerNorfairElevatorDownwardFrames",
@@ -848,6 +860,15 @@ def covers_shinecharge_frames(req):
                                     msg = f"🔴ERROR: Strat has leaveWithSpark exitCondition but is lacking a shinespark requirement:{stratRef}"
                                     messages["reds"].append(msg)
                                     messages["counts"]["reds"] += 1
+                        if ("exitCondition" in strat and "leaveShinecharged" in strat["exitCondition"]) or strat.get("endsWithShineCharge") is True:
+                            has_shinecharge_req = check_shinecharge_req({"and": strat["requires"]})
+                            starts_shinecharged = strat.get("startsWithShineCharge") is True
+                            comes_in_shinecharged = "entranceCondition" in strat and "comeInShinecharged" in strat["entranceCondition"]
+                            comes_in_shinecharging = "entranceCondition" in strat and "comeInShinecharging" in strat["entranceCondition"]
+                            if not (has_shinecharge_req or starts_shinecharged or comes_in_shinecharged or comes_in_shinecharging):
+                                msg = f"🔴ERROR: Strat ends or leaves shinecharged but obtains no shinecharge:{stratRef}"
+                                messages["reds"].append(msg)
+                                messages["counts"]["reds"] += 1
 
                         node_subtype = node_lookup[toNode]["nodeSubType"]
                         door_unlocked_nodes = find_door_unlocked_nodes(strat, node_subtype, nodes_without_implicit_unlocks)