isaacscript-common 20.16.0 → 20.18.0

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 20.16.0
+isaacscript-common 20.18.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -19715,13 +19715,167 @@ function ____exports.spriteEquals(self, sprite1, sprite2, layerID, xStart, xFini
     end
     return true
 end
+return ____exports
+ end,
+["src.classes.DefaultMap"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local Map = ____lualib.Map
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__TypeOf = ____lualib.__TS__TypeOf
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local ____types = require("src.functions.types")
+local isFunction = ____types.isFunction
+local isPrimitive = ____types.isPrimitive
+____exports.DefaultMap = __TS__Class()
+local DefaultMap = ____exports.DefaultMap
+DefaultMap.name = "DefaultMap"
+__TS__ClassExtends(DefaultMap, Map)
+function DefaultMap.prototype.____constructor(self, defaultValueOrFactoryFunction, initializerArray)
+    local argIsPrimitive = isPrimitive(nil, defaultValueOrFactoryFunction)
+    local argIsFunction = isFunction(nil, defaultValueOrFactoryFunction)
+    if not argIsPrimitive and not argIsFunction then
+        error(("Failed to instantiate a DefaultMap since the provided default value was of type \"" .. __TS__TypeOf(defaultValueOrFactoryFunction)) .. "\". This error usually means that you are trying to use an array (or some other non-primitive data structure that is passed by reference) as the default value. Instead, return the data structure in a factory function, like \"() => []\". See the DefaultMap documentation for more details.")
+    end
+    Map.prototype.____constructor(self, initializerArray)
+    if argIsFunction then
+        self.defaultValue = nil
+        self.defaultValueFactory = defaultValueOrFactoryFunction
+    else
+        self.defaultValue = defaultValueOrFactoryFunction
+        self.defaultValueFactory = nil
+    end
+end
+function DefaultMap.prototype.getAndSetDefault(self, key, ...)
+    local value = Map.prototype.get(self, key)
+    if value ~= nil then
+        return value
+    end
+    local defaultValue = self:getDefaultValue(...)
+    self:set(key, defaultValue)
+    return defaultValue
+end
+function DefaultMap.prototype.getDefaultValue(self, ...)
+    if self.defaultValue ~= nil then
+        return self.defaultValue
+    end
+    if self.defaultValueFactory ~= nil then
+        return self:defaultValueFactory(...)
+    end
+    error("A DefaultMap was incorrectly instantiated.")
+end
+function DefaultMap.prototype.getConstructorArg(self)
+    if self.defaultValue ~= nil then
+        return self.defaultValue
+    end
+    if self.defaultValueFactory ~= nil then
+        return self.defaultValueFactory
+    end
+    error("A DefaultMap was incorrectly instantiated.")
+end
+local function test(self)
+    local myDefaultMapBoolean = __TS__New(____exports.DefaultMap, false)
+    local myDefaultMapBooleanFactory = __TS__New(
+        ____exports.DefaultMap,
+        function() return false end
+    )
+    local myDefaultMapBooleanWithoutParams = __TS__New(____exports.DefaultMap, false)
+    local myDefaultMapNumber = __TS__New(____exports.DefaultMap, 123)
+    local myDefaultMapNumberFactory = __TS__New(
+        ____exports.DefaultMap,
+        function() return 123 end
+    )
+    local myDefaultMapNumberWithoutParams = __TS__New(____exports.DefaultMap, 123)
+    local myDefaultMapString = __TS__New(____exports.DefaultMap, "foo")
+    local myDefaultMapStringFactory = __TS__New(
+        ____exports.DefaultMap,
+        function() return "foo" end
+    )
+    local myDefaultMapStringWithoutParams = __TS__New(____exports.DefaultMap, "foo")
+    local myDefaultMapArray = __TS__New(
+        ____exports.DefaultMap,
+        function() return {} end
+    )
+    local myDefaultMapArrayWithoutParams = __TS__New(
+        ____exports.DefaultMap,
+        function() return {} end
+    )
+    local myDefaultMapMap = __TS__New(
+        ____exports.DefaultMap,
+        function() return __TS__New(Map) end
+    )
+    local myDefaultMapMapWithoutParams = __TS__New(
+        ____exports.DefaultMap,
+        function() return __TS__New(Map) end
+    )
+end
+return ____exports
+ end,
+["src.interfaces.TSTLClassMetatable"] = function(...) 
+local ____exports = {}
+return ____exports
+ end,
+["src.types.TSTLClass"] = function(...) 
+local ____exports = {}
+return ____exports
+ end,
+["src.functions.tstlClass"] = function(...) 
+local ____exports = {}
+local ____types = require("src.functions.types")
+local isTable = ____types.isTable
+function ____exports.getTSTLClassConstructor(self, object)
+    if not isTable(nil, object) then
+        return nil
+    end
+    local metatable = getmetatable(object)
+    if metatable == nil then
+        return nil
+    end
+    return metatable.constructor
+end
+function ____exports.getTSTLClassName(self, object)
+    local constructor = ____exports.getTSTLClassConstructor(nil, object)
+    if constructor == nil then
+        return nil
+    end
+    return constructor.name
+end
+function ____exports.isDefaultMap(self, object)
+    local className = ____exports.getTSTLClassName(nil, object)
+    return className == "DefaultMap"
+end
+function ____exports.isTSTLClass(self, object)
+    local tstlClassName = ____exports.getTSTLClassName(nil, object)
+    return tstlClassName ~= nil
+end
+function ____exports.isTSTLMap(self, object)
+    local className = ____exports.getTSTLClassName(nil, object)
+    return className == "Map"
+end
+function ____exports.isTSTLSet(self, object)
+    local className = ____exports.getTSTLClassName(nil, object)
+    return className == "Set"
+end
+function ____exports.newTSTLClass(self, oldClass)
+    local constructor = ____exports.getTSTLClassConstructor(nil, oldClass)
+    if constructor == nil then
+        error("Failed to instantiate a new TypeScriptToLua class since the provided old class does not have a metatable/constructor.")
+    end
+    local newClass = {}
+    local newClassMetatable = setmetatable(newClass, constructor.prototype)
+    newClassMetatable:____constructor()
+    return newClass
+end
 return ____exports
  end,
 ["src.functions.entities"] = function(...) 
 local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__Spread = ____lualib.__TS__Spread
+local __TS__ArraySome = ____lualib.__TS__ArraySome
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
-local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
@@ -19743,6 +19897,8 @@ local isRNG = ____rng.isRNG
 local newRNG = ____rng.newRNG
 local ____sprites = require("src.functions.sprites")
 local setSpriteOpacity = ____sprites.setSpriteOpacity
+local ____tstlClass = require("src.functions.tstlClass")
+local isTSTLSet = ____tstlClass.isTSTLSet
 local ____types = require("src.functions.types")
 local asNumber = ____types.asNumber
 local isPrimitive = ____types.isPrimitive
@@ -19813,6 +19969,22 @@ function ____exports.countEntities(self, entityType, variant, subType, ignoreFri
     )
     return #entities
 end
+function ____exports.doesAnyEntityExist(self, entityTypes, ignoreFriendly)
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    local entityTypesArray = isTSTLSet(nil, entityTypes) and ({__TS__Spread(entityTypes:values())}) or entityTypes
+    return __TS__ArraySome(
+        entityTypesArray,
+        function(____, entityType) return ____exports.countEntities(
+            nil,
+            entityType,
+            -1,
+            -1,
+            ignoreFriendly
+        ) end
+    )
+end
 function ____exports.doesEntityExist(self, entityType, variant, subType, ignoreFriendly)
     if entityType == nil then
         entityType = -1
@@ -20112,39 +20284,40 @@ return ____exports
 ["src.functions.pickupVariants"] = function(...) 
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
+local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 function ____exports.isHeart(self, pickup)
-    return pickup.Variant == PickupVariant.HEART
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.HEART
 end
 function ____exports.isCoin(self, pickup)
-    return pickup.Variant == PickupVariant.COIN
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.COIN
 end
 function ____exports.isKey(self, pickup)
-    return pickup.Variant == PickupVariant.KEY
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.KEY
 end
 function ____exports.isBombPickup(self, pickup)
-    return pickup.Variant == PickupVariant.BOMB
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.BOMB
 end
 function ____exports.isPoopPickup(self, pickup)
-    return pickup.Variant == PickupVariant.POOP
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.POOP
 end
 function ____exports.isSack(self, pickup)
-    return pickup.Variant == PickupVariant.SACK
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.SACK
 end
 function ____exports.isPill(self, pickup)
-    return pickup.Variant == PickupVariant.PILL
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.PILL
 end
 function ____exports.isBattery(self, pickup)
-    return pickup.Variant == PickupVariant.LIL_BATTERY
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.LIL_BATTERY
 end
 function ____exports.isCollectible(self, pickup)
-    return pickup.Variant == PickupVariant.COLLECTIBLE
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.COLLECTIBLE
 end
 function ____exports.isCardPickup(self, pickup)
-    return pickup.Variant == PickupVariant.TAROT_CARD
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.TAROT_CARD
 end
 function ____exports.isTrinket(self, pickup)
-    return pickup.Variant == PickupVariant.TRINKET
+    return pickup.Type == EntityType.PICKUP and pickup.Variant == PickupVariant.TRINKET
 end
 return ____exports
  end,
@@ -20414,158 +20587,6 @@ function ____exports.setToBitFlags(self, set)
     end
     return flags
 end
-return ____exports
- end,
-["src.classes.DefaultMap"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__Class = ____lualib.__TS__Class
-local Map = ____lualib.Map
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__TypeOf = ____lualib.__TS__TypeOf
-local __TS__New = ____lualib.__TS__New
-local ____exports = {}
-local ____types = require("src.functions.types")
-local isFunction = ____types.isFunction
-local isPrimitive = ____types.isPrimitive
-____exports.DefaultMap = __TS__Class()
-local DefaultMap = ____exports.DefaultMap
-DefaultMap.name = "DefaultMap"
-__TS__ClassExtends(DefaultMap, Map)
-function DefaultMap.prototype.____constructor(self, defaultValueOrFactoryFunction, initializerArray)
-    local argIsPrimitive = isPrimitive(nil, defaultValueOrFactoryFunction)
-    local argIsFunction = isFunction(nil, defaultValueOrFactoryFunction)
-    if not argIsPrimitive and not argIsFunction then
-        error(("Failed to instantiate a DefaultMap since the provided default value was of type \"" .. __TS__TypeOf(defaultValueOrFactoryFunction)) .. "\". This error usually means that you are trying to use an array (or some other non-primitive data structure that is passed by reference) as the default value. Instead, return the data structure in a factory function, like \"() => []\". See the DefaultMap documentation for more details.")
-    end
-    Map.prototype.____constructor(self, initializerArray)
-    if argIsFunction then
-        self.defaultValue = nil
-        self.defaultValueFactory = defaultValueOrFactoryFunction
-    else
-        self.defaultValue = defaultValueOrFactoryFunction
-        self.defaultValueFactory = nil
-    end
-end
-function DefaultMap.prototype.getAndSetDefault(self, key, ...)
-    local value = Map.prototype.get(self, key)
-    if value ~= nil then
-        return value
-    end
-    local defaultValue = self:getDefaultValue(...)
-    self:set(key, defaultValue)
-    return defaultValue
-end
-function DefaultMap.prototype.getDefaultValue(self, ...)
-    if self.defaultValue ~= nil then
-        return self.defaultValue
-    end
-    if self.defaultValueFactory ~= nil then
-        return self:defaultValueFactory(...)
-    end
-    error("A DefaultMap was incorrectly instantiated.")
-end
-function DefaultMap.prototype.getConstructorArg(self)
-    if self.defaultValue ~= nil then
-        return self.defaultValue
-    end
-    if self.defaultValueFactory ~= nil then
-        return self.defaultValueFactory
-    end
-    error("A DefaultMap was incorrectly instantiated.")
-end
-local function test(self)
-    local myDefaultMapBoolean = __TS__New(____exports.DefaultMap, false)
-    local myDefaultMapBooleanFactory = __TS__New(
-        ____exports.DefaultMap,
-        function() return false end
-    )
-    local myDefaultMapBooleanWithoutParams = __TS__New(____exports.DefaultMap, false)
-    local myDefaultMapNumber = __TS__New(____exports.DefaultMap, 123)
-    local myDefaultMapNumberFactory = __TS__New(
-        ____exports.DefaultMap,
-        function() return 123 end
-    )
-    local myDefaultMapNumberWithoutParams = __TS__New(____exports.DefaultMap, 123)
-    local myDefaultMapString = __TS__New(____exports.DefaultMap, "foo")
-    local myDefaultMapStringFactory = __TS__New(
-        ____exports.DefaultMap,
-        function() return "foo" end
-    )
-    local myDefaultMapStringWithoutParams = __TS__New(____exports.DefaultMap, "foo")
-    local myDefaultMapArray = __TS__New(
-        ____exports.DefaultMap,
-        function() return {} end
-    )
-    local myDefaultMapArrayWithoutParams = __TS__New(
-        ____exports.DefaultMap,
-        function() return {} end
-    )
-    local myDefaultMapMap = __TS__New(
-        ____exports.DefaultMap,
-        function() return __TS__New(Map) end
-    )
-    local myDefaultMapMapWithoutParams = __TS__New(
-        ____exports.DefaultMap,
-        function() return __TS__New(Map) end
-    )
-end
-return ____exports
- end,
-["src.interfaces.TSTLClassMetatable"] = function(...) 
-local ____exports = {}
-return ____exports
- end,
-["src.types.TSTLClass"] = function(...) 
-local ____exports = {}
-return ____exports
- end,
-["src.functions.tstlClass"] = function(...) 
-local ____exports = {}
-local ____types = require("src.functions.types")
-local isTable = ____types.isTable
-function ____exports.getTSTLClassConstructor(self, object)
-    if not isTable(nil, object) then
-        return nil
-    end
-    local metatable = getmetatable(object)
-    if metatable == nil then
-        return nil
-    end
-    return metatable.constructor
-end
-function ____exports.getTSTLClassName(self, object)
-    local constructor = ____exports.getTSTLClassConstructor(nil, object)
-    if constructor == nil then
-        return nil
-    end
-    return constructor.name
-end
-function ____exports.isDefaultMap(self, object)
-    local className = ____exports.getTSTLClassName(nil, object)
-    return className == "DefaultMap"
-end
-function ____exports.isTSTLClass(self, object)
-    local tstlClassName = ____exports.getTSTLClassName(nil, object)
-    return tstlClassName ~= nil
-end
-function ____exports.isTSTLMap(self, object)
-    local className = ____exports.getTSTLClassName(nil, object)
-    return className == "Map"
-end
-function ____exports.isTSTLSet(self, object)
-    local className = ____exports.getTSTLClassName(nil, object)
-    return className == "Set"
-end
-function ____exports.newTSTLClass(self, oldClass)
-    local constructor = ____exports.getTSTLClassConstructor(nil, oldClass)
-    if constructor == nil then
-        error("Failed to instantiate a new TypeScriptToLua class since the provided old class does not have a metatable/constructor.")
-    end
-    local newClass = {}
-    local newClassMetatable = setmetatable(newClass, constructor.prototype)
-    newClassMetatable:____constructor()
-    return newClass
-end
 return ____exports
  end,
 ["src.functions.doors"] = function(...) 
@@ -20985,7 +21006,7 @@ return ____exports
  end,
 ["src.functions.collectibles"] = function(...) 
 local ____exports = {}
-local initQuestionMarkSprite
+local initQuestionMarkSprite, getCollectibleTypeFromArg
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local CollectibleSpriteLayer = ____isaac_2Dtypescript_2Ddefinitions.CollectibleSpriteLayer
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
@@ -21025,6 +21046,8 @@ local getRoomListIndex = ____roomData.getRoomListIndex
 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 ____utils = require("src.functions.utils")
 local iRange = ____utils.iRange
 function initQuestionMarkSprite(self)
@@ -21035,6 +21058,10 @@ function initQuestionMarkSprite(self)
     return sprite
 end
 function ____exports.clearCollectibleSprite(self, collectible)
+    if not isCollectible(nil, collectible) then
+        local entityID = getEntityID(nil, collectible)
+        error("The \"clearCollectibleSprite\" function was given a non-collectible: " .. entityID)
+    end
     ____exports.setCollectibleSprite(nil, collectible, nil)
 end
 function ____exports.isVanillaCollectibleType(self, collectibleType)
@@ -21079,10 +21106,24 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
         true
     )
 end
+function getCollectibleTypeFromArg(self, collectibleOrCollectibleType, functionName)
+    if isNumber(nil, collectibleOrCollectibleType) then
+        local collectibleType = collectibleOrCollectibleType
+        return collectibleType
+    end
+    local collectible = collectibleOrCollectibleType
+    if not isCollectible(nil, collectible) then
+        local entityID = getEntityID(nil, collectible)
+        error((("The \"" .. functionName) .. "\" function was given a non-collectible: ") .. entityID)
+    end
+    return collectible.SubType
+end
 local COLLECTIBLE_ANM2_PATH = "gfx/005.100_collectible.anm2"
+local DEFAULT_COLLECTIBLE_PRICE = 15
 local GLITCHED_ITEM_THRESHOLD = 4000000000
 local questionMarkSprite = initQuestionMarkSprite(nil)
-function ____exports.collectibleHasCacheFlag(self, collectibleType, cacheFlag)
+function ____exports.collectibleHasCacheFlag(self, collectibleOrCollectibleType, cacheFlag)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "collectibleHasCacheFlag")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return false
@@ -21109,14 +21150,16 @@ function ____exports.collectibleSpriteEquals(self, sprite1, sprite2)
         yIncrement
     )
 end
-function ____exports.getCollectibleChargeType(self, collectibleType)
+function ____exports.getCollectibleChargeType(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleChargeType")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return ItemConfigChargeType.NORMAL
     end
     return itemConfigItem.ChargeType
 end
-function ____exports.getCollectibleDescription(self, collectibleType)
+function ____exports.getCollectibleDescription(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleDescription")
     local collectibleDescription = COLLECTIBLE_DESCRIPTION_MAP:get(collectibleType)
     if collectibleDescription ~= nil then
         return collectibleDescription
@@ -21127,18 +21170,19 @@ function ____exports.getCollectibleDescription(self, collectibleType)
     end
     return DEFAULT_COLLECTIBLE_DESCRIPTION
 end
-function ____exports.getCollectibleDevilCoinPrice(self, collectibleType)
+function ____exports.getCollectibleDevilCoinPrice(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleDescription")
     if collectibleType == CollectibleType.NULL then
         return 0
     end
-    local defaultCollectiblePrice = 15
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
-        return defaultCollectiblePrice
+        return DEFAULT_COLLECTIBLE_PRICE
     end
-    return itemConfigItem.DevilPrice * defaultCollectiblePrice
+    return itemConfigItem.DevilPrice * DEFAULT_COLLECTIBLE_PRICE
 end
-function ____exports.getCollectibleDevilHeartPrice(self, collectibleType, player)
+function ____exports.getCollectibleDevilHeartPrice(self, collectibleOrCollectibleType, player)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleDevilHeartPrice")
     local maxHearts = player:GetMaxHearts()
     if collectibleType == CollectibleType.NULL then
         return 0
@@ -21154,7 +21198,8 @@ function ____exports.getCollectibleDevilHeartPrice(self, collectibleType, player
     local twoHeartPrice = maxHearts == 2 and PickupPrice.ONE_HEART_AND_TWO_SOUL_HEARTS or PickupPrice.TWO_HEARTS
     return itemConfigItem.DevilPrice == 2 and twoHeartPrice or PickupPrice.ONE_HEART
 end
-function ____exports.getCollectibleGfxFilename(self, collectibleType)
+function ____exports.getCollectibleGfxFilename(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleGfxFilename")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return BLIND_ITEM_PNG_PATH
@@ -21178,28 +21223,32 @@ function ____exports.getCollectibleIndex(self, collectible)
     end
     return (((((tostring(roomListIndex) .. ",") .. tostring(gridIndex)) .. ",") .. tostring(collectible.SubType)) .. ",") .. tostring(collectible.InitSeed)
 end
-function ____exports.getCollectibleInitCharge(self, collectibleType)
+function ____exports.getCollectibleInitCharge(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleInitCharge")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return 0
     end
     return itemConfigItem.InitCharge
 end
-function ____exports.getCollectibleItemType(self, collectibleType)
+function ____exports.getCollectibleItemType(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleItemType")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return ItemType.NULL
     end
     return itemConfigItem.Type
 end
-function ____exports.getCollectibleMaxCharges(self, collectibleType)
+function ____exports.getCollectibleMaxCharges(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleMaxCharges")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return 0
     end
     return itemConfigItem.MaxCharges
 end
-function ____exports.getCollectibleName(self, collectibleType)
+function ____exports.getCollectibleName(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleName")
     local collectibleName = COLLECTIBLE_TYPE_TO_NAME_MAP:get(collectibleType)
     if collectibleName ~= nil then
         return collectibleName
@@ -21218,14 +21267,16 @@ function ____exports.getCollectiblePedestalType(self, collectible)
     local sprite = collectible:GetSprite()
     return sprite:GetOverlayFrame()
 end
-function ____exports.getCollectibleQuality(self, collectibleType)
+function ____exports.getCollectibleQuality(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleQuality")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
         return 0
     end
     return itemConfigItem.Quality
 end
-function ____exports.getCollectibleTags(self, collectibleType)
+function ____exports.getCollectibleTags(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleTags")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     return itemConfigItem == nil and ItemConfigTagZero or itemConfigItem.Tags
 end
@@ -21252,22 +21303,24 @@ function ____exports.isBlindCollectible(self, collectible)
     questionMarkSprite:SetFrame(animation, frame)
     return ____exports.collectibleSpriteEquals(nil, sprite, questionMarkSprite)
 end
-function ____exports.isGlitchedCollectible(self, pickup)
-    return pickup.Variant == PickupVariant.COLLECTIBLE and pickup.SubType > GLITCHED_ITEM_THRESHOLD
+function ____exports.isGlitchedCollectible(self, collectible)
+    return collectible.Variant == PickupVariant.COLLECTIBLE and collectible.SubType > GLITCHED_ITEM_THRESHOLD
 end
-function ____exports.isHiddenCollectible(self, collectibleType)
+function ____exports.isHiddenCollectible(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "isHiddenCollectible")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     return itemConfigItem ~= nil and itemConfigItem.Hidden
 end
 function ____exports.isModdedCollectibleType(self, collectibleType)
     return not ____exports.isVanillaCollectibleType(nil, collectibleType)
 end
-function ____exports.isPassiveCollectible(self, collectibleType)
+function ____exports.isPassiveCollectible(self, collectibleOrCollectibleType)
+    local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "isPassiveCollectible")
     local itemType = ____exports.getCollectibleItemType(nil, collectibleType)
     return itemType == ItemType.PASSIVE or itemType == ItemType.FAMILIAR
 end
-function ____exports.isQuality(self, collectibleType, quality)
-    local actualQuality = ____exports.getCollectibleQuality(nil, collectibleType)
+function ____exports.isQuality(self, collectibleOrCollectibleType, quality)
+    local actualQuality = ____exports.getCollectibleQuality(nil, collectibleOrCollectibleType)
     return quality == actualQuality
 end
 function ____exports.isSingleUseCollectible(self, collectibleType)
@@ -21323,6 +21376,15 @@ function ____exports.setCollectibleGlitched(self, collectible)
         player:RemoveCollectible(CollectibleType.TMTRAINER)
     end
 end
+function ____exports.setCollectiblePedestalType(self, collectible, collectiblePedestalType)
+    if not isCollectible(nil, collectible) then
+        local entityID = getEntityID(nil, collectible)
+        error("The \"setCollectiblePedestalType\" function was given a non-collectible: " .. entityID)
+    end
+    local sprite = collectible:GetSprite()
+    local overlayAnimation = sprite:GetOverlayAnimation()
+    sprite:SetOverlayFrame(overlayAnimation, collectiblePedestalType)
+end
 function ____exports.setCollectiblesRerolledForItemTracker(self)
     Isaac.DebugString("Added 3 Collectibles")
 end