isaacscript-common 36.0.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;
@@ -1675,13 +1675,13 @@ export declare function convertBinaryToDecimal(bits: int[]): number;
 /**
  * Helper function to convert a number to an array of bits.
  *
- * @param number The number to convert.
+ * @param num The number to convert.
  * @param minLength Optional. Equal to the minimum amount of bits that should be returned. If the
  *                  converted number of bits is below this number, 0's will be padded to the left
  *                  side until the minimum length is met. Default is undefined (which will not cause
  *                  any padding).
  */
-export declare function convertDecimalToBinary(number: number, minLength?: int): int[];
+export declare function convertDecimalToBinary(num: number, minLength?: int): int[];
 
 /**
  * Helper function to convert the grid entity type found in a room XML file to the corresponding
@@ -8648,6 +8648,12 @@ export declare function isGridEntityBreakableByExplosion(gridEntity: GridEntity)
  */
 export declare function isGridEntityBroken(gridEntity: GridEntity): boolean;
 
+/**
+ * Helper function to see if an arbitrary number is a valid `GridEntityXMLType`. This is useful in
+ * the `PRE_ROOM_ENTITY_SPAWN` callback for narrowing the type of the first argument.
+ */
+export declare function isGridEntityXMLType(num: number): num is GridEntityXMLType;
+
 /** For `PickupVariant.HEART` (10). */
 export declare function isHeart(pickup: EntityPickup): pickup is EntityPickupHeart;
 
@@ -8886,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,
@@ -12543,6 +12549,9 @@ export declare enum ModCallbackCustom {
      * - You can provide an optional fifth argument that will make the callback only fire if it
      *   matches the sub-type provided.
      *
+     * You can use the `isGridEntityXMLType` helper function to convert the
+     * `entityTypeOrGridEntityXMLType` argument to an `EntityType` or `GridEntityXMLType`, if needed.
+     *
      * ```ts
      * function preRoomEntitySpawnFilter(
      *   entityTypeOrGridEntityXMLType: EntityType | GridEntityXMLType,

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 36.0.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
@@ -22930,15 +22929,15 @@ function ____exports.convertBinaryToDecimal(self, bits)
     local bitsString = table.concat(bits, "")
     return __TS__ParseInt(bitsString, 2)
 end
-function ____exports.convertDecimalToBinary(self, number, minLength)
+function ____exports.convertDecimalToBinary(self, num, minLength)
     local bits = {}
-    local bitsString = __TS__NumberToString(number, 2)
+    local bitsString = __TS__NumberToString(num, 2)
     for ____, bitString in __TS__Iterator(bitsString) do
         local bit = tonumber(bitString)
         assertDefined(
             nil,
             bit,
-            "Failed to convert the following number to binary: " .. tostring(number)
+            "Failed to convert the following number to binary: " .. tostring(num)
         )
         bits[#bits + 1] = bit
     end
@@ -28015,6 +28014,8 @@ local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local PoopGridEntityVariant = ____isaac_2Dtypescript_2Ddefinitions.PoopGridEntityVariant
 local StatueVariant = ____isaac_2Dtypescript_2Ddefinitions.StatueVariant
 local TrapdoorVariant = ____isaac_2Dtypescript_2Ddefinitions.TrapdoorVariant
+local ____cachedEnumValues = require("src.arrays.cachedEnumValues")
+local GRID_ENTITY_XML_TYPE_VALUES = ____cachedEnumValues.GRID_ENTITY_XML_TYPE_VALUES
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____constants = require("src.core.constants")
@@ -28041,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
@@ -28078,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)
@@ -28133,6 +28134,7 @@ function ____exports.spawnGridEntityWithVariant(self, gridEntityType, variant, g
     end
     return gridEntity
 end
+local GRID_ENTITY_TYPES_THAT_KEEP_GRID_ENTITY_XML_VARIANT = __TS__New(ReadonlySet, {GridEntityType.SPIKES_ON_OFF, GridEntityType.PRESSURE_PLATE, GridEntityType.TELEPORTER})
 local BREAKABLE_GRID_ENTITY_TYPES_BY_EXPLOSIONS = __TS__New(ReadonlySet, {
     GridEntityType.ROCK,
     GridEntityType.ROCK_TINTED,
@@ -28150,6 +28152,7 @@ local BREAKABLE_GRID_ENTITY_TYPES_VARIANTS_BY_EXPLOSIONS = __TS__New(
     ReadonlySet,
     {(tostring(GridEntityType.STATUE) .. ".") .. tostring(StatueVariant.ANGEL)}
 )
+local GRID_ENTITY_XML_TYPES_SET = __TS__New(ReadonlySet, GRID_ENTITY_XML_TYPE_VALUES)
 function ____exports.convertXMLGridEntityType(self, gridEntityXMLType, gridEntityXMLVariant)
     local gridEntityArray = GRID_ENTITY_XML_MAP:get(gridEntityXMLType)
     assertDefined(
@@ -28158,10 +28161,7 @@ function ____exports.convertXMLGridEntityType(self, gridEntityXMLType, gridEntit
         "Failed to find an entry in the grid entity map for XML entity type: " .. tostring(gridEntityXMLType)
     )
     local gridEntityType = gridEntityArray[1]
-    local variant = gridEntityArray[2]
-    if gridEntityType == GridEntityType.SPIKES_ON_OFF or gridEntityType == GridEntityType.PRESSURE_PLATE or gridEntityType == GridEntityType.TELEPORTER then
-        variant = gridEntityXMLVariant
-    end
+    local variant = GRID_ENTITY_TYPES_THAT_KEEP_GRID_ENTITY_XML_VARIANT:has(gridEntityType) and gridEntityXMLVariant or gridEntityArray[2]
     return {gridEntityType, variant}
 end
 function ____exports.doesGridEntityExist(self, gridEntityType, variant)
@@ -28266,7 +28266,7 @@ function ____exports.getGridEntitiesInRadius(self, targetPosition, radius)
                 local gridIndex = room:GetGridIndex(position)
                 local gridEntity = room:GetGridEntityFromPos(position)
                 if gridEntity == nil or registeredGridIndexes:has(gridIndex) then
-                    goto __continue24
+                    goto __continue23
                 end
                 registeredGridIndexes:add(gridIndex)
                 local ____exports_getGridEntityCollisionPoints_result_1 = ____exports.getGridEntityCollisionPoints(nil, gridEntity)
@@ -28282,7 +28282,7 @@ function ____exports.getGridEntitiesInRadius(self, targetPosition, radius)
                     gridEntities[#gridEntities + 1] = gridEntity
                 end
             end
-            ::__continue24::
+            ::__continue23::
         end
     end
     return gridEntities
@@ -28350,6 +28350,9 @@ function ____exports.isGridEntityBroken(self, gridEntity)
     local brokenState = GRID_ENTITY_TYPE_TO_BROKEN_STATE_MAP:get(gridEntityType)
     return gridEntity.State == brokenState
 end
+function ____exports.isGridEntityXMLType(self, num)
+    return GRID_ENTITY_XML_TYPES_SET:has(num)
+end
 function ____exports.isPoopGridEntityXMLType(self, gridEntityXMLType)
     return POOP_GRID_ENTITY_XML_TYPES_SET:has(gridEntityXMLType)
 end
@@ -34974,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")
@@ -35151,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
@@ -38295,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
@@ -53924,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)
@@ -54021,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/enums/ModCallbackCustom.d.ts

@@ -2437,6 +2437,9 @@ export declare enum ModCallbackCustom {
      * - You can provide an optional fifth argument that will make the callback only fire if it
      *   matches the sub-type provided.
      *
+     * You can use the `isGridEntityXMLType` helper function to convert the
+     * `entityTypeOrGridEntityXMLType` argument to an `EntityType` or `GridEntityXMLType`, if needed.
+     *
      * ```ts
      * function preRoomEntitySpawnFilter(
      *   entityTypeOrGridEntityXMLType: EntityType | GridEntityXMLType,

package/dist/src/enums/ModCallbackCustom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModCallbackCustom.d.ts","sourceRoot":"","sources":["../../../src/enums/ModCallbackCustom.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModCallbackCustom.d.ts","sourceRoot":"","sources":["../../../src/enums/ModCallbackCustom.ts"],"names":[],"mappings":"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"}

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

@@ -9,13 +9,13 @@ export declare function convertBinaryToDecimal(bits: int[]): number;
 /**
  * Helper function to convert a number to an array of bits.
  *
- * @param number The number to convert.
+ * @param num The number to convert.
  * @param minLength Optional. Equal to the minimum amount of bits that should be returned. If the
  *                  converted number of bits is below this number, 0's will be padded to the left
  *                  side until the minimum length is met. Default is undefined (which will not cause
  *                  any padding).
  */
-export declare function convertDecimalToBinary(number: number, minLength?: int): int[];
+export declare function convertDecimalToBinary(num: number, minLength?: int): int[];
 /**
  * Helper function to count the number of bits that are set to 1 in a binary representation of a
  * number.

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

@@ -1 +1 @@
-{"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../src/functions/bitwise.ts"],"names":[],"mappings":";;;;AAGA,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,CAAC,SAAS,OAAO,GAAG,UAAU,EAC5D,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,GACxB,QAAQ,CAAC,CAAC,CAAC,CAOb;AAED,mFAAmF;AACnF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAG1D;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAqB7E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CASxC;AAED,iGAAiG;AACjG,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,GAAG,GAAG,CAE9C;AAED,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CAQzC;AAED,+EAA+E;AAC/E,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,GAAG,UAAU,EAC1D,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAC3B,QAAQ,CAAC,CAAC,CAAC,CAOb"}
+{"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../src/functions/bitwise.ts"],"names":[],"mappings":";;;;AAGA,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,CAAC,SAAS,OAAO,GAAG,UAAU,EAC5D,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,GACxB,QAAQ,CAAC,CAAC,CAAC,CAOb;AAED,mFAAmF;AACnF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAG1D;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAqB1E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CASxC;AAED,iGAAiG;AACjG,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,GAAG,GAAG,CAE9C;AAED,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG,CAQzC;AAED,+EAA+E;AAC/E,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,GAAG,UAAU,EAC1D,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAC3B,QAAQ,CAAC,CAAC,CAAC,CAOb"}

package/dist/src/functions/bitwise.lua

@@ -23,20 +23,20 @@ function ____exports.convertBinaryToDecimal(self, bits)
 end
 --- Helper function to convert a number to an array of bits.
 -- 
--- @param number The number to convert.
+-- @param num The number to convert.
 -- @param minLength Optional. Equal to the minimum amount of bits that should be returned. If the
 -- converted number of bits is below this number, 0's will be padded to the left
 -- side until the minimum length is met. Default is undefined (which will not cause
 -- any padding).
-function ____exports.convertDecimalToBinary(self, number, minLength)
+function ____exports.convertDecimalToBinary(self, num, minLength)
     local bits = {}
-    local bitsString = __TS__NumberToString(number, 2)
+    local bitsString = __TS__NumberToString(num, 2)
     for ____, bitString in __TS__Iterator(bitsString) do
         local bit = tonumber(bitString)
         assertDefined(
             nil,
             bit,
-            "Failed to convert the following number to binary: " .. tostring(number)
+            "Failed to convert the following number to binary: " .. tostring(num)
         )
         bits[#bits + 1] = bit
     end

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.d.ts

@@ -135,6 +135,11 @@ export declare function isGridEntityBreakableByExplosion(gridEntity: GridEntity)
  * the actual collision for the entity is removed.
  */
 export declare function isGridEntityBroken(gridEntity: GridEntity): boolean;
+/**
+ * Helper function to see if an arbitrary number is a valid `GridEntityXMLType`. This is useful in
+ * the `PRE_ROOM_ENTITY_SPAWN` callback for narrowing the type of the first argument.
+ */
+export declare function isGridEntityXMLType(num: number): num is GridEntityXMLType;
 /** Helper function to see if a `GridEntityXMLType` is some kind of poop. */
 export declare function isPoopGridEntityXMLType(gridEntityXMLType: GridEntityXMLType): boolean;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"gridEntities.d.ts","sourceRoot":"","sources":["../../../src/functions/gridEntities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAGL,cAAc,EAIf,MAAM,8BAA8B,CAAC;AAUtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AA8B1D;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,iBAAiB,EAAE,iBAAiB,EACpC,oBAAoB,EAAE,GAAG,GACxB,CAAC,cAAc,EAAE,GAAG,CAAC,GAAG,SAAS,CAqBnC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,cAAc,EAC9B,OAAO,SAAK,GACX,OAAO,CAiBT;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,GAAG,EAAE,CAKzC;AAED;;;;;;;;;GASG;AACH,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,UAAU,GACrB,MAAM,EAAE,CAoBV;AAED,qFAAqF;AACrF,wBAAgB,+BAA+B,CAC7C,YAAY,EAAE,YAAY,GACzB,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,CAuBhD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,eAAe,EAAE,cAAc,EAAE,GACnC,UAAU,EAAE,CAYd;AAgBD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,eAAe,EAAE,cAAc,EAAE,GACnC,UAAU,EAAE,CAYd;AAED,uFAAuF;AACvF,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,UAAU,EAAE,CAyCd;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,eAAe,EAAE,cAAc,EAAE,GACnC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAUtB;AAED,2FAA2F;AAC3F,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG;IACpE,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAWA;AAED,qFAAqF;AACrF,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,YAAY,CAIpE;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,GAAG,GACX,YAAY,CAEd;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,GAAG,GACX,UAAU,EAAE,CAKd;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,GACrB,UAAU,EAAE,CA2Bd;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,UAAU,GAAG,SAAS,CAIvD;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,IAAI,GAAG,CAO7C;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,UAAU,GACrB,OAAO,CAWT;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAIlE;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CACrC,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAET;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAKpE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,eAAe,EAAE,cAAc,EAAE,GACnC,UAAU,EAAE,CAiBd;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,cAAc,EAAE,cAAc,EAAE,GAClC,UAAU,EAAE,CAYd;AAED;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,MAAM,EAAE,EAClB,UAAU,EAAE,UAAU,GACrB,IAAI,CAON;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,aAAa,EACxD,YAAY,EAAE,CAAC,EAAE,EACjB,UAAU,EAAE,OAAO,EACnB,GAAG,CAAC,EAAE,GAAG,GACR,CAAC,EAAE,CAoBL;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,qBAAqB,EAAE,UAAU,GAAG,GAAG,EACvC,UAAU,EAAE,OAAO,GAClB,IAAI,CAqCN;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAGnE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,GAAG,GAAG,OAAO,CAwD7D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,cAAc,EAAE,cAAc,EAC9B,mBAAmB,EAAE,GAAG,GAAG,MAAM,GAChC,UAAU,GAAG,SAAS,CAExB;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,GAAG,EACZ,mBAAmB,EAAE,GAAG,GAAG,MAAM,GAChC,UAAU,GAAG,SAAS,CAgCxB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU,GAAG,SAAS,CAkBtE"}
+{"version":3,"file":"gridEntities.d.ts","sourceRoot":"","sources":["../../../src/functions/gridEntities.ts"],"names":[],"mappings":"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"}

package/dist/src/functions/gridEntities.lua

@@ -14,6 +14,8 @@ local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local PoopGridEntityVariant = ____isaac_2Dtypescript_2Ddefinitions.PoopGridEntityVariant
 local StatueVariant = ____isaac_2Dtypescript_2Ddefinitions.StatueVariant
 local TrapdoorVariant = ____isaac_2Dtypescript_2Ddefinitions.TrapdoorVariant
+local ____cachedEnumValues = require("src.arrays.cachedEnumValues")
+local GRID_ENTITY_XML_TYPE_VALUES = ____cachedEnumValues.GRID_ENTITY_XML_TYPE_VALUES
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____constants = require("src.core.constants")
@@ -40,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
@@ -97,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)
@@ -158,6 +160,9 @@ function ____exports.spawnGridEntityWithVariant(self, gridEntityType, variant, g
     end
     return gridEntity
 end
+--- For some specific grid entities, the variant defined in the XML is what is used by the actual
+-- game (which is not the case for e.g. poops).
+local GRID_ENTITY_TYPES_THAT_KEEP_GRID_ENTITY_XML_VARIANT = __TS__New(ReadonlySet, {GridEntityType.SPIKES_ON_OFF, GridEntityType.PRESSURE_PLATE, GridEntityType.TELEPORTER})
 local BREAKABLE_GRID_ENTITY_TYPES_BY_EXPLOSIONS = __TS__New(ReadonlySet, {
     GridEntityType.ROCK,
     GridEntityType.ROCK_TINTED,
@@ -175,6 +180,7 @@ local BREAKABLE_GRID_ENTITY_TYPES_VARIANTS_BY_EXPLOSIONS = __TS__New(
     ReadonlySet,
     {(tostring(GridEntityType.STATUE) .. ".") .. tostring(StatueVariant.ANGEL)}
 )
+local GRID_ENTITY_XML_TYPES_SET = __TS__New(ReadonlySet, GRID_ENTITY_XML_TYPE_VALUES)
 --- Helper function to convert the grid entity type found in a room XML file to the corresponding
 -- grid entity type and variant normally used by the game. For example, `GridEntityXMLType.ROCK` is
 -- 1000 (in a room XML file), but `GridEntityType.ROCK` is equal to 2 (in-game).
@@ -186,10 +192,7 @@ function ____exports.convertXMLGridEntityType(self, gridEntityXMLType, gridEntit
         "Failed to find an entry in the grid entity map for XML entity type: " .. tostring(gridEntityXMLType)
     )
     local gridEntityType = gridEntityArray[1]
-    local variant = gridEntityArray[2]
-    if gridEntityType == GridEntityType.SPIKES_ON_OFF or gridEntityType == GridEntityType.PRESSURE_PLATE or gridEntityType == GridEntityType.TELEPORTER then
-        variant = gridEntityXMLVariant
-    end
+    local variant = GRID_ENTITY_TYPES_THAT_KEEP_GRID_ENTITY_XML_VARIANT:has(gridEntityType) and gridEntityXMLVariant or gridEntityArray[2]
     return {gridEntityType, variant}
 end
 --- Helper function to check if one or more of a specific kind of grid entity is present in the
@@ -337,7 +340,7 @@ function ____exports.getGridEntitiesInRadius(self, targetPosition, radius)
                 local gridIndex = room:GetGridIndex(position)
                 local gridEntity = room:GetGridEntityFromPos(position)
                 if gridEntity == nil or registeredGridIndexes:has(gridIndex) then
-                    goto __continue24
+                    goto __continue23
                 end
                 registeredGridIndexes:add(gridIndex)
                 local ____exports_getGridEntityCollisionPoints_result_1 = ____exports.getGridEntityCollisionPoints(nil, gridEntity)
@@ -353,7 +356,7 @@ function ____exports.getGridEntitiesInRadius(self, targetPosition, radius)
                     gridEntities[#gridEntities + 1] = gridEntity
                 end
             end
-            ::__continue24::
+            ::__continue23::
         end
     end
     return gridEntities
@@ -451,6 +454,11 @@ function ____exports.isGridEntityBroken(self, gridEntity)
     local brokenState = GRID_ENTITY_TYPE_TO_BROKEN_STATE_MAP:get(gridEntityType)
     return gridEntity.State == brokenState
 end
+--- Helper function to see if an arbitrary number is a valid `GridEntityXMLType`. This is useful in
+-- the `PRE_ROOM_ENTITY_SPAWN` callback for narrowing the type of the first argument.
+function ____exports.isGridEntityXMLType(self, num)
+    return GRID_ENTITY_XML_TYPES_SET:has(num)
+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/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.0.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/enums/ModCallbackCustom.ts

@@ -2576,6 +2576,9 @@ export enum ModCallbackCustom {
    * - You can provide an optional fifth argument that will make the callback only fire if it
    *   matches the sub-type provided.
    *
+   * You can use the `isGridEntityXMLType` helper function to convert the
+   * `entityTypeOrGridEntityXMLType` argument to an `EntityType` or `GridEntityXMLType`, if needed.
+   *
    * ```ts
    * function preRoomEntitySpawnFilter(
    *   entityTypeOrGridEntityXMLType: EntityType | GridEntityXMLType,

package/src/functions/bitwise.ts

@@ -22,21 +22,21 @@ export function convertBinaryToDecimal(bits: int[]): number {
 /**
  * Helper function to convert a number to an array of bits.
  *
- * @param number The number to convert.
+ * @param num The number to convert.
  * @param minLength Optional. Equal to the minimum amount of bits that should be returned. If the
  *                  converted number of bits is below this number, 0's will be padded to the left
  *                  side until the minimum length is met. Default is undefined (which will not cause
  *                  any padding).
  */
-export function convertDecimalToBinary(number: number, minLength?: int): int[] {
+export function convertDecimalToBinary(num: number, minLength?: int): int[] {
   const bits: int[] = [];
 
-  const bitsString = number.toString(2);
+  const bitsString = num.toString(2);
   for (const bitString of bitsString) {
     const bit = tonumber(bitString);
     assertDefined(
       bit,
-      `Failed to convert the following number to binary: ${number}`,
+      `Failed to convert the following number to binary: ${num}`,
     );
 
     bits.push(bit);

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

@@ -7,6 +7,7 @@ import {
   StatueVariant,
   TrapdoorVariant,
 } from "isaac-typescript-definitions";
+import { GRID_ENTITY_XML_TYPE_VALUES } from "../arrays/cachedEnumValues";
 import { game } from "../core/cachedClasses";
 import { DISTANCE_OF_GRID_TILE, VectorOne } from "../core/constants";
 import { GRID_ENTITY_TYPE_TO_BROKEN_STATE_MAP } from "../maps/gridEntityTypeToBrokenStateMap";
@@ -23,10 +24,20 @@ 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";
 
+/**
+ * For some specific grid entities, the variant defined in the XML is what is used by the actual
+ * game (which is not the case for e.g. poops).
+ */
+const GRID_ENTITY_TYPES_THAT_KEEP_GRID_ENTITY_XML_VARIANT = new ReadonlySet([
+  GridEntityType.SPIKES_ON_OFF, // 9
+  GridEntityType.PRESSURE_PLATE, // 20
+  GridEntityType.TELEPORTER, // 23
+]);
+
 const BREAKABLE_GRID_ENTITY_TYPES_BY_EXPLOSIONS =
   new ReadonlySet<GridEntityType>([
     GridEntityType.ROCK, // 2
@@ -47,6 +58,8 @@ const BREAKABLE_GRID_ENTITY_TYPES_BY_EXPLOSIONS =
 const BREAKABLE_GRID_ENTITY_TYPES_VARIANTS_BY_EXPLOSIONS =
   new ReadonlySet<string>([`${GridEntityType.STATUE}.${StatueVariant.ANGEL}`]);
 
+const GRID_ENTITY_XML_TYPES_SET = new ReadonlySet(GRID_ENTITY_XML_TYPE_VALUES);
+
 /**
  * Helper function to convert the grid entity type found in a room XML file to the corresponding
  * grid entity type and variant normally used by the game. For example, `GridEntityXMLType.ROCK` is
@@ -63,17 +76,11 @@ export function convertXMLGridEntityType(
   );
 
   const gridEntityType = gridEntityArray[0];
-  let variant = gridEntityArray[1];
-
-  // For some specific grid entities, the variant defined in the XML is what is used by the actual
-  // game (which is not the case for e.g. poops).
-  if (
-    gridEntityType === GridEntityType.SPIKES_ON_OFF || // 9
-    gridEntityType === GridEntityType.PRESSURE_PLATE || // 20
-    gridEntityType === GridEntityType.TELEPORTER // 23
-  ) {
-    variant = gridEntityXMLVariant;
-  }
+  const variant = GRID_ENTITY_TYPES_THAT_KEEP_GRID_ENTITY_XML_VARIANT.has(
+    gridEntityType,
+  )
+    ? gridEntityXMLVariant
+    : gridEntityArray[1];
 
   return [gridEntityType, variant];
 }
@@ -477,6 +484,14 @@ export function isGridEntityBroken(gridEntity: GridEntity): boolean {
   return gridEntity.State === brokenState;
 }
 
+/**
+ * Helper function to see if an arbitrary number is a valid `GridEntityXMLType`. This is useful in
+ * the `PRE_ROOM_ENTITY_SPAWN` callback for narrowing the type of the first argument.
+ */
+export function isGridEntityXMLType(num: number): num is GridEntityXMLType {
+  return GRID_ENTITY_XML_TYPES_SET.has(num); // eslint-disable-line isaacscript/strict-enums
+}
+
 /** Helper function to see if a `GridEntityXMLType` is some kind of poop. */
 export function isPoopGridEntityXMLType(
   gridEntityXMLType: GridEntityXMLType,
@@ -647,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) {
@@ -659,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);