isaacscript-common 36.1.0 → 36.2.0

package/dist/index.rollup.d.ts

@@ -1583,7 +1583,7 @@ export declare const COLLECTIBLE_INITIAL_WAIT = 20;
 /** Helper function to check in the item config if a given collectible has a given cache flag. */
 export declare function collectibleHasCacheFlag(collectibleOrCollectibleType: EntityPickup | CollectibleType, cacheFlag: CacheFlag): boolean;
 
-export declare function collectibleHasTag(collectibleType: CollectibleType, tag: ItemConfigTag): boolean;
+export declare function collectibleHasTag(collectibleOrCollectibleType: EntityPickupCollectible | CollectibleType, tag: ItemConfigTag): boolean;
 
 declare class CollectibleItemPoolType extends Feature {
     private readonly pickupIndexCreation;
@@ -8892,7 +8892,7 @@ export declare function isProjectile(variable: unknown): variable is EntityProje
 /** Helper function to check if a collectible type is a particular quality. */
 export declare function isQuality(collectibleOrCollectibleType: EntityPickup | CollectibleType, quality: int): boolean;
 
-export declare function isQuestCollectible(collectibleType: CollectibleType): boolean;
+export declare function isQuestCollectible(collectibleOrCollectibleType: EntityPickupCollectible | CollectibleType): boolean;
 
 /**
  * Helper function to detect the custom death state of a Rag Man Ragling. When Rag Man Raglings die,

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 36.1.0
+isaacscript-common 36.2.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -21508,7 +21508,7 @@ local ____sprites = require("src.functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local spriteEquals = ____sprites.spriteEquals
 local ____types = require("src.functions.types")
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local iRange = ____utils.iRange
 function initQuestionMarkSprite(self)
@@ -21568,9 +21568,8 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
     )
 end
 function getCollectibleTypeFromArg(self, collectibleOrCollectibleType, functionName)
-    if isNumber(nil, collectibleOrCollectibleType) then
-        local collectibleType = collectibleOrCollectibleType
-        return collectibleType
+    if isInteger(nil, collectibleOrCollectibleType) then
+        return collectibleOrCollectibleType
     end
     local collectible = collectibleOrCollectibleType
     if not isCollectible(nil, collectible) then
@@ -28043,7 +28042,7 @@ local ____rooms = require("src.functions.rooms")
 local roomUpdateSafe = ____rooms.roomUpdateSafe
 local ____types = require("src.functions.types")
 local asNumber = ____types.asNumber
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
 local eRange = ____utils.eRange
@@ -28080,20 +28079,20 @@ function ____exports.getTopLeftWallGridIndex(self)
 end
 function ____exports.removeGridEntity(self, gridEntityOrGridIndex, updateRoom)
     local room = game:GetRoom()
-    local ____isNumber_result_2
-    if isNumber(nil, gridEntityOrGridIndex) then
-        ____isNumber_result_2 = room:GetGridEntity(gridEntityOrGridIndex)
+    local ____isInteger_result_2
+    if isInteger(nil, gridEntityOrGridIndex) then
+        ____isInteger_result_2 = room:GetGridEntity(gridEntityOrGridIndex)
     else
-        ____isNumber_result_2 = gridEntityOrGridIndex
+        ____isInteger_result_2 = gridEntityOrGridIndex
     end
-    local gridEntity = ____isNumber_result_2
+    local gridEntity = ____isInteger_result_2
     if gridEntity == nil then
         return
     end
     local gridEntityType = gridEntity:GetType()
     local variant = gridEntity:GetVariant()
     local position = gridEntity.Position
-    local gridIndex = isNumber(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
+    local gridIndex = isInteger(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
     room:RemoveGridEntity(gridIndex, 0, false)
     if updateRoom then
         roomUpdateSafe(nil)
@@ -34978,7 +34977,7 @@ local getPlayerFromPtr = ____players.getPlayerFromPtr
 local ____roomData = require("src.functions.roomData")
 local getRoomListIndex = ____roomData.getRoomListIndex
 local ____types = require("src.functions.types")
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
 local ____vector = require("src.functions.vector")
@@ -35155,7 +35154,7 @@ function CustomGridEntities.prototype.getCustomGridEntityType(self, gridEntityOr
     if not self.initialized then
         return nil
     end
-    local gridIndex = isNumber(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
+    local gridIndex = isInteger(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
     local roomListIndex = getRoomListIndex(nil)
     local roomCustomGridEntities = v.level.customGridEntities:get(roomListIndex)
     if roomCustomGridEntities == nil then
@@ -38299,14 +38298,18 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
 local ____cachedClasses = require("src.core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-function ____exports.collectibleHasTag(self, collectibleType, tag)
+local ____types = require("src.functions.types")
+local isInteger = ____types.isInteger
+function ____exports.collectibleHasTag(self, collectibleOrCollectibleType, tag)
+    local collectibleType = isInteger(nil, collectibleOrCollectibleType) and collectibleOrCollectibleType or collectibleOrCollectibleType.SubType
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return false
     end
     return itemConfigItem:HasTags(tag)
 end
-function ____exports.isQuestCollectible(self, collectibleType)
+function ____exports.isQuestCollectible(self, collectibleOrCollectibleType)
+    local collectibleType = isInteger(nil, collectibleOrCollectibleType) and collectibleOrCollectibleType or collectibleOrCollectibleType.SubType
     return ____exports.collectibleHasTag(nil, collectibleType, ItemConfigTag.QUEST)
 end
 return ____exports
@@ -53928,7 +53931,7 @@ local getRoomGridIndex = ____roomData.getRoomGridIndex
 local ____rooms = require("src.functions.rooms")
 local getRoomsInsideGrid = ____rooms.getRoomsInsideGrid
 local ____types = require("src.functions.types")
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
 function ____exports.getRoomDisplayFlags(self, roomGridIndex, minimapAPI)
@@ -54025,7 +54028,7 @@ function ____exports.isRoomVisible(self, roomGridIndexOrRoomDescriptor, minimapA
     if minimapAPI == nil then
         minimapAPI = true
     end
-    local roomGridIndex = isNumber(nil, roomGridIndexOrRoomDescriptor) and roomGridIndexOrRoomDescriptor or roomGridIndexOrRoomDescriptor.SafeGridIndex
+    local roomGridIndex = isInteger(nil, roomGridIndexOrRoomDescriptor) and roomGridIndexOrRoomDescriptor or roomGridIndexOrRoomDescriptor.SafeGridIndex
     local roomDisplayFlags = ____exports.getRoomDisplayFlags(nil, roomGridIndex, minimapAPI)
     return roomDisplayFlags ~= DisplayFlagZero
 end

package/dist/src/classes/features/callbackLogic/CustomGridEntities.lua

@@ -28,7 +28,7 @@ local getPlayerFromPtr = ____players.getPlayerFromPtr
 local ____roomData = require("src.functions.roomData")
 local getRoomListIndex = ____roomData.getRoomListIndex
 local ____types = require("src.functions.types")
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
 local ____vector = require("src.functions.vector")
@@ -205,7 +205,7 @@ function CustomGridEntities.prototype.getCustomGridEntityType(self, gridEntityOr
     if not self.initialized then
         return nil
     end
-    local gridIndex = isNumber(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
+    local gridIndex = isInteger(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
     local roomListIndex = getRoomListIndex(nil)
     local roomCustomGridEntities = v.level.customGridEntities:get(roomListIndex)
     if roomCustomGridEntities == nil then

package/dist/src/functions/collectibleTag.d.ts

@@ -1,5 +1,5 @@
 import type { CollectibleType } from "isaac-typescript-definitions";
 import { ItemConfigTag } from "isaac-typescript-definitions";
-export declare function collectibleHasTag(collectibleType: CollectibleType, tag: ItemConfigTag): boolean;
-export declare function isQuestCollectible(collectibleType: CollectibleType): boolean;
+export declare function collectibleHasTag(collectibleOrCollectibleType: EntityPickupCollectible | CollectibleType, tag: ItemConfigTag): boolean;
+export declare function isQuestCollectible(collectibleOrCollectibleType: EntityPickupCollectible | CollectibleType): boolean;
 //# sourceMappingURL=collectibleTag.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"collectibleTag.d.ts","sourceRoot":"","sources":["../../../src/functions/collectibleTag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG7D,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,aAAa,GACjB,OAAO,CAOT;AAED,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAE5E"}
+{"version":3,"file":"collectibleTag.d.ts","sourceRoot":"","sources":["../../../src/functions/collectibleTag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,wBAAgB,iBAAiB,CAC/B,4BAA4B,EAAE,uBAAuB,GAAG,eAAe,EACvE,GAAG,EAAE,aAAa,GACjB,OAAO,CAWT;AAED,wBAAgB,kBAAkB,CAChC,4BAA4B,EAAE,uBAAuB,GAAG,eAAe,GACtE,OAAO,CAMT"}

package/dist/src/functions/collectibleTag.lua

@@ -3,14 +3,18 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
 local ____cachedClasses = require("src.core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-function ____exports.collectibleHasTag(self, collectibleType, tag)
+local ____types = require("src.functions.types")
+local isInteger = ____types.isInteger
+function ____exports.collectibleHasTag(self, collectibleOrCollectibleType, tag)
+    local collectibleType = isInteger(nil, collectibleOrCollectibleType) and collectibleOrCollectibleType or collectibleOrCollectibleType.SubType
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return false
     end
     return itemConfigItem:HasTags(tag)
 end
-function ____exports.isQuestCollectible(self, collectibleType)
+function ____exports.isQuestCollectible(self, collectibleOrCollectibleType)
+    local collectibleType = isInteger(nil, collectibleOrCollectibleType) and collectibleOrCollectibleType or collectibleOrCollectibleType.SubType
     return ____exports.collectibleHasTag(nil, collectibleType, ItemConfigTag.QUEST)
 end
 return ____exports

package/dist/src/functions/collectibles.lua

@@ -37,7 +37,7 @@ local ____sprites = require("src.functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local spriteEquals = ____sprites.spriteEquals
 local ____types = require("src.functions.types")
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local iRange = ____utils.iRange
 function initQuestionMarkSprite(self)
@@ -114,9 +114,8 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
     )
 end
 function getCollectibleTypeFromArg(self, collectibleOrCollectibleType, functionName)
-    if isNumber(nil, collectibleOrCollectibleType) then
-        local collectibleType = collectibleOrCollectibleType
-        return collectibleType
+    if isInteger(nil, collectibleOrCollectibleType) then
+        return collectibleOrCollectibleType
     end
     local collectible = collectibleOrCollectibleType
     if not isCollectible(nil, collectible) then

package/dist/src/functions/gridEntities.lua

@@ -42,7 +42,7 @@ local ____rooms = require("src.functions.rooms")
 local roomUpdateSafe = ____rooms.roomUpdateSafe
 local ____types = require("src.functions.types")
 local asNumber = ____types.asNumber
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
 local eRange = ____utils.eRange
@@ -99,20 +99,20 @@ end
 -- this to false if you need to run this function multiple times.
 function ____exports.removeGridEntity(self, gridEntityOrGridIndex, updateRoom)
     local room = game:GetRoom()
-    local ____isNumber_result_2
-    if isNumber(nil, gridEntityOrGridIndex) then
-        ____isNumber_result_2 = room:GetGridEntity(gridEntityOrGridIndex)
+    local ____isInteger_result_2
+    if isInteger(nil, gridEntityOrGridIndex) then
+        ____isInteger_result_2 = room:GetGridEntity(gridEntityOrGridIndex)
     else
-        ____isNumber_result_2 = gridEntityOrGridIndex
+        ____isInteger_result_2 = gridEntityOrGridIndex
     end
-    local gridEntity = ____isNumber_result_2
+    local gridEntity = ____isInteger_result_2
     if gridEntity == nil then
         return
     end
     local gridEntityType = gridEntity:GetType()
     local variant = gridEntity:GetVariant()
     local position = gridEntity.Position
-    local gridIndex = isNumber(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
+    local gridIndex = isInteger(nil, gridEntityOrGridIndex) and gridEntityOrGridIndex or gridEntityOrGridIndex:GetGridIndex()
     room:RemoveGridEntity(gridIndex, 0, false)
     if updateRoom then
         roomUpdateSafe(nil)

package/dist/src/functions/minimap.lua

@@ -15,7 +15,7 @@ local getRoomGridIndex = ____roomData.getRoomGridIndex
 local ____rooms = require("src.functions.rooms")
 local getRoomsInsideGrid = ____rooms.getRoomsInsideGrid
 local ____types = require("src.functions.types")
-local isNumber = ____types.isNumber
+local isInteger = ____types.isInteger
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
 --- Helper function to get a particular room's minimap display flags (e.g. whether it is visible and
@@ -178,7 +178,7 @@ function ____exports.isRoomVisible(self, roomGridIndexOrRoomDescriptor, minimapA
     if minimapAPI == nil then
         minimapAPI = true
     end
-    local roomGridIndex = isNumber(nil, roomGridIndexOrRoomDescriptor) and roomGridIndexOrRoomDescriptor or roomGridIndexOrRoomDescriptor.SafeGridIndex
+    local roomGridIndex = isInteger(nil, roomGridIndexOrRoomDescriptor) and roomGridIndexOrRoomDescriptor or roomGridIndexOrRoomDescriptor.SafeGridIndex
     local roomDisplayFlags = ____exports.getRoomDisplayFlags(nil, roomGridIndex, minimapAPI)
     return roomDisplayFlags ~= DisplayFlagZero
 end

package/package.json

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

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

@@ -15,7 +15,7 @@ import {
 } from "../../../functions/gridEntities";
 import { getPlayerFromPtr } from "../../../functions/players";
 import { getRoomListIndex } from "../../../functions/roomData";
-import { isNumber } from "../../../functions/types";
+import { isInteger } from "../../../functions/types";
 import { assertDefined } from "../../../functions/utils";
 import { isVector } from "../../../functions/vector";
 import type { GridEntityCustomData } from "../../../interfaces/GridEntityCustomData";
@@ -386,7 +386,7 @@ export class CustomGridEntities extends Feature {
       return undefined;
     }
 
-    const gridIndex = isNumber(gridEntityOrGridIndex)
+    const gridIndex = isInteger(gridEntityOrGridIndex)
       ? gridEntityOrGridIndex
       : gridEntityOrGridIndex.GetGridIndex();
 

package/src/functions/collectibleTag.ts

@@ -1,11 +1,16 @@
 import type { CollectibleType } from "isaac-typescript-definitions";
 import { ItemConfigTag } from "isaac-typescript-definitions";
 import { itemConfig } from "../core/cachedClasses";
+import { isInteger } from "./types";
 
 export function collectibleHasTag(
-  collectibleType: CollectibleType,
+  collectibleOrCollectibleType: EntityPickupCollectible | CollectibleType,
   tag: ItemConfigTag,
 ): boolean {
+  const collectibleType = isInteger(collectibleOrCollectibleType)
+    ? collectibleOrCollectibleType
+    : collectibleOrCollectibleType.SubType;
+
   const itemConfigItem = itemConfig.GetCollectible(collectibleType);
   if (itemConfigItem === undefined) {
     return false;
@@ -14,6 +19,12 @@ export function collectibleHasTag(
   return itemConfigItem.HasTags(tag);
 }
 
-export function isQuestCollectible(collectibleType: CollectibleType): boolean {
+export function isQuestCollectible(
+  collectibleOrCollectibleType: EntityPickupCollectible | CollectibleType,
+): boolean {
+  const collectibleType = isInteger(collectibleOrCollectibleType)
+    ? collectibleOrCollectibleType
+    : collectibleOrCollectibleType.SubType;
+
   return collectibleHasTag(collectibleType, ItemConfigTag.QUEST);
 }

package/src/functions/collectibles.ts

@@ -33,7 +33,7 @@ import { getEntityID } from "./entities";
 import { hasFlag } from "./flag";
 import { isCollectible } from "./pickupVariants";
 import { clearSprite, spriteEquals } from "./sprites";
-import { isNumber } from "./types";
+import { isInteger } from "./types";
 import { iRange } from "./utils";
 
 const COLLECTIBLE_ANM2_PATH = "gfx/005.100_collectible.anm2";
@@ -754,9 +754,8 @@ function getCollectibleTypeFromArg(
   collectibleOrCollectibleType: EntityPickup | CollectibleType,
   functionName: string,
 ): CollectibleType {
-  if (isNumber(collectibleOrCollectibleType)) {
-    const collectibleType = collectibleOrCollectibleType;
-    return collectibleType;
+  if (isInteger(collectibleOrCollectibleType)) {
+    return collectibleOrCollectibleType;
   }
 
   const collectible = collectibleOrCollectibleType;

package/src/functions/gridEntities.ts

@@ -24,7 +24,7 @@ import { removeEntities } from "./entities";
 import { getEffects } from "./entitiesSpecific";
 import { isCircleIntersectingRectangle } from "./math";
 import { roomUpdateSafe } from "./rooms";
-import { asNumber, isNumber } from "./types";
+import { asNumber, isInteger } from "./types";
 import { assertDefined, eRange, iRange } from "./utils";
 import { isVector, vectorEquals } from "./vector";
 
@@ -662,7 +662,7 @@ export function removeGridEntity(
 ): void {
   const room = game.GetRoom();
 
-  const gridEntity = isNumber(gridEntityOrGridIndex)
+  const gridEntity = isInteger(gridEntityOrGridIndex)
     ? room.GetGridEntity(gridEntityOrGridIndex)
     : gridEntityOrGridIndex;
   if (gridEntity === undefined) {
@@ -674,7 +674,7 @@ export function removeGridEntity(
   const variant = gridEntity.GetVariant();
   const position = gridEntity.Position;
 
-  const gridIndex = isNumber(gridEntityOrGridIndex)
+  const gridIndex = isInteger(gridEntityOrGridIndex)
     ? gridEntityOrGridIndex
     : gridEntityOrGridIndex.GetGridIndex();
   room.RemoveGridEntity(gridIndex, 0, false);

package/src/functions/minimap.ts

@@ -4,7 +4,7 @@ import { game } from "../core/cachedClasses";
 import { addFlag } from "./flag";
 import { getRoomDescriptor, getRoomGridIndex } from "./roomData";
 import { getRoomsInsideGrid } from "./rooms";
-import { isNumber } from "./types";
+import { isInteger } from "./types";
 import { assertDefined } from "./utils";
 
 /**
@@ -145,7 +145,7 @@ export function isRoomVisible(
   roomGridIndexOrRoomDescriptor: int | RoomDescriptor,
   minimapAPI = true,
 ): boolean {
-  const roomGridIndex = isNumber(roomGridIndexOrRoomDescriptor)
+  const roomGridIndex = isInteger(roomGridIndexOrRoomDescriptor)
     ? roomGridIndexOrRoomDescriptor
     : roomGridIndexOrRoomDescriptor.SafeGridIndex;
   const roomDisplayFlags = getRoomDisplayFlags(roomGridIndex, minimapAPI);