isaacscript-common 43.0.1 → 44.0.0

package/dist/index.rollup.d.ts

@@ -6393,6 +6393,12 @@ export declare function getPlayersWithTrinket(...trinketTypes: TrinketType[]): E
 /** Returns a set of the player's current transformations. */
 export declare function getPlayerTransformations(player: EntityPlayer): Set<PlayerForm>;
 
+/**
+ * Helper function to get all of the trinkets that the player is currently holding. This will not
+ * include any smelted trinkets.
+ */
+export declare function getPlayerTrinkets(player: EntityPlayer): TrinketType[];
+
 /**
  * Use this helper function as a workaround for the `EntityPlayer.GetPocketItem` method not working
  * correctly.
@@ -8329,7 +8335,7 @@ export declare enum ISCFeature {
     PAUSE = 37,
     PERSISTENT_ENTITIES = 38,
     PICKUP_INDEX_CREATION = 39,
-    PLAYER_INVENTORY = 40,
+    PLAYER_COLLECTIBLE_TRACKING = 40,
     PONY_DETECTION = 41,
     PRESS_INPUT = 42,
     PREVENT_CHILD_ENTITIES = 43,
@@ -8394,7 +8400,7 @@ declare interface ISCFeatureToClass {
     [ISCFeature.PAUSE]: Pause;
     [ISCFeature.PERSISTENT_ENTITIES]: PersistentEntities;
     [ISCFeature.PICKUP_INDEX_CREATION]: PickupIndexCreation;
-    [ISCFeature.PLAYER_INVENTORY]: PlayerInventory;
+    [ISCFeature.PLAYER_COLLECTIBLE_TRACKING]: PlayerCollectibleTracking;
     [ISCFeature.PONY_DETECTION]: PonyDetection;
     [ISCFeature.PRESS_INPUT]: PressInput;
     [ISCFeature.PREVENT_CHILD_ENTITIES]: PreventChildEntities;
@@ -14242,6 +14248,45 @@ declare class PlayerCollectibleDetection extends Feature {
     private checkActiveItemsChanged;
 }
 
+declare class PlayerCollectibleTracking extends Feature {
+    private readonly postPlayerCollectibleAdded;
+    private readonly postPlayerCollectibleRemoved;
+    /**
+     * Helper function to get all of the collectible types that the player has gotten so far on this
+     * run, in order.
+     *
+     * In the case of items given on the first frame of the run or the case where the player rerolls
+     * their build in the middle of the run (e.g. with D4), the order of the collectible types will
+     * not correspond to the order that the items were actually given to the player. In this case, the
+     * order will be from the lowest `CollectibleType` to the highest.
+     *
+     * Under the hood, this feature works by tracking the number of collectibles that a player has on
+     * every frame. Thus, in a situation where a collectible was both added and removed to the player
+     * on the same frame, the amount of total collectibles would stay the same, and the collectible
+     * types would not be updated. In vanilla, this situation would never happen, but another mod
+     * might do this for some reason. (With that said, the next time that a collectible is normally
+     * added or removed, it would trigger a re-scan, and the previous changes would be picked up.)
+     *
+     * In order to use this function, you must upgrade your mod with
+     * `ISCFeature.PLAYER_COLLECTIBLE_TRACKING`.
+     *
+     * @param player The player to get the collectible types for.
+     * @param includeActiveCollectibles Optional. If true, will include all active collectibles.
+     *                                Default is true.
+     */
+    getPlayerCollectibleTypes(player: EntityPlayer, includeActiveCollectibles?: boolean): readonly CollectibleType[];
+    /**
+     * Helper function to get the last passive collectible type that the player picked up. In most
+     * cases, this will be the passive that would be removed if the player used Clicker.
+     *
+     * Returns undefined if the player does not have any passive collectibles.
+     *
+     * In order to use this function, you must upgrade your mod with
+     * `ISCFeature.PLAYER_COLLECTIBLE_TRACKING`.
+     */
+    getPlayerLastPassiveCollectibleType(player: EntityPlayer): CollectibleType | undefined;
+}
+
 /**
  * Helper function to remove all of a player's black hearts and add the corresponding amount of soul
  * hearts.
@@ -14297,43 +14342,6 @@ export declare type PlayerIndex = int & {
     readonly __playerIndexBrand: symbol;
 };
 
-declare class PlayerInventory extends Feature {
-    private readonly postCollectibleAdded;
-    private readonly postCollectibleRemoved;
-    /**
-     * Helper function to get all of the collectibles that the player has gotten so far on this run,
-     * in order.
-     *
-     * 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.
-     *
-     * Under the hood, the inventory tracking works by tracking the number of collectibles that a
-     * player has on every frame. Thus, in a situation where a collectible was both added and removed
-     * to the player on the same frame, the amount of total collectibles would stay the same, and the
-     * inventory would not be updated. In vanilla, this situation would never happen, but another mod
-     * might do this for some reason. (With that said, the next time that a collectible is normally
-     * added or removed, it would trigger a re-scan, and the previous changes would be picked up.)
-     *
-     * In order to use this function, you must upgrade your mod with `ISCFeature.PLAYER_INVENTORY`.
-     *
-     * @param player The player to get the inventory for.
-     * @param includeActiveCollectibles Optional. If true, will include all active collectibles.
-     *                                Default is true.
-     */
-    getPlayerInventory(player: EntityPlayer, includeActiveCollectibles?: boolean): CollectibleType[];
-    /**
-     * Helper function to get the last passive collectible that the player picked up. In most cases,
-     * this will be the passive that is removed when the player would use Clicker.
-     *
-     * Returns undefined if the player does not have any passive collectibles.
-     *
-     * In order to use this function, you must upgrade your mod with `ISCFeature.PLAYER_INVENTORY`.
-     */
-    getPlayerLastPassiveCollectible(player: EntityPlayer): CollectibleType | undefined;
-}
-
 declare class PlayerReorderedCallbacks extends Feature {
     v: {
         run: {

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 43.0.1
+isaacscript-common 44.0.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -17477,8 +17477,8 @@ ____exports.ISCFeature.PERSISTENT_ENTITIES = 38
 ____exports.ISCFeature[____exports.ISCFeature.PERSISTENT_ENTITIES] = "PERSISTENT_ENTITIES"
 ____exports.ISCFeature.PICKUP_INDEX_CREATION = 39
 ____exports.ISCFeature[____exports.ISCFeature.PICKUP_INDEX_CREATION] = "PICKUP_INDEX_CREATION"
-____exports.ISCFeature.PLAYER_INVENTORY = 40
-____exports.ISCFeature[____exports.ISCFeature.PLAYER_INVENTORY] = "PLAYER_INVENTORY"
+____exports.ISCFeature.PLAYER_COLLECTIBLE_TRACKING = 40
+____exports.ISCFeature[____exports.ISCFeature.PLAYER_COLLECTIBLE_TRACKING] = "PLAYER_COLLECTIBLE_TRACKING"
 ____exports.ISCFeature.PONY_DETECTION = 41
 ____exports.ISCFeature[____exports.ISCFeature.PONY_DETECTION] = "PONY_DETECTION"
 ____exports.ISCFeature.PRESS_INPUT = 42
@@ -29680,6 +29680,16 @@ function ____exports.getOpenTrinketSlot(self, player)
     end
     error("The player has an unknown number of trinket slots: " .. tostring(maxTrinkets))
 end
+function ____exports.getPlayerTrinkets(self, player)
+    local trinketTypes = {}
+    for ____, trinketSlot in ipairs(TRINKET_SLOT_VALUES) do
+        local trinketType = player:GetTrinket(trinketSlot)
+        if trinketType ~= TrinketType.NULL then
+            trinketTypes[#trinketTypes + 1] = trinketType
+        end
+    end
+    return trinketTypes
+end
 function ____exports.getTrinketDescription(self, trinketType)
     local trinketDescription = TRINKET_DESCRIPTION_MAP:get(trinketType)
     if trinketDescription ~= nil then
@@ -50133,7 +50143,7 @@ function ____exports.character(self, params)
         playerType = match[2]
     else
         if num < FIRST_CHARACTER or num > LAST_VANILLA_CHARACTER then
-            print("Invalid player sub-type: " .. tostring(num))
+            print("Invalid character number: " .. tostring(num))
             return
         end
         playerType = num
@@ -51615,7 +51625,7 @@ end
 __TS__DecorateLegacy({Exported}, PersistentEntities.prototype, "spawnPersistentEntity", true)
 return ____exports
  end,
-["src.classes.features.other.PlayerInventory"] = function(...) 
+["src.classes.features.other.PlayerCollectibleTracking"] = function(...) 
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
@@ -51630,7 +51640,6 @@ local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____array = require("src.functions.array")
 local arrayRemoveInPlace = ____array.arrayRemoveInPlace
-local copyArray = ____array.copyArray
 local ____collectibles = require("src.functions.collectibles")
 local isActiveCollectible = ____collectibles.isActiveCollectible
 local ____playerDataStructures = require("src.functions.playerDataStructures")
@@ -51639,46 +51648,46 @@ local ____DefaultMap = require("src.classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
-local v = {run = {playersInventory = __TS__New(
+local v = {run = {playersCollectibleTypes = __TS__New(
     DefaultMap,
     function() return {} end
 )}}
-____exports.PlayerInventory = __TS__Class()
-local PlayerInventory = ____exports.PlayerInventory
-PlayerInventory.name = "PlayerInventory"
-__TS__ClassExtends(PlayerInventory, Feature)
-function PlayerInventory.prototype.____constructor(self)
+____exports.PlayerCollectibleTracking = __TS__Class()
+local PlayerCollectibleTracking = ____exports.PlayerCollectibleTracking
+PlayerCollectibleTracking.name = "PlayerCollectibleTracking"
+__TS__ClassExtends(PlayerCollectibleTracking, Feature)
+function PlayerCollectibleTracking.prototype.____constructor(self)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.postCollectibleAdded = function(____, player, collectibleType)
-        local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
-        inventory[#inventory + 1] = collectibleType
+    self.postPlayerCollectibleAdded = function(____, player, collectibleType)
+        local collectibleTypes = defaultMapGetPlayer(nil, v.run.playersCollectibleTypes, player, player)
+        collectibleTypes[#collectibleTypes + 1] = collectibleType
     end
-    self.postCollectibleRemoved = function(____, player, collectibleType)
-        local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
-        arrayRemoveInPlace(nil, inventory, collectibleType)
+    self.postPlayerCollectibleRemoved = function(____, player, collectibleType)
+        local collectibleTypes = defaultMapGetPlayer(nil, v.run.playersCollectibleTypes, player, player)
+        arrayRemoveInPlace(nil, collectibleTypes, collectibleType)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postCollectibleAdded}, {ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, self.postCollectibleRemoved}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postPlayerCollectibleAdded}, {ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, self.postPlayerCollectibleRemoved}}
 end
-function PlayerInventory.prototype.getPlayerInventory(self, player, includeActiveCollectibles)
+function PlayerCollectibleTracking.prototype.getPlayerCollectibleTypes(self, player, includeActiveCollectibles)
     if includeActiveCollectibles == nil then
         includeActiveCollectibles = true
     end
-    local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
+    local collectibleTypes = defaultMapGetPlayer(nil, v.run.playersCollectibleTypes, player, player)
     if includeActiveCollectibles then
-        return copyArray(nil, inventory)
+        return collectibleTypes
     end
     return __TS__ArrayFilter(
-        inventory,
+        collectibleTypes,
         function(____, collectibleType) return not isActiveCollectible(nil, collectibleType) end
     )
 end
-__TS__DecorateLegacy({Exported}, PlayerInventory.prototype, "getPlayerInventory", true)
-function PlayerInventory.prototype.getPlayerLastPassiveCollectible(self, player)
-    local inventory = self:getPlayerInventory(player, false)
-    return __TS__ArrayAt(inventory, -1)
+__TS__DecorateLegacy({Exported}, PlayerCollectibleTracking.prototype, "getPlayerCollectibleTypes", true)
+function PlayerCollectibleTracking.prototype.getPlayerLastPassiveCollectibleType(self, player)
+    local collectibleTypes = self:getPlayerCollectibleTypes(player, false)
+    return __TS__ArrayAt(collectibleTypes, -1)
 end
-__TS__DecorateLegacy({Exported}, PlayerInventory.prototype, "getPlayerLastPassiveCollectible", true)
+__TS__DecorateLegacy({Exported}, PlayerCollectibleTracking.prototype, "getPlayerLastPassiveCollectibleType", true)
 return ____exports
  end,
 ["src.classes.features.other.PreventChildEntities"] = function(...) 
@@ -52446,8 +52455,8 @@ local ____PersistentEntities = require("src.classes.features.other.PersistentEnt
 local PersistentEntities = ____PersistentEntities.PersistentEntities
 local ____PickupIndexCreation = require("src.classes.features.other.PickupIndexCreation")
 local PickupIndexCreation = ____PickupIndexCreation.PickupIndexCreation
-local ____PlayerInventory = require("src.classes.features.other.PlayerInventory")
-local PlayerInventory = ____PlayerInventory.PlayerInventory
+local ____PlayerCollectibleTracking = require("src.classes.features.other.PlayerCollectibleTracking")
+local PlayerCollectibleTracking = ____PlayerCollectibleTracking.PlayerCollectibleTracking
 local ____PonyDetection = require("src.classes.features.other.PonyDetection")
 local PonyDetection = ____PonyDetection.PonyDetection
 local ____PressInput = require("src.classes.features.other.PressInput")
@@ -52590,7 +52599,7 @@ function ____exports.getFeatures(self, mod, callbacks)
         [ISCFeature.PAUSE] = pause,
         [ISCFeature.PERSISTENT_ENTITIES] = __TS__New(PersistentEntities, roomHistory),
         [ISCFeature.PICKUP_INDEX_CREATION] = pickupIndexCreation,
-        [ISCFeature.PLAYER_INVENTORY] = __TS__New(PlayerInventory),
+        [ISCFeature.PLAYER_COLLECTIBLE_TRACKING] = __TS__New(PlayerCollectibleTracking),
         [ISCFeature.PONY_DETECTION] = ponyDetection,
         [ISCFeature.PRESS_INPUT] = pressInput,
         [ISCFeature.PREVENT_CHILD_ENTITIES] = __TS__New(PreventChildEntities),

package/dist/src/classes/features/other/PlayerCollectibleTracking.d.ts

@@ -0,0 +1,41 @@
+import type { CollectibleType } from "isaac-typescript-definitions";
+import { Feature } from "../../private/Feature";
+export declare class PlayerCollectibleTracking extends Feature {
+    private readonly postPlayerCollectibleAdded;
+    private readonly postPlayerCollectibleRemoved;
+    /**
+     * Helper function to get all of the collectible types that the player has gotten so far on this
+     * run, in order.
+     *
+     * In the case of items given on the first frame of the run or the case where the player rerolls
+     * their build in the middle of the run (e.g. with D4), the order of the collectible types will
+     * not correspond to the order that the items were actually given to the player. In this case, the
+     * order will be from the lowest `CollectibleType` to the highest.
+     *
+     * Under the hood, this feature works by tracking the number of collectibles that a player has on
+     * every frame. Thus, in a situation where a collectible was both added and removed to the player
+     * on the same frame, the amount of total collectibles would stay the same, and the collectible
+     * types would not be updated. In vanilla, this situation would never happen, but another mod
+     * might do this for some reason. (With that said, the next time that a collectible is normally
+     * added or removed, it would trigger a re-scan, and the previous changes would be picked up.)
+     *
+     * In order to use this function, you must upgrade your mod with
+     * `ISCFeature.PLAYER_COLLECTIBLE_TRACKING`.
+     *
+     * @param player The player to get the collectible types for.
+     * @param includeActiveCollectibles Optional. If true, will include all active collectibles.
+     *                                Default is true.
+     */
+    getPlayerCollectibleTypes(player: EntityPlayer, includeActiveCollectibles?: boolean): readonly CollectibleType[];
+    /**
+     * Helper function to get the last passive collectible type that the player picked up. In most
+     * cases, this will be the passive that would be removed if the player used Clicker.
+     *
+     * Returns undefined if the player does not have any passive collectibles.
+     *
+     * In order to use this function, you must upgrade your mod with
+     * `ISCFeature.PLAYER_COLLECTIBLE_TRACKING`.
+     */
+    getPlayerLastPassiveCollectibleType(player: EntityPlayer): CollectibleType | undefined;
+}
+//# sourceMappingURL=PlayerCollectibleTracking.d.ts.map

package/dist/src/classes/features/other/PlayerCollectibleTracking.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlayerCollectibleTracking.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PlayerCollectibleTracking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAQpE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAYhD,qBAAa,yBAA0B,SAAQ,OAAO;IAqBpD,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAUzC;IAGF,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAU3C;IAEF;;;;;;;;;;;;;;;;;;;;;;OAsBG;IAEI,yBAAyB,CAC9B,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,SAAS,eAAe,EAAE;IAgB7B;;;;;;;;OAQG;IAEI,mCAAmC,CACxC,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS;CAI/B"}

package/dist/src/classes/features/other/PlayerCollectibleTracking.lua

@@ -0,0 +1,63 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
+local __TS__DecorateLegacy = ____lualib.__TS__DecorateLegacy
+local __TS__ArrayAt = ____lualib.__TS__ArrayAt
+local ____exports = {}
+local ____decorators = require("src.decorators")
+local Exported = ____decorators.Exported
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____array = require("src.functions.array")
+local arrayRemoveInPlace = ____array.arrayRemoveInPlace
+local ____collectibles = require("src.functions.collectibles")
+local isActiveCollectible = ____collectibles.isActiveCollectible
+local ____playerDataStructures = require("src.functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local ____DefaultMap = require("src.classes.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
+local ____Feature = require("src.classes.private.Feature")
+local Feature = ____Feature.Feature
+local v = {run = {playersCollectibleTypes = __TS__New(
+    DefaultMap,
+    function() return {} end
+)}}
+____exports.PlayerCollectibleTracking = __TS__Class()
+local PlayerCollectibleTracking = ____exports.PlayerCollectibleTracking
+PlayerCollectibleTracking.name = "PlayerCollectibleTracking"
+__TS__ClassExtends(PlayerCollectibleTracking, Feature)
+function PlayerCollectibleTracking.prototype.____constructor(self)
+    Feature.prototype.____constructor(self)
+    self.v = v
+    self.postPlayerCollectibleAdded = function(____, player, collectibleType)
+        local collectibleTypes = defaultMapGetPlayer(nil, v.run.playersCollectibleTypes, player, player)
+        collectibleTypes[#collectibleTypes + 1] = collectibleType
+    end
+    self.postPlayerCollectibleRemoved = function(____, player, collectibleType)
+        local collectibleTypes = defaultMapGetPlayer(nil, v.run.playersCollectibleTypes, player, player)
+        arrayRemoveInPlace(nil, collectibleTypes, collectibleType)
+    end
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postPlayerCollectibleAdded}, {ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, self.postPlayerCollectibleRemoved}}
+end
+function PlayerCollectibleTracking.prototype.getPlayerCollectibleTypes(self, player, includeActiveCollectibles)
+    if includeActiveCollectibles == nil then
+        includeActiveCollectibles = true
+    end
+    local collectibleTypes = defaultMapGetPlayer(nil, v.run.playersCollectibleTypes, player, player)
+    if includeActiveCollectibles then
+        return collectibleTypes
+    end
+    return __TS__ArrayFilter(
+        collectibleTypes,
+        function(____, collectibleType) return not isActiveCollectible(nil, collectibleType) end
+    )
+end
+__TS__DecorateLegacy({Exported}, PlayerCollectibleTracking.prototype, "getPlayerCollectibleTypes", true)
+function PlayerCollectibleTracking.prototype.getPlayerLastPassiveCollectibleType(self, player)
+    local collectibleTypes = self:getPlayerCollectibleTypes(player, false)
+    return __TS__ArrayAt(collectibleTypes, -1)
+end
+__TS__DecorateLegacy({Exported}, PlayerCollectibleTracking.prototype, "getPlayerLastPassiveCollectibleType", true)
+return ____exports

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

@@ -550,7 +550,7 @@ function ____exports.character(self, params)
         playerType = match[2]
     else
         if num < FIRST_CHARACTER or num > LAST_VANILLA_CHARACTER then
-            print("Invalid player sub-type: " .. tostring(num))
+            print("Invalid character number: " .. tostring(num))
             return
         end
         playerType = num

package/dist/src/enums/ISCFeature.d.ts

@@ -39,7 +39,7 @@ export declare enum ISCFeature {
     PAUSE = 37,
     PERSISTENT_ENTITIES = 38,
     PICKUP_INDEX_CREATION = 39,
-    PLAYER_INVENTORY = 40,
+    PLAYER_COLLECTIBLE_TRACKING = 40,
     PONY_DETECTION = 41,
     PRESS_INPUT = 42,
     PREVENT_CHILD_ENTITIES = 43,

package/dist/src/enums/ISCFeature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ISCFeature.d.ts","sourceRoot":"","sources":["../../../src/enums/ISCFeature.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU;IAEpB,aAAa,IAAA;IACb,iBAAiB,IAAA;IACjB,cAAc,IAAA;IACd,+BAA+B,IAAA;IAC/B,4BAA4B,IAAA;IAC5B,4BAA4B,IAAA;IAC5B,wBAAwB,IAAA;IACxB,qBAAqB,IAAA;IACrB,uBAAuB,IAAA;IACvB,4BAA4B,IAAA;IAC5B,0BAA0B,KAAA;IAC1B,wBAAwB,KAAA;IACxB,qBAAqB,KAAA;IACrB,qBAAqB,KAAA;IAGrB,2BAA2B,KAAA;IAC3B,eAAe,KAAA;IACf,0BAA0B,KAAA;IAC1B,oBAAoB,KAAA;IACpB,iBAAiB,KAAA;IACjB,cAAc,KAAA;IACd,cAAc,KAAA;IACd,aAAa,KAAA;IACb,gBAAgB,KAAA;IAChB,aAAa,KAAA;IACb,gBAAgB,KAAA;IAChB,iBAAiB,KAAA;IACjB,cAAc,KAAA;IACd,mBAAmB,KAAA;IACnB,eAAe,KAAA;IACf,UAAU,KAAA;IACV,gBAAgB,KAAA;IAChB,gBAAgB,KAAA;IAChB,sBAAsB,KAAA;IACtB,mBAAmB,KAAA;IACnB,wBAAwB,KAAA;IACxB,mBAAmB,KAAA;IACnB,cAAc,KAAA;IACd,KAAK,KAAA;IACL,mBAAmB,KAAA;IACnB,qBAAqB,KAAA;IACrB,gBAAgB,KAAA;IAChB,cAAc,KAAA;IACd,WAAW,KAAA;IACX,sBAAsB,KAAA;IACtB,4BAA4B,KAAA;IAC5B,2BAA2B,KAAA;IAC3B,gBAAgB,KAAA;IAChB,YAAY,KAAA;IACZ,eAAe,KAAA;IACf,aAAa,KAAA;IACb,iBAAiB,KAAA;IACjB,sBAAsB,KAAA;IACtB,iBAAiB,KAAA;IACjB,aAAa,KAAA;IACb,YAAY,KAAA;IACZ,uBAAuB,KAAA;CACxB"}
+{"version":3,"file":"ISCFeature.d.ts","sourceRoot":"","sources":["../../../src/enums/ISCFeature.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU;IAEpB,aAAa,IAAA;IACb,iBAAiB,IAAA;IACjB,cAAc,IAAA;IACd,+BAA+B,IAAA;IAC/B,4BAA4B,IAAA;IAC5B,4BAA4B,IAAA;IAC5B,wBAAwB,IAAA;IACxB,qBAAqB,IAAA;IACrB,uBAAuB,IAAA;IACvB,4BAA4B,IAAA;IAC5B,0BAA0B,KAAA;IAC1B,wBAAwB,KAAA;IACxB,qBAAqB,KAAA;IACrB,qBAAqB,KAAA;IAGrB,2BAA2B,KAAA;IAC3B,eAAe,KAAA;IACf,0BAA0B,KAAA;IAC1B,oBAAoB,KAAA;IACpB,iBAAiB,KAAA;IACjB,cAAc,KAAA;IACd,cAAc,KAAA;IACd,aAAa,KAAA;IACb,gBAAgB,KAAA;IAChB,aAAa,KAAA;IACb,gBAAgB,KAAA;IAChB,iBAAiB,KAAA;IACjB,cAAc,KAAA;IACd,mBAAmB,KAAA;IACnB,eAAe,KAAA;IACf,UAAU,KAAA;IACV,gBAAgB,KAAA;IAChB,gBAAgB,KAAA;IAChB,sBAAsB,KAAA;IACtB,mBAAmB,KAAA;IACnB,wBAAwB,KAAA;IACxB,mBAAmB,KAAA;IACnB,cAAc,KAAA;IACd,KAAK,KAAA;IACL,mBAAmB,KAAA;IACnB,qBAAqB,KAAA;IACrB,2BAA2B,KAAA;IAC3B,cAAc,KAAA;IACd,WAAW,KAAA;IACX,sBAAsB,KAAA;IACtB,4BAA4B,KAAA;IAC5B,2BAA2B,KAAA;IAC3B,gBAAgB,KAAA;IAChB,YAAY,KAAA;IACZ,eAAe,KAAA;IACf,aAAa,KAAA;IACb,iBAAiB,KAAA;IACjB,sBAAsB,KAAA;IACtB,iBAAiB,KAAA;IACjB,aAAa,KAAA;IACb,YAAY,KAAA;IACZ,uBAAuB,KAAA;CACxB"}

package/dist/src/enums/ISCFeature.lua

@@ -80,8 +80,8 @@ ____exports.ISCFeature.PERSISTENT_ENTITIES = 38
 ____exports.ISCFeature[____exports.ISCFeature.PERSISTENT_ENTITIES] = "PERSISTENT_ENTITIES"
 ____exports.ISCFeature.PICKUP_INDEX_CREATION = 39
 ____exports.ISCFeature[____exports.ISCFeature.PICKUP_INDEX_CREATION] = "PICKUP_INDEX_CREATION"
-____exports.ISCFeature.PLAYER_INVENTORY = 40
-____exports.ISCFeature[____exports.ISCFeature.PLAYER_INVENTORY] = "PLAYER_INVENTORY"
+____exports.ISCFeature.PLAYER_COLLECTIBLE_TRACKING = 40
+____exports.ISCFeature[____exports.ISCFeature.PLAYER_COLLECTIBLE_TRACKING] = "PLAYER_COLLECTIBLE_TRACKING"
 ____exports.ISCFeature.PONY_DETECTION = 41
 ____exports.ISCFeature[____exports.ISCFeature.PONY_DETECTION] = "PONY_DETECTION"
 ____exports.ISCFeature.PRESS_INPUT = 42

package/dist/src/features.d.ts

@@ -39,7 +39,7 @@ import { NoSirenSteal } from "./classes/features/other/NoSirenSteal";
 import { Pause } from "./classes/features/other/Pause";
 import { PersistentEntities } from "./classes/features/other/PersistentEntities";
 import { PickupIndexCreation } from "./classes/features/other/PickupIndexCreation";
-import { PlayerInventory } from "./classes/features/other/PlayerInventory";
+import { PlayerCollectibleTracking } from "./classes/features/other/PlayerCollectibleTracking";
 import { PonyDetection } from "./classes/features/other/PonyDetection";
 import { PressInput } from "./classes/features/other/PressInput";
 import { PreventChildEntities } from "./classes/features/other/PreventChildEntities";
@@ -98,7 +98,7 @@ export interface ISCFeatureToClass {
     [ISCFeature.PAUSE]: Pause;
     [ISCFeature.PERSISTENT_ENTITIES]: PersistentEntities;
     [ISCFeature.PICKUP_INDEX_CREATION]: PickupIndexCreation;
-    [ISCFeature.PLAYER_INVENTORY]: PlayerInventory;
+    [ISCFeature.PLAYER_COLLECTIBLE_TRACKING]: PlayerCollectibleTracking;
     [ISCFeature.PONY_DETECTION]: PonyDetection;
     [ISCFeature.PRESS_INPUT]: PressInput;
     [ISCFeature.PREVENT_CHILD_ENTITIES]: PreventChildEntities;
@@ -156,7 +156,7 @@ export declare function getFeatures(mod: ModUpgradedInterface, callbacks: ModCal
     readonly 37: Pause;
     readonly 38: PersistentEntities;
     readonly 39: PickupIndexCreation;
-    readonly 40: PlayerInventory;
+    readonly 40: PlayerCollectibleTracking;
     readonly 41: PonyDetection;
     readonly 42: PressInput;
     readonly 43: PreventChildEntities;

package/dist/src/features.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../../src/features.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../../src/features.ts"],"names":[],"mappings":"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"}

package/dist/src/features.lua

@@ -81,8 +81,8 @@ local ____PersistentEntities = require("src.classes.features.other.PersistentEnt
 local PersistentEntities = ____PersistentEntities.PersistentEntities
 local ____PickupIndexCreation = require("src.classes.features.other.PickupIndexCreation")
 local PickupIndexCreation = ____PickupIndexCreation.PickupIndexCreation
-local ____PlayerInventory = require("src.classes.features.other.PlayerInventory")
-local PlayerInventory = ____PlayerInventory.PlayerInventory
+local ____PlayerCollectibleTracking = require("src.classes.features.other.PlayerCollectibleTracking")
+local PlayerCollectibleTracking = ____PlayerCollectibleTracking.PlayerCollectibleTracking
 local ____PonyDetection = require("src.classes.features.other.PonyDetection")
 local PonyDetection = ____PonyDetection.PonyDetection
 local ____PressInput = require("src.classes.features.other.PressInput")
@@ -225,7 +225,7 @@ function ____exports.getFeatures(self, mod, callbacks)
         [ISCFeature.PAUSE] = pause,
         [ISCFeature.PERSISTENT_ENTITIES] = __TS__New(PersistentEntities, roomHistory),
         [ISCFeature.PICKUP_INDEX_CREATION] = pickupIndexCreation,
-        [ISCFeature.PLAYER_INVENTORY] = __TS__New(PlayerInventory),
+        [ISCFeature.PLAYER_COLLECTIBLE_TRACKING] = __TS__New(PlayerCollectibleTracking),
         [ISCFeature.PONY_DETECTION] = ponyDetection,
         [ISCFeature.PRESS_INPUT] = pressInput,
         [ISCFeature.PREVENT_CHILD_ENTITIES] = __TS__New(PreventChildEntities),

package/dist/src/functions/trinkets.d.ts

@@ -44,6 +44,11 @@ export declare function getMysteriousPaperEffectForFrame(player: EntityPlayer, f
  * ```
  */
 export declare function getOpenTrinketSlot(player: EntityPlayer): int | undefined;
+/**
+ * Helper function to get all of the trinkets that the player is currently holding. This will not
+ * include any smelted trinkets.
+ */
+export declare function getPlayerTrinkets(player: EntityPlayer): TrinketType[];
 /**
  * Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
  * trinket type was not valid.

package/dist/src/functions/trinkets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trinkets.d.ts","sourceRoot":"","sources":["../../../src/functions/trinkets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AA+BvE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAE1E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,GAAG,GACf,qBAAqB,GAAG,SAAS,CAUnC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,GAAG,SAAS,CAkBxE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CActE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAOtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAc/D;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAO3D;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAOhE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAEtE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAYjE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAiBN;AAED,6FAA6F;AAC7F,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,OAAO,CAOT"}
+{"version":3,"file":"trinkets.d.ts","sourceRoot":"","sources":["../../../src/functions/trinkets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AA+BvE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAE1E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,GAAG,GACf,qBAAqB,GAAG,SAAS,CAUnC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,GAAG,SAAS,CAkBxE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,WAAW,EAAE,CAWrE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CActE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAOtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAc/D;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAO3D;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAOhE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAEtE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAYjE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAiBN;AAED,6FAA6F;AAC7F,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,OAAO,CAOT"}

package/dist/src/functions/trinkets.lua

@@ -109,6 +109,18 @@ function ____exports.getOpenTrinketSlot(self, player)
     end
     error("The player has an unknown number of trinket slots: " .. tostring(maxTrinkets))
 end
+--- Helper function to get all of the trinkets that the player is currently holding. This will not
+-- include any smelted trinkets.
+function ____exports.getPlayerTrinkets(self, player)
+    local trinketTypes = {}
+    for ____, trinketSlot in ipairs(TRINKET_SLOT_VALUES) do
+        local trinketType = player:GetTrinket(trinketSlot)
+        if trinketType ~= TrinketType.NULL then
+            trinketTypes[#trinketTypes + 1] = trinketType
+        end
+    end
+    return trinketTypes
+end
 --- Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
 -- trinket type was not valid.
 -- 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "43.0.1",
+  "version": "44.0.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/features/other/PlayerCollectibleTracking.ts

@@ -0,0 +1,126 @@
+import type { CollectibleType } from "isaac-typescript-definitions";
+import { Exported } from "../../../decorators";
+import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
+import { arrayRemoveInPlace } from "../../../functions/array";
+import { isActiveCollectible } from "../../../functions/collectibles";
+import { defaultMapGetPlayer } from "../../../functions/playerDataStructures";
+import type { PlayerIndex } from "../../../types/PlayerIndex";
+import { DefaultMap } from "../../DefaultMap";
+import { Feature } from "../../private/Feature";
+
+const v = {
+  run: {
+    playersCollectibleTypes: new DefaultMap<
+      PlayerIndex,
+      CollectibleType[],
+      [player: EntityPlayer]
+    >(() => []),
+  },
+};
+
+export class PlayerCollectibleTracking extends Feature {
+  /** @internal */
+  public override v = v;
+
+  /** @internal */
+  constructor() {
+    super();
+
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED,
+        this.postPlayerCollectibleAdded,
+      ],
+      [
+        ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED,
+        this.postPlayerCollectibleRemoved,
+      ],
+    ];
+  }
+
+  // ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED
+  private readonly postPlayerCollectibleAdded = (
+    player: EntityPlayer,
+    collectibleType: CollectibleType,
+  ) => {
+    const collectibleTypes = defaultMapGetPlayer(
+      v.run.playersCollectibleTypes,
+      player,
+      player,
+    );
+    collectibleTypes.push(collectibleType);
+  };
+
+  // ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED
+  private readonly postPlayerCollectibleRemoved = (
+    player: EntityPlayer,
+    collectibleType: CollectibleType,
+  ) => {
+    const collectibleTypes = defaultMapGetPlayer(
+      v.run.playersCollectibleTypes,
+      player,
+      player,
+    );
+    arrayRemoveInPlace(collectibleTypes, collectibleType);
+  };
+
+  /**
+   * Helper function to get all of the collectible types that the player has gotten so far on this
+   * run, in order.
+   *
+   * In the case of items given on the first frame of the run or the case where the player rerolls
+   * their build in the middle of the run (e.g. with D4), the order of the collectible types will
+   * not correspond to the order that the items were actually given to the player. In this case, the
+   * order will be from the lowest `CollectibleType` to the highest.
+   *
+   * Under the hood, this feature works by tracking the number of collectibles that a player has on
+   * every frame. Thus, in a situation where a collectible was both added and removed to the player
+   * on the same frame, the amount of total collectibles would stay the same, and the collectible
+   * types would not be updated. In vanilla, this situation would never happen, but another mod
+   * might do this for some reason. (With that said, the next time that a collectible is normally
+   * added or removed, it would trigger a re-scan, and the previous changes would be picked up.)
+   *
+   * In order to use this function, you must upgrade your mod with
+   * `ISCFeature.PLAYER_COLLECTIBLE_TRACKING`.
+   *
+   * @param player The player to get the collectible types for.
+   * @param includeActiveCollectibles Optional. If true, will include all active collectibles.
+   *                                Default is true.
+   */
+  @Exported
+  public getPlayerCollectibleTypes(
+    player: EntityPlayer,
+    includeActiveCollectibles = true,
+  ): readonly CollectibleType[] {
+    const collectibleTypes = defaultMapGetPlayer(
+      v.run.playersCollectibleTypes,
+      player,
+      player,
+    );
+
+    if (includeActiveCollectibles) {
+      return collectibleTypes;
+    }
+
+    return collectibleTypes.filter(
+      (collectibleType) => !isActiveCollectible(collectibleType),
+    );
+  }
+
+  /**
+   * Helper function to get the last passive collectible type that the player picked up. In most
+   * cases, this will be the passive that would be removed if the player used Clicker.
+   *
+   * Returns undefined if the player does not have any passive collectibles.
+   *
+   * In order to use this function, you must upgrade your mod with
+   * `ISCFeature.PLAYER_COLLECTIBLE_TRACKING`.
+   */
+  @Exported
+  public getPlayerLastPassiveCollectibleType(
+    player: EntityPlayer,
+  ): CollectibleType | undefined {
+    const collectibleTypes = this.getPlayerCollectibleTypes(player, false);
+    return collectibleTypes.at(-1);
+  }
+}

package/src/classes/features/other/extraConsoleCommands/commands.ts

@@ -446,7 +446,7 @@ export function character(params: string): void {
     playerType = match[1];
   } else {
     if (num < FIRST_CHARACTER || num > LAST_VANILLA_CHARACTER) {
-      print(`Invalid player sub-type: ${num}`);
+      print(`Invalid character number: ${num}`);
       return;
     }
 

package/src/enums/ISCFeature.ts

@@ -42,7 +42,7 @@ export enum ISCFeature {
   PAUSE,
   PERSISTENT_ENTITIES,
   PICKUP_INDEX_CREATION,
-  PLAYER_INVENTORY,
+  PLAYER_COLLECTIBLE_TRACKING,
   PONY_DETECTION,
   PRESS_INPUT,
   PREVENT_CHILD_ENTITIES,

package/src/features.ts

@@ -39,7 +39,7 @@ import { NoSirenSteal } from "./classes/features/other/NoSirenSteal";
 import { Pause } from "./classes/features/other/Pause";
 import { PersistentEntities } from "./classes/features/other/PersistentEntities";
 import { PickupIndexCreation } from "./classes/features/other/PickupIndexCreation";
-import { PlayerInventory } from "./classes/features/other/PlayerInventory";
+import { PlayerCollectibleTracking } from "./classes/features/other/PlayerCollectibleTracking";
 import { PonyDetection } from "./classes/features/other/PonyDetection";
 import { PressInput } from "./classes/features/other/PressInput";
 import { PreventChildEntities } from "./classes/features/other/PreventChildEntities";
@@ -105,7 +105,7 @@ export interface ISCFeatureToClass {
   [ISCFeature.PAUSE]: Pause;
   [ISCFeature.PERSISTENT_ENTITIES]: PersistentEntities;
   [ISCFeature.PICKUP_INDEX_CREATION]: PickupIndexCreation;
-  [ISCFeature.PLAYER_INVENTORY]: PlayerInventory;
+  [ISCFeature.PLAYER_COLLECTIBLE_TRACKING]: PlayerCollectibleTracking;
   [ISCFeature.PONY_DETECTION]: PonyDetection;
   [ISCFeature.PRESS_INPUT]: PressInput;
   [ISCFeature.PREVENT_CHILD_ENTITIES]: PreventChildEntities;
@@ -287,7 +287,7 @@ export function getFeatures(
     [ISCFeature.PAUSE]: pause,
     [ISCFeature.PERSISTENT_ENTITIES]: new PersistentEntities(roomHistory),
     [ISCFeature.PICKUP_INDEX_CREATION]: pickupIndexCreation,
-    [ISCFeature.PLAYER_INVENTORY]: new PlayerInventory(),
+    [ISCFeature.PLAYER_COLLECTIBLE_TRACKING]: new PlayerCollectibleTracking(),
     [ISCFeature.PONY_DETECTION]: ponyDetection,
     [ISCFeature.PRESS_INPUT]: pressInput,
     [ISCFeature.PREVENT_CHILD_ENTITIES]: new PreventChildEntities(),

package/src/functions/trinkets.ts

@@ -118,6 +118,23 @@ export function getOpenTrinketSlot(player: EntityPlayer): int | undefined {
   error(`The player has an unknown number of trinket slots: ${maxTrinkets}`);
 }
 
+/**
+ * Helper function to get all of the trinkets that the player is currently holding. This will not
+ * include any smelted trinkets.
+ */
+export function getPlayerTrinkets(player: EntityPlayer): TrinketType[] {
+  const trinketTypes: TrinketType[] = [];
+
+  for (const trinketSlot of TRINKET_SLOT_VALUES) {
+    const trinketType = player.GetTrinket(trinketSlot);
+    if (trinketType !== TrinketType.NULL) {
+      trinketTypes.push(trinketType);
+    }
+  }
+
+  return trinketTypes;
+}
+
 /**
  * Helper function to get the in-game description for a trinket. Returns "Unknown" if the provided
  * trinket type was not valid.

package/dist/src/classes/features/other/PlayerInventory.d.ts

@@ -1,39 +0,0 @@
-import type { CollectibleType } from "isaac-typescript-definitions";
-import { Feature } from "../../private/Feature";
-export declare class PlayerInventory extends Feature {
-    private readonly postCollectibleAdded;
-    private readonly postCollectibleRemoved;
-    /**
-     * Helper function to get all of the collectibles that the player has gotten so far on this run,
-     * in order.
-     *
-     * 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.
-     *
-     * Under the hood, the inventory tracking works by tracking the number of collectibles that a
-     * player has on every frame. Thus, in a situation where a collectible was both added and removed
-     * to the player on the same frame, the amount of total collectibles would stay the same, and the
-     * inventory would not be updated. In vanilla, this situation would never happen, but another mod
-     * might do this for some reason. (With that said, the next time that a collectible is normally
-     * added or removed, it would trigger a re-scan, and the previous changes would be picked up.)
-     *
-     * In order to use this function, you must upgrade your mod with `ISCFeature.PLAYER_INVENTORY`.
-     *
-     * @param player The player to get the inventory for.
-     * @param includeActiveCollectibles Optional. If true, will include all active collectibles.
-     *                                Default is true.
-     */
-    getPlayerInventory(player: EntityPlayer, includeActiveCollectibles?: boolean): CollectibleType[];
-    /**
-     * Helper function to get the last passive collectible that the player picked up. In most cases,
-     * this will be the passive that is removed when the player would use Clicker.
-     *
-     * Returns undefined if the player does not have any passive collectibles.
-     *
-     * In order to use this function, you must upgrade your mod with `ISCFeature.PLAYER_INVENTORY`.
-     */
-    getPlayerLastPassiveCollectible(player: EntityPlayer): CollectibleType | undefined;
-}
-//# sourceMappingURL=PlayerInventory.d.ts.map

package/dist/src/classes/features/other/PlayerInventory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PlayerInventory.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PlayerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAQpE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAYhD,qBAAa,eAAgB,SAAQ,OAAO;IAqB1C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAUnC;IAGF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAUrC;IAEF;;;;;;;;;;;;;;;;;;;;;OAqBG;IAEI,kBAAkB,CACvB,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE;IAgBpB;;;;;;;OAOG;IAEI,+BAA+B,CACpC,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS;CAI/B"}

package/dist/src/classes/features/other/PlayerInventory.lua

@@ -1,64 +0,0 @@
-local ____lualib = require("lualib_bundle")
-local __TS__New = ____lualib.__TS__New
-local __TS__Class = ____lualib.__TS__Class
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
-local __TS__DecorateLegacy = ____lualib.__TS__DecorateLegacy
-local __TS__ArrayAt = ____lualib.__TS__ArrayAt
-local ____exports = {}
-local ____decorators = require("src.decorators")
-local Exported = ____decorators.Exported
-local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
-local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
-local ____array = require("src.functions.array")
-local arrayRemoveInPlace = ____array.arrayRemoveInPlace
-local copyArray = ____array.copyArray
-local ____collectibles = require("src.functions.collectibles")
-local isActiveCollectible = ____collectibles.isActiveCollectible
-local ____playerDataStructures = require("src.functions.playerDataStructures")
-local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
-local ____DefaultMap = require("src.classes.DefaultMap")
-local DefaultMap = ____DefaultMap.DefaultMap
-local ____Feature = require("src.classes.private.Feature")
-local Feature = ____Feature.Feature
-local v = {run = {playersInventory = __TS__New(
-    DefaultMap,
-    function() return {} end
-)}}
-____exports.PlayerInventory = __TS__Class()
-local PlayerInventory = ____exports.PlayerInventory
-PlayerInventory.name = "PlayerInventory"
-__TS__ClassExtends(PlayerInventory, Feature)
-function PlayerInventory.prototype.____constructor(self)
-    Feature.prototype.____constructor(self)
-    self.v = v
-    self.postCollectibleAdded = function(____, player, collectibleType)
-        local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
-        inventory[#inventory + 1] = collectibleType
-    end
-    self.postCollectibleRemoved = function(____, player, collectibleType)
-        local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
-        arrayRemoveInPlace(nil, inventory, collectibleType)
-    end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postCollectibleAdded}, {ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, self.postCollectibleRemoved}}
-end
-function PlayerInventory.prototype.getPlayerInventory(self, player, includeActiveCollectibles)
-    if includeActiveCollectibles == nil then
-        includeActiveCollectibles = true
-    end
-    local inventory = defaultMapGetPlayer(nil, v.run.playersInventory, player, player)
-    if includeActiveCollectibles then
-        return copyArray(nil, inventory)
-    end
-    return __TS__ArrayFilter(
-        inventory,
-        function(____, collectibleType) return not isActiveCollectible(nil, collectibleType) end
-    )
-end
-__TS__DecorateLegacy({Exported}, PlayerInventory.prototype, "getPlayerInventory", true)
-function PlayerInventory.prototype.getPlayerLastPassiveCollectible(self, player)
-    local inventory = self:getPlayerInventory(player, false)
-    return __TS__ArrayAt(inventory, -1)
-end
-__TS__DecorateLegacy({Exported}, PlayerInventory.prototype, "getPlayerLastPassiveCollectible", true)
-return ____exports

package/src/classes/features/other/PlayerInventory.ts

@@ -1,124 +0,0 @@
-import type { CollectibleType } from "isaac-typescript-definitions";
-import { Exported } from "../../../decorators";
-import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
-import { arrayRemoveInPlace, copyArray } from "../../../functions/array";
-import { isActiveCollectible } from "../../../functions/collectibles";
-import { defaultMapGetPlayer } from "../../../functions/playerDataStructures";
-import type { PlayerIndex } from "../../../types/PlayerIndex";
-import { DefaultMap } from "../../DefaultMap";
-import { Feature } from "../../private/Feature";
-
-const v = {
-  run: {
-    playersInventory: new DefaultMap<
-      PlayerIndex,
-      CollectibleType[],
-      [player: EntityPlayer]
-    >(() => []),
-  },
-};
-
-export class PlayerInventory extends Feature {
-  /** @internal */
-  public override v = v;
-
-  /** @internal */
-  constructor() {
-    super();
-
-    this.customCallbacksUsed = [
-      [
-        ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED,
-        this.postCollectibleAdded,
-      ],
-      [
-        ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED,
-        this.postCollectibleRemoved,
-      ],
-    ];
-  }
-
-  // ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED
-  private readonly postCollectibleAdded = (
-    player: EntityPlayer,
-    collectibleType: CollectibleType,
-  ) => {
-    const inventory = defaultMapGetPlayer(
-      v.run.playersInventory,
-      player,
-      player,
-    );
-    inventory.push(collectibleType);
-  };
-
-  // ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED
-  private readonly postCollectibleRemoved = (
-    player: EntityPlayer,
-    collectibleType: CollectibleType,
-  ) => {
-    const inventory = defaultMapGetPlayer(
-      v.run.playersInventory,
-      player,
-      player,
-    );
-    arrayRemoveInPlace(inventory, collectibleType);
-  };
-
-  /**
-   * Helper function to get all of the collectibles that the player has gotten so far on this run,
-   * in order.
-   *
-   * 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.
-   *
-   * Under the hood, the inventory tracking works by tracking the number of collectibles that a
-   * player has on every frame. Thus, in a situation where a collectible was both added and removed
-   * to the player on the same frame, the amount of total collectibles would stay the same, and the
-   * inventory would not be updated. In vanilla, this situation would never happen, but another mod
-   * might do this for some reason. (With that said, the next time that a collectible is normally
-   * added or removed, it would trigger a re-scan, and the previous changes would be picked up.)
-   *
-   * In order to use this function, you must upgrade your mod with `ISCFeature.PLAYER_INVENTORY`.
-   *
-   * @param player The player to get the inventory for.
-   * @param includeActiveCollectibles Optional. If true, will include all active collectibles.
-   *                                Default is true.
-   */
-  @Exported
-  public getPlayerInventory(
-    player: EntityPlayer,
-    includeActiveCollectibles = true,
-  ): CollectibleType[] {
-    const inventory = defaultMapGetPlayer(
-      v.run.playersInventory,
-      player,
-      player,
-    );
-
-    if (includeActiveCollectibles) {
-      return copyArray(inventory);
-    }
-
-    return inventory.filter(
-      (collectibleType) => !isActiveCollectible(collectibleType),
-    );
-  }
-
-  /**
-   * Helper function to get the last passive collectible that the player picked up. In most cases,
-   * this will be the passive that is removed when the player would use Clicker.
-   *
-   * Returns undefined if the player does not have any passive collectibles.
-   *
-   * In order to use this function, you must upgrade your mod with `ISCFeature.PLAYER_INVENTORY`.
-   */
-  @Exported
-  public getPlayerLastPassiveCollectible(
-    player: EntityPlayer,
-  ): CollectibleType | undefined {
-    const inventory = this.getPlayerInventory(player, false);
-    return inventory.at(-1);
-  }
-}