isaacscript-common 2.0.15 → 2.0.18

package/dist/features/extraConsoleCommands/commands.lua

@@ -1,13 +1,13 @@
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__StringSplit = ____lualib.__TS__StringSplit
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__StringSlice = ____lualib.__TS__StringSlice
 local __TS__ArrayIncludes = ____lualib.__TS__ArrayIncludes
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
 local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
-local Card = ____isaac_2Dtypescript_2Ddefinitions.Card
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local Direction = ____isaac_2Dtypescript_2Ddefinitions.Direction
 local DisplayFlag = ____isaac_2Dtypescript_2Ddefinitions.DisplayFlag
@@ -19,24 +19,30 @@ local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local sfxManager = ____cachedClasses.sfxManager
 local ____constants = require("constants")
+local FIRST_ROOM_TYPE = ____constants.FIRST_ROOM_TYPE
+local FIRST_STAGE = ____constants.FIRST_STAGE
 local MAX_LEVEL_GRID_INDEX = ____constants.MAX_LEVEL_GRID_INDEX
 local MAX_ROOM_TYPE = ____constants.MAX_ROOM_TYPE
 local MAX_STAGE = ____constants.MAX_STAGE
-local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____constantsMax = require("constantsMax")
+local FIRST_CARD = ____constantsMax.FIRST_CARD
+local FIRST_CHARACTER = ____constantsMax.FIRST_CHARACTER
+local FIRST_PILL_EFFECT = ____constantsMax.FIRST_PILL_EFFECT
 local MAX_CARD = ____constantsMax.MAX_CARD
 local MAX_PILL_EFFECT = ____constantsMax.MAX_PILL_EFFECT
+local MAX_VANILLA_CHARACTER = ____constantsMax.MAX_VANILLA_CHARACTER
 local ____HealthType = require("enums.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____cards = require("functions.cards")
 local getCardName = ____cards.getCardName
 local ____character = require("functions.character")
 local getCharacterName = ____character.getCharacterName
+local ____collectibles = require("functions.collectibles")
+local isValidCollectibleType = ____collectibles.isValidCollectibleType
 local ____entitySpecific = require("functions.entitySpecific")
 local getNPCs = ____entitySpecific.getNPCs
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
-local getLastEnumValue = ____enums.getLastEnumValue
 local ____flag = require("functions.flag")
 local addFlag = ____flag.addFlag
 local ____log = require("functions.log")
@@ -51,7 +57,6 @@ local spawnCard = ____pickups.spawnCard
 local spawnPill = ____pickups.spawnPill
 local spawnTrinket = ____pickups.spawnTrinket
 local ____pills = require("functions.pills")
-local getHorsePillColor = ____pills.getHorsePillColor
 local getPillEffectName = ____pills.getPillEffectName
 local ____player = require("functions.player")
 local getPlayerName = ____player.getPlayerName
@@ -277,7 +282,7 @@ function ____exports.card(self, params)
         end
         cardNum = match[2]
     else
-        if num <= Card.NULL or num > MAX_CARD then
+        if num < FIRST_CARD or num > MAX_CARD then
             printConsole(
                 nil,
                 "Invalid card sub-type: " .. tostring(num)
@@ -332,7 +337,7 @@ function ____exports.characterCommand(self, params)
         end
         character = match[2]
     else
-        if num < 0 or num > MAX_VANILLA_CHARACTER then
+        if num < FIRST_CHARACTER or num > MAX_VANILLA_CHARACTER then
             printConsole(
                 nil,
                 "Invalid player sub-type: " .. tostring(num)
@@ -554,7 +559,7 @@ function ____exports.pill(self, params)
         end
         pillEffect = match[2]
     else
-        if num < 0 or num > MAX_PILL_EFFECT then
+        if num < FIRST_PILL_EFFECT or num > MAX_PILL_EFFECT then
             printConsole(
                 nil,
                 "Invalid pill effect ID: " .. tostring(num)
@@ -571,27 +576,24 @@ function ____exports.pill(self, params)
     )
 end
 function ____exports.pills(self)
-    local maxPillColor = getLastEnumValue(nil, PillColor)
-    local pillColor = 1
-    local horse = false
+    local pillColors = __TS__ArrayFilter(
+        getEnumValues(nil, PillColor),
+        function(____, pillColor) return pillColor ~= PillColor.NULL end
+    )
+    local pillColorIndex = -1
     do
         local y = 0
         while y <= 6 do
             do
                 local x = 0
                 while x <= 12 do
-                    if pillColor == maxPillColor then
-                        if horse then
-                            return
-                        end
-                        horse = true
-                        pillColor = 1
+                    pillColorIndex = pillColorIndex + 1
+                    local pillColor = pillColors[pillColorIndex + 1]
+                    if pillColor == nil then
+                        return
                     end
-                    local horsePillColor = getHorsePillColor(nil, pillColor)
-                    local pillColorToUse = horse and horsePillColor or pillColor
                     local position = gridCoordinatesToWorldPosition(nil, x, y)
-                    spawnPill(nil, pillColorToUse, position)
-                    pillColor = pillColor + 1
+                    spawnPill(nil, pillColor, position)
                     x = x + 1
                 end
             end
@@ -610,13 +612,17 @@ function ____exports.pocket(self, params)
         printConsole(nil, "You must supply a collectible type to put as the pocket item.")
         return
     end
-    local num = tonumber(params)
-    if num == nil then
+    local collectibleType = tonumber(params)
+    if collectibleType == nil then
+        printConsole(nil, "That is an invalid collectible type.")
+        return
+    end
+    if not isValidCollectibleType(nil, collectibleType) then
         printConsole(nil, "That is an invalid collectible type.")
         return
     end
     local player = Isaac.GetPlayer()
-    player:SetPocketActiveItem(num, ActiveSlot.POCKET)
+    player:SetPocketActiveItem(collectibleType, ActiveSlot.POCKET)
 end
 function ____exports.poopMana(self, params)
     local charges = 1
@@ -672,11 +678,10 @@ function ____exports.s(self, params)
         )
         return
     end
-    local minStage = 1
-    if stage < minStage or stage > MAX_STAGE then
+    if stage < FIRST_STAGE or stage > MAX_STAGE then
         printConsole(
             nil,
-            ((("Invalid stage number; must be between " .. tostring(minStage)) .. " and ") .. tostring(MAX_STAGE)) .. "."
+            ((("Invalid stage number; must be between " .. tostring(FIRST_STAGE)) .. " and ") .. tostring(MAX_STAGE)) .. "."
         )
         return
     end
@@ -877,7 +882,7 @@ function ____exports.warp(self, params)
         end
         roomType = match[2]
     else
-        if num < 1 or num > MAX_ROOM_TYPE then
+        if num < FIRST_ROOM_TYPE or num > MAX_ROOM_TYPE then
             printConsole(
                 nil,
                 "Invalid room type: " .. tostring(num)

package/dist/features/extraConsoleCommands/commandsDisplay.d.ts

@@ -7,6 +7,15 @@
 export declare function bombDisplay(): void;
 /** Alias for the "bombdisplay" command. */
 export declare function bombsDisplay(): void;
+/**
+ * Toggles custom text to appear next to every door. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setDoorDisplay` helper function to
+ * assign the text that you want to appear.
+ */
+export declare function doorDisplay(): void;
+/** Alias for the "doordisplay" function. */
+export declare function doorsDisplay(): void;
 /**
  * Toggles custom text to appear next to every effect. Useful for debugging.
  *
@@ -61,6 +70,15 @@ export declare function npcsDisplay(): void;
 export declare function pickupDisplay(): void;
 /** Alias for the "pickupdisplay" command. */
 export declare function pickupsDisplay(): void;
+/**
+ * Toggles custom text to appear next to every pit. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setPitDisplay` helper function to
+ * assign the text that you want to appear.
+ */
+export declare function pitDisplay(): void;
+/** Alias for the "pitdisplay" function. */
+export declare function pitsDisplay(): void;
 /**
  * Toggles custom text to appear next to every player. Useful for debugging.
  *
@@ -70,6 +88,24 @@ export declare function pickupsDisplay(): void;
 export declare function playerDisplay(): void;
 /** Alias for the "playerdisplay" command. */
 export declare function playersDisplay(): void;
+/**
+ * Toggles custom text to appear next to every poop. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setPoopDisplay` helper function to
+ * assign the text that you want to appear.
+ */
+export declare function poopDisplay(): void;
+/** Alias for the "poopdisplay" function. */
+export declare function poopsDisplay(): void;
+/**
+ * Toggles custom text to appear next to every pressure plate. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setPressurePlateDisplay` helper
+ * function to assign the text that you want to appear.
+ */
+export declare function pressurePlateDisplay(): void;
+/** Alias for the "pressureplatedisplay" function. */
+export declare function pressurePlatesDisplay(): void;
 /**
  * Toggles custom text to appear next to every projectile. Useful for debugging.
  *
@@ -79,6 +115,15 @@ export declare function playersDisplay(): void;
 export declare function projectileDisplay(): void;
 /** Alias for the "projectiledisplay" command. */
 export declare function projectilesDisplay(): void;
+/**
+ * Toggles custom text to appear next to every rock. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setRockDisplay` helper function to
+ * assign the text that you want to appear.
+ */
+export declare function rockDisplay(): void;
+/** Alias for the "rockdisplay" function. */
+export declare function rocksDisplay(): void;
 /**
  * Toggles custom text to appear next to every slot. Useful for debugging.
  *
@@ -88,6 +133,15 @@ export declare function projectilesDisplay(): void;
 export declare function slotDisplay(): void;
 /** Alias for the "slotdisplay" command. */
 export declare function slotsDisplay(): void;
+/** Alias for the "spikesdisplay" function. */
+export declare function spikeDisplay(): void;
+/**
+ * Toggles custom text to appear next to every spikes. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setSpikesDisplay` helper function to
+ * assign the text that you want to appear.
+ */
+export declare function spikesDisplay(): void;
 /**
  * Toggles custom text to appear next to every tear. Useful for debugging.
  *
@@ -97,3 +151,12 @@ export declare function slotsDisplay(): void;
 export declare function tearDisplay(): void;
 /** Alias for the "teardisplay" command. */
 export declare function tearsDisplay(): void;
+/**
+ * Toggles custom text to appear next to every TNT. Useful for debugging.
+ *
+ * By default, the grid entity ID will be displayed. Use the `setTNTDisplay` helper function to
+ * assign the text that you want to appear.
+ */
+export declare function tntDisplay(): void;
+/** Alias for the "tntdisplay" function. */
+export declare function tntsDisplay(): void;

package/dist/features/extraConsoleCommands/commandsDisplay.lua

@@ -1,22 +1,38 @@
 local ____exports = {}
 local ____debugDisplay = require("features.debugDisplay")
 local toggleBombDisplay = ____debugDisplay.toggleBombDisplay
+local toggleDoorDisplay = ____debugDisplay.toggleDoorDisplay
 local toggleEffectDisplay = ____debugDisplay.toggleEffectDisplay
 local toggleFamiliarDisplay = ____debugDisplay.toggleFamiliarDisplay
 local toggleKnifeDisplay = ____debugDisplay.toggleKnifeDisplay
 local toggleLaserDisplay = ____debugDisplay.toggleLaserDisplay
 local toggleNPCDisplay = ____debugDisplay.toggleNPCDisplay
 local togglePickupDisplay = ____debugDisplay.togglePickupDisplay
+local togglePitDisplay = ____debugDisplay.togglePitDisplay
 local togglePlayerDisplay = ____debugDisplay.togglePlayerDisplay
+local togglePoopDisplay = ____debugDisplay.togglePoopDisplay
+local togglePressurePlateDisplay = ____debugDisplay.togglePressurePlateDisplay
 local toggleProjectileDisplay = ____debugDisplay.toggleProjectileDisplay
+local toggleRockDisplay = ____debugDisplay.toggleRockDisplay
 local toggleSlotDisplay = ____debugDisplay.toggleSlotDisplay
+local toggleSpikesDisplay = ____debugDisplay.toggleSpikesDisplay
 local toggleTearDisplay = ____debugDisplay.toggleTearDisplay
+local toggleTNTDisplay = ____debugDisplay.toggleTNTDisplay
+function ____exports.spikesDisplay(self)
+    toggleSpikesDisplay(nil)
+end
 function ____exports.bombDisplay(self)
     toggleBombDisplay(nil)
 end
 function ____exports.bombsDisplay(self)
     ____exports.bombDisplay(nil)
 end
+function ____exports.doorDisplay(self)
+    toggleDoorDisplay(nil)
+end
+function ____exports.doorsDisplay(self)
+    ____exports.doorDisplay(nil)
+end
 function ____exports.effectDisplay(self)
     toggleEffectDisplay(nil)
 end
@@ -53,28 +69,61 @@ end
 function ____exports.pickupsDisplay(self)
     ____exports.pickupDisplay(nil)
 end
+function ____exports.pitDisplay(self)
+    togglePitDisplay(nil)
+end
+function ____exports.pitsDisplay(self)
+    ____exports.pitDisplay(nil)
+end
 function ____exports.playerDisplay(self)
     togglePlayerDisplay(nil)
 end
 function ____exports.playersDisplay(self)
     ____exports.playerDisplay(nil)
 end
+function ____exports.poopDisplay(self)
+    togglePoopDisplay(nil)
+end
+function ____exports.poopsDisplay(self)
+    ____exports.poopDisplay(nil)
+end
+function ____exports.pressurePlateDisplay(self)
+    togglePressurePlateDisplay(nil)
+end
+function ____exports.pressurePlatesDisplay(self)
+    ____exports.pressurePlateDisplay(nil)
+end
 function ____exports.projectileDisplay(self)
     toggleProjectileDisplay(nil)
 end
 function ____exports.projectilesDisplay(self)
     ____exports.projectileDisplay(nil)
 end
+function ____exports.rockDisplay(self)
+    toggleRockDisplay(nil)
+end
+function ____exports.rocksDisplay(self)
+    ____exports.rockDisplay(nil)
+end
 function ____exports.slotDisplay(self)
     toggleSlotDisplay(nil)
 end
 function ____exports.slotsDisplay(self)
     ____exports.slotDisplay(nil)
 end
+function ____exports.spikeDisplay(self)
+    ____exports.spikesDisplay(nil)
+end
 function ____exports.tearDisplay(self)
     toggleTearDisplay(nil)
 end
 function ____exports.tearsDisplay(self)
     ____exports.tearDisplay(nil)
 end
+function ____exports.tntDisplay(self)
+    toggleTNTDisplay(nil)
+end
+function ____exports.tntsDisplay(self)
+    ____exports.tntDisplay(nil)
+end
 return ____exports

package/dist/features/extraConsoleCommands/init.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="isaac-typescript-definitions" />
+import { ModUpgraded } from "../../classes/ModUpgraded";
 /**
  * Enables extra console commands which are useful for debugging. See the `isaacscript-common`
  * documentation for details on the commands that are added.
  */
-export declare function enableExtraConsoleCommands(mod: Mod): void;
+export declare function enableExtraConsoleCommands(mod: ModUpgraded): void;
 /**
  * Helper function to add a custom console command.
  *

package/dist/features/extraConsoleCommands/init.lua

@@ -16,6 +16,8 @@ local ____map = require("functions.map")
 local getMapPartialMatch = ____map.getMapPartialMatch
 local ____utils = require("functions.utils")
 local printConsole = ____utils.printConsole
+local ____debugDisplay = require("features.debugDisplay")
+local debugDisplayInit = ____debugDisplay.debugDisplayInit
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local commands = require("features.extraConsoleCommands.commands")
@@ -74,6 +76,7 @@ initialized = false
 function ____exports.enableExtraConsoleCommands(self, mod)
     initialized = true
     saveDataManager(nil, "extraConsoleCommands", v, featureEnabled)
+    debugDisplayInit(nil, mod)
     mod:AddCallback(ModCallback.POST_UPDATE, postUpdate)
     mod:AddCallback(ModCallback.EVALUATE_CACHE, evaluateCacheFireDelay, CacheFlag.FIRE_DELAY)
     mod:AddCallback(ModCallback.EVALUATE_CACHE, evaluateCacheSpeed, CacheFlag.SPEED)
@@ -135,6 +138,8 @@ commandFunctionsMap:set("dd", commands.dd)
 commandFunctionsMap:set("devil", commands.devil)
 commandFunctionsMap:set("dirtybedroom", commands.dirtyBedroom)
 commandFunctionsMap:set("disablecurses", commands.disableCurses)
+commandFunctionsMap:set("doordisplay", commandsDisplay.doorDisplay)
+commandFunctionsMap:set("doorsdisplay", commandsDisplay.doorsDisplay)
 commandFunctionsMap:set("down", commands.down)
 commandFunctionsMap:set("dungeon", commands.dungeon)
 commandFunctionsMap:set("effectdisplay", commandsDisplay.effectDisplay)
@@ -185,18 +190,22 @@ commandFunctionsMap:set("pickupdisplay", commandsDisplay.pickupDisplay)
 commandFunctionsMap:set("pickupsdisplay", commandsDisplay.pickupsDisplay)
 commandFunctionsMap:set("pill", commands.pill)
 commandFunctionsMap:set("pills", commands.pills)
+commandFunctionsMap:set("pitdisplay", commandsDisplay.pitDisplay)
 commandFunctionsMap:set("planetarium", commands.planetarium)
 commandFunctionsMap:set("playerdisplay", commandsDisplay.playerDisplay)
 commandFunctionsMap:set("playersdisplay", commandsDisplay.playersDisplay)
 commandFunctionsMap:set("playsound", commands.playSound)
 commandFunctionsMap:set("pocket", commands.pocket)
-commandFunctionsMap:set("poopMana", commands.poopMana)
+commandFunctionsMap:set("poopdisplay", commandsDisplay.poopDisplay)
+commandFunctionsMap:set("poopmana", commands.poopMana)
 commandFunctionsMap:set("position", commands.positionCommand)
+commandFunctionsMap:set("pressureplatedisplay", commandsDisplay.pressurePlateDisplay)
 commandFunctionsMap:set("projectiledisplay", commandsDisplay.projectileDisplay)
 commandFunctionsMap:set("projectilesdisplay", commandsDisplay.projectilesDisplay)
 commandFunctionsMap:set("redhearts", commands.redHearts)
 commandFunctionsMap:set("rh", commands.rh)
 commandFunctionsMap:set("right", commands.right)
+commandFunctionsMap:set("rockdisplay", commandsDisplay.rockDisplay)
 commandFunctionsMap:set("room", commands.roomCommand)
 commandFunctionsMap:set("rottenhearts", commands.rottenHearts)
 commandFunctionsMap:set("s", commands.s)
@@ -218,11 +227,13 @@ commandFunctionsMap:set("sounds", commands.sounds)
 commandFunctionsMap:set("spam", commands.spam)
 commandFunctionsMap:set("spawngoldentrinket", commands.spawnGoldenTrinket)
 commandFunctionsMap:set("speed", commands.speed)
+commandFunctionsMap:set("spikesdisplay", commandsDisplay.spikesDisplay)
 commandFunctionsMap:set("supersecret", commands.superSecret)
 commandFunctionsMap:set("startingroom", commands.startingRoom)
 commandFunctionsMap:set("teardisplay", commandsDisplay.tearDisplay)
 commandFunctionsMap:set("tears", commands.tears)
 commandFunctionsMap:set("tearsdisplay", commandsDisplay.tearsDisplay)
+commandFunctionsMap:set("tntdisplay", commandsDisplay.tntDisplay)
 commandFunctionsMap:set("trapdoor", commands.trapdoorCommand)
 commandFunctionsMap:set("treasure", commands.treasure)
 commandFunctionsMap:set("ultrasecret", commands.ultraSecret)

package/dist/features/getCollectibleItemPoolType.lua

@@ -4,7 +4,6 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local postPickupInitCollectible, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local ____cachedClasses = require("cachedClasses")
@@ -13,6 +12,8 @@ local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
 local ____entity = require("functions.entity")
 local getEntityID = ____entity.getEntityID
+local ____pickupVariants = require("functions.pickupVariants")
+local isCollectible = ____pickupVariants.isCollectible
 local ____rooms = require("functions.rooms")
 local getRoomItemPoolType = ____rooms.getRoomItemPoolType
 local ____exports = require("features.saveDataManager.exports")
@@ -31,7 +32,7 @@ function ____exports.getCollectibleItemPoolTypeInit(self, mod)
 end
 function ____exports.getCollectibleItemPoolType(self, collectible)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    if collectible.Type ~= EntityType.PICKUP or collectible.Variant ~= PickupVariant.COLLECTIBLE then
+    if not isCollectible(nil, collectible) then
         local entityID = getEntityID(nil, collectible)
         error("The \"getCollectibleItemPoolType\" function was given a non-collectible: " .. entityID)
     end

package/dist/features/playerInventory.lua

@@ -1,13 +1,12 @@
 local ____lualib = require("lualib_bundle")
-local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
+local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local newPlayerInventory, useItemD4, postGameStarted, postItemPickup, addCollectibleToInventory, COLLECTIBLE_ITEM_TYPES, v
+local newPlayerInventory, useItemD4, postGameStarted, postItemPickup, addCollectibleToInventory, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
@@ -27,6 +26,8 @@ local getAllPlayers = ____playerIndex.getAllPlayers
 local getPlayerIndex = ____playerIndex.getPlayerIndex
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
+local ____PickingUpItem = require("types.PickingUpItem")
+local pickingUpItemIsCollectible = ____PickingUpItem.pickingUpItemIsCollectible
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function newPlayerInventory(self, player)
@@ -59,7 +60,7 @@ function postGameStarted(self)
     end
 end
 function postItemPickup(self, player, pickingUpItem)
-    if not COLLECTIBLE_ITEM_TYPES:has(pickingUpItem.itemType) then
+    if not pickingUpItemIsCollectible(nil, pickingUpItem) then
         return
     end
     addCollectibleToInventory(nil, player, pickingUpItem.subType)
@@ -83,11 +84,10 @@ function addCollectibleToInventory(self, player, collectibleType)
     end
 end
 local FEATURE_NAME = "player inventory tracker"
-COLLECTIBLE_ITEM_TYPES = __TS__New(Set, {ItemType.PASSIVE, ItemType.ACTIVE, ItemType.FAMILIAR})
 v = {run = {
     playersInventory = __TS__New(
         DefaultMap,
-        function(____, _key, player) return newPlayerInventory(nil, player) end
+        function(____, player) return newPlayerInventory(nil, player) end
     ),
     playersActiveCollectibleTypes = __TS__New(
         DefaultMap,

package/dist/features/preventCollectibleRotate.lua

@@ -14,6 +14,10 @@ local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
 local ____collectibles = require("functions.collectibles")
 local setCollectibleSubType = ____collectibles.setCollectibleSubType
+local ____entity = require("functions.entity")
+local getEntityID = ____entity.getEntityID
+local ____pickupVariants = require("functions.pickupVariants")
+local isCollectible = ____pickupVariants.isCollectible
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function useCardSoulOfIsaac(self)
@@ -43,8 +47,9 @@ function ____exports.preventCollectibleRotateInit(self, mod)
 end
 function ____exports.preventCollectibleRotate(self, collectible, collectibleType)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    if collectible.Variant ~= PickupVariant.COLLECTIBLE then
-        error("You cannot prevent the rotation for pickups of variant: " .. tostring(collectible.Variant))
+    if not isCollectible(nil, collectible) then
+        local entityID = getEntityID(nil, collectible)
+        error("The \"preventCollectibleRotate\" function was given a non-collectible: " .. entityID)
     end
     local index = getMapIndex(nil, collectible)
     v.room.trackedCollectibles:set(index, collectibleType)

package/dist/functions/array.lua

@@ -235,7 +235,7 @@ function ____exports.isArray(self, object)
     return true
 end
 function ____exports.isArrayContiguous(self, array)
-    local lastValue = nil
+    local lastValue
     for ____, element in ipairs(array) do
         if lastValue == nil then
             lastValue = element - 1

package/dist/functions/boss.d.ts

@@ -1,5 +1,4 @@
 import { EntityType, StageType } from "isaac-typescript-definitions";
-import { EntityTypeNonNPC } from "../types/EntityTypeNonNPC";
 /**
  * Helper function to get all of the non-dead bosses in the room.
  *
@@ -48,10 +47,10 @@ export declare function isSin(npc: EntityNPC): boolean;
  * Gurglings/Turdlings with 2 copies, and other multi-segment bosses with 4 segments. You can
  * customize this via the "numSegments" argument.
  */
-export declare function spawnBoss<T extends number>(entityType: T extends EntityTypeNonNPC ? never : T, variant: int, subType: int, position: Vector, velocity?: Readonly<Vector>, spawner?: Entity | undefined, seed?: Seed | undefined, numSegments?: int): EntityNPC;
+export declare function spawnBoss(entityType: EntityType, variant: int, subType: int, position: Vector, velocity?: Readonly<Vector>, spawner?: Entity | undefined, seed?: Seed | undefined, numSegments?: int): EntityNPC;
 /**
  * Helper function to spawn a boss with a specific seed.
  *
  * For more information, see the documentation for the `spawnBoss` function.
  */
-export declare function spawnBossWithSeed<T extends number>(entityType: T extends EntityTypeNonNPC ? never : T, variant: int, subType: int, position: Vector, seed: Seed, velocity?: Readonly<Vector>, spawner?: Entity | undefined, numSegments?: int): EntityNPC;
+export declare function spawnBossWithSeed(entityType: EntityType, variant: int, subType: int, position: Vector, seed: Seed, velocity?: Readonly<Vector>, spawner?: Entity | undefined, numSegments?: int): EntityNPC;

package/dist/functions/cards.lua

@@ -11,6 +11,7 @@ local ItemConfigCardType = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigCardTy
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsMax = require("constantsMax")
+local FIRST_CARD = ____constantsMax.FIRST_CARD
 local MAX_CARD = ____constantsMax.MAX_CARD
 local ____cardDescriptions = require("objects.cardDescriptions")
 local CARD_DESCRIPTIONS = ____cardDescriptions.CARD_DESCRIPTIONS
@@ -37,7 +38,8 @@ function initCardObjects(self)
             __TS__New(Set)
         )
     end
-    for ____, card in ipairs(irange(nil, 1, MAX_CARD)) do
+    for ____, cardInt in ipairs(irange(nil, FIRST_CARD, MAX_CARD)) do
+        local card = cardInt
         local cardType = ____exports.getCardType(nil, card)
         local cardTypeSet = CARD_TYPE_TO_CARDS_MAP:get(cardType)
         if cardTypeSet == nil then

package/dist/functions/character.lua

@@ -1,8 +1,8 @@
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
-local ____constants = require("constants")
-local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
+local ____constantsMax = require("constantsMax")
+local MAX_VANILLA_CHARACTER = ____constantsMax.MAX_VANILLA_CHARACTER
 local ____characterNames = require("objects.characterNames")
 local CHARACTER_NAMES = ____characterNames.CHARACTER_NAMES
 local DEFAULT_CHARACTER_NAME = ____characterNames.DEFAULT_CHARACTER_NAME

package/dist/functions/charge.d.ts

@@ -10,8 +10,8 @@ import { ActiveSlot } from "isaac-typescript-definitions";
  *
  * @param player The player to grant the charges to.
  * @param ignoreBigRoomDoubleCharge Optional. If set to true, it will treat the current room as a
- *                                  1x1 room for the purposes of calculating how much charge to
- *                                  grant. Default is false.
+ *                                 1x1 room for the purposes of calculating how much charge to
+ *                                 grant. Default is false.
  */
 export declare function addRoomClearCharge(player: EntityPlayer, ignoreBigRoomDoubleCharge?: boolean): void;
 /**
@@ -26,8 +26,8 @@ export declare function addRoomClearCharge(player: EntityPlayer, ignoreBigRoomDo
  * @param player The player to grant the charges to.
  * @param activeSlot The active item slot to grant the charges to.
  * @param ignoreBigRoomDoubleCharge Optional. If set to true, it will treat the current room as a
- *                                  1x1 room for the purposes of calculating how much charge to
- *                                  grant. Default is false.
+ *                                 1x1 room for the purposes of calculating how much charge to
+ *                                 grant. Default is false.
  */
 export declare function addRoomClearChargeToSlot(player: EntityPlayer, activeSlot: ActiveSlot, ignoreBigRoomDoubleCharge?: boolean): void;
 /**
@@ -40,8 +40,8 @@ export declare function addRoomClearChargeToSlot(player: EntityPlayer, activeSlo
  * - AAA Battery
  *
  * @param ignoreBigRoomDoubleCharge Optional. If set to true, it will treat the current room as a
- *                                  1x1 room for the purposes of calculating how much charge to
- *                                  grant. Default is false.
+ *                                 1x1 room for the purposes of calculating how much charge to
+ *                                 grant. Default is false.
  */
 export declare function addRoomClearCharges(ignoreBigRoomDoubleCharge?: boolean): void;
 /**

package/dist/functions/collectibleCacheFlag.lua

@@ -6,6 +6,7 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
 local ____constantsMax = require("constantsMax")
+local FIRST_COLLECTIBLE_TYPE = ____constantsMax.FIRST_COLLECTIBLE_TYPE
 local MAX_COLLECTIBLE_TYPE = ____constantsMax.MAX_COLLECTIBLE_TYPE
 local ____collectibles = require("functions.collectibles")
 local collectibleHasCacheFlag = ____collectibles.collectibleHasCacheFlag
@@ -21,7 +22,8 @@ local CACHE_FLAG_TO_COLLECTIBLES_MAP = __TS__New(Map)
 local function initCacheFlagMap(self)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local collectiblesSet = __TS__New(Set)
-        for ____, collectibleType in ipairs(irange(nil, 1, MAX_COLLECTIBLE_TYPE)) do
+        for ____, collectibleTypeInt in ipairs(irange(nil, FIRST_COLLECTIBLE_TYPE, MAX_COLLECTIBLE_TYPE)) do
+            local collectibleType = collectibleTypeInt
             if collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
                 collectiblesSet:add(collectibleType)
             end