isaacscript-common 9.0.0 → 9.0.1

package/dist/callbacks/postPlayerCollectible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postPlayerCollectible.d.ts","sourceRoot":"","sources":["../../src/callbacks/postPlayerCollectible.ts"],"names":[],"mappings":";AAkCA,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAIjE"}
+{"version":3,"file":"postPlayerCollectible.d.ts","sourceRoot":"","sources":["../../src/callbacks/postPlayerCollectible.ts"],"names":[],"mappings":";AA4CA,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAIjE"}

package/dist/callbacks/postPlayerCollectible.lua

@@ -1,19 +1,27 @@
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
+local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
 local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
+local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArraySort = ____lualib.__TS__ArraySort
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdate, collectibleCountChanged, v
+local hasSubscriptions, postPEffectUpdate, collectibleCountChanged, checkActiveItemsChanged, activeItemsChanged, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
+local ____array = require("functions.array")
+local arrayEquals = ____array.arrayEquals
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 local ____playerDataStructures = require("functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
@@ -43,30 +51,37 @@ function postPEffectUpdate(self, player)
     end
     local difference = newCollectibleCount - oldCollectibleCount
     if difference > 0 then
-        collectibleCountChanged(nil, player, difference, true)
+        collectibleCountChanged(nil, player, difference)
     elseif difference < 0 then
-        collectibleCountChanged(nil, player, difference * -1, false)
+        collectibleCountChanged(nil, player, difference * -1)
+    elseif difference == 0 then
+        checkActiveItemsChanged(nil, player)
     end
 end
-function collectibleCountChanged(self, player, numCollectiblesChanged, increased)
+function collectibleCountChanged(self, player, numCollectiblesChanged)
     local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player)
     local newCollectibleMap = getPlayerCollectibleMap(nil, player)
     mapSetPlayer(nil, v.run.playersCollectibleMap, player, newCollectibleMap)
+    local ____Set_1 = Set
     local ____array_0 = __TS__SparseArrayNew(__TS__Spread(oldCollectibleMap:keys()))
     __TS__SparseArrayPush(
         ____array_0,
         __TS__Spread(newCollectibleMap:keys())
     )
-    local collectibleTypes = {__TS__SparseArraySpread(____array_0)}
-    __TS__ArraySort(collectibleTypes)
+    local collectibleTypeSet = __TS__New(
+        ____Set_1,
+        {__TS__SparseArraySpread(____array_0)}
+    )
     local numFired = 0
-    for ____, collectibleType in ipairs(collectibleTypes) do
+    for ____, collectibleType in __TS__Iterator(collectibleTypeSet:values()) do
         local oldNum = oldCollectibleMap:get(collectibleType) or 0
         local newNum = newCollectibleMap:get(collectibleType) or 0
-        local difference = math.abs(newNum - oldNum)
+        local difference = newNum - oldNum
+        local increased = difference > 0
+        local absoluteDifference = math.abs(difference)
         ____repeat(
             nil,
-            difference,
+            absoluteDifference,
             function()
                 if increased then
                     postPlayerCollectibleAddedFire(nil, player, collectibleType)
@@ -81,11 +96,65 @@ function collectibleCountChanged(self, player, numCollectiblesChanged, increased
         end
     end
 end
+function checkActiveItemsChanged(self, player)
+    local activeItemMap = defaultMapGetPlayer(nil, v.run.playersActiveItemMap, player)
+    local oldCollectibleTypes = {}
+    local newCollectibleTypes = {}
+    for ____, activeSlot in ipairs(getEnumValues(nil, ActiveSlot)) do
+        local oldCollectibleType = activeItemMap:get(activeSlot) or CollectibleType.NULL
+        local newCollectibleType = player:GetActiveItem(activeSlot)
+        activeItemMap:set(activeSlot, newCollectibleType)
+        oldCollectibleTypes[#oldCollectibleTypes + 1] = oldCollectibleType
+        newCollectibleTypes[#newCollectibleTypes + 1] = newCollectibleType
+    end
+    __TS__ArraySort(oldCollectibleTypes)
+    __TS__ArraySort(newCollectibleTypes)
+    if not arrayEquals(nil, oldCollectibleTypes, newCollectibleTypes) then
+        local ____Set_3 = Set
+        local ____array_2 = __TS__SparseArrayNew(table.unpack(oldCollectibleTypes))
+        __TS__SparseArrayPush(
+            ____array_2,
+            table.unpack(newCollectibleTypes)
+        )
+        local collectibleTypeSet = __TS__New(
+            ____Set_3,
+            {__TS__SparseArraySpread(____array_2)}
+        )
+        activeItemsChanged(nil, player, collectibleTypeSet)
+    end
+end
+function activeItemsChanged(self, player, collectibleTypesSet)
+    local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player)
+    local newCollectibleMap = getPlayerCollectibleMap(nil, player)
+    mapSetPlayer(nil, v.run.playersCollectibleMap, player, newCollectibleMap)
+    for ____, collectibleType in __TS__Iterator(collectibleTypesSet:values()) do
+        local oldNum = oldCollectibleMap:get(collectibleType) or 0
+        local newNum = newCollectibleMap:get(collectibleType) or 0
+        local difference = newNum - oldNum
+        local increased = difference > 0
+        local absoluteDifference = math.abs(difference)
+        ____repeat(
+            nil,
+            absoluteDifference,
+            function()
+                if increased then
+                    postPlayerCollectibleAddedFire(nil, player, collectibleType)
+                else
+                    postPlayerCollectibleRemovedFire(nil, player, collectibleType)
+                end
+            end
+        )
+    end
+end
 v = {run = {
     playersCollectibleCount = __TS__New(Map),
     playersCollectibleMap = __TS__New(
         DefaultMap,
         function() return __TS__New(Map) end
+    ),
+    playersActiveItemMap = __TS__New(
+        DefaultMap,
+        function() return __TS__New(Map) end
     )
 }}
 function ____exports.postPlayerCollectibleCallbacksInit(self, mod)

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

@@ -1 +1 @@
-{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AAsH5E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS,CAK7B"}
+{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AAkH5E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS,CAK7B"}

package/dist/features/playerInventory.lua

@@ -33,16 +33,14 @@ local saveDataManager = ____exports.saveDataManager
 function newPlayerInventory(self, player)
     local inventory = {}
     for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
-        if player:HasCollectible(collectibleType) then
-            local numCollectibles = player:GetCollectibleNum(collectibleType, true)
-            ____repeat(
-                nil,
-                numCollectibles,
-                function()
-                    inventory[#inventory + 1] = collectibleType
-                end
-            )
-        end
+        local numCollectibles = player:GetCollectibleNum(collectibleType, true)
+        ____repeat(
+            nil,
+            numCollectibles,
+            function()
+                inventory[#inventory + 1] = collectibleType
+            end
+        )
     end
     return inventory
 end

package/dist/functions/cards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cards.d.ts","sourceRoot":"","sources":["../../src/functions/cards.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAkE5E;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAe7D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAetD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,mBAAmB,EAAE,kBAAkB,EAAE,GAC3C,GAAG,CAAC,QAAQ,CAAC,CAqBf;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,kBAAkB,CAQ5E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAC3B,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,QAAQ,EAAO,GAC1B,QAAQ,CAEV;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,QAAQ,EAAO,GAC1B,QAAQ,CAGV;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,QAAQ,EAAO,GAC1B,QAAQ,CAIV;AAED,8EAA8E;AAC9E,wBAAgB,mBAAmB,IAAI,QAAQ,EAAE,CAEhD;AAED;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAElD;AAED,8FAA8F;AAC9F,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAET;AAED,wDAAwD;AACxD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE5D;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE9D;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE9D;AAED,wDAAwD;AACxD,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAElD;AAED,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAEzD;AAED,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAEtD;AAED,yDAAyD;AACzD,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAEvD;AAED,iDAAiD;AACjD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE7D"}
+{"version":3,"file":"cards.d.ts","sourceRoot":"","sources":["../../src/functions/cards.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAkE5E;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAgB7D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAgBtD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,mBAAmB,EAAE,kBAAkB,EAAE,GAC3C,GAAG,CAAC,QAAQ,CAAC,CAqBf;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,kBAAkB,CAQ5E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAC3B,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,QAAQ,EAAO,GAC1B,QAAQ,CAEV;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,QAAQ,EAAO,GAC1B,QAAQ,CAGV;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,QAAQ,EAAO,GAC1B,QAAQ,CAIV;AAED,8EAA8E;AAC9E,wBAAgB,mBAAmB,IAAI,QAAQ,EAAE,CAEhD;AAED;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAElD;AAED,8FAA8F;AAC9F,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAET;AAED,wDAAwD;AACxD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE5D;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE9D;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE9D;AAED,wDAAwD;AACxD,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAElD;AAED,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAEzD;AAED,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAEtD;AAED,yDAAyD;AACzD,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAEvD;AAED,iDAAiD;AACjD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE7D"}

package/dist/functions/collectibleCacheFlag.d.ts

@@ -11,7 +11,7 @@ export declare function collectibleHasCacheFlag(collectibleType: CollectibleType
 export declare function getCollectiblesForCacheFlag(cacheFlag: CacheFlag): ReadonlySet<CollectibleType>;
 /**
  * Returns an array containing every collectible type that the player has that matches the provided
- * CacheFlag.
+ * `CacheFlag`.
  *
  * For example, if the cache flag is `CacheFlag.FLYING`, and the player has one Lord of the Pit and
  * two Dead Doves, then this function would return:
@@ -24,6 +24,9 @@ export declare function getCollectiblesForCacheFlag(cacheFlag: CacheFlag): Reado
  * ]
  * ```
  *
+ * Note that this array will not include collectibles that the player does not really have, like
+ * Lilith's Incubus.
+ *
  * This function can only be called if at least one callback has been executed. This is because not
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */

package/dist/functions/collectibleCacheFlag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectibleCacheFlag.d.ts","sourceRoot":"","sources":["../../src/functions/collectibleCacheFlag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AA+B1E,iGAAiG;AACjG,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GACnB,OAAO,CAOT;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,SAAS,GACnB,WAAW,CAAC,eAAe,CAAC,CAS9B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,SAAS,GACnB,eAAe,EAAE,CAYnB"}
+{"version":3,"file":"collectibleCacheFlag.d.ts","sourceRoot":"","sources":["../../src/functions/collectibleCacheFlag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AA+B1E,iGAAiG;AACjG,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GACnB,OAAO,CAOT;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,SAAS,GACnB,WAAW,CAAC,eAAe,CAAC,CAS9B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,SAAS,GACnB,eAAe,EAAE,CAanB"}

package/dist/functions/collectibleCacheFlag.lua

@@ -54,7 +54,7 @@ function ____exports.getCollectiblesForCacheFlag(self, cacheFlag)
     return collectiblesSet
 end
 --- Returns an array containing every collectible type that the player has that matches the provided
--- CacheFlag.
+-- `CacheFlag`.
 -- 
 -- For example, if the cache flag is `CacheFlag.FLYING`, and the player has one Lord of the Pit and
 -- two Dead Doves, then this function would return:
@@ -67,13 +67,16 @@ end
 -- ]
 -- ```
 -- 
+-- Note that this array will not include collectibles that the player does not really have, like
+-- Lilith's Incubus.
+-- 
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getPlayerCollectiblesForCacheFlag(self, player, cacheFlag)
     local collectiblesForCacheFlag = ____exports.getCollectiblesForCacheFlag(nil, cacheFlag)
     local playerCollectibles = {}
     for ____, collectibleType in ipairs(getSortedSetValues(nil, collectiblesForCacheFlag)) do
-        local numCollectibles = player:GetCollectibleNum(collectibleType)
+        local numCollectibles = player:GetCollectibleNum(collectibleType, true)
         ____repeat(
             nil,
             numCollectibles,

package/dist/functions/familiars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"familiars.d.ts","sourceRoot":"","sources":["../../src/functions/familiars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAKhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,GAAG,EAChB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,GAAG,GACpB,IAAI,CASN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,GAAG,GACpB,IAAI,CAiBN;AAED,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,EAAE,CAOzE;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,cAAc,GACvB,OAAO,CAET"}
+{"version":3,"file":"familiars.d.ts","sourceRoot":"","sources":["../../src/functions/familiars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAKhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,GAAG,EAChB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,GAAG,GACpB,IAAI,CASN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,GAAG,GACpB,IAAI,CAkBN;AAED,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,EAAE,CAOzE;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,cAAc,GACvB,OAAO,CAET"}

package/dist/functions/itemPool.lua

@@ -71,17 +71,15 @@ function removeItemsAndTrinketsThatAffectItemPools(self)
     for ____, player in ipairs(getPlayers(nil)) do
         local removedItems = {}
         for ____, itemToRemove in ipairs(COLLECTIBLES_THAT_AFFECT_ITEM_POOLS) do
-            if player:HasCollectible(itemToRemove) then
-                local numCollectibles = player:GetCollectibleNum(itemToRemove)
-                ____repeat(
-                    nil,
-                    numCollectibles,
-                    function()
-                        player:RemoveCollectible(itemToRemove)
-                        removedItems[#removedItems + 1] = itemToRemove
-                    end
-                )
-            end
+            local numCollectibles = player:GetCollectibleNum(itemToRemove)
+            ____repeat(
+                nil,
+                numCollectibles,
+                function()
+                    player:RemoveCollectible(itemToRemove)
+                    removedItems[#removedItems + 1] = itemToRemove
+                end
+            )
         end
         mapSetPlayer(nil, removedItemsMap, player, removedItems)
         local removedTrinkets = {}

package/dist/functions/players.d.ts

@@ -62,11 +62,15 @@ export declare function getPlayerCloserThan(position: Vector, distance: float):
  * collectible type(s) provided.
  *
  * This function is variadic, meaning that you can specify N collectible types.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export declare function getPlayerCollectibleCount(player: EntityPlayer, ...collectibleTypes: CollectibleType[]): int;
 /**
  * Iterates over every item in the game and returns a map containing the number of each item that
  * the player has.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export declare function getPlayerCollectibleMap(player: EntityPlayer): Map<CollectibleType, int>;
 /** Helper function to get the player from a tear, laser, bomb, etc. */
@@ -111,6 +115,8 @@ export declare function getPlayersWithTrinket(...trinketTypes: TrinketType[]): E
 /**
  * Returns the total number of collectibles amongst all players. For example, if player 1 has 1 Sad
  * Onion and player 2 has 2 Sad Onions, then this function would return 3.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export declare function getTotalPlayerCollectibles(collectibleType: CollectibleType): int;
 /** After touching a white fire, a player will turn into The Lost until they clear a room. */

package/dist/functions/players.d.ts.map

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

package/dist/functions/players.lua

@@ -219,6 +219,8 @@ end
 -- collectible type(s) provided.
 -- 
 -- This function is variadic, meaning that you can specify N collectible types.
+-- 
+-- Note that this will filter out non-real collectibles like Lilith's Incubus.
 function ____exports.getPlayerCollectibleCount(self, player, ...)
     local collectibleTypes = {...}
     local numCollectibles = 0
@@ -229,6 +231,8 @@ function ____exports.getPlayerCollectibleCount(self, player, ...)
 end
 --- Iterates over every item in the game and returns a map containing the number of each item that
 -- the player has.
+-- 
+-- Note that this will filter out non-real collectibles like Lilith's Incubus.
 function ____exports.getPlayerCollectibleMap(self, player)
     local collectibleArray = getCollectibleArray(nil)
     local collectibleMap = __TS__New(Map)
@@ -334,11 +338,13 @@ function ____exports.getPlayersWithTrinket(self, ...)
 end
 --- Returns the total number of collectibles amongst all players. For example, if player 1 has 1 Sad
 -- Onion and player 2 has 2 Sad Onions, then this function would return 3.
+-- 
+-- Note that this will filter out non-real collectibles like Lilith's Incubus.
 function ____exports.getTotalPlayerCollectibles(self, collectibleType)
     local players = getPlayers(nil)
     local numCollectiblesArray = __TS__ArrayMap(
         players,
-        function(____, player) return player:GetCollectibleNum(collectibleType) end
+        function(____, player) return player:GetCollectibleNum(collectibleType, true) end
     )
     return sumArray(nil, numCollectiblesArray)
 end

package/dist/index.d.ts

@@ -3926,18 +3926,22 @@ export declare function getPlayerCloserThan(position: Vector, distance: float):
  * collectible type(s) provided.
  *
  * This function is variadic, meaning that you can specify N collectible types.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export declare function getPlayerCollectibleCount(player: EntityPlayer, ...collectibleTypes: CollectibleType[]): int;
 
 /**
  * Iterates over every item in the game and returns a map containing the number of each item that
  * the player has.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export declare function getPlayerCollectibleMap(player: EntityPlayer): Map<CollectibleType, int>;
 
 /**
  * Returns an array containing every collectible type that the player has that matches the provided
- * CacheFlag.
+ * `CacheFlag`.
  *
  * For example, if the cache flag is `CacheFlag.FLYING`, and the player has one Lord of the Pit and
  * two Dead Doves, then this function would return:
@@ -3950,6 +3954,9 @@ export declare function getPlayerCollectibleMap(player: EntityPlayer): Map<Colle
  * ]
  * ```
  *
+ * Note that this array will not include collectibles that the player does not really have, like
+ * Lilith's Incubus.
+ *
  * This function can only be called if at least one callback has been executed. This is because not
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
@@ -4983,6 +4990,8 @@ export declare function getTotalCharge(player: EntityPlayer, activeSlot: ActiveS
 /**
  * Returns the total number of collectibles amongst all players. For example, if player 1 has 1 Sad
  * Onion and player 2 has 2 Sad Onions, then this function would return 3.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export declare function getTotalPlayerCollectibles(collectibleType: CollectibleType): int;
 

package/package.json

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

package/src/callbacks/postPlayerCollectible.ts

@@ -2,9 +2,15 @@
 // - `POST_PLAYER_COLLECTIBLE_ADDED`
 // - `POST_PLAYER_COLLECTIBLE_REMOVED`
 
-import { CollectibleType, ModCallback } from "isaac-typescript-definitions";
+import {
+  ActiveSlot,
+  CollectibleType,
+  ModCallback,
+} from "isaac-typescript-definitions";
 import { DefaultMap } from "../classes/DefaultMap";
 import { saveDataManager } from "../features/saveDataManager/exports";
+import { arrayEquals } from "../functions/array";
+import { getEnumValues } from "../functions/enums";
 import {
   defaultMapGetPlayer,
   mapGetPlayer,
@@ -29,6 +35,10 @@ const v = {
       PlayerIndex,
       Map<CollectibleType, int>
     >(() => new Map()),
+    playersActiveItemMap: new DefaultMap<
+      PlayerIndex,
+      Map<ActiveSlot, CollectibleType>
+    >(() => new Map()),
   },
 };
 
@@ -65,16 +75,17 @@ function postPEffectUpdate(player: EntityPlayer) {
   const difference = newCollectibleCount - oldCollectibleCount;
 
   if (difference > 0) {
-    collectibleCountChanged(player, difference, true);
+    collectibleCountChanged(player, difference);
   } else if (difference < 0) {
-    collectibleCountChanged(player, difference * -1, false);
+    collectibleCountChanged(player, difference * -1);
+  } else if (difference === 0) {
+    checkActiveItemsChanged(player);
   }
 }
 
 function collectibleCountChanged(
   player: EntityPlayer,
   numCollectiblesChanged: int,
-  increased: boolean,
 ) {
   const oldCollectibleMap = defaultMapGetPlayer(
     v.run.playersCollectibleMap,
@@ -83,19 +94,20 @@ function collectibleCountChanged(
   const newCollectibleMap = getPlayerCollectibleMap(player);
   mapSetPlayer(v.run.playersCollectibleMap, player, newCollectibleMap);
 
-  const collectibleTypes = [
+  const collectibleTypeSet = new Set<CollectibleType>([
     ...oldCollectibleMap.keys(),
     ...newCollectibleMap.keys(),
-  ];
-  collectibleTypes.sort();
+  ]);
 
   let numFired = 0;
-  for (const collectibleType of collectibleTypes) {
+  for (const collectibleType of collectibleTypeSet.values()) {
     const oldNum = oldCollectibleMap.get(collectibleType) ?? 0;
     const newNum = newCollectibleMap.get(collectibleType) ?? 0;
-    const difference = Math.abs(newNum - oldNum);
+    const difference = newNum - oldNum;
+    const increased = difference > 0;
+    const absoluteDifference = Math.abs(difference);
 
-    repeat(difference, () => {
+    repeat(absoluteDifference, () => {
       if (increased) {
         postPlayerCollectibleAddedFire(player, collectibleType);
       } else {
@@ -109,3 +121,70 @@ function collectibleCountChanged(
     }
   }
 }
+
+/**
+ * The special case is when a player swaps their active item for another active item. In this
+ * situation, their overall collectible count will not change. Thus, we explicitly check for this.
+ */
+function checkActiveItemsChanged(player: EntityPlayer) {
+  const activeItemMap = defaultMapGetPlayer(v.run.playersActiveItemMap, player);
+
+  const oldCollectibleTypes: CollectibleType[] = [];
+  const newCollectibleTypes: CollectibleType[] = [];
+
+  for (const activeSlot of getEnumValues(ActiveSlot)) {
+    const oldCollectibleType =
+      activeItemMap.get(activeSlot) ?? CollectibleType.NULL;
+    const newCollectibleType = player.GetActiveItem(activeSlot);
+    activeItemMap.set(activeSlot, newCollectibleType);
+
+    oldCollectibleTypes.push(oldCollectibleType);
+    newCollectibleTypes.push(newCollectibleType);
+  }
+
+  // For example, it is possible for the player to switch Schoolbag items, which will cause the
+  // collectibles in the array to be the same, but in a different order. Thus, sort both arrays
+  // before comparing them.
+  oldCollectibleTypes.sort();
+  newCollectibleTypes.sort();
+
+  if (!arrayEquals(oldCollectibleTypes, newCollectibleTypes)) {
+    const collectibleTypeSet = new Set<CollectibleType>([
+      ...oldCollectibleTypes,
+      ...newCollectibleTypes,
+    ]);
+    activeItemsChanged(player, collectibleTypeSet);
+  }
+}
+
+/**
+ * One or more active items have changed (with the player's total collectible count remaining the
+ * same).
+ */
+function activeItemsChanged(
+  player: EntityPlayer,
+  collectibleTypesSet: Set<CollectibleType>,
+) {
+  const oldCollectibleMap = defaultMapGetPlayer(
+    v.run.playersCollectibleMap,
+    player,
+  );
+  const newCollectibleMap = getPlayerCollectibleMap(player);
+  mapSetPlayer(v.run.playersCollectibleMap, player, newCollectibleMap);
+
+  for (const collectibleType of collectibleTypesSet.values()) {
+    const oldNum = oldCollectibleMap.get(collectibleType) ?? 0;
+    const newNum = newCollectibleMap.get(collectibleType) ?? 0;
+    const difference = newNum - oldNum;
+    const increased = difference > 0;
+    const absoluteDifference = Math.abs(difference);
+
+    repeat(absoluteDifference, () => {
+      if (increased) {
+        postPlayerCollectibleAddedFire(player, collectibleType);
+      } else {
+        postPlayerCollectibleRemovedFire(player, collectibleType);
+      }
+    });
+  }
+}

package/src/features/playerInventory.ts

@@ -35,16 +35,12 @@ function newPlayerInventory(player: EntityPlayer) {
   const inventory: CollectibleType[] = [];
 
   for (const collectibleType of getCollectibleArray()) {
-    // We have to use the `EntityPlayer.HasCollectible` method in addition to the
-    // `EntityPlayer.GetCollectibleNum` method in order to mitigate situations like Lilith's Incubus
-    // counting as a collectible. (The former method will return false for her innate Incubus, but
-    // the latter method will return 1.)
-    if (player.HasCollectible(collectibleType)) {
-      const numCollectibles = player.GetCollectibleNum(collectibleType, true);
-      repeat(numCollectibles, () => {
-        inventory.push(collectibleType);
-      });
-    }
+    // We need to specify "true" as the second argument here to filter out things like Lilith's
+    // Incubus.
+    const numCollectibles = player.GetCollectibleNum(collectibleType, true);
+    repeat(numCollectibles, () => {
+      inventory.push(collectibleType);
+    });
   }
 
   return inventory;

package/src/functions/cards.ts

@@ -73,7 +73,8 @@ export function getCardDescription(cardType: CardType): string {
   // "ItemConfigCard.Description" is bugged with vanilla cards on patch v1.7.6, so we use a
   // hard-coded map as a workaround.
   const cardDescription = CARD_DESCRIPTIONS[cardType];
-
+  // Handle modded cards.
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (cardDescription !== undefined) {
     return cardDescription;
   }
@@ -95,7 +96,8 @@ export function getCardName(cardType: CardType): string {
   // "ItemConfigCard.Name" is bugged with vanilla cards on patch v1.7.6, so we use a hard-coded map
   // as a workaround.
   const cardName = CARD_NAMES[cardType];
-
+  // Handle modded cards.
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (cardName !== undefined) {
     return cardName;
   }

package/src/functions/collectibleCacheFlag.ts

@@ -64,7 +64,7 @@ export function getCollectiblesForCacheFlag(
 
 /**
  * Returns an array containing every collectible type that the player has that matches the provided
- * CacheFlag.
+ * `CacheFlag`.
  *
  * For example, if the cache flag is `CacheFlag.FLYING`, and the player has one Lord of the Pit and
  * two Dead Doves, then this function would return:
@@ -77,6 +77,9 @@ export function getCollectiblesForCacheFlag(
  * ]
  * ```
  *
+ * Note that this array will not include collectibles that the player does not really have, like
+ * Lilith's Incubus.
+ *
  * This function can only be called if at least one callback has been executed. This is because not
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
@@ -88,7 +91,8 @@ export function getPlayerCollectiblesForCacheFlag(
 
   const playerCollectibles: CollectibleType[] = [];
   for (const collectibleType of getSortedSetValues(collectiblesForCacheFlag)) {
-    const numCollectibles = player.GetCollectibleNum(collectibleType);
+    // We specify "true" as the second argument to filter out things like Lilith's Incubus.
+    const numCollectibles = player.GetCollectibleNum(collectibleType, true);
     repeat(numCollectibles, () => {
       playerCollectibles.push(collectibleType);
     });

package/src/functions/familiars.ts

@@ -82,6 +82,7 @@ export function checkFamiliarFromCollectibles(
   familiarVariant: FamiliarVariant,
   familiarSubType?: int,
 ): void {
+  // We need to include non-real collectibles, like Lilith's Incubus.
   const numCollectibles = player.GetCollectibleNum(collectibleType);
   const effects = player.GetEffects();
 

package/src/functions/itemPool.ts

@@ -128,13 +128,12 @@ function removeItemsAndTrinketsThatAffectItemPools(): [
   for (const player of getPlayers()) {
     const removedItems: CollectibleType[] = [];
     for (const itemToRemove of COLLECTIBLES_THAT_AFFECT_ITEM_POOLS) {
-      if (player.HasCollectible(itemToRemove)) {
-        const numCollectibles = player.GetCollectibleNum(itemToRemove);
-        repeat(numCollectibles, () => {
-          player.RemoveCollectible(itemToRemove);
-          removedItems.push(itemToRemove);
-        });
-      }
+      // We need to include non-real collectibles, like Lilith's Incubus.
+      const numCollectibles = player.GetCollectibleNum(itemToRemove);
+      repeat(numCollectibles, () => {
+        player.RemoveCollectible(itemToRemove);
+        removedItems.push(itemToRemove);
+      });
     }
 
     mapSetPlayer(removedItemsMap, player, removedItems);

package/src/functions/players.ts

@@ -223,6 +223,8 @@ export function getPlayerCloserThan(
  * collectible type(s) provided.
  *
  * This function is variadic, meaning that you can specify N collectible types.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export function getPlayerCollectibleCount(
   player: EntityPlayer,
@@ -230,6 +232,8 @@ export function getPlayerCollectibleCount(
 ): int {
   let numCollectibles = 0;
   for (const collectibleType of collectibleTypes) {
+    // We need to specify "true" as the second argument here to filter out things like Lilith's
+    // Incubus.
     numCollectibles += player.GetCollectibleNum(collectibleType, true);
   }
 
@@ -239,6 +243,8 @@ export function getPlayerCollectibleCount(
 /**
  * Iterates over every item in the game and returns a map containing the number of each item that
  * the player has.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export function getPlayerCollectibleMap(
   player: EntityPlayer,
@@ -247,6 +253,8 @@ export function getPlayerCollectibleMap(
 
   const collectibleMap = new Map<CollectibleType, int>();
   for (const collectibleType of collectibleArray) {
+    // We need to specify "true" as the second argument here to filter out things like Lilith's
+    // Incubus.
     const collectibleNum = player.GetCollectibleNum(collectibleType, true);
     if (collectibleNum > 0) {
       collectibleMap.set(collectibleType, collectibleNum);
@@ -374,14 +382,19 @@ export function getPlayersWithTrinket(
 /**
  * Returns the total number of collectibles amongst all players. For example, if player 1 has 1 Sad
  * Onion and player 2 has 2 Sad Onions, then this function would return 3.
+ *
+ * Note that this will filter out non-real collectibles like Lilith's Incubus.
  */
 export function getTotalPlayerCollectibles(
   collectibleType: CollectibleType,
 ): int {
   const players = getPlayers();
   const numCollectiblesArray = players.map((player) =>
-    player.GetCollectibleNum(collectibleType),
+    // We need to specify "true" as the second argument here to filter out things like Lilith's
+    // Incubus.
+    player.GetCollectibleNum(collectibleType, true),
   );
+
   return sumArray(numCollectiblesArray);
 }