isaacscript-common 3.2.0 → 3.4.1

package/enums/ModCallbackCustom.lua

@@ -94,68 +94,72 @@ ____exports.ModCallbackCustom.POST_PLAYER_CHANGE_HEALTH = 42
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_CHANGE_HEALTH] = "POST_PLAYER_CHANGE_HEALTH"
 ____exports.ModCallbackCustom.POST_PLAYER_CHANGE_TYPE = 43
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_CHANGE_TYPE] = "POST_PLAYER_CHANGE_TYPE"
-____exports.ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE = 44
+____exports.ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED = 44
+____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED] = "POST_PLAYER_COLLECTIBLE_ADDED"
+____exports.ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED = 45
+____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED] = "POST_PLAYER_COLLECTIBLE_REMOVED"
+____exports.ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE = 46
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE] = "POST_PLAYER_FATAL_DAMAGE"
-____exports.ModCallbackCustom.POST_PLAYER_INIT_LATE = 45
+____exports.ModCallbackCustom.POST_PLAYER_INIT_LATE = 47
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_INIT_LATE] = "POST_PLAYER_INIT_LATE"
-____exports.ModCallbackCustom.POST_PLAYER_INIT_REORDERED = 46
+____exports.ModCallbackCustom.POST_PLAYER_INIT_REORDERED = 48
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_INIT_REORDERED] = "POST_PLAYER_INIT_REORDERED"
-____exports.ModCallbackCustom.POST_PLAYER_RENDER_REORDERED = 47
+____exports.ModCallbackCustom.POST_PLAYER_RENDER_REORDERED = 49
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_RENDER_REORDERED] = "POST_PLAYER_RENDER_REORDERED"
-____exports.ModCallbackCustom.POST_PLAYER_UPDATE_REORDERED = 48
+____exports.ModCallbackCustom.POST_PLAYER_UPDATE_REORDERED = 50
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PLAYER_UPDATE_REORDERED] = "POST_PLAYER_UPDATE_REORDERED"
-____exports.ModCallbackCustom.POST_POOP_RENDER = 49
+____exports.ModCallbackCustom.POST_POOP_RENDER = 51
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_POOP_RENDER] = "POST_POOP_RENDER"
-____exports.ModCallbackCustom.POST_POOP_UPDATE = 50
+____exports.ModCallbackCustom.POST_POOP_UPDATE = 52
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_POOP_UPDATE] = "POST_POOP_UPDATE"
-____exports.ModCallbackCustom.POST_PRESSURE_PLATE_RENDER = 51
+____exports.ModCallbackCustom.POST_PRESSURE_PLATE_RENDER = 53
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PRESSURE_PLATE_RENDER] = "POST_PRESSURE_PLATE_RENDER"
-____exports.ModCallbackCustom.POST_PRESSURE_PLATE_UPDATE = 52
+____exports.ModCallbackCustom.POST_PRESSURE_PLATE_UPDATE = 54
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PRESSURE_PLATE_UPDATE] = "POST_PRESSURE_PLATE_UPDATE"
-____exports.ModCallbackCustom.POST_PROJECTILE_INIT_LATE = 53
+____exports.ModCallbackCustom.POST_PROJECTILE_INIT_LATE = 55
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PROJECTILE_INIT_LATE] = "POST_PROJECTILE_INIT_LATE"
-____exports.ModCallbackCustom.POST_PURCHASE = 54
+____exports.ModCallbackCustom.POST_PURCHASE = 56
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_PURCHASE] = "POST_PURCHASE"
-____exports.ModCallbackCustom.POST_ROCK_RENDER = 55
+____exports.ModCallbackCustom.POST_ROCK_RENDER = 57
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_ROCK_RENDER] = "POST_ROCK_RENDER"
-____exports.ModCallbackCustom.POST_ROCK_UPDATE = 56
+____exports.ModCallbackCustom.POST_ROCK_UPDATE = 58
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_ROCK_UPDATE] = "POST_ROCK_UPDATE"
-____exports.ModCallbackCustom.POST_ROOM_CLEAR_CHANGED = 57
+____exports.ModCallbackCustom.POST_ROOM_CLEAR_CHANGED = 59
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_ROOM_CLEAR_CHANGED] = "POST_ROOM_CLEAR_CHANGED"
-____exports.ModCallbackCustom.POST_SACRIFICE = 58
+____exports.ModCallbackCustom.POST_SACRIFICE = 60
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SACRIFICE] = "POST_SACRIFICE"
-____exports.ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED = 59
+____exports.ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED = 61
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED] = "POST_SLOT_ANIMATION_CHANGED"
-____exports.ModCallbackCustom.POST_SLOT_DESTROYED = 60
+____exports.ModCallbackCustom.POST_SLOT_DESTROYED = 62
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SLOT_DESTROYED] = "POST_SLOT_DESTROYED"
-____exports.ModCallbackCustom.POST_SLOT_INIT = 61
+____exports.ModCallbackCustom.POST_SLOT_INIT = 63
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SLOT_INIT] = "POST_SLOT_INIT"
-____exports.ModCallbackCustom.POST_SLOT_RENDER = 62
+____exports.ModCallbackCustom.POST_SLOT_RENDER = 64
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SLOT_RENDER] = "POST_SLOT_RENDER"
-____exports.ModCallbackCustom.POST_SLOT_UPDATE = 63
+____exports.ModCallbackCustom.POST_SLOT_UPDATE = 65
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SLOT_UPDATE] = "POST_SLOT_UPDATE"
-____exports.ModCallbackCustom.POST_SPIKES_RENDER = 64
+____exports.ModCallbackCustom.POST_SPIKES_RENDER = 66
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SPIKES_RENDER] = "POST_SPIKES_RENDER"
-____exports.ModCallbackCustom.POST_SPIKES_UPDATE = 65
+____exports.ModCallbackCustom.POST_SPIKES_UPDATE = 67
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_SPIKES_UPDATE] = "POST_SPIKES_UPDATE"
-____exports.ModCallbackCustom.POST_TEAR_INIT_LATE = 66
+____exports.ModCallbackCustom.POST_TEAR_INIT_LATE = 68
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_TEAR_INIT_LATE] = "POST_TEAR_INIT_LATE"
-____exports.ModCallbackCustom.POST_TEAR_INIT_VERY_LATE = 67
+____exports.ModCallbackCustom.POST_TEAR_INIT_VERY_LATE = 69
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_TEAR_INIT_VERY_LATE] = "POST_TEAR_INIT_VERY_LATE"
-____exports.ModCallbackCustom.POST_TNT_RENDER = 68
+____exports.ModCallbackCustom.POST_TNT_RENDER = 70
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_TNT_RENDER] = "POST_TNT_RENDER"
-____exports.ModCallbackCustom.POST_TNT_UPDATE = 69
+____exports.ModCallbackCustom.POST_TNT_UPDATE = 71
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_TNT_UPDATE] = "POST_TNT_UPDATE"
-____exports.ModCallbackCustom.POST_TRANSFORMATION = 70
+____exports.ModCallbackCustom.POST_TRANSFORMATION = 72
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_TRANSFORMATION] = "POST_TRANSFORMATION"
-____exports.ModCallbackCustom.POST_TRINKET_BREAK = 71
+____exports.ModCallbackCustom.POST_TRINKET_BREAK = 73
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.POST_TRINKET_BREAK] = "POST_TRINKET_BREAK"
-____exports.ModCallbackCustom.PRE_BERSERK_DEATH = 72
+____exports.ModCallbackCustom.PRE_BERSERK_DEATH = 74
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.PRE_BERSERK_DEATH] = "PRE_BERSERK_DEATH"
-____exports.ModCallbackCustom.PRE_CUSTOM_REVIVE = 73
+____exports.ModCallbackCustom.PRE_CUSTOM_REVIVE = 75
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.PRE_CUSTOM_REVIVE] = "PRE_CUSTOM_REVIVE"
-____exports.ModCallbackCustom.PRE_ITEM_PICKUP = 74
+____exports.ModCallbackCustom.PRE_ITEM_PICKUP = 76
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.PRE_ITEM_PICKUP] = "PRE_ITEM_PICKUP"
-____exports.ModCallbackCustom.PRE_NEW_LEVEL = 75
+____exports.ModCallbackCustom.PRE_NEW_LEVEL = 77
 ____exports.ModCallbackCustom[____exports.ModCallbackCustom.PRE_NEW_LEVEL] = "PRE_NEW_LEVEL"
 return ____exports

package/features/deployJSONRoom.lua

@@ -4,7 +4,7 @@ local __TS__New = ____lualib.__TS__New
 local Map = ____lualib.Map
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local postNewRoom, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPC_TYPES_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, v
+local postNewRoomReordered, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPC_TYPES_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
 local EntityCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityCollisionClass
@@ -12,7 +12,6 @@ local EntityFlag = ____isaac_2Dtypescript_2Ddefinitions.EntityFlag
 local EntityGridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityGridCollisionClass
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
-local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local PitfallVariant = ____isaac_2Dtypescript_2Ddefinitions.PitfallVariant
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
@@ -20,6 +19,8 @@ local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
 local ____entity = require("functions.entity")
@@ -57,7 +58,7 @@ local ____utils = require("functions.utils")
 local erange = ____utils.erange
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-function postNewRoom(self)
+function postNewRoomReordered(self)
     local roomListIndex = getRoomListIndex(nil)
     if not v.level.deployedRoomListIndexes:has(roomListIndex) then
         return
@@ -427,7 +428,7 @@ v = {level = {
 -- @internal
 function ____exports.deployJSONRoomInit(self, mod)
     saveDataManager(nil, "deployJSONRoom", v)
-    mod:AddCallback(ModCallback.POST_NEW_ROOM, postNewRoom)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end
 --- Helper function to deconstruct a vanilla room and set up a custom room in its place.
 -- Specifically, this will clear the current room of all entities and grid entities, and then spawn

package/features/extraConsoleCommands/listCommands.lua

@@ -810,6 +810,7 @@ end
 --- Logs information about the room to the "log.txt" file.
 function ____exports.roomCommand(self)
     logRoom()
+    printConsole(nil, "Logged room information to the \"log.txt\" file.")
 end
 --- Gives a rotten heart. Provide a number to give a custom amount of hearts. (You can use negative
 -- numbers to remove hearts.)

package/features/persistentEntities.d.ts

@@ -0,0 +1,28 @@
+import { EntityType } from "isaac-typescript-definitions";
+/**
+ * Helper function to spawn an entity that will have persistence similar to a pickup.
+ *
+ * By default, as soon as you leave a room, any spawned entities will be despawned and will not
+ * return if the player revisits the room. This means that if you want to have an entity like a
+ * pickup, you have to manually respawn it when the player re-enters the room. Use this helper
+ * function to avoid having to do any tracking on your own.
+ *
+ * Conventionally, the word "persistent" refers to `EntityFlag.FLAG_PERSISTENT`, which is used on
+ * e.g. familiars to make them appear in every room. On the other hand, pickups are also persistent,
+ * but they are not present in every room, only one specific room. This function spawns entities
+ * like pickups, not familiars.
+ *
+ * @returns A tuple containing the entity and the persistent entity index. You can use the index
+ *          with the `removePersistentEntity` function.
+ */
+export declare function spawnPersistentEntity(entityType: EntityType, variant: int, subType: int, position: Vector): [Entity, int];
+/**
+ * Helper function to stop an entity spawned with the `spawnPersistentEntity` helper function from
+ * respawning.
+ *
+ * @param persistentEntityIndex The index that was returned by the `spawnPersistentEntity` function.
+ * @param removeEntity Optional. True by default. Set to false if you want to stop an entity from
+ *                     being persistent but you don't want to actually remove the currently-spawned
+ *                     entity from the room.
+ */
+export declare function removePersistentEntity(persistentEntityIndex: int, removeEntity?: boolean): void;

package/features/persistentEntities.lua

@@ -0,0 +1,150 @@
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local __TS__Iterator = ____lualib.__TS__Iterator
+local ____exports = {}
+local postEntityRemove, postNewRoomReordered, spawnAndTrack, v
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local EntityFlag = ____isaac_2Dtypescript_2Ddefinitions.EntityFlag
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____cachedClasses = require("cachedClasses")
+local game = ____cachedClasses.game
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____entity = require("functions.entity")
+local spawn = ____entity.spawn
+local ____roomData = require("functions.roomData")
+local getRoomListIndex = ____roomData.getRoomListIndex
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+function postEntityRemove(self, entity)
+    local ptrHash = GetPtrHash(entity)
+    local tuple = v.room.spawnedPersistentEntities:get(ptrHash)
+    if tuple == nil then
+        return
+    end
+    local index = tuple[1]
+    local level = game:GetLevel()
+    local previousRoomGridIndex = level:GetPreviousRoomIndex()
+    local previousRoomListIndex = getRoomListIndex(nil, previousRoomGridIndex)
+    v.level.persistentEntities:set(index, {
+        entityType = entity.Type,
+        variant = entity.Variant,
+        subType = entity.SubType,
+        roomListIndex = previousRoomListIndex,
+        position = entity.Position
+    })
+end
+function postNewRoomReordered(self)
+    local roomListIndex = getRoomListIndex(nil)
+    for ____, ____value in __TS__Iterator(v.level.persistentEntities:entries()) do
+        local index = ____value[1]
+        local description = ____value[2]
+        do
+            if roomListIndex ~= description.roomListIndex then
+                goto __continue6
+            end
+            v.level.persistentEntities:delete(index)
+            spawnAndTrack(
+                nil,
+                description.entityType,
+                description.variant,
+                description.subType,
+                description.position,
+                index,
+                true
+            )
+        end
+        ::__continue6::
+    end
+end
+function spawnAndTrack(self, entityType, variant, subType, position, index, respawning)
+    if respawning == nil then
+        respawning = false
+    end
+    local entity = spawn(
+        nil,
+        entityType,
+        variant,
+        subType,
+        position
+    )
+    if respawning then
+        entity:ClearEntityFlags(EntityFlag.APPEAR)
+    end
+    local ptrHash = GetPtrHash(entity)
+    local tuple = {
+        index,
+        EntityPtr(entity)
+    }
+    v.room.spawnedPersistentEntities:set(ptrHash, tuple)
+    return entity
+end
+--- Iterates upward as new persistent entities are created.
+local persistentEntityIndexCounter = 0
+v = {
+    level = {persistentEntities = __TS__New(Map)},
+    room = {spawnedPersistentEntities = __TS__New(Map)}
+}
+---
+-- @internal
+function ____exports.persistentEntitiesInit(self, mod)
+    saveDataManager(nil, "persistentEntities", v)
+    mod:AddCallback(ModCallback.POST_ENTITY_REMOVE, postEntityRemove)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
+end
+--- Helper function to spawn an entity that will have persistence similar to a pickup.
+-- 
+-- By default, as soon as you leave a room, any spawned entities will be despawned and will not
+-- return if the player revisits the room. This means that if you want to have an entity like a
+-- pickup, you have to manually respawn it when the player re-enters the room. Use this helper
+-- function to avoid having to do any tracking on your own.
+-- 
+-- Conventionally, the word "persistent" refers to `EntityFlag.FLAG_PERSISTENT`, which is used on
+-- e.g. familiars to make them appear in every room. On the other hand, pickups are also persistent,
+-- but they are not present in every room, only one specific room. This function spawns entities
+-- like pickups, not familiars.
+-- 
+-- @returns A tuple containing the entity and the persistent entity index. You can use the index
+-- with the `removePersistentEntity` function.
+function ____exports.spawnPersistentEntity(self, entityType, variant, subType, position)
+    persistentEntityIndexCounter = persistentEntityIndexCounter + 1
+    local entity = spawnAndTrack(
+        nil,
+        entityType,
+        variant,
+        subType,
+        position,
+        persistentEntityIndexCounter
+    )
+    return {entity, persistentEntityIndexCounter}
+end
+--- Helper function to stop an entity spawned with the `spawnPersistentEntity` helper function from
+-- respawning.
+-- 
+-- @param persistentEntityIndex The index that was returned by the `spawnPersistentEntity` function.
+-- @param removeEntity Optional. True by default. Set to false if you want to stop an entity from
+-- being persistent but you don't want to actually remove the currently-spawned
+-- entity from the room.
+function ____exports.removePersistentEntity(self, persistentEntityIndex, removeEntity)
+    if removeEntity == nil then
+        removeEntity = true
+    end
+    v.level.persistentEntities:delete(persistentEntityIndex)
+    for ____, ____value in __TS__Iterator(v.room.spawnedPersistentEntities:entries()) do
+        local ptrHash = ____value[1]
+        local tuple = ____value[2]
+        do
+            local index, entityPtr = table.unpack(tuple)
+            if index ~= persistentEntityIndex then
+                goto __continue13
+            end
+            v.room.spawnedPersistentEntities:delete(ptrHash)
+            if removeEntity and entityPtr.Ref ~= nil then
+                entityPtr.Ref:Remove()
+            end
+        end
+        ::__continue13::
+    end
+end
+return ____exports

package/features/playerInventory.d.ts

@@ -1,4 +1,4 @@
-import { ActiveSlot, CollectibleType } from "isaac-typescript-definitions";
+import { CollectibleType } from "isaac-typescript-definitions";
 /**
  * Helper function to get all of the collectibles that the player has gotten so far on this run, in
  * order.
@@ -12,12 +12,3 @@ import { ActiveSlot, CollectibleType } from "isaac-typescript-definitions";
  * order of the lowest `CollectibleType` to the highest.
  */
 export declare function getPlayerInventory(player: EntityPlayer, includeActiveCollectibles?: boolean): CollectibleType[];
-/**
- * Helper function to add a collectible to a player. Use this instead of the
- * `EntityPlayer.AddCollectible` method if you want the collectible that is added to be
- * automatically tracked by the player inventory tracker feature.
- *
- * You only need to use this function if you are using the inventory feature from the standard
- * library.
- */
-export declare function addCollectible(player: EntityPlayer, collectibleType: CollectibleType, charge?: int, firstTimePickingUp?: boolean, activeSlot?: ActiveSlot, varData?: int): void;

package/features/playerInventory.lua

@@ -1,10 +1,9 @@
 local ____lualib = require("lualib_bundle")
 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, v
+local newPlayerInventory, resetInventory, useItemD4, postGameStarted, postCollectibleAdded, postCollectibleRemoved, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
@@ -21,13 +20,14 @@ local ____collectibles = require("functions.collectibles")
 local isActiveCollectible = ____collectibles.isActiveCollectible
 local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____playerIndex = require("functions.playerIndex")
 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)
@@ -45,62 +45,42 @@ function newPlayerInventory(self, player)
     end
     return inventory
 end
-function useItemD4(self, _collectibleType, _rng, player)
-    local playerIndex = getPlayerIndex(nil, player)
+function resetInventory(self, player)
     local inventory = newPlayerInventory(nil, player)
-    v.run.playersInventory:set(playerIndex, inventory)
+    mapSetPlayer(nil, v.run.playersInventory, player, inventory)
+end
+function useItemD4(self, _collectibleType, _rng, player)
+    resetInventory(nil, player)
 end
 function postGameStarted(self)
     for ____, player in ipairs(getAllPlayers(nil)) do
         local playerIndex = getPlayerIndex(nil, player)
         if not v.run.playersInventory:has(playerIndex) then
-            local inventory = newPlayerInventory(nil, player)
-            v.run.playersInventory:set(playerIndex, inventory)
+            resetInventory(nil, player)
         end
     end
 end
-function postItemPickup(self, player, pickingUpItem)
-    if not pickingUpItemIsCollectible(nil, pickingUpItem) then
-        return
-    end
-    addCollectibleToInventory(nil, player, pickingUpItem.subType)
-end
-function addCollectibleToInventory(self, player, collectibleType)
-    local playerIndex = getPlayerIndex(nil, player)
-    local inventory = v.run.playersInventory:getAndSetDefault(playerIndex, player)
+function postCollectibleAdded(self, player, collectibleType)
+    local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
     inventory[#inventory + 1] = collectibleType
-    if not isActiveCollectible(nil, collectibleType) then
-        return
-    end
-    local activeCollectibleTypes = v.run.playersActiveCollectibleTypes:getAndSetDefault(playerIndex)
-    activeCollectibleTypes[#activeCollectibleTypes + 1] = collectibleType
-    local droppedActiveCollectibleTypes = __TS__ArrayFilter(
-        activeCollectibleTypes,
-        function(____, activeCollectibleType) return not player:HasCollectible(activeCollectibleType) end
-    )
-    for ____, activeCollectibleType in ipairs(droppedActiveCollectibleTypes) do
-        arrayRemoveInPlace(nil, inventory, activeCollectibleType)
-        arrayRemoveInPlace(nil, activeCollectibleTypes, activeCollectibleType)
-    end
+end
+function postCollectibleRemoved(self, player, collectibleType)
+    local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
+    arrayRemoveInPlace(nil, inventory, collectibleType)
 end
 local FEATURE_NAME = "player inventory tracker"
-v = {run = {
-    playersInventory = __TS__New(
-        DefaultMap,
-        function(____, player) return newPlayerInventory(nil, player) end
-    ),
-    playersActiveCollectibleTypes = __TS__New(
-        DefaultMap,
-        function() return {} end
-    )
-}}
+v = {run = {playersInventory = __TS__New(
+    DefaultMap,
+    function(____, player) return newPlayerInventory(nil, player) end
+)}}
 ---
 -- @internal
 function ____exports.playerInventoryInit(self, mod)
     saveDataManager(nil, "playerInventory", v)
     mod:AddCallback(ModCallback.POST_USE_ITEM, useItemD4, CollectibleType.D4)
     mod:AddCallback(ModCallback.POST_GAME_STARTED, postGameStarted)
-    mod:AddCallbackCustom(ModCallbackCustom.POST_ITEM_PICKUP, postItemPickup)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, postCollectibleAdded)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, postCollectibleRemoved)
 end
 --- Helper function to get all of the collectibles that the player has gotten so far on this run, in
 -- order.
@@ -117,8 +97,7 @@ function ____exports.getPlayerInventory(self, player, includeActiveCollectibles)
         includeActiveCollectibles = true
     end
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    local playerIndex = getPlayerIndex(nil, player)
-    local inventory = v.run.playersInventory:getAndSetDefault(playerIndex, player)
+    local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
     local copiedInventory = copyArray(nil, inventory)
     if includeActiveCollectibles then
         return copiedInventory
@@ -128,20 +107,4 @@ function ____exports.getPlayerInventory(self, player, includeActiveCollectibles)
         function(____, collectibleType) return not isActiveCollectible(nil, collectibleType) end
     )
 end
---- Helper function to add a collectible to a player. Use this instead of the
--- `EntityPlayer.AddCollectible` method if you want the collectible that is added to be
--- automatically tracked by the player inventory tracker feature.
--- 
--- You only need to use this function if you are using the inventory feature from the standard
--- library.
-function ____exports.addCollectible(self, player, collectibleType, charge, firstTimePickingUp, activeSlot, varData)
-    player:AddCollectible(
-        collectibleType,
-        charge,
-        firstTimePickingUp,
-        activeSlot,
-        varData
-    )
-    addCollectibleToInventory(nil, player, collectibleType)
-end
 return ____exports

package/functions/array.d.ts

@@ -16,7 +16,7 @@ export declare function arrayEquals<T>(array1: T[] | readonly T[], array2: T[] |
 export declare function arrayRemove<T>(originalArray: T[] | readonly T[], ...elementsToRemove: T[]): T[];
 /**
  * Removes the specified element(s) from the array. If the specified element(s) are not found in the
- * array, this function will do nothing. Returns whether or not one or more elements were removed.
+ * array, this function will do nothing. Returns true if one or more elements were removed.
  *
  * This function is variadic, meaning that you can specify N arguments to remove N elements.
  */
@@ -31,8 +31,8 @@ export declare function arrayRemoveInPlace<T>(array: T[], ...elementsToRemove: T
 export declare function arrayRemoveIndex<T>(originalArray: T[] | readonly T[], ...indexesToRemove: int[]): T[];
 /**
  * Removes the elements at the specified indexes from the array. If the specified indexes are not
- * found in the array, this function will do nothing. Returns whether or not one or more elements
- * were removed.
+ * found in the array, this function will do nothing. Returns true if one or more elements were
+ * removed.
  *
  * This function is variadic, meaning that you can specify N arguments to remove N elements.
  */

package/functions/array.lua

@@ -87,7 +87,7 @@ function ____exports.arrayRemove(self, originalArray, ...)
     return array
 end
 --- Removes the specified element(s) from the array. If the specified element(s) are not found in the
--- array, this function will do nothing. Returns whether or not one or more elements were removed.
+-- array, this function will do nothing. Returns true if one or more elements were removed.
 -- 
 -- This function is variadic, meaning that you can specify N arguments to remove N elements.
 function ____exports.arrayRemoveInPlace(self, array, ...)
@@ -122,8 +122,8 @@ function ____exports.arrayRemoveIndex(self, originalArray, ...)
     return array
 end
 --- Removes the elements at the specified indexes from the array. If the specified indexes are not
--- found in the array, this function will do nothing. Returns whether or not one or more elements
--- were removed.
+-- found in the array, this function will do nothing. Returns true if one or more elements were
+-- removed.
 -- 
 -- This function is variadic, meaning that you can specify N arguments to remove N elements.
 function ____exports.arrayRemoveIndexInPlace(self, array, ...)

package/functions/collectibleSet.d.ts

@@ -2,8 +2,8 @@ import { CollectibleType } from "isaac-typescript-definitions";
 /**
  * Returns a set containing every valid collectible type in the game, including modded collectibles.
  */
-export declare function getCollectibleSet(): Set<CollectibleType>;
+export declare function getCollectibleSet(): ReadonlySet<CollectibleType>;
 /** Returns a set containing every modded collectible type in the game. */
-export declare function getModdedCollectibleSet(): Set<CollectibleType>;
+export declare function getModdedCollectibleSet(): ReadonlySet<CollectibleType>;
 /** Returns a set containing every valid vanilla collectible type in the game. */
-export declare function getVanillaCollectibleSet(): Set<CollectibleType>;
+export declare function getVanillaCollectibleSet(): ReadonlySet<CollectibleType>;

package/functions/collectibleSet.lua

@@ -8,8 +8,6 @@ local ____constantsFirstLast = require("constantsFirstLast")
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
 local ____collectibles = require("functions.collectibles")
 local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
-local ____set = require("functions.set")
-local copySet = ____set.copySet
 local ALL_COLLECTIBLES_SET = __TS__New(Set)
 local VANILLA_COLLECTIBLES_SET = __TS__New(Set)
 local MODDED_COLLECTIBLES_SET = __TS__New(Set)
@@ -35,20 +33,20 @@ function ____exports.getCollectibleSet(self)
     if ALL_COLLECTIBLES_SET.size == 0 then
         initCollectibleSets(nil)
     end
-    return copySet(nil, ALL_COLLECTIBLES_SET)
+    return ALL_COLLECTIBLES_SET
 end
 --- Returns a set containing every modded collectible type in the game.
 function ____exports.getModdedCollectibleSet(self)
     if ALL_COLLECTIBLES_SET.size == 0 then
         initCollectibleSets(nil)
     end
-    return copySet(nil, MODDED_COLLECTIBLES_SET)
+    return MODDED_COLLECTIBLES_SET
 end
 --- Returns a set containing every valid vanilla collectible type in the game.
 function ____exports.getVanillaCollectibleSet(self)
     if ALL_COLLECTIBLES_SET.size == 0 then
         initCollectibleSets(nil)
     end
-    return copySet(nil, VANILLA_COLLECTIBLES_SET)
+    return VANILLA_COLLECTIBLES_SET
 end
 return ____exports

package/functions/color.d.ts

@@ -9,9 +9,6 @@ interface CopyColorReturn {
     [SerializationType.SERIALIZE]: SerializedColor;
     [SerializationType.DESERIALIZE]: Color;
 }
-/**
- * @category color
- */
 export declare function colorEquals(color1: Color, color2: Color): boolean;
 /**
  * Helper function to copy a `Color` object.
@@ -19,27 +16,16 @@ export declare function colorEquals(color1: Color, color2: Color): boolean;
  * @param color The Color object to copy. In the case of deserialization, this will actually be a
  *              Lua table instead of an instantiated Color class.
  * @param serializationType Default is `SerializationType.NONE`.
- * @category color
  */
 export declare function copyColor<C extends Color | SerializedColor, S extends SerializationType>(color: C, serializationType: S): CopyColorReturn[S];
 export declare function copyColor<C extends Color | SerializedColor>(color: C): CopyColorReturn[SerializationType.NONE];
-/**
- * Returns `Color(1, 1, 1)`.
- *
- * @category color
- */
+/** Returns `Color(1, 1, 1)`. */
 export declare function getDefaultColor(): Color;
-/**
- * Helper function to check if something is an instantiated Color object.
- *
- * @category color
- */
+/** Helper function to check if something is an instantiated Color object. */
 export declare function isColor(object: unknown): object is Color;
 /**
  * Used to determine is the given table is a serialized `Color` object created by the save data
  * manager and/or the `deepCopy` function.
- *
- * @category color
  */
 export declare function isSerializedColor(object: unknown): object is SerializedColor;
 export {};