isaacscript-common 6.17.0 → 6.19.0

package/dist/enums/ModCallbackCustom.d.ts

@@ -519,7 +519,7 @@ export declare enum ModCallbackCustom {
      * - When registering the callback, takes an optional second argument that will make the callback
      *   only fire if it matches the `ItemType` provided.
      * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the `CollectibleType` or the `TrinketType` matches the ID provided.
+     *   only fire if the `CollectibleType` or the `TrinketType` matches the sub-type provided.
      *
      * ```ts
      * function postItemPickup(

package/dist/features/customGridEntity.d.ts

@@ -1,5 +1,5 @@
 import { GridCollisionClass, GridEntityType } from "isaac-typescript-definitions";
-import { CustomGridEntityData } from "../interfaces/CustomGridEntityData";
+import { GridEntityCustomData } from "../interfaces/GridEntityCustomData";
 /**
  * Helper function to spawn a custom grid entity. Custom grid entities are persistent in that they
  * will reappear if the player leaves and re-enters the room. (It will be manually respawned in the
@@ -46,13 +46,13 @@ export declare function spawnCustomGridEntity(gridEntityTypeCustom: GridEntityTy
  * @returns The grid entity that was removed. Returns undefined if no grid entity was found at the
  *          given location or if the given grid entity was not a custom grid entity.
  */
-export declare function removeCustomGrid(gridIndexOrPositionOrGridEntity: int | Vector | GridEntity, updateRoom?: boolean): GridEntity | undefined;
+export declare function removeCustomGridEntity(gridIndexOrPositionOrGridEntity: int | Vector | GridEntity, updateRoom?: boolean): GridEntity | undefined;
 /**
  * Helper function to get the custom grid entities in the current room. Returns an array of tuples
  * containing the raw decoration grid entity and the associated entity data.
  */
 export declare function getCustomGridEntities(): Array<[
     gridEntity: GridEntity,
-    data: CustomGridEntityData
+    data: GridEntityCustomData
 ]>;
 //# sourceMappingURL=customGridEntity.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"customGridEntity.d.ts","sourceRoot":"","sources":["../../src/features/customGridEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,kBAAkB,EAClB,cAAc,EAGf,MAAM,8BAA8B,CAAC;AAgBtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AA0K1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,cAAc,EACpC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,MAAM,EACzB,SAAS,UAAQ,GAChB,UAAU,CA8DZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC9B,+BAA+B,EAAE,GAAG,GAAG,MAAM,GAAG,UAAU,EAC1D,UAAU,UAAO,GAChB,UAAU,GAAG,SAAS,CAqCxB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,KAAK,CAC5C;IAAC,UAAU,EAAE,UAAU;IAAE,IAAI,EAAE,oBAAoB;CAAC,CACrD,CAiBA"}
+{"version":3,"file":"customGridEntity.d.ts","sourceRoot":"","sources":["../../src/features/customGridEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EAClB,cAAc,EAGf,MAAM,8BAA8B,CAAC;AAgBtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AA2K1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,cAAc,EACpC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,MAAM,EACzB,SAAS,UAAQ,GAChB,UAAU,CAyEZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,+BAA+B,EAAE,GAAG,GAAG,MAAM,GAAG,UAAU,EAC1D,UAAU,UAAO,GAChB,UAAU,GAAG,SAAS,CAqCxB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,KAAK,CAC5C;IAAC,UAAU,EAAE,UAAU;IAAE,IAAI,EAAE,oBAAoB;CAAC,CACrD,CAiBA"}

package/dist/features/customGridEntity.lua

@@ -4,10 +4,11 @@ local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local entityTakeDmgDummy, preUseItemWeNeedToGoDeeper, postNewRoomReordered, v
+local entityTakeDmgGenericProp, preUseItemWeNeedToGoDeeper, postNewRoomReordered, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
+local EntityFlag = ____isaac_2Dtypescript_2Ddefinitions.EntityFlag
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local GridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.GridCollisionClass
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
@@ -24,8 +25,8 @@ local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
-local ____entitiesSpecific = require("functions.entitiesSpecific")
-local spawnNPC = ____entitiesSpecific.spawnNPC
+local ____entities = require("functions.entities")
+local spawn = ____entities.spawn
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
 local ____gridEntities = require("functions.gridEntities")
@@ -39,9 +40,9 @@ local ____runInNFrames = require("features.runInNFrames")
 local runNextGameFrame = ____runInNFrames.runNextGameFrame
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-function entityTakeDmgDummy(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgGenericProp(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
     local ptrHash = GetPtrHash(tookDamage)
-    if not v.room.dummyPtrHashes:has(ptrHash) then
+    if not v.room.genericPropPtrHashes:has(ptrHash) then
         return nil
     end
     if not hasFlag(nil, damageFlags, DamageFlag.EXPLOSION) then
@@ -125,13 +126,14 @@ function postNewRoomReordered(self)
     end
 end
 local FEATURE_NAME = "customGridEntity"
+local GENERIC_PROP_SIZE_MULTIPLIER = 0.66
 v = {
     level = {customGridEntities = __TS__New(
         DefaultMap,
         function() return __TS__New(Map) end
     )},
     room = {
-        dummyPtrHashes = __TS__New(Set),
+        genericPropPtrHashes = __TS__New(Set),
         manuallyUsingShovel = false
     }
 }
@@ -139,7 +141,7 @@ v = {
 -- @internal
 function ____exports.customGridEntityInit(self, mod)
     saveDataManager(nil, FEATURE_NAME, v)
-    mod:AddCallback(ModCallback.ENTITY_TAKE_DMG, entityTakeDmgDummy, EntityType.DUMMY)
+    mod:AddCallback(ModCallback.ENTITY_TAKE_DMG, entityTakeDmgGenericProp, EntityType.GENERIC_PROP)
     mod:AddCallback(ModCallback.PRE_USE_ITEM, preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER)
     mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end
@@ -188,6 +190,7 @@ function ____exports.spawnCustomGridEntity(self, gridEntityTypeCustom, gridIndex
     if decoration == nil then
         error("Failed to spawn a decoration for a custom grid entity.")
     end
+    decoration.CollisionClass = gridCollisionClass
     local sprite = decoration:GetSprite()
     sprite:Load(anm2Path, true)
     local animationToPlay = defaultAnimation == nil and sprite:GetDefaultAnimation() or defaultAnimation
@@ -204,14 +207,18 @@ function ____exports.spawnCustomGridEntity(self, gridEntityTypeCustom, gridIndex
     roomCustomGridEntities:set(gridIndex, customGridEntityData)
     if breakable then
         local position = room:GetGridPosition(gridIndex)
-        local dummy = spawnNPC(
+        local entity = spawn(
             nil,
-            EntityType.DUMMY,
+            EntityType.GENERIC_PROP,
             0,
             0,
             position
         )
-        dummy.Visible = false
+        entity:ClearEntityFlags(EntityFlag.APPEAR)
+        entity.Visible = false
+        entity.SizeMulti = Vector(GENERIC_PROP_SIZE_MULTIPLIER, GENERIC_PROP_SIZE_MULTIPLIER)
+        local ptrHash = GetPtrHash(entity)
+        v.room.genericPropPtrHashes:add(ptrHash)
     end
     return decoration
 end
@@ -228,7 +235,7 @@ end
 -- multiple times.
 -- @returns The grid entity that was removed. Returns undefined if no grid entity was found at the
 -- given location or if the given grid entity was not a custom grid entity.
-function ____exports.removeCustomGrid(self, gridIndexOrPositionOrGridEntity, updateRoom)
+function ____exports.removeCustomGridEntity(self, gridIndexOrPositionOrGridEntity, updateRoom)
     if updateRoom == nil then
         updateRoom = true
     end

package/dist/features/extraConsoleCommands/listCommands.lua

@@ -53,7 +53,7 @@ local addFlag = ____flag.addFlag
 local ____gridEntities = require("functions.gridEntities")
 local spawnGridEntity = ____gridEntities.spawnGridEntity
 local ____log = require("functions.log")
-local logEffects = ____log.logEffects
+local logPlayerEffects = ____log.logPlayerEffects
 local logRoom = ____log.logRoom
 local logSeedEffects = ____log.logSeedEffects
 local logSounds = ____log.logSounds
@@ -512,7 +512,7 @@ end
 --- Logs the player's current temporary effects to the "log.txt" file.
 function ____exports.effects(self)
     local player = Isaac.GetPlayer()
-    logEffects(player)
+    logPlayerEffects(player)
     printConsole(nil, "Logged the player's effects to the \"log.txt\" file.")
 end
 --- Alias for the "eternalHearts" command.

package/dist/features/pickupIndex.lua

@@ -108,8 +108,9 @@ function postNewRoomReordered(self)
             pickupIndex = getPostAscentPickupIndex(nil, pickup)
         end
         if pickupIndex == nil then
-            local entityID = getEntityID(nil, pickup)
-            error("Failed to find a pickup index corresponding to existing pickup: " .. entityID)
+            local ____v_run_2, ____pickupCounter_3 = v.run, "pickupCounter"
+            ____v_run_2[____pickupCounter_3] = ____v_run_2[____pickupCounter_3] + 1
+            pickupIndex = v.run.pickupCounter
         end
         local ptrHash = GetPtrHash(pickup)
         v.room.pickupIndexes:set(ptrHash, pickupIndex)

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;AA0G5E;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB"}
+{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AAyG5E;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB"}

package/dist/features/playerInventory.lua

@@ -1,6 +1,5 @@
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
-local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
 local newPlayerInventory, resetInventory, useItemD4, postGameStarted, postCollectibleAdded, postCollectibleRemoved, v
@@ -19,7 +18,7 @@ local copyArray = ____array.copyArray
 local ____collectibles = require("functions.collectibles")
 local isActiveCollectible = ____collectibles.isActiveCollectible
 local ____collectibleSet = require("functions.collectibleSet")
-local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____playerDataStructures = require("functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
@@ -32,8 +31,7 @@ local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function newPlayerInventory(self, player)
     local inventory = {}
-    local collectibleSet = getCollectibleSet(nil)
-    for ____, collectibleType in __TS__Iterator(collectibleSet:values()) do
+    for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
         local numCollectibles = player:GetCollectibleNum(collectibleType, true)
         ____repeat(
             nil,

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

@@ -1 +1 @@
-{"version":3,"file":"eden.d.ts","sourceRoot":"","sources":["../../src/functions/eden.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,8BAA8B,CAAC;AAuB9E,wBAAgB,eAAe,IAAI,GAAG,CAAC,eAAe,CAAC,CAOtD;AAED,wBAAgB,oBAAoB,CAClC,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,eAAe,EAAE,GAAG,SAAS,eAAe,EAAO,GAC9D,eAAe,CAWjB"}
+{"version":3,"file":"eden.d.ts","sourceRoot":"","sources":["../../src/functions/eden.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,8BAA8B,CAAC;AAqB9E,wBAAgB,eAAe,IAAI,GAAG,CAAC,eAAe,CAAC,CAOtD;AAED,wBAAgB,oBAAoB,CAClC,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,UAAU,GAAE,eAAe,EAAE,GAAG,SAAS,eAAe,EAAO,GAC9D,eAAe,CAWjB"}

package/dist/functions/eden.lua

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
-local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
@@ -9,7 +8,7 @@ local ____collectibles = require("functions.collectibles")
 local isHiddenCollectible = ____collectibles.isHiddenCollectible
 local isPassiveCollectible = ____collectibles.isPassiveCollectible
 local ____collectibleSet = require("functions.collectibleSet")
-local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____collectibleTag = require("functions.collectibleTag")
 local collectibleHasTag = ____collectibleTag.collectibleHasTag
 local ____rng = require("functions.rng")
@@ -19,8 +18,7 @@ local copySet = ____set.copySet
 local getRandomSetElement = ____set.getRandomSetElement
 local EDEN_PASSIVE_COLLECTIBLES_SET = __TS__New(Set)
 local function initCollectibleSet(self)
-    local collectibleSet = getCollectibleSet(nil)
-    for ____, collectibleType in __TS__Iterator(collectibleSet:values()) do
+    for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
         if isPassiveCollectible(nil, collectibleType) and not isHiddenCollectible(nil, collectibleType) and not collectibleHasTag(nil, collectibleType, ItemConfigTag.NO_EDEN) then
             EDEN_PASSIVE_COLLECTIBLES_SET:add(collectibleType)
         end

package/dist/functions/itemPool.d.ts

@@ -1,10 +1,18 @@
 import { CollectibleType, ItemPoolType } from "isaac-typescript-definitions";
+/**
+ * Helper function to get the remaining collectibles in a given item pool. This function is
+ * expensive, so only use it in situations where the lag is acceptable.
+ */
+export declare function getCollectiblesInItemPool(itemPoolType: ItemPoolType): CollectibleType[];
 /**
  * Helper function to see if the given collectible is still present in the given item pool.
  *
  * If the collectible is non-offensive, any Tainted Losts will be temporarily changed to Isaac and
  * then changed back. (This is because Tainted Lost is not able to retrieve non-offensive
  * collectibles from item pools).
+ *
+ * Under the hood, this function works by using the `ItemPool.AddRoomBlacklist` method to blacklist
+ * every collectible except for the one provided.
  */
 export declare function isCollectibleInItemPool(collectibleType: CollectibleType, itemPoolType: ItemPoolType): boolean;
 //# sourceMappingURL=itemPool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"itemPool.d.ts","sourceRoot":"","sources":["../../src/functions/itemPool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAoBtC;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAsDT"}
+{"version":3,"file":"itemPool.d.ts","sourceRoot":"","sources":["../../src/functions/itemPool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAsBtC;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,YAAY,GACzB,eAAe,EAAE,CAKnB;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CA6DT"}

package/dist/functions/itemPool.lua

@@ -1,9 +1,9 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local Map = ____lualib.Map
-local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local removeItemsAndTrinketsThatAffectItemPools, restoreItemsAndTrinketsThatAffectItemPools, COLLECTIBLES_THAT_AFFECT_ITEM_POOLS, TRINKETS_THAT_AFFECT_ITEM_POOLS
+local removeItemsAndTrinketsThatAffectItemPools, restoreItemsAndTrinketsThatAffectItemPools, COLLECTIBLES_THAT_AFFECT_ITEM_POOLS, TRINKETS_THAT_AFFECT_ITEM_POOLS, COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
@@ -12,7 +12,7 @@ local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local ____collectibleSet = require("functions.collectibleSet")
-local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____collectibleTag = require("functions.collectibleTag")
 local collectibleHasTag = ____collectibleTag.collectibleHasTag
 local ____playerDataStructures = require("functions.playerDataStructures")
@@ -24,6 +24,47 @@ local ____players = require("functions.players")
 local getPlayersOfType = ____players.getPlayersOfType
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
+--- Helper function to see if the given collectible is still present in the given item pool.
+-- 
+-- If the collectible is non-offensive, any Tainted Losts will be temporarily changed to Isaac and
+-- then changed back. (This is because Tainted Lost is not able to retrieve non-offensive
+-- collectibles from item pools).
+-- 
+-- Under the hood, this function works by using the `ItemPool.AddRoomBlacklist` method to blacklist
+-- every collectible except for the one provided.
+function ____exports.isCollectibleInItemPool(self, collectibleType, itemPoolType)
+    if collectibleType == COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS then
+        return false
+    end
+    local taintedLosts = getPlayersOfType(nil, PlayerType.THE_LOST_B)
+    local isOffensive = collectibleHasTag(nil, collectibleType, ItemConfigTag.OFFENSIVE)
+    local changedPlayerTypes = false
+    if not isOffensive then
+        changedPlayerTypes = true
+        for ____, player in ipairs(taintedLosts) do
+            player:ChangePlayerType(PlayerType.ISAAC)
+        end
+    end
+    local removedItemsMap, removedTrinketsMap = table.unpack(removeItemsAndTrinketsThatAffectItemPools(nil))
+    local itemPool = game:GetItemPool()
+    itemPool:ResetRoomBlacklist()
+    for ____, collectibleTypeInSet in ipairs(getCollectibleArray(nil)) do
+        if collectibleTypeInSet ~= collectibleType then
+            itemPool:AddRoomBlacklist(collectibleTypeInSet)
+        end
+    end
+    local seed = 1
+    local retrievedCollectibleType = itemPool:GetCollectible(itemPoolType, false, seed, COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS)
+    local collectibleUnlocked = retrievedCollectibleType == collectibleType
+    itemPool:ResetRoomBlacklist()
+    restoreItemsAndTrinketsThatAffectItemPools(nil, removedItemsMap, removedTrinketsMap)
+    if changedPlayerTypes then
+        for ____, player in ipairs(taintedLosts) do
+            player:ChangePlayerType(PlayerType.THE_LOST_B)
+        end
+    end
+    return collectibleUnlocked
+end
 function removeItemsAndTrinketsThatAffectItemPools(self)
     local removedItemsMap = __TS__New(Map)
     local removedTrinketsMap = __TS__New(Map)
@@ -79,38 +120,14 @@ function restoreItemsAndTrinketsThatAffectItemPools(self, removedItemsMap, remov
 end
 COLLECTIBLES_THAT_AFFECT_ITEM_POOLS = {CollectibleType.CHAOS, CollectibleType.SACRED_ORB, CollectibleType.TMTRAINER}
 TRINKETS_THAT_AFFECT_ITEM_POOLS = {TrinketType.NO}
---- Helper function to see if the given collectible is still present in the given item pool.
--- 
--- If the collectible is non-offensive, any Tainted Losts will be temporarily changed to Isaac and
--- then changed back. (This is because Tainted Lost is not able to retrieve non-offensive
--- collectibles from item pools).
-function ____exports.isCollectibleInItemPool(self, collectibleType, itemPoolType)
-    local taintedLosts = getPlayersOfType(nil, PlayerType.THE_LOST_B)
-    local isOffensive = collectibleHasTag(nil, collectibleType, ItemConfigTag.OFFENSIVE)
-    local changedPlayerTypes = false
-    if not isOffensive then
-        changedPlayerTypes = true
-        for ____, player in ipairs(taintedLosts) do
-            player:ChangePlayerType(PlayerType.ISAAC)
-        end
-    end
-    local removedItemsMap, removedTrinketsMap = table.unpack(removeItemsAndTrinketsThatAffectItemPools(nil))
-    local itemPool = game:GetItemPool()
-    local collectibleSet = getCollectibleSet(nil)
-    for ____, collectibleTypeInSet in __TS__Iterator(collectibleSet:values()) do
-        if collectibleTypeInSet ~= collectibleType then
-            itemPool:AddRoomBlacklist(collectibleTypeInSet)
-        end
-    end
-    local retrievedCollectibleType = itemPool:GetCollectible(itemPoolType, false, 1)
-    local collectibleUnlocked = retrievedCollectibleType == collectibleType
-    itemPool:ResetRoomBlacklist()
-    restoreItemsAndTrinketsThatAffectItemPools(nil, removedItemsMap, removedTrinketsMap)
-    if changedPlayerTypes then
-        for ____, player in ipairs(taintedLosts) do
-            player:ChangePlayerType(PlayerType.THE_LOST_B)
-        end
-    end
-    return collectibleUnlocked
+COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS = CollectibleType.KEY_PIECE_1
+--- Helper function to get the remaining collectibles in a given item pool. This function is
+-- expensive, so only use it in situations where the lag is acceptable.
+function ____exports.getCollectiblesInItemPool(self, itemPoolType)
+    local collectibleArray = getCollectibleArray(nil)
+    return __TS__ArrayFilter(
+        collectibleArray,
+        function(____, collectibleType) return ____exports.isCollectibleInItemPool(nil, collectibleType, itemPoolType) end
+    )
 end
 return ____exports

package/dist/functions/log.d.ts

@@ -21,7 +21,6 @@ export declare function logArray<T>(this: void, array: T[] | readonly T[]): void
 export declare function logColor(this: void, color: Color): void;
 /** Helper function for printing out every damage flag that is turned on. Useful when debugging. */
 export declare function logDamageFlags(this: void, flags: DamageFlag | BitFlags<DamageFlag>): void;
-export declare function logEffects(this: void, player: EntityPlayer): void;
 /** Helper function for logging an array of specific entities. */
 export declare function logEntities(this: void, entities: Entity[]): void;
 /** Helper function to log information about a specific entity. */
@@ -52,6 +51,7 @@ export declare function logKColor(this: void, kColor: KColor): void;
  */
 export declare function logLevelStateFlags(this: void): void;
 export declare function logMap(this: void, map: Map<AnyNotNil, unknown>): void;
+export declare function logPlayerEffects(this: void, player: EntityPlayer): void;
 export declare function logPlayerHealth(this: void, player: EntityPlayer): void;
 /**
  * Helper function for printing out every projectile flag that is turned on. Useful when debugging.

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

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

package/dist/functions/log.lua

@@ -312,32 +312,6 @@ end
 function ____exports.logDamageFlags(flags)
     ____exports.logFlags(flags, DamageFlag, "damage")
 end
-function ____exports.logEffects(player)
-    local effects = getEffectsList(nil, player)
-    ____exports.log("Logging player effects:")
-    if #effects == 0 then
-        ____exports.log("  n/a (no effects)")
-        return
-    end
-    __TS__ArrayForEach(
-        effects,
-        function(____, effect, i)
-            local effectDescription
-            if effect.Item:IsCollectible() then
-                local collectibleName = getCollectibleName(nil, effect.Item.ID)
-                effectDescription = "Collectible: " .. collectibleName
-            elseif effect.Item:IsTrinket() then
-                local trinketName = getTrinketName(nil, effect.Item.ID)
-                effectDescription = "Trinket: " .. trinketName
-            elseif effect.Item:IsNull() then
-                effectDescription = "Null item: " .. tostring(effect.Item.ID)
-            else
-                effectDescription = "Unknown type of effect: " .. tostring(effect.Item.ID)
-            end
-            ____exports.log(((((("  " .. tostring(i + 1)) .. ") ") .. effectDescription) .. " (x") .. tostring(effect.Count)) .. ")")
-        end
-    )
-end
 --- Helper function for logging an array of specific entities.
 function ____exports.logEntities(entities)
     for ____, entity in ipairs(entities) do
@@ -417,6 +391,32 @@ function ____exports.logMap(map)
     end
     ____exports.log("  The size of the map was: " .. tostring(map.size))
 end
+function ____exports.logPlayerEffects(player)
+    local effects = getEffectsList(nil, player)
+    ____exports.log("Logging player effects:")
+    if #effects == 0 then
+        ____exports.log("  n/a (no effects)")
+        return
+    end
+    __TS__ArrayForEach(
+        effects,
+        function(____, effect, i)
+            local effectDescription
+            if effect.Item:IsCollectible() then
+                local collectibleName = getCollectibleName(nil, effect.Item.ID)
+                effectDescription = "Collectible: " .. collectibleName
+            elseif effect.Item:IsTrinket() then
+                local trinketName = getTrinketName(nil, effect.Item.ID)
+                effectDescription = "Trinket: " .. trinketName
+            elseif effect.Item:IsNull() then
+                effectDescription = "Null item: " .. tostring(effect.Item.ID)
+            else
+                effectDescription = "Unknown type of effect: " .. tostring(effect.Item.ID)
+            end
+            ____exports.log(((((("  " .. tostring(i + 1)) .. ") ") .. effectDescription) .. " (x") .. tostring(effect.Count)) .. ")")
+        end
+    )
+end
 function ____exports.logPlayerHealth(player)
     local playerName = getPlayerName(nil, player)
     local playerHealth = getPlayerHealth(nil, player)
@@ -613,7 +613,6 @@ function ____exports.setLogFunctionsGlobal(self)
     globals.logArray = ____exports.logArray
     globals.logColor = ____exports.logColor
     globals.logDamageFlags = ____exports.logDamageFlags
-    globals.logEffects = ____exports.logEffects
     globals.logEntities = ____exports.logEntities
     globals.logEntity = ____exports.logEntity
     globals.logEntityID = ____exports.logEntityID
@@ -626,6 +625,7 @@ function ____exports.setLogFunctionsGlobal(self)
     globals.logKColor = ____exports.logKColor
     globals.logLevelStateFlags = ____exports.logLevelStateFlags
     globals.logMap = ____exports.logMap
+    globals.logPlayerEffects = ____exports.logPlayerEffects
     globals.logPlayerHealth = ____exports.logPlayerHealth
     globals.logProjectileFlags = ____exports.logProjectileFlags
     globals.logRoom = ____exports.logRoom

package/dist/functions/saveFile.d.ts

@@ -1,7 +1,7 @@
 import { CollectibleType, ItemPoolType } from "isaac-typescript-definitions";
 /**
  * Helper function to see if the given collectible is unlocked on the current save file. This
- * requires providing the corresponding item pool that the collectible is located in.
+ * requires providing the corresponding item pool that the collectible is normally located in.
  *
  * - If any player currently has the collectible, then it is assumed to be unlocked. (This is
  *   because in almost all cases, when a collectible is added to a player's inventory, it is

package/dist/functions/saveFile.lua

@@ -4,7 +4,7 @@ local isCollectibleInItemPool = ____itemPool.isCollectibleInItemPool
 local ____players = require("functions.players")
 local anyPlayerHasCollectible = ____players.anyPlayerHasCollectible
 --- Helper function to see if the given collectible is unlocked on the current save file. This
--- requires providing the corresponding item pool that the collectible is located in.
+-- requires providing the corresponding item pool that the collectible is normally located in.
 -- 
 -- - If any player currently has the collectible, then it is assumed to be unlocked. (This is
 --   because in almost all cases, when a collectible is added to a player's inventory, it is

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export * from "./enums/SerializationType";
 export { ConversionHeartSubType, registerCharacterHealthConversion, } from "./features/characterHealthConversion";
 export { registerCharacterStats } from "./features/characterStats";
 export { getCollectibleItemPoolType } from "./features/collectibleItemPoolType";
-export { removeCustomGrid, spawnCustomGridEntity as spawnCustomGrid, } from "./features/customGridEntity";
+export { removeCustomGridEntity as removeCustomGrid, spawnCustomGridEntity as spawnCustomGrid, } from "./features/customGridEntity";
 export * from "./features/customStage/exports";
 export * from "./features/customTrapdoor/exports";
 export * from "./features/debugDisplay/exports";

package/dist/index.d.ts.map

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

package/dist/index.lua

@@ -104,7 +104,7 @@ do
 end
 do
     local ____customGridEntity = require("features.customGridEntity")
-    local removeCustomGrid = ____customGridEntity.removeCustomGrid
+    local removeCustomGrid = ____customGridEntity.removeCustomGridEntity
     local spawnCustomGrid = ____customGridEntity.spawnCustomGridEntity
     ____exports.removeCustomGrid = removeCustomGrid
     ____exports.spawnCustomGrid = spawnCustomGrid

package/dist/interfaces/{CustomGridEntityData.d.ts → GridEntityCustomData.d.ts}

@@ -1,5 +1,5 @@
 import { GridCollisionClass, GridEntityType } from "isaac-typescript-definitions";
-export interface CustomGridEntityData {
+export interface GridEntityCustomData {
     /**
      * This is not a real `GridEntityType`; rather it is an arbitrary integer selected by end-user
      * mods.
@@ -11,4 +11,4 @@ export interface CustomGridEntityData {
     defaultAnimation?: string;
     gridCollisionClass: GridCollisionClass;
 }
-//# sourceMappingURL=CustomGridEntityData.d.ts.map
+//# sourceMappingURL=GridEntityCustomData.d.ts.map

package/dist/interfaces/{CustomGridEntityData.d.ts.map → GridEntityCustomData.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"CustomGridEntityData.d.ts","sourceRoot":"","sources":["../../src/interfaces/CustomGridEntityData.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACf,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,oBAAoB,EAAE,cAAc,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,kBAAkB,CAAC;CACxC"}
+{"version":3,"file":"GridEntityCustomData.d.ts","sourceRoot":"","sources":["../../src/interfaces/GridEntityCustomData.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACf,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,oBAAoB,EAAE,cAAc,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,kBAAkB,CAAC;CACxC"}

package/package.json

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

package/src/enums/ModCallbackCustom.ts

@@ -564,7 +564,7 @@ export enum ModCallbackCustom {
    * - When registering the callback, takes an optional second argument that will make the callback
    *   only fire if it matches the `ItemType` provided.
    * - When registering the callback, takes an optional third argument that will make the callback
-   *   only fire if the `CollectibleType` or the `TrinketType` matches the ID provided.
+   *   only fire if the `CollectibleType` or the `TrinketType` matches the sub-type provided.
    *
    * ```ts
    * function postItemPickup(

package/src/features/customGridEntity.ts

@@ -2,6 +2,7 @@ import {
   ActiveSlot,
   CollectibleType,
   DamageFlag,
+  EntityFlag,
   EntityType,
   GridCollisionClass,
   GridEntityType,
@@ -15,7 +16,7 @@ import { ModUpgraded } from "../classes/ModUpgraded";
 import { DecorationVariant } from "../enums/DecorationVariant";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
-import { spawnNPC } from "../functions/entitiesSpecific";
+import { spawn } from "../functions/entities";
 import { hasFlag } from "../functions/flag";
 import {
   removeGridEntity,
@@ -23,22 +24,23 @@ import {
 } from "../functions/gridEntities";
 import { getRoomListIndex } from "../functions/roomData";
 import { isVector } from "../functions/vector";
-import { CustomGridEntityData } from "../interfaces/CustomGridEntityData";
+import { GridEntityCustomData } from "../interfaces/GridEntityCustomData";
 import { runNextGameFrame } from "./runInNFrames";
 import { saveDataManager } from "./saveDataManager/exports";
 
 const FEATURE_NAME = "customGridEntity";
+const GENERIC_PROP_SIZE_MULTIPLIER = 0.66;
 
 const v = {
   level: {
     /** Indexed by room list index and grid index. */
-    customGridEntities: new DefaultMap<int, Map<int, CustomGridEntityData>>(
+    customGridEntities: new DefaultMap<int, Map<int, GridEntityCustomData>>(
       () => new Map(),
     ),
   },
 
   room: {
-    dummyPtrHashes: new Set<PtrHash>(),
+    genericPropPtrHashes: new Set<PtrHash>(),
     manuallyUsingShovel: false,
   },
 };
@@ -49,8 +51,8 @@ export function customGridEntityInit(mod: ModUpgraded): void {
 
   mod.AddCallback(
     ModCallback.ENTITY_TAKE_DMG,
-    entityTakeDmgDummy,
-    EntityType.DUMMY,
+    entityTakeDmgGenericProp,
+    EntityType.GENERIC_PROP,
   ); // 11
 
   mod.AddCallback(
@@ -66,8 +68,8 @@ export function customGridEntityInit(mod: ModUpgraded): void {
 }
 
 // ModCallback.ENTITY_TAKE_DMG (11)
-// EntityType.DUMMY (964)
-function entityTakeDmgDummy(
+// EntityType.GENERIC_PROP (960)
+function entityTakeDmgGenericProp(
   tookDamage: Entity,
   _damageAmount: float,
   damageFlags: BitFlags<DamageFlag>,
@@ -75,7 +77,7 @@ function entityTakeDmgDummy(
   _damageCountdownFrames: int,
 ): boolean | undefined {
   const ptrHash = GetPtrHash(tookDamage);
-  if (!v.room.dummyPtrHashes.has(ptrHash)) {
+  if (!v.room.genericPropPtrHashes.has(ptrHash)) {
     return undefined;
   }
 
@@ -105,8 +107,8 @@ function entityTakeDmgDummy(
 
   postGridEntityCustomBrokenFire(gridEntity, data.gridEntityTypeCustom);
 
-  // Even though the custom grid entity is now broke, we do not want to remove it, as the end-user
-  // could intend for it to persist with different graphics.
+  // Even though the custom grid entity is now broken, we do not want to remove it, as the end-user
+  // could intend for it to persist with different graphics (or take multiple hits to be destroyed).
   return false;
 }
 
@@ -261,6 +263,7 @@ export function spawnCustomGridEntity(
   if (decoration === undefined) {
     error("Failed to spawn a decoration for a custom grid entity.");
   }
+  decoration.CollisionClass = gridCollisionClass;
 
   const sprite = decoration.GetSprite();
   sprite.Load(anm2Path, true);
@@ -270,7 +273,7 @@ export function spawnCustomGridEntity(
       : defaultAnimation;
   sprite.Play(animationToPlay, true);
 
-  const customGridEntityData: CustomGridEntityData = {
+  const customGridEntityData: GridEntityCustomData = {
     gridEntityTypeCustom,
     roomListIndex,
     gridIndex,
@@ -287,8 +290,18 @@ export function spawnCustomGridEntity(
   // the monitoring for explosions in the `ENTITY_TAKE_DMG` callback.
   if (breakable) {
     const position = room.GetGridPosition(gridIndex);
-    const dummy = spawnNPC(EntityType.DUMMY, 0, 0, position);
-    dummy.Visible = false;
+    const entity = spawn(EntityType.GENERIC_PROP, 0, 0, position);
+    entity.ClearEntityFlags(EntityFlag.APPEAR);
+    entity.Visible = false;
+
+    // By default, it is larger than a grid tile, so make it a bit smaller.
+    entity.SizeMulti = Vector(
+      GENERIC_PROP_SIZE_MULTIPLIER,
+      GENERIC_PROP_SIZE_MULTIPLIER,
+    );
+
+    const ptrHash = GetPtrHash(entity);
+    v.room.genericPropPtrHashes.add(ptrHash);
   }
 
   return decoration;
@@ -309,7 +322,7 @@ export function spawnCustomGridEntity(
  * @returns The grid entity that was removed. Returns undefined if no grid entity was found at the
  *          given location or if the given grid entity was not a custom grid entity.
  */
-export function removeCustomGrid(
+export function removeCustomGridEntity(
   gridIndexOrPositionOrGridEntity: int | Vector | GridEntity,
   updateRoom = true,
 ): GridEntity | undefined {
@@ -356,7 +369,7 @@ export function removeCustomGrid(
  * containing the raw decoration grid entity and the associated entity data.
  */
 export function getCustomGridEntities(): Array<
-  [gridEntity: GridEntity, data: CustomGridEntityData]
+  [gridEntity: GridEntity, data: GridEntityCustomData]
 > {
   const roomListIndex = getRoomListIndex();
   const roomCustomGridEntities = v.level.customGridEntities.get(roomListIndex);
@@ -365,7 +378,7 @@ export function getCustomGridEntities(): Array<
   }
 
   const room = game.GetRoom();
-  const customGridEntities: Array<[GridEntity, CustomGridEntityData]> = [];
+  const customGridEntities: Array<[GridEntity, GridEntityCustomData]> = [];
   for (const [gridIndex, data] of roomCustomGridEntities.entries()) {
     const gridEntity = room.GetGridEntity(gridIndex);
     if (gridEntity !== undefined) {

package/src/features/extraConsoleCommands/listCommands.ts

@@ -64,7 +64,7 @@ import { getEnumValues } from "../../functions/enums";
 import { addFlag } from "../../functions/flag";
 import { spawnGridEntity } from "../../functions/gridEntities";
 import {
-  logEffects,
+  logPlayerEffects,
   logRoom,
   logSeedEffects,
   logSounds,
@@ -515,7 +515,7 @@ export function dungeon(): void {
 /** Logs the player's current temporary effects to the "log.txt" file. */
 export function effects(): void {
   const player = Isaac.GetPlayer();
-  logEffects(player);
+  logPlayerEffects(player);
   printConsole('Logged the player\'s effects to the "log.txt" file.');
 }
 

package/src/features/pickupIndex.ts

@@ -170,10 +170,10 @@ function postNewRoomReordered() {
     }
 
     if (pickupIndex === undefined) {
-      const entityID = getEntityID(pickup);
-      error(
-        `Failed to find a pickup index corresponding to existing pickup: ${entityID}`,
-      );
+      // At this point, if we do not already have an existing pickup index, we need to create a new
+      // one in order to cover the cases where mods spawn items in the `POST_NEW_ROOM` callback.
+      v.run.pickupCounter++;
+      pickupIndex = v.run.pickupCounter;
     }
 
     const ptrHash = GetPtrHash(pickup);

package/src/features/playerInventory.ts

@@ -5,7 +5,7 @@ import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { arrayRemoveInPlace, copyArray } from "../functions/array";
 import { isActiveCollectible } from "../functions/collectibles";
-import { getCollectibleSet } from "../functions/collectibleSet";
+import { getCollectibleArray } from "../functions/collectibleSet";
 import {
   defaultMapGetPlayer,
   mapSetPlayer,
@@ -30,8 +30,7 @@ const v = {
 function newPlayerInventory(player: EntityPlayer) {
   const inventory: CollectibleType[] = [];
 
-  const collectibleSet = getCollectibleSet();
-  for (const collectibleType of collectibleSet.values()) {
+  for (const collectibleType of getCollectibleArray()) {
     const numCollectibles = player.GetCollectibleNum(collectibleType, true);
     repeat(numCollectibles, () => {
       inventory.push(collectibleType);

package/src/functions/eden.ts

@@ -1,6 +1,6 @@
 import { CollectibleType, ItemConfigTag } from "isaac-typescript-definitions";
 import { isHiddenCollectible, isPassiveCollectible } from "./collectibles";
-import { getCollectibleSet } from "./collectibleSet";
+import { getCollectibleArray } from "./collectibleSet";
 import { collectibleHasTag } from "./collectibleTag";
 import { getRandomSeed } from "./rng";
 import { copySet, getRandomSetElement } from "./set";
@@ -8,9 +8,7 @@ import { copySet, getRandomSetElement } from "./set";
 const EDEN_PASSIVE_COLLECTIBLES_SET = new Set<CollectibleType>();
 
 function initCollectibleSet() {
-  const collectibleSet = getCollectibleSet();
-
-  for (const collectibleType of collectibleSet.values()) {
+  for (const collectibleType of getCollectibleArray()) {
     if (
       isPassiveCollectible(collectibleType) &&
       !isHiddenCollectible(collectibleType) &&

package/src/functions/itemPool.ts

@@ -7,7 +7,7 @@ import {
 } from "isaac-typescript-definitions";
 import { game } from "../cachedClasses";
 import { PlayerIndex } from "../types/PlayerIndex";
-import { getCollectibleSet } from "./collectibleSet";
+import { getCollectibleArray } from "./collectibleSet";
 import { collectibleHasTag } from "./collectibleTag";
 import { mapGetPlayer, mapSetPlayer } from "./playerDataStructures";
 import { getPlayers } from "./playerIndex";
@@ -24,17 +24,41 @@ const TRINKETS_THAT_AFFECT_ITEM_POOLS: readonly TrinketType[] = [
   TrinketType.NO,
 ];
 
+const COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS = CollectibleType.KEY_PIECE_1;
+
+/**
+ * Helper function to get the remaining collectibles in a given item pool. This function is
+ * expensive, so only use it in situations where the lag is acceptable.
+ */
+export function getCollectiblesInItemPool(
+  itemPoolType: ItemPoolType,
+): CollectibleType[] {
+  const collectibleArray = getCollectibleArray();
+  return collectibleArray.filter((collectibleType) =>
+    isCollectibleInItemPool(collectibleType, itemPoolType),
+  );
+}
+
 /**
  * Helper function to see if the given collectible is still present in the given item pool.
  *
  * If the collectible is non-offensive, any Tainted Losts will be temporarily changed to Isaac and
  * then changed back. (This is because Tainted Lost is not able to retrieve non-offensive
  * collectibles from item pools).
+ *
+ * Under the hood, this function works by using the `ItemPool.AddRoomBlacklist` method to blacklist
+ * every collectible except for the one provided.
  */
 export function isCollectibleInItemPool(
   collectibleType: CollectibleType,
   itemPoolType: ItemPoolType,
 ): boolean {
+  // We use a specific collectible which is known to not be in any pools as a default value. Thus,
+  // we must explicitly handle this case.
+  if (collectibleType === COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS) {
+    return false;
+  }
+
   // On Tainted Lost, it is impossible to retrieve non-offensive collectibles from pools, so we
   // temporarily change the character to Isaac.
   const taintedLosts = getPlayersOfType(PlayerType.THE_LOST_B);
@@ -55,8 +79,8 @@ export function isCollectibleInItemPool(
 
   // Blacklist every collectible in the game except for the provided collectible.
   const itemPool = game.GetItemPool();
-  const collectibleSet = getCollectibleSet();
-  for (const collectibleTypeInSet of collectibleSet.values()) {
+  itemPool.ResetRoomBlacklist();
+  for (const collectibleTypeInSet of getCollectibleArray()) {
     if (collectibleTypeInSet !== collectibleType) {
       itemPool.AddRoomBlacklist(collectibleTypeInSet);
     }
@@ -64,12 +88,13 @@ export function isCollectibleInItemPool(
 
   // Get a collectible from the pool and see if it is the intended collectible. (We can use any
   // arbitrary value as the seed since it should not influence the result.)
+  const seed = 1 as Seed;
   const retrievedCollectibleType = itemPool.GetCollectible(
     itemPoolType,
     false,
-    1 as Seed,
+    seed,
+    COLLECTIBLE_TYPE_THAT_IS_NOT_IN_ANY_POOLS,
   );
-
   const collectibleUnlocked = retrievedCollectibleType === collectibleType;
 
   // Reset the blacklist

package/src/functions/log.ts

@@ -203,34 +203,6 @@ export function logDamageFlags(
   logFlags(flags, DamageFlag, "damage");
 }
 
-export function logEffects(this: void, player: EntityPlayer): void {
-  const effects = getEffectsList(player);
-
-  log("Logging player effects:");
-
-  if (effects.length === 0) {
-    log("  n/a (no effects)");
-    return;
-  }
-
-  effects.forEach((effect, i) => {
-    let effectDescription: string;
-    if (effect.Item.IsCollectible()) {
-      const collectibleName = getCollectibleName(effect.Item.ID);
-      effectDescription = `Collectible: ${collectibleName}`;
-    } else if (effect.Item.IsTrinket()) {
-      const trinketName = getTrinketName(effect.Item.ID);
-      effectDescription = `Trinket: ${trinketName}`;
-    } else if (effect.Item.IsNull()) {
-      effectDescription = `Null item: ${effect.Item.ID}`;
-    } else {
-      effectDescription = `Unknown type of effect: ${effect.Item.ID}`;
-    }
-
-    log(`  ${i + 1}) ${effectDescription} (x${effect.Count})`);
-  });
-}
-
 /** Helper function for logging an array of specific entities. */
 export function logEntities(this: void, entities: Entity[]): void {
   for (const entity of entities) {
@@ -505,6 +477,34 @@ export function logMap(this: void, map: Map<AnyNotNil, unknown>): void {
   log(`  The size of the map was: ${map.size}`);
 }
 
+export function logPlayerEffects(this: void, player: EntityPlayer): void {
+  const effects = getEffectsList(player);
+
+  log("Logging player effects:");
+
+  if (effects.length === 0) {
+    log("  n/a (no effects)");
+    return;
+  }
+
+  effects.forEach((effect, i) => {
+    let effectDescription: string;
+    if (effect.Item.IsCollectible()) {
+      const collectibleName = getCollectibleName(effect.Item.ID);
+      effectDescription = `Collectible: ${collectibleName}`;
+    } else if (effect.Item.IsTrinket()) {
+      const trinketName = getTrinketName(effect.Item.ID);
+      effectDescription = `Trinket: ${trinketName}`;
+    } else if (effect.Item.IsNull()) {
+      effectDescription = `Null item: ${effect.Item.ID}`;
+    } else {
+      effectDescription = `Unknown type of effect: ${effect.Item.ID}`;
+    }
+
+    log(`  ${i + 1}) ${effectDescription} (x${effect.Count})`);
+  });
+}
+
 export function logPlayerHealth(this: void, player: EntityPlayer): void {
   const playerName = getPlayerName(player);
   const playerHealth = getPlayerHealth(player);
@@ -769,7 +769,6 @@ export function setLogFunctionsGlobal(): void {
   globals["logArray"] = logArray;
   globals["logColor"] = logColor;
   globals["logDamageFlags"] = logDamageFlags;
-  globals["logEffects"] = logEffects;
   globals["logEntities"] = logEntities;
   globals["logEntity"] = logEntity;
   globals["logEntityID"] = logEntityID;
@@ -782,6 +781,7 @@ export function setLogFunctionsGlobal(): void {
   globals["logKColor"] = logKColor;
   globals["logLevelStateFlags"] = logLevelStateFlags;
   globals["logMap"] = logMap;
+  globals["logPlayerEffects"] = logPlayerEffects;
   globals["logPlayerHealth"] = logPlayerHealth;
   globals["logProjectileFlags"] = logProjectileFlags;
   globals["logRoom"] = logRoom;

package/src/functions/saveFile.ts

@@ -4,7 +4,7 @@ import { anyPlayerHasCollectible } from "./players";
 
 /**
  * Helper function to see if the given collectible is unlocked on the current save file. This
- * requires providing the corresponding item pool that the collectible is located in.
+ * requires providing the corresponding item pool that the collectible is normally located in.
  *
  * - If any player currently has the collectible, then it is assumed to be unlocked. (This is
  *   because in almost all cases, when a collectible is added to a player's inventory, it is

package/src/index.ts

@@ -23,7 +23,7 @@ export {
 export { registerCharacterStats } from "./features/characterStats";
 export { getCollectibleItemPoolType } from "./features/collectibleItemPoolType";
 export {
-  removeCustomGrid,
+  removeCustomGridEntity as removeCustomGrid,
   spawnCustomGridEntity as spawnCustomGrid,
 } from "./features/customGridEntity";
 export * from "./features/customStage/exports";

package/src/interfaces/{CustomGridEntityData.ts → GridEntityCustomData.ts}

@@ -3,7 +3,7 @@ import {
   GridEntityType,
 } from "isaac-typescript-definitions";
 
-export interface CustomGridEntityData {
+export interface GridEntityCustomData {
   /**
    * This is not a real `GridEntityType`; rather it is an arbitrary integer selected by end-user
    * mods.