isaacscript-common 59.4.1 → 59.6.0

package/dist/src/functions/gridEntities.lua

@@ -340,6 +340,25 @@ function getRockPNGName(self)
         end
     until true
 end
+--- Helper function to get the grid indexes on the surrounding tiles from the provided grid index.
+-- 
+-- There are always 8 grid indexes returned (e.g. top-left + top + top-right + left + right +
+-- bottom-left + bottom + right), even if the computed values would be negative or otherwise
+-- invalid.
+function ____exports.getSurroundingGridIndexes(self, gridIndex)
+    local room = game:GetRoom()
+    local gridWidth = room:GetGridWidth()
+    return {
+        gridIndex - gridWidth - 1,
+        gridIndex - gridWidth,
+        gridIndex - gridWidth + 1,
+        gridIndex - 1,
+        gridIndex + 1,
+        gridIndex + gridWidth - 1,
+        gridIndex + gridWidth,
+        gridIndex + gridWidth + 1
+    }
+end
 --- Helper function to get the grid index of the top left wall. (This will depend on what the current
 -- room shape is.)
 -- 
@@ -683,18 +702,8 @@ end
 -- rocks (e.g. top-left + top + top-right + left + right + bottom-left + bottom + right).
 function ____exports.getSurroundingGridEntities(self, gridEntity)
     local room = game:GetRoom()
-    local gridWidth = room:GetGridWidth()
     local gridIndex = gridEntity:GetGridIndex()
-    local surroundingGridIndexes = {
-        gridIndex - 1,
-        gridIndex + 1,
-        gridIndex - gridWidth - 1,
-        gridIndex - gridWidth,
-        gridIndex - gridWidth + 1,
-        gridIndex + gridWidth - 1,
-        gridIndex + gridWidth,
-        gridIndex + gridWidth + 1
-    }
+    local surroundingGridIndexes = ____exports.getSurroundingGridIndexes(nil, gridIndex)
     local surroundingGridEntities = {}
     for ____, surroundingGridIndex in ipairs(surroundingGridIndexes) do
         local surroundingGridEntity = room:GetGridEntity(surroundingGridIndex)
@@ -737,6 +746,26 @@ end
 function ____exports.isGridEntityXMLType(self, num)
     return GRID_ENTITY_XML_TYPES_SET:has(num)
 end
+--- Helper function to check if the provided grid index has a door on it or if the surrounding 8 grid
+-- indexes have a door on it.
+function ____exports.isGridIndexAdjacentToDoor(self, gridIndex)
+    local room = game:GetRoom()
+    local surroundingGridIndexes = ____exports.getSurroundingGridIndexes(nil, gridIndex)
+    local gridIndexes = {
+        gridIndex,
+        table.unpack(surroundingGridIndexes)
+    }
+    for ____, gridIndexToInspect in ipairs(gridIndexes) do
+        local gridEntity = room:GetGridEntity(gridIndexToInspect)
+        if gridEntity ~= nil then
+            local door = gridEntity:ToDoor()
+            if door ~= nil then
+                return true
+            end
+        end
+    end
+    return false
+end
 --- Helper function to see if a `GridEntityXMLType` is some kind of poop.
 function ____exports.isPoopGridEntityXMLType(self, gridEntityXMLType)
     return POOP_GRID_ENTITY_XML_TYPES_SET:has(gridEntityXMLType)

package/dist/src/functions/revive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revive.d.ts","sourceRoot":"","sources":["../../../src/functions/revive.ts"],"names":[],"mappings":";;;AAoBA;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,SAAS,EACjB,mBAAmB,EAAE,GAAG,GAAG,SAAS,GACnC,OAAO,CAuFT;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAmBvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAa9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAYtE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAe1E"}
+{"version":3,"file":"revive.d.ts","sourceRoot":"","sources":["../../../src/functions/revive.ts"],"names":[],"mappings":";;;AAoBA;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,SAAS,EACjB,mBAAmB,EAAE,GAAG,GAAG,SAAS,GACnC,OAAO,CAsFT;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAmBvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAa9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAYtE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAe1E"}

package/dist/src/functions/revive.lua

@@ -5,8 +5,6 @@ local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local NullItemID = ____isaac_2Dtypescript_2Ddefinitions.NullItemID
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
-local ____cachedClasses = require("src.core.cachedClasses")
-local game = ____cachedClasses.game
 local ____constants = require("src.core.constants")
 local MAX_TAINTED_SAMSON_BERSERK_CHARGE = ____constants.MAX_TAINTED_SAMSON_BERSERK_CHARGE
 local TAINTED_SAMSON_BERSERK_CHARGE_FROM_TAKING_DAMAGE = ____constants.TAINTED_SAMSON_BERSERK_CHARGE_FROM_TAKING_DAMAGE
@@ -14,6 +12,8 @@ local ____MysteriousPaperEffect = require("src.enums.MysteriousPaperEffect")
 local MysteriousPaperEffect = ____MysteriousPaperEffect.MysteriousPaperEffect
 local ____characters = require("src.functions.characters")
 local getCharacterDeathAnimationName = ____characters.getCharacterDeathAnimationName
+local ____frames = require("src.functions.frames")
+local onGameFrame = ____frames.onGameFrame
 local ____playerHealth = require("src.functions.playerHealth")
 local getPlayerMaxHeartContainers = ____playerHealth.getPlayerMaxHeartContainers
 local ____players = require("src.functions.players")
@@ -54,7 +54,6 @@ end
 --- Uses the player's current health and other miscellaneous things to determine if incoming damage
 -- will be fatal.
 function ____exports.isDamageToPlayerFatal(self, player, amount, source, lastDamageGameFrame)
-    local gameFrameCount = game:GetFrameCount()
     local character = player:GetPlayerType()
     local effects = player:GetEffects()
     local isBerserk = effects:HasCollectibleEffect(CollectibleType.BERSERK)
@@ -84,7 +83,7 @@ function ____exports.isDamageToPlayerFatal(self, player, amount, source, lastDam
     if ____exports.willReviveFromHeartbreak(nil, player) then
         return false
     end
-    if player:HasCollectible(CollectibleType.BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageGameFrame then
+    if player:HasCollectible(CollectibleType.BROKEN_GLASS_CANNON) and onGameFrame(nil, lastDamageGameFrame) then
         return false
     end
     local hearts = player:GetHearts()

package/dist/src/index.d.ts

@@ -54,6 +54,7 @@ export * from "./functions/enums";
 export * from "./functions/external";
 export * from "./functions/familiars";
 export * from "./functions/flag";
+export * from "./functions/frames";
 export * from "./functions/globals";
 export * from "./functions/gridEntities";
 export * from "./functions/gridEntitiesSpecific";

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,0CAA0C,CAAC;AACzD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}

package/dist/src/index.lua

@@ -447,6 +447,14 @@ do
         end
     end
 end
+do
+    local ____export = require("src.functions.frames")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("src.functions.globals")
     for ____exportKey, ____exportValue in pairs(____export) do

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "59.4.1",
+  "version": "59.6.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/ModUpgraded.ts

@@ -5,7 +5,7 @@ import { EXPORTED_METHOD_NAMES_KEY } from "../decorators";
 import { ISCFeature } from "../enums/ISCFeature";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { getFeatures } from "../features";
-import { getTime } from "../functions/debugFunctions";
+import { getElapsedTimeSince, getTime } from "../functions/debugFunctions";
 import { getParentFunctionDescription, log } from "../functions/log";
 import {
   getTSTLClassConstructor,
@@ -116,8 +116,7 @@ export class ModUpgraded implements Mod {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, n/no-callback-literal
         const returnValue = callback(...callbackArgs);
 
-        const endTime = getTime();
-        const elapsedTime = endTime - startTime;
+        const elapsedTime = getElapsedTimeSince(startTime);
         if (
           this.timeThreshold === undefined ||
           this.timeThreshold <= elapsedTime

package/src/classes/callbacks/PostCursedTeleport.ts

@@ -8,6 +8,7 @@ import {
 import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { hasFlag } from "../../functions/flag";
+import { onGameFrame } from "../../functions/frames";
 import {
   mapGetPlayer,
   mapSetPlayer,
@@ -146,8 +147,7 @@ export class PostCursedTeleport extends CustomCallback<ModCallbackCustom.POST_CU
     lastDamageFrame: int,
   ) {
     // Check to see if this is the frame that we last took damage.
-    const gameFrameCount = game.GetFrameCount();
-    if (gameFrameCount !== lastDamageFrame) {
+    if (!onGameFrame(lastDamageFrame)) {
       return false;
     }
 

package/src/classes/callbacks/PostItemDischarge.ts

@@ -172,8 +172,10 @@ export class PostItemDischarge extends CustomCallback<T> {
       v.room.playersBulbLastCollisionFrame,
       player,
     );
+
     const collidedOnThisFrame = gameFrameCount === bulbLastCollisionFrame;
     const collidedOnLastFrame = gameFrameCount - 1 === bulbLastCollisionFrame;
+
     return collidedOnThisFrame || collidedOnLastFrame;
   }
 }

package/src/classes/callbacks/PostPickupInitFirst.ts

@@ -1,6 +1,6 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { game } from "../../core/cachedClasses";
 import type { ModCallbackCustom } from "../../enums/ModCallbackCustom";
+import { isPastRoomFrame } from "../../functions/frames";
 import { getRoomVisitedCount } from "../../functions/roomData";
 import { shouldFirePickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
@@ -25,13 +25,11 @@ export class PostPickupInitFirst extends CustomCallback<ModCallbackCustom.POST_P
 
   // ModCallback.POST_PICKUP_INIT (34)
   private readonly postPickupInit = (pickup: EntityPickup) => {
-    const room = game.GetRoom();
-    const roomFrameCount = room.GetFrameCount();
     const roomVisitedCount = getRoomVisitedCount();
 
     // The room visited count is not reset when re-entering a Treasure Room or Boss room in the
     // Ascent.
-    if (roomFrameCount > 0 || roomVisitedCount === 0) {
+    if (isPastRoomFrame(0) || roomVisitedCount === 0) {
       this.fire(pickup);
     }
   };

package/src/classes/features/callbackLogic/GameReorderedCallbacks.ts

@@ -2,6 +2,7 @@ import type { LevelStage, StageType } from "isaac-typescript-definitions";
 import { CollectibleType, ModCallback } from "isaac-typescript-definitions";
 import { game } from "../../../core/cachedClasses";
 import { Exported } from "../../../decorators";
+import { onGameFrame, onRenderFrame } from "../../../functions/frames";
 import type { PostGameStartedReordered } from "../../callbacks/PostGameStartedReordered";
 import type { PostGameStartedReorderedLast } from "../../callbacks/PostGameStartedReorderedLast";
 import type { PostNewLevelReordered } from "../../callbacks/PostNewLevelReordered";
@@ -123,14 +124,13 @@ export class GameReorderedCallbacks extends Feature {
 
   // ModCallback.POST_NEW_LEVEL (18)
   private readonly postNewLevel = (): void => {
-    const gameFrameCount = game.GetFrameCount();
     const level = game.GetLevel();
     const stage = level.GetStage();
     const stageType = level.GetStageType();
     const room = game.GetRoom();
     const roomType = room.GetType();
 
-    if (gameFrameCount === 0 && !this.forceNewLevel) {
+    if (onGameFrame(0) && !this.forceNewLevel) {
       // Wait for the `POST_GAME_STARTED` callback to fire.
       return;
     }
@@ -143,13 +143,11 @@ export class GameReorderedCallbacks extends Feature {
 
   // ModCallback.POST_NEW_ROOM (19)
   private readonly postNewRoom = (): void => {
-    const gameFrameCount = game.GetFrameCount();
     const level = game.GetLevel();
     const stage = level.GetStage();
     const stageType = level.GetStageType();
     const room = game.GetRoom();
     const roomType = room.GetType();
-    const renderFrameCount = Isaac.GetFrameCount();
 
     if (this.usedGlowingHourGlass) {
       this.usedGlowingHourGlass = false;
@@ -166,8 +164,8 @@ export class GameReorderedCallbacks extends Feature {
     }
 
     if (
-      (gameFrameCount === 0 ||
-        renderFrameCount === this.renderFrameRunStarted ||
+      (onGameFrame(0) ||
+        onRenderFrame(this.renderFrameRunStarted) ||
         this.currentStage !== stage ||
         this.currentStageType !== stageType) &&
       !this.forceNewRoom

package/src/classes/features/other/CustomTrapdoors.ts

@@ -21,6 +21,10 @@ import { GridEntityTypeCustom } from "../../../enums/private/GridEntityTypeCusto
 import { StageTravelState } from "../../../enums/private/StageTravelState";
 import { TrapdoorAnimation } from "../../../enums/private/TrapdoorAnimation";
 import { easeOutSine } from "../../../functions/easing";
+import {
+  isPastRoomFrame,
+  onOrPastRenderFrame,
+} from "../../../functions/frames";
 import { log } from "../../../functions/log";
 import { movePlayersToCenter } from "../../../functions/playerCenter";
 import {
@@ -218,12 +222,9 @@ export class CustomTrapdoors extends Feature {
       return;
     }
 
-    const hud = game.GetHUD();
-    const renderFrameCount = Isaac.GetFrameCount();
-
     const renderFrameScreenBlack =
       v.run.stateRenderFrame + PIXELATION_TO_BLACK_FRAMES;
-    if (renderFrameCount < renderFrameScreenBlack) {
+    if (!onOrPastRenderFrame(renderFrameScreenBlack)) {
       return;
     }
 
@@ -232,6 +233,7 @@ export class CustomTrapdoors extends Feature {
 
     // Now, we display a black sprite on top of the pixelation effect, to prevent showing the rest
     // of the animation.
+    const hud = game.GetHUD();
     hud.SetVisible(false);
 
     // If the pixelation effect is not fully allowed to complete, the game's internal buffer will
@@ -313,18 +315,16 @@ export class CustomTrapdoors extends Feature {
       return;
     }
 
-    const hud = game.GetHUD();
-    const renderFrameCount = Isaac.GetFrameCount();
-
     const renderFrameScreenBlack =
       v.run.stateRenderFrame + PIXELATION_TO_BLACK_FRAMES;
-    if (renderFrameCount < renderFrameScreenBlack) {
+    if (!onOrPastRenderFrame(renderFrameScreenBlack)) {
       return;
     }
 
     v.run.state = StageTravelState.PIXELATION_TO_ROOM;
     this.logStateChanged();
 
+    const hud = game.GetHUD();
     hud.SetVisible(true);
 
     this.runNextRoom.runNextRoom(() => {
@@ -439,7 +439,6 @@ export class CustomTrapdoors extends Feature {
   }
 
   private isPlayerCloseAfterBoss(position: Vector) {
-    const gameFrameCount = game.GetFrameCount();
     const room = game.GetRoom();
     const roomType = room.GetType();
     const roomClearGameFrame = this.roomClearFrame.getRoomClearGameFrame();
@@ -449,7 +448,7 @@ export class CustomTrapdoors extends Feature {
     if (
       roomType !== RoomType.BOSS ||
       roomClearGameFrame === undefined ||
-      gameFrameCount >= roomClearGameFrame + TRAPDOOR_BOSS_REACTION_FRAMES
+      onOrPastRenderFrame(roomClearGameFrame + TRAPDOOR_BOSS_REACTION_FRAMES)
     ) {
       return false;
     }
@@ -627,7 +626,6 @@ export class CustomTrapdoors extends Feature {
     firstSpawn: boolean,
   ): boolean {
     const room = game.GetRoom();
-    const roomFrameCount = room.GetFrameCount();
     const roomClear = room.IsClear();
 
     // Trapdoors created after a room has already initialized should spawn closed by default:
@@ -635,7 +633,7 @@ export class CustomTrapdoors extends Feature {
     //   into them.
     // - Trapdoors created by We Need to Go Deeper should spawn closed because the player will be
     //   standing on top of them.
-    if (roomFrameCount > 0) {
+    if (isPastRoomFrame(0)) {
       return false;
     }
 
@@ -762,7 +760,6 @@ export class CustomTrapdoors extends Feature {
     }
 
     const room = game.GetRoom();
-    const roomFrameCount = room.GetFrameCount();
     const roomListIndex = getRoomListIndex();
     const gridIndex = isVector(gridIndexOrPosition)
       ? room.GetGridIndex(gridIndexOrPosition)
@@ -776,7 +773,7 @@ export class CustomTrapdoors extends Feature {
       TrapdoorAnimation.OPENED,
     );
 
-    const firstSpawn = roomFrameCount !== 0;
+    const firstSpawn = isPastRoomFrame(0);
     const open =
       spawnOpen ?? this.shouldTrapdoorSpawnOpen(gridEntity, firstSpawn);
 

package/src/classes/features/other/PickupIndexCreation.ts

@@ -7,6 +7,7 @@ import { game } from "../../../core/cachedClasses";
 import { Exported } from "../../../decorators";
 import { ISCFeature } from "../../../enums/ISCFeature";
 import { getEntityID } from "../../../functions/entities";
+import { isPastRoomFrame } from "../../../functions/frames";
 import { getRoomListIndex } from "../../../functions/roomData";
 import { onAscent } from "../../../functions/stage";
 import { vectorEquals } from "../../../functions/vector";
@@ -93,11 +94,10 @@ export class PickupIndexCreation extends Feature {
       this.getPickupIndexFromPreviousData(pickup);
     const room = game.GetRoom();
     const isFirstVisit = room.IsFirstVisit();
-    const roomFrameCount = room.GetFrameCount();
     if (
       pickupIndexFromLevelData !== undefined &&
       !isFirstVisit &&
-      roomFrameCount <= 0
+      !isPastRoomFrame(0)
     ) {
       v.room.pickupIndexes.set(ptrHash, pickupIndexFromLevelData);
       return;

package/src/classes/features/other/PreventCollectibleRotation.ts

@@ -11,6 +11,7 @@ import { ISCFeature } from "../../../enums/ISCFeature";
 import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { setCollectibleSubType } from "../../../functions/collectibles";
 import { getEntityID } from "../../../functions/entities";
+import { onGameFrame } from "../../../functions/frames";
 import { isCollectible } from "../../../functions/pickupVariants";
 import { getCollectibles } from "../../../functions/pickupsSpecific";
 import { asCollectibleType } from "../../../functions/types";
@@ -142,11 +143,9 @@ export class PreventCollectibleRotation extends Feature {
     }
 
     // It can take a frame after the activation of the D6 for the sub-type to change.
-    const gameFrameCount = game.GetFrameCount();
     if (
       v.run.rollGameFrame !== null &&
-      (gameFrameCount === v.run.rollGameFrame ||
-        gameFrameCount === v.run.rollGameFrame + 1)
+      (onGameFrame(v.run.rollGameFrame) || onGameFrame(v.run.rollGameFrame + 1))
     ) {
       v.run.trackedCollectibles.delete(pickupIndex);
       return;

package/src/classes/features/other/SaveDataManager.ts

@@ -1,11 +1,11 @@
 import type { ActiveSlot, UseFlag } from "isaac-typescript-definitions";
 import { CollectibleType, ModCallback } from "isaac-typescript-definitions";
-import { game } from "../../../core/cachedClasses";
 import { Exported } from "../../../decorators";
 import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { SaveDataKey } from "../../../enums/SaveDataKey";
 import { SerializationType } from "../../../enums/SerializationType";
 import { deepCopy } from "../../../functions/deepCopy";
+import { isPastGameFrame } from "../../../functions/frames";
 import { log } from "../../../functions/log";
 import { onFirstFloor } from "../../../functions/stage";
 import { getTSTLClassName, isTSTLClass } from "../../../functions/tstlClass";
@@ -145,8 +145,7 @@ export class SaveDataManager extends Feature {
     // data that is not tied to an individual run.
     loadFromDisk(this.mod, this.saveDataMap, this.classConstructors);
 
-    const gameFrameCount = game.GetFrameCount();
-    const isContinued = gameFrameCount !== 0;
+    const isContinued = isPastGameFrame(0);
     if (!isContinued) {
       restoreDefaultsForAllFeaturesAndKeys(
         this.saveDataMap,

package/src/classes/features/other/customStages/streakText.ts

@@ -3,6 +3,10 @@ import { CONTROLLER_INDEX_VALUES } from "../../../../arrays/cachedEnumValues";
 import { fonts, game } from "../../../../core/cachedClasses";
 import { KColorDefault, VectorOne } from "../../../../core/constants";
 import { UIStreakAnimation } from "../../../../enums/private/UIStreakAnimation";
+import {
+  getElapsedGameFramesSince,
+  getElapsedRenderFramesSince,
+} from "../../../../functions/frames";
 import {
   getScreenBottomCenterPos,
   getScreenTopCenterPos,
@@ -102,9 +106,9 @@ function checkEndTopStreakText() {
     return;
   }
 
-  const renderFrameCount = Isaac.GetFrameCount();
-  const elapsedFrames =
-    renderFrameCount - v.run.topStreakTextStartedRenderFrame;
+  const elapsedFrames = getElapsedRenderFramesSince(
+    v.run.topStreakTextStartedRenderFrame,
+  );
   if (elapsedFrames >= 115) {
     v.run.topStreakText.animation = UIStreakAnimation.TEXT;
     // We adjust by the frame backwards by an arbitrary amount to roughly align with the speed of
@@ -114,8 +118,9 @@ function checkEndTopStreakText() {
 }
 
 function trackMapInputPressed() {
+  const gameFrameCount = game.GetFrameCount();
+
   for (const controllerIndex of CONTROLLER_INDEX_VALUES) {
-    const gameFrameCount = game.GetFrameCount();
     const oldPushedMapFrame =
       v.run.controllerIndexPushingMapRenderFrame.get(controllerIndex);
     const isPushingMap = Input.IsActionPressed(
@@ -153,8 +158,7 @@ function checkStartBottomStreakText() {
   }
 
   const earliestFrame = Math.min(...pushedMapFrames);
-  const gameFrameCount = game.GetFrameCount();
-  const elapsedFrames = gameFrameCount - earliestFrame;
+  const elapsedFrames = getElapsedGameFramesSince(earliestFrame);
   if (elapsedFrames >= NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT) {
     v.run.bottomStreakText.animation = UIStreakAnimation.TEXT;
     v.run.bottomStreakText.frame = 0;

package/src/functions/debugFunctions.ts

@@ -1,5 +1,14 @@
 import { log } from "./log";
 
+/**
+ * Helper function to get the amount of elapsed time for benchmarking / profiling purposes.
+ *
+ * For more information, see the documentation for the `getTime` helper function.
+ */
+export function getElapsedTimeSince(time: int | float): int {
+  return getTime() - time;
+}
+
 /**
  * Helper function to get the current time for benchmarking / profiling purposes.
  *
@@ -18,7 +27,7 @@ import { log } from "./log";
  *                             Default is true. If set to false, the `Isaac.GetTime()` method will
  *                             always be used.
  */
-export function getTime(useSocketIfAvailable = true): float {
+export function getTime(useSocketIfAvailable = true): int | float {
   if (useSocketIfAvailable) {
     if (SandboxGetTime !== undefined) {
       return SandboxGetTime();