isaacscript-common 1.2.174 → 1.2.175

package/dist/classes/null.d.ts

@@ -1,15 +1,14 @@
 /**
- * Null is a class that represents the JavaScript/TypeScript type of "null".
+ * NullT is a class that represents the JavaScript/TypeScript type of "null". T is short for "type".
  *
- * Do not instantiate this class directly and instead use the `Nul` singleton.
+ * Do not instantiate this class directly and instead use the `Null` singleton.
  */
-export declare class Null {
+export declare class NullT {
 }
 /**
- * Nul is a singleton that represents an instantiated version of the `Null` class.
+ * Null is a singleton that represents an instantiated version of the `NullT` class.
  *
  * In TSTL, `null` transpiles to `nil`. This is problematic because if you use it as an object or
- * map value, the corresponding key will be deleted. You can work around this by using this `Nul`,
- * which is an instantiated version of the `Null` custom class.
+ * map value, the corresponding key will be deleted. You can work around this by using this `Null`.
  */
-export declare const Nul: Null;
+export declare const Null: NullT;

package/dist/classes/null.lua

@@ -3,10 +3,10 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-____exports.Null = __TS__Class()
-local Null = ____exports.Null
-Null.name = "Null"
-function Null.prototype.____constructor(self)
+____exports.NullT = __TS__Class()
+local NullT = ____exports.NullT
+NullT.name = "NullT"
+function NullT.prototype.____constructor(self)
 end
-____exports.Nul = __TS__New(____exports.Null)
+____exports.Null = __TS__New(____exports.NullT)
 return ____exports

package/dist/constants.d.ts

@@ -63,8 +63,8 @@ export declare const FINAL_STAGE: number;
  * second TMTRAINER item subtracts one from that, and so on.
  */
 export declare const FIRST_GLITCHED_COLLECTIBLE_TYPE: number;
-export declare const GRID_INDEX_CENTER_OF_1X1_ROOM = 67;
 export declare const GAME_FRAMES_PER_SECOND = 30;
+export declare const GRID_INDEX_CENTER_OF_1X1_ROOM = 67;
 export declare const ISAAC_FRAMES_PER_SECOND = 60;
 /**
  * This is the set of characters that look like The Lost and play the "LostDeath" animation when
@@ -81,11 +81,6 @@ export declare const MAX_NUM_DOORS = 8;
 export declare const MAX_NUM_FAMILIARS = 64;
 /** The game can only handle up to four different players. */
 export declare const MAX_NUM_INPUTS = 4;
-/**
- * The maximum speed stat that a player can have. Any additional speed beyond this will not take
- * effect.
- */
-export declare const MAX_SPEED_STAT = 2;
 /** With Birthright, it is possible for Magdalene to have 18 heart containers. */
 export declare const MAX_PLAYER_HEART_CONTAINERS = 18;
 export declare const MAX_PLAYER_POCKET_ITEM_SLOTS = 4;
@@ -103,6 +98,11 @@ export declare const MAX_PLAYER_TRINKET_SLOTS = 2;
  * on. The maximum room index possible is 168. (It is not 169 because we start at 0 instead of 1.)
  */
 export declare const MAX_ROOM_INDEX = 168;
+/**
+ * The maximum speed stat that a player can have. Any additional speed beyond this will not take
+ * effect.
+ */
+export declare const MAX_SPEED_STAT = 2;
 export declare const MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B;
 export declare const MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING;
 export declare const NUM_DIMENSIONS = 3;
@@ -113,16 +113,16 @@ export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;
  * In vanilla, this is part of the `PillColor` enum, but we implement it as a constant in
  * IsaacScript since it is not a real pill color.
  *
- * 1 << 11
+ * (1 << 11) - 1
  */
-export declare const PILL_GIANT_FLAG = 2048;
+export declare const PILL_COLOR_MASK = 2047;
 /**
  * In vanilla, this is part of the `PillColor` enum, but we implement it as a constant in
  * IsaacScript since it is not a real pill color.
  *
- * (1 << 11) - 1
+ * 1 << 11
  */
-export declare const PILL_COLOR_MASK = 2047;
+export declare const PILL_GIANT_FLAG = 2048;
 export declare const SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES: ReadonlySet<CollectibleType>;
 export declare const STORY_BOSSES: ReadonlySet<EntityType>;
 /**

package/dist/constants.lua

@@ -79,8 +79,8 @@ ____exports.FAMILIARS_THAT_SHOOT_PLAYER_TEARS = __TS__New(Set, {
 })
 ____exports.FINAL_STAGE = LevelStage.NUM_STAGES - 1
 ____exports.FIRST_GLITCHED_COLLECTIBLE_TYPE = (1 << 32) - 1
-____exports.GRID_INDEX_CENTER_OF_1X1_ROOM = 67
 ____exports.GAME_FRAMES_PER_SECOND = 30
+____exports.GRID_INDEX_CENTER_OF_1X1_ROOM = 67
 ____exports.ISAAC_FRAMES_PER_SECOND = 60
 ____exports.LOST_STYLE_PLAYER_TYPES = __TS__New(Set, {
     PlayerType.PLAYER_THELOST,
@@ -92,20 +92,20 @@ ____exports.LOST_STYLE_PLAYER_TYPES = __TS__New(Set, {
 ____exports.MAX_NUM_DOORS = 8
 ____exports.MAX_NUM_FAMILIARS = 64
 ____exports.MAX_NUM_INPUTS = 4
-____exports.MAX_SPEED_STAT = 2
 ____exports.MAX_PLAYER_HEART_CONTAINERS = 18
 ____exports.MAX_PLAYER_POCKET_ITEM_SLOTS = 4
 ____exports.MAX_PLAYER_SPEED_IN_UNITS = 9.8
 ____exports.MAX_PLAYER_TRINKET_SLOTS = 2
 ____exports.MAX_ROOM_INDEX = 168
+____exports.MAX_SPEED_STAT = 2
 ____exports.MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B
 ____exports.MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING
 ____exports.NUM_DIMENSIONS = 3
 ____exports.SECOND_IN_MILLISECONDS = 1000
 ____exports.MINUTE_IN_MILLISECONDS = 60 * ____exports.SECOND_IN_MILLISECONDS
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135
-____exports.PILL_GIANT_FLAG = 2048
 ____exports.PILL_COLOR_MASK = 2047
+____exports.PILL_GIANT_FLAG = 2048
 ____exports.SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES = __TS__New(Set, {
     CollectibleType.COLLECTIBLE_FORGET_ME_NOW,
     CollectibleType.COLLECTIBLE_EDENS_SOUL,

package/dist/features/collectiblesSeen.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * Helper function to determine if a collectible has been previously seen on the run before this
+ * room was entered.
+ */
+export declare function isCollectiblePreviouslySeen(collectible: EntityPickup): boolean;

package/dist/features/collectiblesSeen.lua

@@ -0,0 +1,43 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local postPickupInitCollectible, postNewRoomEarly, v
+local ____ModCallbacksCustom = require("enums.ModCallbacksCustom")
+local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
+local ____featuresInitialized = require("featuresInitialized")
+local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
+local ____collectibles = require("functions.collectibles")
+local getCollectibleIndex = ____collectibles.getCollectibleIndex
+local ____set = require("functions.set")
+local addSetsToSet = ____set.addSetsToSet
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+function postPickupInitCollectible(self, collectible)
+    local collectibleIndex = getCollectibleIndex(nil, collectible)
+    v.run.collectiblesSeenInThisRoom:add(collectibleIndex)
+end
+function postNewRoomEarly(self)
+    addSetsToSet(nil, v.run.collectiblesSeenInPreviousRooms, v.run.collectiblesSeenInThisRoom)
+    v.run.collectiblesSeenInThisRoom:clear()
+end
+local FEATURE_NAME = "collectibles tracker"
+v = {run = {
+    collectiblesSeenInPreviousRooms = __TS__New(Set),
+    collectiblesSeenInThisRoom = __TS__New(Set)
+}}
+function ____exports.collectiblesSeenInit(self, mod)
+    saveDataManager(nil, "collectiblesSave", v)
+    mod:AddCallback(ModCallbacks.MC_POST_PICKUP_INIT, postPickupInitCollectible, PickupVariant.PICKUP_COLLECTIBLE)
+    mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_NEW_ROOM_EARLY, postNewRoomEarly)
+end
+function ____exports.isCollectiblePreviouslySeen(self, collectible)
+    errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
+    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+        error("You cannot request if the following pickup variant is previously seen: " .. tostring(collectible.Variant))
+    end
+    local collectibleIndex = getCollectibleIndex(nil, collectible)
+    return v.run.collectiblesSeenInPreviousRooms:has(collectibleIndex)
+end
+return ____exports

package/dist/features/deployJSONRoom.lua

@@ -35,8 +35,9 @@ local ____pickups = require("functions.pickups")
 local removeAllPickups = ____pickups.removeAllPickups
 local ____random = require("functions.random")
 local nextSeed = ____random.nextSeed
+local ____roomData = require("functions.roomData")
+local getRoomListIndex = ____roomData.getRoomListIndex
 local ____rooms = require("functions.rooms")
-local getRoomListIndex = ____rooms.getRoomListIndex
 local gridToPos = ____rooms.gridToPos
 local setRoomCleared = ____rooms.setRoomCleared
 local setRoomUncleared = ____rooms.setRoomUncleared

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

@@ -27,6 +27,8 @@ export declare function blackMarket(): void;
  * charges. (You can use negative numbers to remove charges.)
  */
 export declare function bloodCharges(params: string): void;
+/** Alias for the "blackmarket" command. */
+export declare function bm(): void;
 /**
  * Gives a bomb. Provide a number to give a custom amount of bombs. (You can use negative numbers to
  * remove bombs.)
@@ -46,8 +48,6 @@ export declare function boneHearts(params: string): void;
 export declare function boss(): void;
 /** Warps to the Boss Rush for the floor. */
 export declare function bossRush(): void;
-/** Alias for the "blackmarket" command. */
-export declare function bm(): void;
 /**
  * Gives a broken heart. Provide a number to give a custom amount of hearts. (You can use negative
  * numbers to remove hearts.)
@@ -92,10 +92,10 @@ export declare function coin(params: string): void;
 export declare function coins(params: string): void;
 /** Creates a crawlspace next to the player. */
 export declare function crawlspace(): void;
-/** Uses the D6. */
-export declare function d6(): void;
 /** Uses the D20. */
 export declare function d20(): void;
+/** Uses the D6. */
+export declare function d6(): void;
 /** Toggles extremely high-damage tears. */
 export declare function damage(): void;
 /** Alias for the "devil" command. */
@@ -135,6 +135,10 @@ export declare function getPosition(): void;
 export declare function gigaBomb(params: string): void;
 /** Alias for the "goldenbomb" command. */
 export declare function goldBomb(): void;
+/** Alias for the "goldenhearts" command. */
+export declare function goldHearts(params: string): void;
+/** Alias for the "goldenkey" command. */
+export declare function goldKey(): void;
 /** Gives the player a golden bomb. */
 export declare function goldenBomb(): void;
 /**
@@ -144,10 +148,6 @@ export declare function goldenBomb(): void;
 export declare function goldenHearts(params: string): void;
 /** Gives the player a golden key. */
 export declare function goldenKey(): void;
-/** Alias for the "goldenhearts" command. */
-export declare function goldHearts(params: string): void;
-/** Alias for the "goldenkey" command. */
-export declare function goldKey(): void;
 /** Alias for the "debug 2" command. */
 export declare function grid(): void;
 /** Alias for the "debug 11" command. */
@@ -162,7 +162,7 @@ export declare function hearts(params: string): void;
 /** Alias for the "debug 6" command. */
 export declare function hitboxes(): void;
 /** Warps to the I AM ERROR room for the floor. */
-export declare function IAMERROR(): void;
+export declare function iAmError(): void;
 /**
  * Gives a key. Provide a number to give a custom amount of key. (You can use negative numbers to
  * remove keys.)
@@ -263,10 +263,10 @@ export declare function s(params: string): void;
 export declare function sacrifice(): void;
 /** Warps to the first Secret Room on the floor. */
 export declare function secret(): void;
-/** Logs all of the current run's seed effects to the "log.txt" file. */
-export declare function seedsCommand(): void;
 /** Changes to a seeded run, using the seed of the current run. */
 export declare function seedStick(): void;
+/** Logs all of the current run's seed effects to the "log.txt" file. */
+export declare function seedsCommand(): void;
 /**
  * Sets a charge to the player's specified active item. You must provide the active slot number and
  * the number of charges to set.

package/dist/features/extraConsoleCommands/commands.lua

@@ -18,10 +18,10 @@ local getCardName = ____cards.getCardName
 local ____gridEntity = require("functions.gridEntity")
 local spawnGridEntityWithVariant = ____gridEntity.spawnGridEntityWithVariant
 local ____log = require("functions.log")
-local logAllSeedEffects = ____log.logAllSeedEffects
 local logEntities = ____log.logEntities
 local logGridEntities = ____log.logGridEntities
 local logRoom = ____log.logRoom
+local logSeedEffects = ____log.logSeedEffects
 local logSounds = ____log.logSounds
 local logTemporaryEffects = ____log.logTemporaryEffects
 local ____map = require("functions.map")
@@ -36,9 +36,10 @@ local getPlayers = ____player.getPlayers
 local useActiveItemTemp = ____player.useActiveItemTemp
 local ____playerHealth = require("functions.playerHealth")
 local addPlayerHealthType = ____playerHealth.addPlayerHealthType
+local ____roomData = require("functions.roomData")
+local getRoomData = ____roomData.getRoomData
 local ____rooms = require("functions.rooms")
 local changeRoom = ____rooms.changeRoom
-local getRoomData = ____rooms.getRoomData
 local getRoomGridIndexesForType = ____rooms.getRoomGridIndexesForType
 local gridToPos = ____rooms.gridToPos
 local ____run = require("functions.run")
@@ -77,10 +78,17 @@ function ____exports.goldenBomb(self)
     local player = Isaac.GetPlayer()
     player:AddGoldenBomb()
 end
+function ____exports.goldenHearts(self, params)
+    addHeart(nil, params, HealthType.GOLDEN)
+end
+function ____exports.goldenKey(self)
+    local player = Isaac.GetPlayer()
+    player:AddGoldenKey()
+end
 function ____exports.hearts(self, params)
     addHeart(nil, params, HealthType.RED)
 end
-function ____exports.IAMERROR(self)
+function ____exports.iAmError(self)
     changeRoom(nil, GridRooms.ROOM_ERROR_IDX)
 end
 function ____exports.soulHearts(self, params)
@@ -279,6 +287,9 @@ function ____exports.bloodCharges(self, params)
     local player = Isaac.GetPlayer()
     player:AddBloodCharge(charges)
 end
+function ____exports.bm(self)
+    ____exports.blackMarket(nil)
+end
 function ____exports.bomb(self, params)
     local numBombs = 1
     if params ~= "" then
@@ -314,9 +325,6 @@ end
 function ____exports.bossRush(self)
     changeRoom(nil, GridRooms.ROOM_BOSSRUSH_IDX)
 end
-function ____exports.bm(self)
-    ____exports.blackMarket(nil)
-end
 function ____exports.brokenHearts(self, params)
     addHeart(nil, params, HealthType.BROKEN)
 end
@@ -448,14 +456,14 @@ end
 function ____exports.crawlspace(self)
     spawnTrapdoorOrCrawlspace(nil, false)
 end
-function ____exports.d6(self)
-    local player = Isaac.GetPlayer()
-    useActiveItemTemp(nil, player, CollectibleType.COLLECTIBLE_D6)
-end
 function ____exports.d20(self)
     local player = Isaac.GetPlayer()
     useActiveItemTemp(nil, player, CollectibleType.COLLECTIBLE_D20)
 end
+function ____exports.d6(self)
+    local player = Isaac.GetPlayer()
+    useActiveItemTemp(nil, player, CollectibleType.COLLECTIBLE_D6)
+end
 function ____exports.damage(self)
     v.run.maxDamage = not v.run.maxDamage
     printEnabled(nil, v.run.maxDamage, "debug damage")
@@ -485,7 +493,7 @@ function ____exports.eh(self, params)
     ____exports.eternalHearts(nil, params)
 end
 function ____exports.error(self)
-    ____exports.IAMERROR(nil)
+    ____exports.iAmError(nil)
 end
 function ____exports.fool(self)
     ____exports.startingRoom(nil)
@@ -515,13 +523,6 @@ end
 function ____exports.goldBomb(self)
     ____exports.goldenBomb(nil)
 end
-function ____exports.goldenHearts(self, params)
-    addHeart(nil, params, HealthType.GOLDEN)
-end
-function ____exports.goldenKey(self)
-    local player = Isaac.GetPlayer()
-    player:AddGoldenKey()
-end
 function ____exports.goldHearts(self, params)
     ____exports.goldenHearts(nil, params)
 end
@@ -755,15 +756,15 @@ end
 function ____exports.secret(self)
     warpToRoomType(nil, RoomType.ROOM_SECRET)
 end
-function ____exports.seedsCommand(self)
-    logAllSeedEffects()
-    printConsole(nil, "Logged the seed effects to the \"log.txt\" file.")
-end
 function ____exports.seedStick(self)
     local seeds = game:GetSeeds()
     local startSeedString = seeds:GetStartSeedString()
     Isaac.ExecuteCommand("seed " .. startSeedString)
 end
+function ____exports.seedsCommand(self)
+    logSeedEffects()
+    printConsole(nil, "Logged the seed effects to the \"log.txt\" file.")
+end
 function ____exports.setCharges(self, params)
     if params == "" then
         printConsole(nil, "You must specify a slot number and a charge amount. (Use 0 for the primary slot, 1 for the Schoolbag slot, 2 for the pocket item slot, and 3 for the Dice Bag slot.)")

package/dist/features/extraConsoleCommands/init.lua

@@ -101,12 +101,12 @@ commandFunctionsMap:set("bh", commands.bh)
 commandFunctionsMap:set("blackhearts", commands.blackHearts)
 commandFunctionsMap:set("blackmarket", commands.blackMarket)
 commandFunctionsMap:set("bloodcharges", commands.bloodCharges)
+commandFunctionsMap:set("bm", commands.bm)
 commandFunctionsMap:set("bomb", commands.bomb)
 commandFunctionsMap:set("bombs", commands.bombs)
 commandFunctionsMap:set("bonehearts", commands.boneHearts)
 commandFunctionsMap:set("boss", commands.boss)
 commandFunctionsMap:set("bossrush", commands.bossRush)
-commandFunctionsMap:set("bm", commands.bm)
 commandFunctionsMap:set("brokenhearts", commands.brokenHearts)
 commandFunctionsMap:set("card", commands.card)
 commandFunctionsMap:set("cards", commands.cards)
@@ -118,8 +118,8 @@ commandFunctionsMap:set("cleanbedroom", commands.cleanBedroom)
 commandFunctionsMap:set("coin", commands.coin)
 commandFunctionsMap:set("coins", commands.coins)
 commandFunctionsMap:set("crawlspace", commands.crawlspace)
-commandFunctionsMap:set("d6", commands.d6)
 commandFunctionsMap:set("d20", commands.d20)
+commandFunctionsMap:set("d6", commands.d6)
 commandFunctionsMap:set("damage", commands.damage)
 commandFunctionsMap:set("dd", commands.dd)
 commandFunctionsMap:set("devil", commands.devil)
@@ -135,17 +135,17 @@ commandFunctionsMap:set("fool", commands.fool)
 commandFunctionsMap:set("getposition", commands.getPosition)
 commandFunctionsMap:set("gigabomb", commands.gigaBomb)
 commandFunctionsMap:set("goldbomb", commands.goldBomb)
+commandFunctionsMap:set("goldhearts", commands.goldHearts)
+commandFunctionsMap:set("goldkey", commands.goldKey)
 commandFunctionsMap:set("goldenbomb", commands.goldenBomb)
 commandFunctionsMap:set("goldenhearts", commands.goldenHearts)
 commandFunctionsMap:set("goldenkey", commands.goldenKey)
-commandFunctionsMap:set("goldhearts", commands.goldHearts)
-commandFunctionsMap:set("goldkey", commands.goldKey)
 commandFunctionsMap:set("grid", commands.grid)
 commandFunctionsMap:set("grid2", commands.grid2)
 commandFunctionsMap:set("h", commands.h)
 commandFunctionsMap:set("hearts", commands.hearts)
 commandFunctionsMap:set("hitboxes", commands.hitboxes)
-commandFunctionsMap:set("iamerror", commands.IAMERROR)
+commandFunctionsMap:set("iamerror", commands.iAmError)
 commandFunctionsMap:set("key", commands.key)
 commandFunctionsMap:set("keys", commands.keys)
 commandFunctionsMap:set("library", commands.library)
@@ -173,8 +173,8 @@ commandFunctionsMap:set("rottenhearts", commands.rottenHearts)
 commandFunctionsMap:set("s", commands.s)
 commandFunctionsMap:set("sacrifice", commands.sacrifice)
 commandFunctionsMap:set("secret", commands.secret)
-commandFunctionsMap:set("seeds", commands.seedsCommand)
 commandFunctionsMap:set("seedstick", commands.seedStick)
+commandFunctionsMap:set("seeds", commands.seedsCommand)
 commandFunctionsMap:set("setcharges", commands.setCharges)
 commandFunctionsMap:set("setposition", commands.setPosition)
 commandFunctionsMap:set("sh", commands.sh)

package/dist/features/playerInventory.d.ts

@@ -1,9 +1,17 @@
 /// <reference types="isaac-typescript-definitions" />
 /**
  * Helper function to get all of the collectibles that the player has gotten so far on this run, in
- * order. This does not include active items.
+ * order.
+ *
+ * Note that this does not include active collectibles that have since been dropped for other
+ * collectibles.
+ *
+ * In the case of inventory initialization or the case where the player rerolls their build in the
+ * middle of the run (e.g. with D4), the order of the inventory will not correspond to the order
+ * that the items were actually given to the player. In this case, the inventory will be in the
+ * order of the lowest `CollectibleType` to the highest.
  */
-export declare function getPlayerInventory(player: EntityPlayer): CollectibleType[];
+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

package/dist/features/playerInventory.lua

@@ -1,11 +1,12 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
-local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__Iterator = ____lualib.__TS__Iterator
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local newPlayerInventory, useItemD4, postGameStarted, postItemPickup, v
+local newPlayerInventory, useItemD4, postGameStarted, postItemPickup, addCollectibleToInventory, COLLECTIBLE_ITEM_TYPES, v
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____ModCallbacksCustom = require("enums.ModCallbacksCustom")
@@ -13,7 +14,10 @@ local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
 local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
 local ____array = require("functions.array")
+local arrayRemoveInPlace = ____array.arrayRemoveInPlace
 local copyArray = ____array.copyArray
+local ____collectibles = require("functions.collectibles")
+local isActiveCollectible = ____collectibles.isActiveCollectible
 local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
 local ____player = require("functions.player")
@@ -53,28 +57,62 @@ function postGameStarted(self)
     end
 end
 function postItemPickup(self, player, pickingUpItem)
-    if pickingUpItem.itemType == ItemType.ITEM_PASSIVE or pickingUpItem.itemType == ItemType.ITEM_FAMILIAR then
-        local playerIndex = getPlayerIndex(nil, player)
-        local inventory = v.run.playersInventory:getAndSetDefault(playerIndex, player)
-        __TS__ArrayPush(inventory, pickingUpItem.subType)
+    if not COLLECTIBLE_ITEM_TYPES:has(pickingUpItem.itemType) 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)
+    __TS__ArrayPush(inventory, collectibleType)
+    if not isActiveCollectible(nil, collectibleType) then
+        return
+    end
+    local activeCollectibleTypes = v.run.playersActiveCollectibleTypes:getAndSetDefault(playerIndex)
+    __TS__ArrayPush(activeCollectibleTypes, 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
 local FEATURE_NAME = "player inventory tracker"
-v = {run = {playersInventory = __TS__New(
-    DefaultMap,
-    function(____, _key, player) return newPlayerInventory(nil, player) end
-)}}
+COLLECTIBLE_ITEM_TYPES = __TS__New(Set, {ItemType.ITEM_PASSIVE, ItemType.ITEM_ACTIVE, ItemType.ITEM_FAMILIAR})
+v = {run = {
+    playersInventory = __TS__New(
+        DefaultMap,
+        function(____, _key, player) return newPlayerInventory(nil, player) end
+    ),
+    playersActiveCollectibleTypes = __TS__New(
+        DefaultMap,
+        function() return {} end
+    )
+}}
 function ____exports.playerInventoryInit(self, mod)
     saveDataManager(nil, "playerInventory", v)
     mod:AddCallback(ModCallbacks.MC_USE_ITEM, useItemD4, CollectibleType.COLLECTIBLE_D4)
     mod:AddCallback(ModCallbacks.MC_POST_GAME_STARTED, postGameStarted)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_ITEM_PICKUP, postItemPickup)
 end
-function ____exports.getPlayerInventory(self, player)
+function ____exports.getPlayerInventory(self, player, includeActiveCollectibles)
+    if includeActiveCollectibles == nil then
+        includeActiveCollectibles = true
+    end
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     local playerIndex = getPlayerIndex(nil, player)
     local inventory = v.run.playersInventory:getAndSetDefault(playerIndex, player)
-    return copyArray(nil, inventory)
+    local copiedInventory = copyArray(nil, inventory)
+    if includeActiveCollectibles then
+        return copiedInventory
+    end
+    return __TS__ArrayFilter(
+        copiedInventory,
+        function(____, collectibleType) return not isActiveCollectible(nil, collectibleType) end
+    )
 end
 function ____exports.addCollectible(self, player, collectibleType, charge, firstTimePickingUp, activeSlot, varData)
     player:AddCollectible(
@@ -84,8 +122,6 @@ function ____exports.addCollectible(self, player, collectibleType, charge, first
         activeSlot,
         varData
     )
-    local playerIndex = getPlayerIndex(nil, player)
-    local inventory = v.run.playersInventory:getAndSetDefault(playerIndex, player)
-    __TS__ArrayPush(inventory, collectibleType)
+    addCollectibleToInventory(nil, player, collectibleType)
 end
 return ____exports

package/dist/features/saveDataManager/constants.d.ts

@@ -1,3 +1,3 @@
-export declare const SAVE_DATA_MANAGER_FEATURE_NAME = "save data manager";
 /** Set this to true to enable more verbosity in the save data manger. */
 export declare const SAVE_DATA_MANAGER_DEBUG = false;
+export declare const SAVE_DATA_MANAGER_FEATURE_NAME = "save data manager";

package/dist/features/saveDataManager/constants.lua

@@ -1,5 +1,5 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-____exports.SAVE_DATA_MANAGER_FEATURE_NAME = "save data manager"
 ____exports.SAVE_DATA_MANAGER_DEBUG = false
+____exports.SAVE_DATA_MANAGER_FEATURE_NAME = "save data manager"
 return ____exports

package/dist/features/saveDataManager/exports.d.ts

@@ -76,12 +76,6 @@ import { SaveData } from "../../types/private/SaveData";
  * variables on run/level/room, but not clutter the the "save#.dat" file with unnecessary keys.
  */
 export declare function saveDataManager(key: string, v: SaveData, conditionalFunc?: () => boolean): void;
-/**
- * The save data manager will automatically save variables to disk at the appropriate times (i.e.
- * when the run is exited). Use this function to explicitly force the save data manager to write all
- * of its variables to disk immediately.
- */
-export declare function saveDataManagerSave(): void;
 /**
  * The save data manager will automatically load variables from disk at the appropriate times (i.e.
  * when a new run is started). Use this function to explicitly force the save data manager to load
@@ -90,6 +84,12 @@ export declare function saveDataManagerSave(): void;
  * Note that doing this will overwrite current data, which can potentially result in lost state.
  */
 export declare function saveDataManagerLoad(): void;
+/**
+ * The save data manager will automatically save variables to disk at the appropriate times (i.e.
+ * when the run is exited). Use this function to explicitly force the save data manager to write all
+ * of its variables to disk immediately.
+ */
+export declare function saveDataManagerSave(): void;
 /**
  * Sets the global variable of "g" equal to all of the save data variables for this mod.
  * Sets the global variable of "gd" equal to all of the save data default variables for this mod.

package/dist/features/saveDataManager/exports.lua

@@ -40,14 +40,14 @@ function ____exports.saveDataManager(self, key, v, conditionalFunc)
         saveDataConditionalFuncMap:set(key, conditionalFunc)
     end
 end
-function ____exports.saveDataManagerSave(self)
-    errorIfFeaturesNotInitialized(nil, SAVE_DATA_MANAGER_FEATURE_NAME)
-    forceSaveDataManagerSave(nil)
-end
 function ____exports.saveDataManagerLoad(self)
     errorIfFeaturesNotInitialized(nil, SAVE_DATA_MANAGER_FEATURE_NAME)
     forceSaveDataManagerLoad(nil)
 end
+function ____exports.saveDataManagerSave(self)
+    errorIfFeaturesNotInitialized(nil, SAVE_DATA_MANAGER_FEATURE_NAME)
+    forceSaveDataManagerSave(nil)
+end
 function ____exports.saveDataManagerSetGlobal(self)
     g = saveDataMap
     gd = saveDataDefaultsMap

package/dist/features/saveDataManager/merge.lua

@@ -13,14 +13,16 @@ local SerializationType = ____SerializationType.SerializationType
 local ____array = require("functions.array")
 local isArray = ____array.isArray
 local ____deepCopy = require("functions.deepCopy")
-local addTraversalDescription = ____deepCopy.addTraversalDescription
 local deepCopy = ____deepCopy.deepCopy
-local deserializeVector = ____deepCopy.deserializeVector
 local isSerializedVector = ____deepCopy.isSerializedVector
 local ____log = require("functions.log")
 local log = ____log.log
 local ____table = require("functions.table")
 local clearTable = ____table.clearTable
+local ____utils = require("functions.utils")
+local getTraversalDescription = ____utils.getTraversalDescription
+local ____vector = require("functions.vector")
+local deserializeVector = ____vector.deserializeVector
 local ____constants = require("features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
 function ____exports.merge(self, oldObject, newTable, traversalDescription)
@@ -110,7 +112,7 @@ function mergeTable(self, oldTable, newTable, traversalDescription)
                     oldValue = {}
                     oldTable[key] = oldValue
                 end
-                traversalDescription = addTraversalDescription(nil, key, traversalDescription)
+                traversalDescription = getTraversalDescription(nil, key, traversalDescription)
                 ____exports.merge(nil, oldValue, value, traversalDescription)
             else
                 if SAVE_DATA_MANAGER_DEBUG then