Merge pull request #1795 from blkerby/more-tests

osse101 · web-flow · commit e55c7564de9a · 2024-11-24T12:35:35.000-06:00
More tests
diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json
@@ -2013,7 +2013,8 @@
         "canShinechargeMovementComplex",
         "HiJump",
         "canWalljump",
-        "Morph"
+        "Morph",
+        {"shinespark": {"frames": 5, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {
@@ -2047,7 +2048,8 @@
         "canShinechargeMovementComplex",
         "HiJump",
         "canWalljump",
-        "Morph"
+        "Morph",
+        {"shinespark": {"frames": 3, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {
diff --git a/region/lowernorfair/east/Lower Norfair Farming Room.json b/region/lowernorfair/east/Lower Norfair Farming Room.json
@@ -423,6 +423,7 @@
       "link": [3, 3],
       "name": "Very Patient Zebbo and Viola Farm",
       "requires": [
+        {"heatFrames": 0},
         "canPauseAbuse",
         "Grapple",
         "canBeVeryPatient",
@@ -532,6 +533,7 @@
       "link": [4, 4],
       "name": "Very Patient Zebbo and Viola Farm",
       "requires": [
+        {"heatFrames": 0},
         "canPauseAbuse",
         "Grapple",
         "canBeVeryPatient",
diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze Room.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze Room.json
@@ -291,15 +291,6 @@
         {"heatFrames": 120}
       ]
     },
-    {
-      "id": 7,
-      "link": [2, 2],
-      "name": "Leave Normally",
-      "exitCondition": {
-        "leaveNormally": {}
-      },
-      "requires": []
-    },
     {
       "id": 8,
       "link": [2, 2],
@@ -437,7 +428,9 @@
       "id": 17,
       "link": [3, 3],
       "name": "Open Door",
-      "requires": [],
+      "requires": [
+        {"heatFrames": 20}
+      ],
       "clearsObstacles": ["C"]
     },
     {
diff --git a/region/lowernorfair/east/Main Hall.json b/region/lowernorfair/east/Main Hall.json
@@ -456,7 +456,8 @@
       "name": "Reserve Trigger",
       "requires": [
         "canManageReserves",
-        {"autoReserveTrigger": {}}
+        {"autoReserveTrigger": {}},
+        {"heatFrames": 0}
       ],
       "flashSuitChecked": true,
       "note": "Riding the elevator without enough energy will cause a reserve trigger in the next room, reducing the total heat damage dealt.",
@@ -534,7 +535,8 @@
       "name": "Reserve Trigger",
       "requires": [
         "canManageReserves",
-        {"autoReserveTrigger": {}}
+        {"autoReserveTrigger": {}},
+        {"heatFrames": 0}
       ],
       "flashSuitChecked": true,
       "note": "Riding the elevator without enough energy will cause a reserve trigger in the next room, reducing the total heat damage dealt.",
diff --git a/region/lowernorfair/east/Mickey Mouse Room.json b/region/lowernorfair/east/Mickey Mouse Room.json
@@ -333,7 +333,8 @@
         }
       },
       "requires": [
-        "canPrepareForNextRoom"
+        "canPrepareForNextRoom",
+        {"heatFrames": 0}
       ]
     },
     {
@@ -1768,6 +1769,7 @@
       "name": "Multiviola Clip (X-Ray Standup and Morph)",
       "requires": [
         {"notable": "Multiviola Ice Clip"},
+        "h_heatProof",
         "h_canXRayMorphIceClip"
       ],
       "flashSuitChecked": true,
diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json
@@ -392,15 +392,6 @@
       ],
       "note": "Entering from water or without a way to shoot both blocks simultaneously, pause abuse the first KiHunter and then stay ahead of the other two."
     },
-    {
-      "id": 13,
-      "link": [2, 2],
-      "name": "Leave Normally",
-      "exitCondition": {
-        "leaveNormally": {}
-      },
-      "requires": []
-    },
     {
       "id": 14,
       "link": [2, 2],
@@ -689,7 +680,8 @@
       "link": [3, 7],
       "name": "Screw Kill",
       "requires": [
-        "ScrewAttack"
+        "ScrewAttack",
+        {"heatFrames": 0}
       ]
     },
     {
@@ -1253,7 +1245,9 @@
       "id": 64,
       "link": [7, 3],
       "name": "Base",
-      "requires": []
+      "requires": [
+        {"heatFrames": 0}
+      ]
     },
     {
       "id": 65,
diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json
@@ -321,13 +321,16 @@
       "name": "Ridley without Heat Protection",
       "requires": [
         {"notable": "Ridley without Heat Protection"},
-        "canHeatRun",
+        {"heatFrames": 0},
         {"enemyKill": {
           "enemies": [["Ridley"]]
         }}
       ],
       "setsFlags": ["f_DefeatedRidley"],
-      "note": "Fight Ridley without immunity to heat damage."
+      "note": "Fight Ridley without immunity to heat damage.",
+      "devNote": [
+        "Heat frames are accounted for as part of the enemyKill."
+      ]
     },
     {
       "id": 13,
diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json
@@ -1267,7 +1267,9 @@
       "id": 45,
       "link": [6, 5],
       "name": "Base",
-      "requires": [],
+      "requires": [
+        {"heatFrames": 0}
+      ],
       "clearsObstacles": ["A"]
     }
   ],
diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json
@@ -722,7 +722,8 @@
       "requires": [
         "ScrewAttack",
         "canShinechargeMovementComplex",
-        {"heatFrames": 105}
+        {"heatFrames": 105},
+        {"shinespark": {"frames": 9, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
diff --git a/region/norfair/east/Acid Snakes Tunnel.json b/region/norfair/east/Acid Snakes Tunnel.json
@@ -257,7 +257,9 @@
           "blockPositions": [[7, 2]]
         }
       },
-      "requires": []
+      "requires": [
+        {"heatFrames": 50}
+      ]
     },
     {
       "id": 6,
@@ -1107,7 +1109,10 @@
       "name": "Gamet Farm",
       "requires": [
         {"or": [
-          "canPauseAbuse",
+          {"and": [
+            {"heatFrames": 0},
+            "canPauseAbuse"
+          ]},
           {"heatFrames": 60}
         ]},
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
diff --git a/region/norfair/east/Bat Cave.json b/region/norfair/east/Bat Cave.json
@@ -492,7 +492,9 @@
       "id": 21,
       "link": [3, 2],
       "name": "Leave with Runway",
-      "requires": [],
+      "requires": [
+        {"heatFrames": 15}
+      ],
       "exitCondition": {
         "leaveWithRunway": {
           "length": 7,
@@ -535,7 +537,10 @@
       "requires": [
         {"obstaclesNotCleared": ["A"]},
         {"or": [
-          "canPauseAbuse",
+          {"and": [
+            {"heatFrames": 0},
+            "canPauseAbuse"
+          ]},
           {"heatFrames": 50}
         ]},
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
@@ -554,7 +559,10 @@
           "Grapple"
         ]},
         {"or": [
-          "canPauseAbuse",
+          {"and": [
+            {"heatFrames": 0},
+            "canPauseAbuse"
+          ]},
           {"heatFrames": 50}
         ]},
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
diff --git a/region/norfair/east/Cathedral Entrance.json b/region/norfair/east/Cathedral Entrance.json
@@ -892,7 +892,9 @@
       "id": 41,
       "link": [4, 5],
       "name": "Base",
-      "requires": []
+      "requires": [
+        {"heatFrames": 0}
+      ]
     },
     {
       "id": 42,
diff --git a/region/norfair/east/Cathedral.json b/region/norfair/east/Cathedral.json
@@ -268,7 +268,8 @@
         }
       },
       "requires": [
-        "canTrickyJump"
+        "canTrickyJump",
+        {"heatFrames": 200}
       ],
       "devNote": "FIXME: Jumping fully over the platform, and killing the sova before landing on it is a little faster, with no movement items."
     },
diff --git a/region/norfair/east/Lower Norfair Elevator.json b/region/norfair/east/Lower Norfair Elevator.json
@@ -867,7 +867,8 @@
       "name": "Reserve Trigger",
       "requires": [
         "canManageReserves",
-        {"autoReserveTrigger": {}}
+        {"autoReserveTrigger": {}},
+        {"heatFrames": 0}
       ],
       "note": "Riding the elevator without enough energy will cause a reserve trigger in the next room, reducing the total heat damage dealt.",
       "devNote": "FIXME: If the next room is also heated, the reserve won't trigger until after that elevator ride as well, but then the reserve will trigger during heat damage."
diff --git a/region/norfair/east/Norfair Reserve Tank Room.json b/region/norfair/east/Norfair Reserve Tank Room.json
@@ -832,7 +832,9 @@
       "id": 31,
       "link": [4, 3],
       "name": "Base",
-      "requires": []
+      "requires": [
+        {"heatFrames": 0}
+      ]
     }
   ],
   "nextStratId": 43,
diff --git a/region/norfair/east/Purple Farming Room.json b/region/norfair/east/Purple Farming Room.json
@@ -83,7 +83,8 @@
       "link": [2, 1],
       "name": "Leave with Runway",
       "requires": [
-        "h_runOverRespawningEnemies"
+        "h_runOverRespawningEnemies",
+        {"heatFrames": 0}
       ],
       "exitCondition": {
         "leaveWithRunway": {
@@ -126,7 +127,10 @@
       "name": "Gamet Farm",
       "requires": [
         {"or": [
-          "canPauseAbuse",
+          {"and": [
+            {"heatFrames": 0},
+            "canPauseAbuse"
+          ]},
           {"heatFrames": 50}
         ]},
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
diff --git a/region/norfair/east/Upper Norfair Farming Room.json b/region/norfair/east/Upper Norfair Farming Room.json
@@ -1076,7 +1076,10 @@
       "name": "Gamet Farm",
       "requires": [
         {"or": [
-          "canPauseAbuse",
+          {"and": [
+            {"heatFrames": 0},
+            "canPauseAbuse"
+          ]},
           {"heatFrames": 50}
         ]},
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json
@@ -124,7 +124,9 @@
           "blockPositions": [[12, 12]]
         }
       },
-      "requires": []
+      "requires": [
+        {"heatFrames": 20}
+      ]
     },
     {
       "id": 5,
diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json
@@ -469,7 +469,8 @@
           "canPreciseReserveRefill",
           {"resourceConsumed": [{"type": "ReserveEnergy", "count": 15}]}
         ]},
-        {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]}
+        {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]},
+        {"heatFrames": 0}
       ],
       "clearsObstacles": ["A"],
       "note": [
@@ -485,15 +486,6 @@
         "FIXME: the regular energy required could be reduced in that case."
       ]
     },
-    {
-      "id": 11,
-      "link": [3, 3],
-      "name": "Leave Normally",
-      "exitCondition": {
-        "leaveNormally": {}
-      },
-      "requires": []
-    },
     {
       "id": 12,
       "link": [3, 3],
@@ -710,7 +702,8 @@
           "canPreciseReserveRefill",
           {"resourceConsumed": [{"type": "ReserveEnergy", "count": 15}]}
         ]},
-        {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]}
+        {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]},
+        {"heatFrames": 0}
       ],
       "clearsObstacles": ["A"],
       "note": [
@@ -1360,7 +1353,8 @@
           "canPreciseReserveRefill",
           {"resourceConsumed": [{"type": "ReserveEnergy", "count": 15}]}
         ]},
-        {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]}
+        {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]},
+        {"heatFrames": 0}
       ],
       "clearsObstacles": ["A"],
       "note": [
diff --git a/resources/app/manifests/pip_requirements.txt b/resources/app/manifests/pip_requirements.txt
@@ -1,5 +1,6 @@
 flatten_json
 jsonschema
+referencing
 numpy
 opencv-python
 pillow
diff --git a/schema/m3-requirements.schema.json b/schema/m3-requirements.schema.json
@@ -244,7 +244,7 @@
           },
           "heatFrames": {
             "type": "integer",
-            "minimum": 1,
+            "minimum": 0,
             "title": "Heat Frames",
             "description": "Fulfilled by spending an amount of energy that corresponds to spending a number of frames in a heat room."
           },
diff --git a/tests/asserts/keywords.py b/tests/asserts/keywords.py
diff --git a/tests/asserts/validate.py b/tests/asserts/validate.py

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,8 @@`
`333`	`333`	`}`
`334`	`334`	`},`
`335`	`335`	`"requires": [`
`336`		`- "canPrepareForNextRoom"`
	`336`	`+ "canPrepareForNextRoom",`
	`337`	`+ {"heatFrames": 0}`
`337`	`338`	`]`
`338`	`339`	`},`
`339`	`340`	`{`
`@@ -1768,6 +1769,7 @@`
`1768`	`1769`	`"name": "Multiviola Clip (X-Ray Standup and Morph)",`
`1769`	`1770`	`"requires": [`
`1770`	`1771`	`{"notable": "Multiviola Ice Clip"},`
	`1772`	`+ "h_heatProof",`
`1771`	`1773`	`"h_canXRayMorphIceClip"`
`1772`	`1774`	`],`
`1773`	`1775`	`"flashSuitChecked": true,`