isaacscript-common 80.2.2 → 80.2.4

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 80.2.1
+isaacscript-common 80.2.3
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -1518,6 +1518,10 @@ local function __TS__NumberIsFinite(value)
     return type(value) == "number" and value == value and value ~= math.huge and value ~= -math.huge
 end
 
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end
+
 local function __TS__NumberIsNaN(value)
     return value ~= value
 end
@@ -2619,6 +2623,7 @@ return {
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
+  __TS__NumberIsInteger = __TS__NumberIsInteger,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
   __TS__ParseInt = __TS__ParseInt,
   __TS__ParseFloat = __TS__ParseFloat,
@@ -17147,6 +17152,23 @@ end
 function ____exports.isUserdata(self, variable)
     return type(variable) == "userdata"
 end
+--- Helper function to convert a string to an integer. Returns undefined if the string is not an
+-- integer.
+-- 
+-- Under the hood, this uses the built-in `tonumber` and `math.floor` functions.
+-- 
+-- This is named `parseIntSafe` in order to match the helper function in `isaacscript-common-ts`.
+function ____exports.parseIntSafe(self, ____string)
+    if not ____exports.isString(nil, ____string) then
+        return nil
+    end
+    local number = tonumber(____string)
+    if number == nil then
+        return nil
+    end
+    local flooredNumber = math.floor(number)
+    return number == flooredNumber and flooredNumber or nil
+end
 return ____exports
  end,
 ["functions.sort"] = function(...) 
@@ -17936,6 +17958,8 @@ local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__StringSlice = ____lualib.__TS__StringSlice
 local __TS__StringEndsWith = ____lualib.__TS__StringEndsWith
 local ____exports = {}
+local ____types = require("functions.types")
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
 --- Helper function to get the closest value from an array of strings based on partial search text.
@@ -18049,9 +18073,9 @@ function ____exports.parseSemanticVersion(self, versionString)
     if majorVersionString == nil or minorVersionString == nil or patchVersionString == nil then
         return nil
     end
-    local majorVersion = tonumber(majorVersionString)
-    local minorVersion = tonumber(minorVersionString)
-    local patchVersion = tonumber(patchVersionString)
+    local majorVersion = parseIntSafe(nil, majorVersionString)
+    local minorVersion = parseIntSafe(nil, minorVersionString)
+    local patchVersion = parseIntSafe(nil, patchVersionString)
     if majorVersion == nil or minorVersion == nil or patchVersion == nil then
         return nil
     end
@@ -18292,8 +18316,9 @@ function ____exports.getBooleansFromTable(self, luaMap, objectName, ...)
     end
     return booleans
 end
---- Helper function to safely get number values from specific keys on a Lua table. Will throw an
--- error if the specific value does not exist on the table or if it cannot be converted to a number.
+--- Helper function to safely get number values from specific keys on a Lua table. If the values are
+-- strings, they will be converted to numbers. Will throw an error if the specific value does not
+-- exist on the table or if it cannot be converted to a number.
 -- 
 -- This function is variadic, meaning that you can specify N arguments to get N values.
 function ____exports.getNumbersFromTable(self, luaMap, objectName, ...)
@@ -20107,11 +20132,9 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local CardType = ____isaac_2Dtypescript_2Ddefinitions.CardType
 local Challenge = ____isaac_2Dtypescript_2Ddefinitions.Challenge
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local PillColor = ____isaac_2Dtypescript_2Ddefinitions.PillColor
 local PillEffect = ____isaac_2Dtypescript_2Ddefinitions.PillEffect
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
-local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____enums = require("functions.enums")
 local getEnumLength = ____enums.getEnumLength
@@ -20139,20 +20162,12 @@ ____exports.NUM_VANILLA_TRINKET_TYPES = getEnumLength(nil, TrinketType) - 1
 --- Equal to `Card.FOOL`.
 ____exports.FIRST_CARD_TYPE = CardType.FOOL
 --- Calculated from the `CardType` enum.
--- 
--- Note that this could be calculated from the length of the enum, because card types are
--- contiguous. However, we instead get the highest enum value to be safer and to make the code more
--- consistent with collectibles and trinkets.
 ____exports.LAST_VANILLA_CARD_TYPE = getHighestEnumValue(nil, CardType)
 --- Calculated from the `Card` enum. `Card.NULL` is not included.
 ____exports.NUM_VANILLA_CARD_TYPES = getEnumLength(nil, CardType) - 1
 --- Equal to `PillEffect.BAD_GAS`.
 ____exports.FIRST_PILL_EFFECT = PillEffect.BAD_GAS
 --- Calculated from the `PillEffect` enum.
--- 
--- Note that this could be calculated from the length of the enum, because pill effects are
--- contiguous. However, we instead get the highest enum value to be safer and to make the code more
--- consistent with collectibles and trinkets.
 ____exports.LAST_VANILLA_PILL_EFFECT = getHighestEnumValue(nil, PillEffect)
 --- Calculated from the `PillEffect` enum. (There is no `PillEffect.NULL` in the custom enum, so we
 -- do not have to subtract one here.)
@@ -20175,15 +20190,7 @@ ____exports.NUM_NORMAL_PILL_COLORS = #iRange(nil, ____exports.FIRST_PILL_COLOR,
 --- Equal to `PlayerType.ISAAC`.
 ____exports.FIRST_CHARACTER = PlayerType.ISAAC
 --- Calculated from the `PlayerType` enum.
--- 
--- Note that this could be calculated from the length of the enum, because characters are
--- contiguous. However, we instead get the highest enum value to be safer and to make the code more
--- consistent with collectibles and trinkets.
 ____exports.LAST_VANILLA_CHARACTER = getHighestEnumValue(nil, PlayerType)
-____exports.FIRST_ROOM_TYPE = RoomType.DEFAULT
-____exports.LAST_ROOM_TYPE = getHighestEnumValue(nil, RoomType)
-____exports.FIRST_STAGE = LevelStage.BASEMENT_1
-____exports.LAST_STAGE = getHighestEnumValue(nil, LevelStage)
 --- Calculated from the `Challenge` enum. `Challenge.NULL` is not included.
 ____exports.NUM_VANILLA_CHALLENGES = getEnumLength(nil, Challenge) - 1
 return ____exports
@@ -23574,10 +23581,14 @@ local ____bitwise = require("functions.bitwise")
 local arrayToBitFlags = ____bitwise.arrayToBitFlags
 local ____direction = require("functions.direction")
 local directionToVector = ____direction.directionToVector
+local ____enums = require("functions.enums")
+local isEnumValue = ____enums.isEnumValue
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
 local ____tstlClass = require("functions.tstlClass")
 local isTSTLSet = ____tstlClass.isTSTLSet
+local ____types = require("functions.types")
+local parseIntSafe = ____types.parseIntSafe
 function ____exports.doorSlotToDirection(self, doorSlot)
     return DOOR_SLOT_TO_DIRECTION[doorSlot]
 end
@@ -23836,11 +23847,17 @@ function ____exports.getRoomShapeDoorSlot(self, roomShape, x, y)
     for ____, ____value in ipairs(__TS__ObjectEntries(doorSlotCoordinates)) do
         local doorSlotString = ____value[1]
         local coordinates = ____value[2]
-        local doorSlot = tonumber(doorSlotString)
-        local doorX, doorY = table.unpack(coordinates)
-        if x == doorX and y == doorY then
-            return doorSlot
+        do
+            local doorSlot = parseIntSafe(nil, doorSlotString)
+            if doorSlot == nil or not isEnumValue(nil, doorSlot, DoorSlot) then
+                goto __continue40
+            end
+            local doorX, doorY = table.unpack(coordinates)
+            if x == doorX and y == doorY then
+                return doorSlot
+            end
         end
+        ::__continue40::
     end
     return nil
 end
@@ -26788,6 +26805,7 @@ local isTSTLSet = ____tstlClass.isTSTLSet
 local ____types = require("functions.types")
 local asNPCState = ____types.asNPCState
 local isPrimitive = ____types.isPrimitive
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
 local ____vector = require("functions.vector")
@@ -26967,24 +26985,15 @@ function ____exports.getConstituentsFromEntityID(self, entityID)
         error("Failed to get the constituents from entity ID: " .. entityID)
     end
     local entityTypeString, variantString, subTypeString = table.unpack(parts)
-    local entityType = tonumber(entityTypeString)
-    assertDefined(
-        nil,
-        entityType,
-        "Failed to convert the entity type to a number: " .. tostring(entityTypeString)
-    )
-    local variant = tonumber(variantString)
-    assertDefined(
-        nil,
-        variant,
-        "Failed to convert the entity variant to a number: " .. tostring(variantString)
-    )
-    local subType = tonumber(subTypeString)
-    assertDefined(
-        nil,
-        subType,
-        "Failed to convert the entity sub-type to a number: " .. tostring(subTypeString)
-    )
+    assertDefined(nil, entityTypeString, "Failed to get the first constituent from an entity ID: " .. entityID)
+    assertDefined(nil, variantString, "Failed to get the second constituent from an entity ID: " .. entityID)
+    assertDefined(nil, subTypeString, "Failed to get the third constituent from an entity ID: " .. entityID)
+    local entityType = parseIntSafe(nil, entityTypeString)
+    assertDefined(nil, entityType, "Failed to convert the entity type to an integer: " .. entityTypeString)
+    local variant = parseIntSafe(nil, variantString)
+    assertDefined(nil, variant, "Failed to convert the entity variant to an integer: " .. variantString)
+    local subType = parseIntSafe(nil, subTypeString)
+    assertDefined(nil, subType, "Failed to convert the entity sub-type to an integer: " .. subTypeString)
     return {entityType, variant, subType}
 end
 --- Helper function to get all of the entities in the room or all of the entities that match a
@@ -27193,16 +27202,13 @@ function ____exports.parseEntityID(self, entityID)
         return nil
     end
     local entityTypeString, variantString, subTypeString = table.unpack(entityIDArray)
-    local entityType = tonumber(entityTypeString)
-    if entityType == nil then
+    if entityTypeString == nil or variantString == nil or subTypeString == nil then
         return nil
     end
-    local variant = tonumber(variantString)
-    if variant == nil then
-        return nil
-    end
-    local subType = tonumber(subTypeString)
-    if subType == nil then
+    local entityType = parseIntSafe(nil, entityTypeString)
+    local variant = parseIntSafe(nil, variantString)
+    local subType = parseIntSafe(nil, subTypeString)
+    if entityType == nil or variant == nil or subType == nil then
         return nil
     end
     return {entityType, variant, subType}
@@ -27219,12 +27225,12 @@ function ____exports.parseEntityTypeVariantString(self, entityTypeVariantString)
         return nil
     end
     local entityTypeString, variantString = table.unpack(entityTypeVariantArray)
-    local entityType = tonumber(entityTypeString)
-    if entityType == nil then
+    if entityTypeString == nil or variantString == nil then
         return nil
     end
-    local variant = tonumber(variantString)
-    if variant == nil then
+    local entityType = parseIntSafe(nil, entityTypeString)
+    local variant = parseIntSafe(nil, variantString)
+    if entityType == nil or variant == nil then
         return nil
     end
     return {entityType, variant}
@@ -27481,6 +27487,7 @@ local ____sprites = require("functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local spriteEquals = ____sprites.spriteEquals
 local ____types = require("functions.types")
+local asCollectibleType = ____types.asCollectibleType
 local isInteger = ____types.isInteger
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
@@ -27705,8 +27712,12 @@ function ____exports.getCollectibleGfxFilename(self, collectibleOrCollectibleTyp
     end
     return itemConfigItem.GfxFileName
 end
---- Helper function to get the initial amount of charges that a collectible has. Returns 0 if the
--- provided collectible type was not valid.
+--- Helper function to get the initial amount of charges that a collectible has. In most cases, when
+-- picking up an active collectible for the first time, it will be fully charged, which corresponds
+-- to an `InitCharge` value of -1. However, in some cases, this may be different. For example,
+-- Eden's Soul starts without any charges, so it has an `InitCharge` value of 0.
+-- 
+-- This function returns 0 if the provided collectible type was not valid.
 function ____exports.getCollectibleInitCharge(self, collectibleOrCollectibleType)
     local collectibleType = getCollectibleTypeFromArg(nil, collectibleOrCollectibleType, "getCollectibleInitCharge")
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
@@ -27858,7 +27869,8 @@ function ____exports.isSingleUseCollectible(self, collectibleType)
     return SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES_SET:has(collectibleType)
 end
 function ____exports.isValidCollectibleType(self, collectibleType)
-    local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+    local potentialCollectibleType = asCollectibleType(nil, collectibleType)
+    local itemConfigItem = itemConfig:GetCollectible(potentialCollectibleType)
     return itemConfigItem ~= nil
 end
 --- Helper function to generate a new sprite based on a collectible. If the provided collectible type
@@ -33166,6 +33178,7 @@ local ____rooms = require("functions.rooms")
 local roomUpdateSafe = ____rooms.roomUpdateSafe
 local ____types = require("functions.types")
 local isInteger = ____types.isInteger
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
 local eRange = ____utils.eRange
@@ -33668,21 +33681,15 @@ end
 function ____exports.getConstituentsFromGridEntityID(self, gridEntityID)
     local parts = __TS__StringSplit(gridEntityID, ".")
     if #parts ~= 2 then
-        error("Failed to get the constituents from grid entity ID: " .. gridEntityID)
+        error("Failed to get the constituents from a grid entity ID: " .. gridEntityID)
     end
     local gridEntityTypeString, variantString = table.unpack(parts)
-    local gridEntityType = tonumber(gridEntityTypeString)
-    assertDefined(
-        nil,
-        gridEntityType,
-        "Failed to convert the grid entity type to a number: " .. tostring(gridEntityTypeString)
-    )
-    local variant = tonumber(variantString)
-    assertDefined(
-        nil,
-        variant,
-        "Failed to convert the grid entity variant to a number: " .. tostring(variantString)
-    )
+    assertDefined(nil, gridEntityTypeString, "Failed to get the first constituent from a grid entity ID: " .. gridEntityID)
+    assertDefined(nil, variantString, "Failed to get the second constituent from a grid entity ID: " .. gridEntityID)
+    local gridEntityType = parseIntSafe(nil, gridEntityTypeString)
+    assertDefined(nil, gridEntityType, "Failed to convert the grid entity type to a number: " .. gridEntityTypeString)
+    local variant = parseIntSafe(nil, variantString)
+    assertDefined(nil, variant, "Failed to convert the grid entity variant to an integer: " .. variantString)
     return {gridEntityType, variant}
 end
 --- Helper function to get every grid entity in the current room.
@@ -36561,6 +36568,7 @@ local ____sprites = require("functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local ____types = require("functions.types")
 local asNumber = ____types.asNumber
+local asTrinketType = ____types.asTrinketType
 function ____exports.isGoldenTrinketType(self, trinketType)
     return asNumber(nil, trinketType) > GOLDEN_TRINKET_ADJUSTMENT
 end
@@ -36663,6 +36671,11 @@ end
 function ____exports.isModdedTrinketType(self, trinketType)
     return not ____exports.isVanillaTrinketType(nil, trinketType)
 end
+function ____exports.isValidTrinketType(self, trinketType)
+    local potentialTrinketType = asTrinketType(nil, trinketType)
+    local itemConfigItem = itemConfig:GetTrinket(potentialTrinketType)
+    return itemConfigItem ~= nil
+end
 --- Helper function to generate a new sprite based on a collectible. If the provided collectible type
 -- is invalid, a sprite with a Curse of the Blind question mark will be returned.
 function ____exports.newTrinketSprite(self, trinketType)
@@ -38591,6 +38604,7 @@ local PILL_EFFECT_TYPES = ____pillEffectTypes.PILL_EFFECT_TYPES
 local ____types = require("functions.types")
 local asNumber = ____types.asNumber
 local asPillColor = ____types.asPillColor
+local asPillEffect = ____types.asPillEffect
 local ____utils = require("functions.utils")
 local iRange = ____utils.iRange
 --- Helper function to see if the given pill color is a horse pill.
@@ -38713,6 +38727,11 @@ end
 function ____exports.isModdedPillEffect(self, pillEffect)
     return not ____exports.isVanillaPillEffect(nil, pillEffect)
 end
+function ____exports.isValidPillEffect(self, pillEffect)
+    local potentialPillEffect = asPillEffect(nil, pillEffect)
+    local itemConfigPillEffect = itemConfig:GetPillEffect(potentialPillEffect)
+    return itemConfigPillEffect ~= nil
+end
 return ____exports
  end,
 ["interfaces.PocketItemDescription"] = function(...) 
@@ -40244,13 +40263,12 @@ local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.index")
 local Challenge = ____isaac_2Dtypescript_2Ddefinitions.Challenge
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local SeedEffect = ____isaac_2Dtypescript_2Ddefinitions.SeedEffect
 local ____cachedEnumValues = require("arrays.cachedEnumValues")
 local SEED_EFFECTS = ____cachedEnumValues.SEED_EFFECTS
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
-local ____constantsFirstLast = require("core.constantsFirstLast")
-local FIRST_CHARACTER = ____constantsFirstLast.FIRST_CHARACTER
 local ____characters = require("functions.characters")
 local getCharacterName = ____characters.getCharacterName
 local ____log = require("functions.log")
@@ -40314,7 +40332,7 @@ function ____exports.restart(self, character)
         Isaac.ExecuteCommand(command)
         return
     end
-    if character < FIRST_CHARACTER then
+    if character < PlayerType.ISAAC then
         error(("Restarting as a character of " .. tostring(character)) .. " would crash the game.")
     end
     local command = "restart " .. tostring(character)
@@ -44095,6 +44113,8 @@ local ____itemConfigCardTypesForCards = require("sets.itemConfigCardTypesForCard
 local ITEM_CONFIG_CARD_TYPES_FOR_CARDS = ____itemConfigCardTypesForCards.ITEM_CONFIG_CARD_TYPES_FOR_CARDS
 local ____flag = require("functions.flag")
 local addFlag = ____flag.addFlag
+local ____types = require("functions.types")
+local asCardType = ____types.asCardType
 function ____exports.isVanillaCardType(self, cardType)
     return cardType <= LAST_VANILLA_CARD_TYPE
 end
@@ -44204,6 +44224,11 @@ end
 function ____exports.isTarotCard(self, cardType)
     return ____exports.isCardType(nil, cardType, ItemConfigCardType.TAROT)
 end
+function ____exports.isValidCardType(self, cardType)
+    local potentialCardType = asCardType(nil, cardType)
+    local itemConfigCard = itemConfig:GetCard(potentialCardType)
+    return itemConfigCard ~= nil
+end
 --- Helper function to use a card without showing an animation and without the announcer voice
 -- playing.
 function ____exports.useCardTemp(self, player, cardType)
@@ -44453,10 +44478,10 @@ local ____decorators = require("decorators")
 local Exported = ____decorators.Exported
 local ____Feature = require("classes.private.Feature")
 local Feature = ____Feature.Feature
-____exports.FIRST_MODDED_COLLECTIBLE_TYPE = LAST_VANILLA_COLLECTIBLE_TYPE + 1
-____exports.FIRST_MODDED_TRINKET_TYPE = LAST_VANILLA_TRINKET_TYPE + 1
-____exports.FIRST_MODDED_CARD_TYPE = LAST_VANILLA_CARD_TYPE + 1
-____exports.FIRST_MODDED_PILL_EFFECT = LAST_VANILLA_PILL_EFFECT + 1
+local FIRST_MODDED_COLLECTIBLE_TYPE = LAST_VANILLA_COLLECTIBLE_TYPE + 1
+local FIRST_MODDED_TRINKET_TYPE = LAST_VANILLA_TRINKET_TYPE + 1
+local FIRST_MODDED_CARD_TYPE = LAST_VANILLA_CARD_TYPE + 1
+local FIRST_MODDED_PILL_EFFECT = LAST_VANILLA_PILL_EFFECT + 1
 --- Mods can add extra things to the game (e.g. collectibles, trinkets, and so on). Since mods load
 -- in alphabetical order, the total number of things can't be properly be known until at least one
 -- callback fires (which indicates that all mods have been loaded).
@@ -44484,12 +44509,12 @@ function ModdedElementDetection.prototype.errorIfNoCallbacksFired(self, constant
 end
 function ModdedElementDetection.prototype.getFirstModdedCollectibleType(self)
     self:errorIfNoCallbacksFired("collectible")
-    local itemConfigItem = itemConfig:GetCollectible(____exports.FIRST_MODDED_COLLECTIBLE_TYPE)
+    local itemConfigItem = itemConfig:GetCollectible(FIRST_MODDED_COLLECTIBLE_TYPE)
     local ____temp_0
     if itemConfigItem == nil then
         ____temp_0 = nil
     else
-        ____temp_0 = ____exports.FIRST_MODDED_COLLECTIBLE_TYPE
+        ____temp_0 = FIRST_MODDED_COLLECTIBLE_TYPE
     end
     return ____temp_0
 end
@@ -44511,12 +44536,12 @@ end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedCollectibleTypes", true)
 function ModdedElementDetection.prototype.getFirstModdedTrinketType(self)
     self:errorIfNoCallbacksFired("trinket")
-    local itemConfigItem = itemConfig:GetTrinket(____exports.FIRST_MODDED_TRINKET_TYPE)
+    local itemConfigItem = itemConfig:GetTrinket(FIRST_MODDED_TRINKET_TYPE)
     local ____temp_1
     if itemConfigItem == nil then
         ____temp_1 = nil
     else
-        ____temp_1 = ____exports.FIRST_MODDED_TRINKET_TYPE
+        ____temp_1 = FIRST_MODDED_TRINKET_TYPE
     end
     return ____temp_1
 end
@@ -44538,12 +44563,12 @@ end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedTrinketTypes", true)
 function ModdedElementDetection.prototype.getFirstModdedCardType(self)
     self:errorIfNoCallbacksFired("card")
-    local itemConfigCard = itemConfig:GetCard(____exports.FIRST_MODDED_CARD_TYPE)
+    local itemConfigCard = itemConfig:GetCard(FIRST_MODDED_CARD_TYPE)
     local ____temp_2
     if itemConfigCard == nil then
         ____temp_2 = nil
     else
-        ____temp_2 = ____exports.FIRST_MODDED_CARD_TYPE
+        ____temp_2 = FIRST_MODDED_CARD_TYPE
     end
     return ____temp_2
 end
@@ -44565,12 +44590,12 @@ end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedCardTypes", true)
 function ModdedElementDetection.prototype.getFirstModdedPillEffect(self)
     self:errorIfNoCallbacksFired("pill")
-    local itemConfigPillEffect = itemConfig:GetPillEffect(____exports.FIRST_MODDED_PILL_EFFECT)
+    local itemConfigPillEffect = itemConfig:GetPillEffect(FIRST_MODDED_PILL_EFFECT)
     local ____temp_3
     if itemConfigPillEffect == nil then
         ____temp_3 = nil
     else
-        ____temp_3 = ____exports.FIRST_MODDED_PILL_EFFECT
+        ____temp_3 = FIRST_MODDED_PILL_EFFECT
     end
     return ____temp_3
 end
@@ -53967,6 +53992,8 @@ local ____log = require("functions.log")
 local log = ____log.log
 local ____random = require("functions.random")
 local getRandomFloat = ____random.getRandomFloat
+local ____types = require("functions.types")
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
 function getTotalWeightOfJSONObject(self, jsonOjectArray)
@@ -54008,7 +54035,7 @@ end
 -- (A JSON room is an XML file converted to JSON so that it can be directly imported into your mod.)
 function ____exports.getJSONRoomDoorSlotFlags(self, jsonRoom)
     local roomShapeString = jsonRoom["$"].shape
-    local roomShape = tonumber(roomShapeString)
+    local roomShape = parseIntSafe(nil, roomShapeString)
     assertDefined(nil, roomShape, "Failed to parse the \"shape\" field of a JSON room: " .. roomShapeString)
     if not isEnumValue(nil, roomShape, RoomShape) then
         error("Failed to parse the \"shape\" field of a JSON room since it was an invalid number: " .. tostring(roomShape))
@@ -54024,10 +54051,10 @@ function ____exports.getJSONRoomDoorSlotFlags(self, jsonRoom)
                 goto __continue4
             end
             local xString = door["$"].x
-            local x = tonumber(xString)
+            local x = parseIntSafe(nil, xString)
             assertDefined(nil, x, "Failed to parse the \"x\" field of a JSON room door: " .. xString)
             local yString = door["$"].y
-            local y = tonumber(yString)
+            local y = parseIntSafe(nil, yString)
             assertDefined(nil, y, "Failed to parse the \"y\" field of a JSON room door: " .. yString)
             local doorSlot = getRoomShapeDoorSlot(nil, roomShape, x, y)
             assertDefined(
@@ -54054,7 +54081,10 @@ function ____exports.getJSONRoomOfVariant(self, jsonRooms, variant)
         jsonRooms,
         function(____, jsonRoom)
             local roomVariantString = jsonRoom["$"].variant
-            local roomVariant = tonumber(roomVariantString)
+            local roomVariant = parseIntSafe(nil, roomVariantString)
+            if roomVariant == nil then
+                error("Failed to convert a JSON room variant to an integer: " .. roomVariantString)
+            end
             return roomVariant == variant
         end
     )
@@ -54077,7 +54107,10 @@ function ____exports.getJSONRoomsOfSubType(self, jsonRooms, subType)
         jsonRooms,
         function(____, jsonRoom)
             local roomSubTypeString = jsonRoom["$"].subtype
-            local roomSubType = tonumber(roomSubTypeString)
+            local roomSubType = parseIntSafe(nil, roomSubTypeString)
+            if roomSubType == nil then
+                error("Failed to convert a JSON room sub-type to an integer: " .. roomSubTypeString)
+            end
             return roomSubType == subType
         end
     )
@@ -54603,6 +54636,7 @@ local ____spawnCollectible = require("functions.spawnCollectible")
 local spawnCollectible = ____spawnCollectible.spawnCollectible
 local ____types = require("functions.types")
 local asCollectibleType = ____types.asCollectibleType
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
 local ____ReadonlySet = require("types.ReadonlySet")
@@ -54756,28 +54790,28 @@ function DeployJSONRoom.prototype.spawnAllEntities(self, jsonRoom, rng, verbose)
     local shouldUnclearRoom = false
     for ____, jsonSpawn in ipairs(jsonRoom.spawn) do
         local xString = jsonSpawn["$"].x
-        local x = tonumber(xString)
-        assertDefined(nil, x, "Failed to convert the following x coordinate to a number (for a spawn): " .. xString)
+        local x = parseIntSafe(nil, xString)
+        assertDefined(nil, x, "Failed to convert the following x coordinate to an integer (for a spawn): " .. xString)
         local yString = jsonSpawn["$"].y
-        local y = tonumber(yString)
-        assertDefined(nil, y, "Failed to convert the following y coordinate to a number (for a spawn): " .. yString)
+        local y = parseIntSafe(nil, yString)
+        assertDefined(nil, y, "Failed to convert the following y coordinate to an integer (for a spawn): " .. yString)
         local jsonEntity = getRandomJSONEntity(nil, jsonSpawn.entity, rng)
         local entityTypeString = jsonEntity["$"].type
-        local entityTypeNumber = tonumber(entityTypeString)
-        assertDefined(nil, entityTypeNumber, "Failed to convert the entity type to a number: " .. entityTypeString)
+        local entityTypeNumber = parseIntSafe(nil, entityTypeString)
+        assertDefined(nil, entityTypeNumber, "Failed to convert the entity type to an integer: " .. entityTypeString)
         local variantString = jsonEntity["$"].variant
-        local variant = tonumber(variantString)
+        local variant = parseIntSafe(nil, variantString)
         assertDefined(
             nil,
             variant,
-            "Failed to convert the entity variant to a number: " .. tostring(variant)
+            "Failed to convert the entity variant to an integer: " .. tostring(variant)
         )
         local subTypeString = jsonEntity["$"].subtype
-        local subType = tonumber(subTypeString)
+        local subType = parseIntSafe(nil, subTypeString)
         assertDefined(
             nil,
             subType,
-            "Failed to convert the entity sub-type to a number: " .. tostring(subType)
+            "Failed to convert the entity sub-type to an integer: " .. tostring(subType)
         )
         local isGridEntity = GRID_ENTITY_XML_TYPE_SET:has(entityTypeNumber)
         if isGridEntity then
@@ -57982,6 +58016,7 @@ local ITEM_POOL_TYPE_VALUES = ____cachedEnumValues.ITEM_POOL_TYPE_VALUES
 local itemPoolsJSON = require("data.itempools")
 local ____types = require("functions.types")
 local asCollectibleType = ____types.asCollectibleType
+local parseIntSafe = ____types.parseIntSafe
 local ____itemPoolTypeToItemPoolName = require("maps.itemPoolTypeToItemPoolName")
 local ITEM_POOL_TYPE_TO_ITEM_POOL_NAME = ____itemPoolTypeToItemPoolName.ITEM_POOL_TYPE_TO_ITEM_POOL_NAME
 function getItemPoolJSON(self, itemPoolType)
@@ -58001,11 +58036,11 @@ ____exports.ITEM_POOL_TYPE_TO_COLLECTIBLE_TYPES_SET = (function()
         else
             local collectibleTypesSet = __TS__New(Set)
             for ____, itemPoolJSONElement in ipairs(itemPoolJSON.Item) do
-                local collectibleTypeNumber = tonumber(itemPoolJSONElement["$"].Id)
-                if collectibleTypeNumber == nil then
+                local collectibleTypeInt = parseIntSafe(nil, itemPoolJSONElement["$"].Id)
+                if collectibleTypeInt == nil then
                     error("Failed to parse a collectible type in the \"itempools.json\" file: " .. itemPoolJSONElement["$"].Id)
                 end
-                local collectibleType = asCollectibleType(nil, collectibleTypeNumber)
+                local collectibleType = asCollectibleType(nil, collectibleTypeInt)
                 collectibleTypesSet:add(collectibleType)
             end
             itemPoolTypeToCollectibleTypes[itemPoolType] = collectibleTypesSet
@@ -59857,13 +59892,15 @@ local getRoomData = ____roomData.getRoomData
 local getRoomDescriptor = ____roomData.getRoomDescriptor
 local ____rooms = require("functions.rooms")
 local changeRoom = ____rooms.changeRoom
+local ____types = require("functions.types")
+local parseIntSafe = ____types.parseIntSafe
 local ____roomTypeNames = require("objects.roomTypeNames")
 local ROOM_TYPE_NAMES = ____roomTypeNames.ROOM_TYPE_NAMES
 local DEFAULT_MOVE_UNITS = 0.5
 function ____exports.addHeart(self, params, healthType)
     local numHearts = healthType == HealthType.MAX_HEARTS and 2 or 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
             print("That is an invalid amount of hearts to add.")
             return
@@ -59894,7 +59931,7 @@ end
 function ____exports.listEntities(self, params, includeBackgroundEffects)
     local entityTypeFilter
     if params ~= "" then
-        entityTypeFilter = tonumber(params)
+        entityTypeFilter = parseIntSafe(nil, params)
         if entityTypeFilter == nil then
             print("That is an invalid entity type to filter by.")
             return
@@ -59906,7 +59943,7 @@ end
 function ____exports.listGridEntities(self, params, includeWalls)
     local gridEntityTypeFilter
     if params ~= "" then
-        gridEntityTypeFilter = tonumber(params)
+        gridEntityTypeFilter = parseIntSafe(nil, params)
         if gridEntityTypeFilter == nil then
             print("That is an invalid grid entity type to filter by.")
             return
@@ -59918,7 +59955,7 @@ end
 function ____exports.movePlayer(self, params, direction)
     local amount = DEFAULT_MOVE_UNITS
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
             print("That is an invalid amount of units to move.")
             return
@@ -59999,7 +60036,6 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
-local __TS__ArrayIncludes = ____lualib.__TS__ArrayIncludes
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.index")
 local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
@@ -60014,10 +60050,11 @@ local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local GridRoom = ____isaac_2Dtypescript_2Ddefinitions.GridRoom
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local PillColor = ____isaac_2Dtypescript_2Ddefinitions.PillColor
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
+local SoundEffect = ____isaac_2Dtypescript_2Ddefinitions.SoundEffect
 local StageType = ____isaac_2Dtypescript_2Ddefinitions.StageType
 local ____cachedEnumValues = require("arrays.cachedEnumValues")
-local ACTIVE_SLOT_VALUES = ____cachedEnumValues.ACTIVE_SLOT_VALUES
 local GRID_ENTITY_TYPE_VALUES = ____cachedEnumValues.GRID_ENTITY_TYPE_VALUES
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
@@ -60028,21 +60065,14 @@ local MAX_LEVEL_GRID_INDEX = ____constants.MAX_LEVEL_GRID_INDEX
 local MAX_NUM_FAMILIARS = ____constants.MAX_NUM_FAMILIARS
 local ____constantsFirstLast = require("core.constantsFirstLast")
 local FIRST_CARD_TYPE = ____constantsFirstLast.FIRST_CARD_TYPE
-local FIRST_CHARACTER = ____constantsFirstLast.FIRST_CHARACTER
 local FIRST_HORSE_PILL_COLOR = ____constantsFirstLast.FIRST_HORSE_PILL_COLOR
 local FIRST_PILL_COLOR = ____constantsFirstLast.FIRST_PILL_COLOR
-local FIRST_PILL_EFFECT = ____constantsFirstLast.FIRST_PILL_EFFECT
-local FIRST_ROOM_TYPE = ____constantsFirstLast.FIRST_ROOM_TYPE
-local FIRST_STAGE = ____constantsFirstLast.FIRST_STAGE
-local LAST_ROOM_TYPE = ____constantsFirstLast.LAST_ROOM_TYPE
-local LAST_STAGE = ____constantsFirstLast.LAST_STAGE
 local LAST_VANILLA_CARD_TYPE = ____constantsFirstLast.LAST_VANILLA_CARD_TYPE
-local LAST_VANILLA_CHARACTER = ____constantsFirstLast.LAST_VANILLA_CHARACTER
-local LAST_VANILLA_PILL_EFFECT = ____constantsFirstLast.LAST_VANILLA_PILL_EFFECT
 local ____HealthType = require("enums.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____cards = require("functions.cards")
 local getCardName = ____cards.getCardName
+local isValidCardType = ____cards.isValidCardType
 local ____characters = require("functions.characters")
 local getCharacterName = ____characters.getCharacterName
 local ____charge = require("functions.charge")
@@ -60056,6 +60086,8 @@ local ____deepCopyTests = require("functions.deepCopyTests")
 local runDeepCopyTests = ____deepCopyTests.runDeepCopyTests
 local ____entitiesSpecific = require("functions.entitiesSpecific")
 local getNPCs = ____entitiesSpecific.getNPCs
+local ____enums = require("functions.enums")
+local isEnumValue = ____enums.isEnumValue
 local ____flag = require("functions.flag")
 local addFlag = ____flag.addFlag
 local ____gridEntities = require("functions.gridEntities")
@@ -60076,6 +60108,7 @@ local spawnPill = ____pickupsSpecific.spawnPill
 local spawnTrinketFunction = ____pickupsSpecific.spawnTrinket
 local ____pills = require("functions.pills")
 local getPillEffectName = ____pills.getPillEffectName
+local isValidPillEffect = ____pills.isValidPillEffect
 local ____playerCollectibles = require("functions.playerCollectibles")
 local addCollectibleCostume = ____playerCollectibles.addCollectibleCostume
 local removeCollectibleCostume = ____playerCollectibles.removeCollectibleCostume
@@ -60105,9 +60138,9 @@ local ____string = require("functions.string")
 local getMapPartialMatch = ____string.getMapPartialMatch
 local ____trinkets = require("functions.trinkets")
 local getGoldenTrinketType = ____trinkets.getGoldenTrinketType
+local isValidTrinketType = ____trinkets.isValidTrinketType
 local ____types = require("functions.types")
-local asCollectibleType = ____types.asCollectibleType
-local asTrinketType = ____types.asTrinketType
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local iRange = ____utils.iRange
 local ____cardNameToTypeMap = require("maps.cardNameToTypeMap")
@@ -60203,9 +60236,9 @@ end
 function ____exports.poopMana(self, params)
     local charges = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of mana to add.")
+            print("Invalid mana amount: " .. tostring(num))
             return
         end
         charges = num
@@ -60218,9 +60251,9 @@ end
 -- For example:
 -- - sound 1 - Plays the 1-Up sound effect.
 function ____exports.sound(self, params)
-    local soundEffect = tonumber(params)
-    if soundEffect == nil then
-        print("That is an invalid sound effect ID.")
+    local soundEffect = parseIntSafe(nil, params)
+    if soundEffect == nil or not isEnumValue(nil, soundEffect, SoundEffect) then
+        print(("Invalid sound effect ID: " .. tostring(soundEffect)) .. ".")
         return
     end
     sfxManager:Play(soundEffect)
@@ -60241,9 +60274,9 @@ function ____exports.spawnCollectible(self, params)
         print("You must specify the collectible name or the number corresponding to the collectible type.")
         return
     end
-    local collectibleTypeNumber = tonumber(params)
+    local num = parseIntSafe(nil, params)
     local collectibleType
-    if collectibleTypeNumber == nil then
+    if num == nil then
         local match = getMapPartialMatch(nil, params, COLLECTIBLE_NAME_TO_TYPE_MAP)
         if match == nil then
             print("Unknown collectible: " .. params)
@@ -60251,7 +60284,10 @@ function ____exports.spawnCollectible(self, params)
         end
         collectibleType = match[2]
     else
-        collectibleType = asCollectibleType(nil, collectibleTypeNumber)
+        if not isValidCollectibleType(nil, num) then
+            print("Invalid collectible type: " .. tostring(num))
+        end
+        collectibleType = num
     end
     local roomClass = game:GetRoom()
     local centerPos = roomClass:GetCenterPos()
@@ -60283,9 +60319,9 @@ function ____exports.spawnTrinket(self, params, golden)
         print("You must specify the name or number corresponding to the trinket type.")
         return
     end
-    local trinketTypeNumber = tonumber(params)
+    local num = parseIntSafe(nil, params)
     local trinketType
-    if trinketTypeNumber == nil then
+    if num == nil then
         local match = getMapPartialMatch(nil, params, TRINKET_NAME_TO_TYPE_MAP)
         if match == nil then
             print("Unknown trinket: " .. params)
@@ -60293,7 +60329,11 @@ function ____exports.spawnTrinket(self, params, golden)
         end
         trinketType = match[2]
     else
-        trinketType = asTrinketType(nil, trinketTypeNumber)
+        if not isValidTrinketType(nil, num) then
+            print("Invalid trinket type: " .. tostring(num))
+            return
+        end
+        trinketType = num
     end
     local roomClass = game:GetRoom()
     local centerPos = roomClass:GetCenterPos()
@@ -60325,17 +60365,20 @@ function ____exports.spawnTrinketAt(self, params, golden)
         print("You must specify the number corresponding to the trinket type and the number corresponding to the grid tile location.")
         return
     end
-    local trinketTypeNumber = tonumber(args[1])
-    if trinketTypeNumber == nil or trinketTypeNumber < 0 then
-        print("Failed to parse the trinket type of: " .. tostring(args[1]))
+    local trinketTypeString, gridIndexString = table.unpack(args)
+    if trinketTypeString == nil or gridIndexString == nil then
+        return
+    end
+    local trinketType = parseIntSafe(nil, trinketTypeString)
+    if trinketType == nil or not isValidTrinketType(nil, trinketType) then
+        print("Invalid trinket type: " .. trinketTypeString)
         return
     end
-    local gridIndex = tonumber(args[2])
+    local gridIndex = parseIntSafe(nil, gridIndexString)
     if gridIndex == nil or gridIndex < 0 then
         print("Failed to parse the grid index of: " .. tostring(args[2]))
         return
     end
-    local trinketType = asTrinketType(nil, trinketTypeNumber)
     local goldenTrinketType = getGoldenTrinketType(nil, trinketType)
     local trinketTypeToSpawn = golden and goldenTrinketType or trinketType
     spawnTrinketFunction(nil, trinketTypeToSpawn, gridIndex)
@@ -60356,24 +60399,23 @@ function ____exports.addCharges(self, params)
     end
     local args = __TS__StringSplit(params, " ")
     if #args ~= 1 and #args ~= 2 then
-        print("That is an invalid amount of arguments.")
+        print("Invalid amount of arguments: " .. tostring(#args))
         return
     end
     local activeSlotString, numChargeString = table.unpack(args)
-    local activeSlot = tonumber(activeSlotString)
-    if activeSlot == nil then
-        print("The provided slot number is invalid: " .. tostring(activeSlotString))
+    if activeSlotString == nil then
         return
     end
-    if activeSlot < ActiveSlot.PRIMARY or activeSlot > ActiveSlot.POCKET_SINGLE_USE then
-        print("The provided slot number is invalid: " .. tostring(activeSlot))
+    local activeSlot = parseIntSafe(nil, activeSlotString)
+    if activeSlot == nil or not isEnumValue(nil, activeSlot, ActiveSlot) then
+        print("Invalid slot number: " .. tostring(activeSlot))
         return
     end
     local numCharges = 1
     if numChargeString ~= nil then
-        local numChargesAttempt = tonumber(numChargeString)
+        local numChargesAttempt = parseIntSafe(nil, numChargeString)
         if numChargesAttempt == nil then
-            print("The provided charge amount is invalid: " .. numChargeString)
+            print("Invalid charge amount: " .. numChargeString)
             return
         end
         numCharges = numChargesAttempt
@@ -60425,9 +60467,9 @@ end
 function ____exports.bloodCharges(self, params)
     local charges = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of charges to add.")
+            print("Invalid charge amount: " .. tostring(num))
             return
         end
         charges = num
@@ -60444,9 +60486,9 @@ end
 function ____exports.bomb(self, params)
     local numBombs = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of bombs to add.")
+            print("Invalid bomb amount: " .. tostring(num))
             return
         end
         numBombs = num
@@ -60459,9 +60501,9 @@ end
 function ____exports.bombs(self, params)
     local numBombs = 99
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of bombs to add.")
+            print("Invalid bomb amount: " .. tostring(num))
             return
         end
         numBombs = num
@@ -60491,7 +60533,7 @@ end
 function ____exports.brokenHearts(self, params)
     addHeart(nil, params, HealthType.BROKEN)
 end
---- Gives the specified card. Accepts either the card sub-type or the partial name of the card.
+--- Gives the specified card. Accepts either the card type or the partial name of the card.
 -- 
 -- For example:
 -- - card 5 - Gives The Emperor.
@@ -60502,7 +60544,7 @@ function ____exports.card(self, params)
         return
     end
     local cardType
-    local num = tonumber(params)
+    local num = parseIntSafe(nil, params)
     if num == nil then
         local match = getMapPartialMatch(nil, params, CARD_NAME_TO_TYPE_MAP)
         if match == nil then
@@ -60511,8 +60553,8 @@ function ____exports.card(self, params)
         end
         cardType = match[2]
     else
-        if num < FIRST_CARD_TYPE or num > LAST_VANILLA_CARD_TYPE then
-            print("Invalid card sub-type: " .. tostring(num))
+        if not isValidCardType(nil, num) then
+            print("Invalid card type: " .. tostring(num))
             return
         end
         cardType = num
@@ -60559,7 +60601,7 @@ function ____exports.character(self, params)
         return
     end
     local playerType
-    local num = tonumber(params)
+    local num = parseIntSafe(nil, params)
     if num == nil then
         local match = getMapPartialMatch(nil, params, CHARACTER_NAME_TO_TYPE_MAP)
         if match == nil then
@@ -60568,7 +60610,7 @@ function ____exports.character(self, params)
         end
         playerType = match[2]
     else
-        if num < FIRST_CHARACTER or num > LAST_VANILLA_CHARACTER then
+        if not isEnumValue(nil, num, PlayerType) or num == PlayerType.POSSESSOR then
             print("Invalid character number: " .. tostring(num))
             return
         end
@@ -60591,9 +60633,9 @@ end
 function ____exports.coin(self, params)
     local numCoins = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of coins to add.")
+            print("Invalid coin amount: " .. tostring(num))
             return
         end
         numCoins = num
@@ -60606,9 +60648,9 @@ end
 function ____exports.coins(self, params)
     local numCoins = 999
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of coins to add.")
+            print("Invalid coin amount: " .. tostring(num))
             return
         end
         numCoins = num
@@ -60651,7 +60693,7 @@ function ____exports.damage(self, params)
     if params ~= "" then
         local num = tonumber(params)
         if num == nil then
-            print("The provided damage amount is invalid: " .. params)
+            print("Invalid damage amount: " .. params)
             return
         end
         v.persistent.damageAmount = num
@@ -60747,9 +60789,9 @@ end
 function ____exports.getCharge(self, params)
     local activeSlot = ActiveSlot.PRIMARY
     if params ~= "" then
-        local num = tonumber(params)
-        if num == nil then
-            print("The provided slot number is invalid: " .. params)
+        local num = parseIntSafe(nil, params)
+        if num == nil or not isEnumValue(nil, num, ActiveSlot) then
+            print("Invalid slot number: " .. params)
             return
         end
         activeSlot = num
@@ -60775,9 +60817,9 @@ end
 function ____exports.gigaBomb(self, params)
     local numBombs = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of Giga Bombs to add.")
+            print("Invalid Giga Bomb amount: " .. tostring(num))
             return
         end
         numBombs = num
@@ -60856,9 +60898,9 @@ end
 function ____exports.key(self, params)
     local numKeys = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of keys to add.")
+            print("Invalid key amount: " .. tostring(num))
             return
         end
         numKeys = num
@@ -60871,9 +60913,9 @@ end
 function ____exports.keys(self, params)
     local numKeys = 99
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of keys to add.")
+            print("Invalid key amount: " .. tostring(num))
             return
         end
         numKeys = num
@@ -60983,7 +61025,7 @@ function ____exports.pill(self, params)
         return
     end
     local pillEffect
-    local num = tonumber(params)
+    local num = parseIntSafe(nil, params)
     if num == nil then
         local match = getMapPartialMatch(nil, params, PILL_NAME_TO_EFFECT_MAP)
         if match == nil then
@@ -60992,7 +61034,7 @@ function ____exports.pill(self, params)
         end
         pillEffect = match[2]
     else
-        if num < FIRST_PILL_EFFECT or num > LAST_VANILLA_PILL_EFFECT then
+        if not isValidPillEffect(nil, num) then
             print("Invalid pill effect ID: " .. tostring(num))
             return
         end
@@ -61054,13 +61096,9 @@ function ____exports.pocket(self, params)
         print("You must supply a collectible type to put as the pocket item.")
         return
     end
-    local collectibleType = tonumber(params)
-    if collectibleType == nil then
-        print("That is an invalid collectible type.")
-        return
-    end
-    if not isValidCollectibleType(nil, collectibleType) then
-        print("That is an invalid collectible type.")
+    local collectibleType = parseIntSafe(nil, params)
+    if collectibleType == nil or not isValidCollectibleType(nil, collectibleType) then
+        print("Invalid collectible type: " .. tostring(collectibleType))
         return
     end
     local player = Isaac.GetPlayer()
@@ -61128,13 +61166,9 @@ function ____exports.s(self, params)
         stageString = params
         stageTypeLetter = ""
     end
-    local stage = tonumber(stageString)
-    if stage == nil then
-        print("That is an invalid stage number: " .. tostring(stage))
-        return
-    end
-    if stage < FIRST_STAGE or stage > LAST_STAGE then
-        print(((("Invalid stage number; must be between " .. tostring(FIRST_STAGE)) .. " and ") .. tostring(LAST_STAGE)) .. ".")
+    local stage = parseIntSafe(nil, stageString)
+    if stage == nil or not isEnumValue(nil, stage, StageType) then
+        print("Invalid stage number: " .. tostring(stage))
         return
     end
     Isaac.ExecuteCommand(("stage " .. tostring(stage)) .. stageTypeLetter)
@@ -61176,26 +61210,25 @@ function ____exports.setCharges(self, params)
         return
     end
     if #args ~= 2 then
-        print("That is an invalid amount of arguments.")
+        print("Invalid amount of arguments: " .. tostring(#args))
         return
     end
     local activeSlotString, chargeString = table.unpack(args)
-    local activeSlot = tonumber(activeSlotString)
-    if activeSlot == nil then
-        print("The provided slot number is invalid: " .. tostring(activeSlotString))
+    if activeSlotString == nil or chargeString == nil then
         return
     end
-    if not __TS__ArrayIncludes(ACTIVE_SLOT_VALUES, activeSlot) then
-        print("The provided slot number is invalid: " .. tostring(activeSlot))
+    local activeSlot = parseIntSafe(nil, activeSlotString)
+    if activeSlot == nil or not isEnumValue(nil, activeSlot, ActiveSlot) then
+        print("Invalid slot number: " .. activeSlotString)
         return
     end
-    local chargeNum = tonumber(chargeString)
+    local chargeNum = parseIntSafe(nil, chargeString)
     if chargeNum == nil then
-        print("The provided charge amount is invalid: " .. tostring(chargeString))
+        print("Invalid charge amount: " .. chargeString)
         return
     end
     if chargeNum < 0 then
-        print("The provided charge amount is invalid: " .. tostring(chargeNum))
+        print("Invalid charge amount: " .. tostring(chargeNum))
         return
     end
     local player = Isaac.GetPlayer()
@@ -61216,14 +61249,17 @@ function ____exports.setPosition(self, params)
         return
     end
     local xString, yString = table.unpack(args)
-    local x = tonumber(xString)
+    if xString == nil or yString == nil then
+        return
+    end
+    local x = parseIntSafe(nil, xString)
     if x == nil then
-        print("That is an invalid x value: " .. tostring(xString))
+        print("Invalid x value: " .. xString)
         return
     end
-    local y = tonumber(yString)
+    local y = parseIntSafe(nil, yString)
     if y == nil then
-        print("That is an invalid y value: " .. tostring(yString))
+        print("Invalid y value: " .. yString)
         return
     end
     local player = Isaac.GetPlayer()
@@ -61244,9 +61280,9 @@ end
 function ____exports.soulCharges(self, params)
     local charges = 1
     if params ~= "" then
-        local num = tonumber(params)
+        local num = parseIntSafe(nil, params)
         if num == nil then
-            print("That is an invalid amount of charges to add.")
+            print("Invalid charges amount: " .. tostring(num))
             return
         end
         charges = num
@@ -61291,17 +61327,20 @@ function ____exports.spawnCollectibleAt(self, params)
         print("You must specify the number corresponding to the collectible type and the number corresponding to the grid tile location.")
         return
     end
-    local collectibleTypeNumber = tonumber(args[1])
-    if collectibleTypeNumber == nil or collectibleTypeNumber < 0 then
-        print("Failed to parse the collectible type of: " .. tostring(args[1]))
+    local collectibleTypeString, gridIndexString = table.unpack(args)
+    if collectibleTypeString == nil or gridIndexString == nil then
         return
     end
-    local gridIndex = tonumber(args[2])
+    local collectibleType = parseIntSafe(nil, collectibleTypeString)
+    if collectibleType == nil or not isValidCollectibleType(nil, collectibleType) then
+        print("Invalid collectible type: " .. tostring(args[1]))
+        return
+    end
+    local gridIndex = parseIntSafe(nil, gridIndexString)
     if gridIndex == nil or gridIndex < 0 then
         print("Failed to parse the grid index of: " .. tostring(args[2]))
         return
     end
-    local collectibleType = asCollectibleType(nil, collectibleTypeNumber)
     spawnCollectibleFunc(nil, collectibleType, gridIndex, nil)
 end
 --- Alias for the `spawnGoldenTrinket` command.
@@ -61321,7 +61360,7 @@ function ____exports.speed(self, params)
     if params ~= "" then
         local num = tonumber(params)
         if num == nil then
-            print("The provided speed amount is invalid: " .. params)
+            print("Invalid speed amount: " .. params)
             return
         end
         v.persistent.damageAmount = num
@@ -61355,7 +61394,7 @@ function ____exports.tears(self, params)
     if params ~= "" then
         local num = tonumber(params)
         if num == nil then
-            print("The provided tear delay amount is invalid: " .. params)
+            print("Invalid tear delay amount: " .. params)
             return
         end
         v.persistent.tearsAmount = num
@@ -61416,7 +61455,7 @@ function ____exports.warp(self, params)
         return
     end
     local roomType
-    local num = tonumber(params)
+    local num = parseIntSafe(nil, params)
     if num == nil then
         local match = getMapPartialMatch(nil, params, ROOM_NAME_TO_TYPE_MAP)
         if match == nil then
@@ -61425,7 +61464,7 @@ function ____exports.warp(self, params)
         end
         roomType = match[2]
     else
-        if num < FIRST_ROOM_TYPE or num > LAST_ROOM_TYPE then
+        if not isEnumValue(nil, num, RoomType) then
             print("Invalid room type: " .. tostring(num))
             return
         end
@@ -63406,12 +63445,16 @@ local getFeatures = ____features.getFeatures
 local ____debugFunctions = require("functions.debugFunctions")
 local getElapsedTimeSince = ____debugFunctions.getElapsedTimeSince
 local getTime = ____debugFunctions.getTime
+local ____enums = require("functions.enums")
+local isEnumValue = ____enums.isEnumValue
 local ____log = require("functions.log")
 local getParentFunctionDescription = ____log.getParentFunctionDescription
 local log = ____log.log
 local ____tstlClass = require("functions.tstlClass")
 local getTSTLClassConstructor = ____tstlClass.getTSTLClassConstructor
 local getTSTLClassName = ____tstlClass.getTSTLClassName
+local ____types = require("functions.types")
+local parseIntSafe = ____types.parseIntSafe
 local ____utils = require("functions.utils")
 local assertDefined = ____utils.assertDefined
 function getExportedMethodsFromFeature(self, featureClass)
@@ -63530,9 +63573,12 @@ function ModUpgraded.prototype.logUsedFeatures(self)
             if callbackClass.numConsumers == 0 then
                 goto __continue19
             end
-            local modCallbackCustom = tonumber(modCallbackCustomString)
-            assertDefined(nil, modCallbackCustom, "Failed to convert an index on the callbacks object to a number.")
-            log(((("- ModCallbackCustom." .. tostring(ModCallbackCustom[modCallbackCustom])) .. " (") .. tostring(modCallbackCustom)) .. ")")
+            local modCallbackCustom = parseIntSafe(nil, modCallbackCustomString)
+            assertDefined(nil, modCallbackCustom, ("Failed to convert the string \"" .. modCallbackCustomString) .. "\" representing a \"ModCallbackCustom\" value to a number.")
+            if not isEnumValue(nil, modCallbackCustom, ModCallbackCustom) then
+                error(("Failed to convert the number " .. tostring(modCallbackCustom)) .. " to a \"ModCallbackCustom\" value.")
+            end
+            log(((("- ModCallbackCustom." .. ModCallbackCustom[modCallbackCustom]) .. " (") .. tostring(modCallbackCustom)) .. ")")
         end
         ::__continue19::
     end
@@ -63541,13 +63587,16 @@ function ModUpgraded.prototype.logUsedFeatures(self)
         local featureClass = ____value[2]
         do
             if featureClass.numConsumers == 0 then
-                goto __continue22
+                goto __continue23
+            end
+            local iscFeature = parseIntSafe(nil, iscFeatureString)
+            assertDefined(nil, iscFeature, ("Failed to convert the string \"" .. iscFeatureString) .. "\" representing a \"ISCFeature\" value to a number.")
+            if not isEnumValue(nil, iscFeature, ISCFeature) then
+                error(("Failed to convert the number " .. tostring(iscFeature)) .. " to a \"ISCFeature\" value.")
             end
-            local iscFeature = tonumber(iscFeatureString)
-            assertDefined(nil, iscFeature, "Failed to convert an index on the features object to a number.")
-            log(((("- ISCFeature." .. tostring(ISCFeature[iscFeature])) .. " (") .. tostring(iscFeature)) .. ")")
+            log(((("- ISCFeature." .. ISCFeature[iscFeature]) .. " (") .. tostring(iscFeature)) .. ")")
         end
-        ::__continue22::
+        ::__continue23::
     end
 end
 function ModUpgraded.prototype.initFeature(self, feature)