isaacscript-common 80.2.1 → 80.2.3

package/dist/classes/features/other/extraConsoleCommands/commands.lua

@@ -1,7 +1,6 @@
 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("isaac-typescript-definitions")
 local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
@@ -16,10 +15,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
@@ -30,21 +30,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")
@@ -58,6 +51,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")
@@ -78,6 +73,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
@@ -107,9 +103,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")
@@ -205,9 +201,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
@@ -220,9 +216,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)
@@ -243,9 +239,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)
@@ -253,7 +249,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()
@@ -285,9 +284,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)
@@ -295,7 +294,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()
@@ -327,17 +330,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)
@@ -358,24 +364,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
@@ -427,9 +432,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
@@ -446,9 +451,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
@@ -461,9 +466,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
@@ -493,7 +498,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.
@@ -504,7 +509,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
@@ -513,8 +518,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
@@ -561,7 +566,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
@@ -570,7 +575,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
@@ -593,9 +598,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
@@ -608,9 +613,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
@@ -653,7 +658,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
@@ -749,9 +754,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
@@ -777,9 +782,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
@@ -858,9 +863,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
@@ -873,9 +878,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
@@ -985,7 +990,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
@@ -994,7 +999,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
@@ -1056,13 +1061,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()
@@ -1130,13 +1131,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)
@@ -1178,26 +1175,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()
@@ -1218,14 +1214,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()
@@ -1246,9 +1245,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
@@ -1293,17 +1292,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 collectibleType = parseIntSafe(nil, collectibleTypeString)
+    if collectibleType == nil or not isValidCollectibleType(nil, collectibleType) then
+        print("Invalid collectible type: " .. tostring(args[1]))
         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 collectibleType = asCollectibleType(nil, collectibleTypeNumber)
     spawnCollectibleFunc(nil, collectibleType, gridIndex, nil)
 end
 --- Alias for the `spawnGoldenTrinket` command.
@@ -1323,7 +1325,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
@@ -1357,7 +1359,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
@@ -1418,7 +1420,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
@@ -1427,7 +1429,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

package/dist/classes/features/other/extraConsoleCommands/subroutines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subroutines.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/extraConsoleCommands/subroutines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAGL,QAAQ,EACT,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAkB1D,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAcrE;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAqBlD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,wBAAwB,EAAE,OAAO,GAChC,IAAI,CAYN;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,IAAI,CAY5E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAgBrE;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CASjE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAWvD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAuB3D"}
+{"version":3,"file":"subroutines.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/extraConsoleCommands/subroutines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAGL,QAAQ,EACT,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAmB1D,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAcrE;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAqBlD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,wBAAwB,EAAE,OAAO,GAChC,IAAI,CAYN;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,IAAI,CAY5E;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAgBrE;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CASjE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAWvD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAuB3D"}

package/dist/classes/features/other/extraConsoleCommands/subroutines.lua

@@ -26,13 +26,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
@@ -63,7 +65,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
@@ -75,7 +77,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
@@ -87,7 +89,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

package/dist/core/constantsFirstLast.d.ts

@@ -3,7 +3,7 @@
  *
  * @module
  */
-import { CardType, CollectibleType, LevelStage, PillColor, PillEffect, PlayerType, RoomType, TrinketType } from "isaac-typescript-definitions";
+import { CardType, CollectibleType, PillColor, PillEffect, PlayerType, TrinketType } from "isaac-typescript-definitions";
 /** Equal to `CollectibleType.SAD_ONION`. */
 export declare const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
 /**
@@ -28,25 +28,13 @@ export declare const LAST_VANILLA_TRINKET_TYPE: TrinketType;
 export declare const NUM_VANILLA_TRINKET_TYPES: number;
 /** Equal to `Card.FOOL`. */
 export declare const 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.
- */
+/** Calculated from the `CardType` enum. */
 export declare const LAST_VANILLA_CARD_TYPE: CardType;
 /** Calculated from the `Card` enum. `Card.NULL` is not included. */
 export declare const NUM_VANILLA_CARD_TYPES: number;
 /** Equal to `PillEffect.BAD_GAS`. */
 export declare const 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.
- */
+/** Calculated from the `PillEffect` enum. */
 export declare const LAST_VANILLA_PILL_EFFECT: PillEffect;
 /**
  * Calculated from the `PillEffect` enum. (There is no `PillEffect.NULL` in the custom enum, so we
@@ -74,18 +62,8 @@ export declare const LAST_HORSE_PILL_COLOR = PillColor.HORSE_WHITE_YELLOW;
 export declare const NUM_NORMAL_PILL_COLORS: number;
 /** Equal to `PlayerType.ISAAC`. */
 export declare const 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.
- */
+/** Calculated from the `PlayerType` enum. */
 export declare const LAST_VANILLA_CHARACTER: PlayerType;
-export declare const FIRST_ROOM_TYPE = RoomType.DEFAULT;
-export declare const LAST_ROOM_TYPE: RoomType;
-export declare const FIRST_STAGE = LevelStage.BASEMENT_1;
-export declare const LAST_STAGE: LevelStage;
 /** Calculated from the `Challenge` enum. `Challenge.NULL` is not included. */
 export declare const NUM_VANILLA_CHALLENGES: number;
 //# sourceMappingURL=constantsFirstLast.d.ts.map

package/dist/core/constantsFirstLast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constantsFirstLast.d.ts","sourceRoot":"","sources":["../../src/core/constantsFirstLast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EAER,eAAe,EACf,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAQtC,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,iBACJ,CAAC;AAEvC,4FAA4F;AAC5F,eAAO,MAAM,6BAA6B,QAAqC,CAAC;AAMhF,8CAA8C;AAC9C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,aAAmC,CAAC;AAE1E,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,QAAiC,CAAC;AAMxE,4BAA4B;AAC5B,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,UAAgC,CAAC;AAEpE,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,QAA8B,CAAC;AAMlE,qCAAqC;AACrC,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AAEpD;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,YAAkC,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,KAA4B,CAAC;AAMlE,sCAAsC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,eAAO,MAAM,sBAAsB,QAG3B,CAAC;AAMT,mCAAmC;AACnC,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAIhD;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,YAAkC,CAAC;AAMtE,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,cAAc,UAAgC,CAAC;AAM5D,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,UAAU,YAAkC,CAAC;AAM1D,8EAA8E;AAC9E,eAAO,MAAM,sBAAsB,QAA+B,CAAC"}
+{"version":3,"file":"constantsFirstLast.d.ts","sourceRoot":"","sources":["../../src/core/constantsFirstLast.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EAER,eAAe,EACf,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAQtC,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,iBACJ,CAAC;AAEvC,4FAA4F;AAC5F,eAAO,MAAM,6BAA6B,QAAqC,CAAC;AAMhF,8CAA8C;AAC9C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,aAAmC,CAAC;AAE1E,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,QAAiC,CAAC;AAMxE,4BAA4B;AAC5B,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,2CAA2C;AAC3C,eAAO,MAAM,sBAAsB,UAAgC,CAAC;AAEpE,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,QAA8B,CAAC;AAMlE,qCAAqC;AACrC,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AAEpD,6CAA6C;AAC7C,eAAO,MAAM,wBAAwB,YAAkC,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,KAA4B,CAAC;AAMlE,sCAAsC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,eAAO,MAAM,sBAAsB,QAG3B,CAAC;AAMT,mCAAmC;AACnC,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAIhD,6CAA6C;AAC7C,eAAO,MAAM,sBAAsB,YAAkC,CAAC;AAMtE,8EAA8E;AAC9E,eAAO,MAAM,sBAAsB,QAA+B,CAAC"}