isaacscript-common 6.17.1 → 6.18.0

package/dist/functions/rockAlt.d.ts

@@ -24,10 +24,10 @@ export declare function getRockAltType(): RockAltType;
  * Most of the time, this function will do nothing, similar to how most of the time, when an
  * individual urn is destroyed, nothing will spawn.
  *
- * Note that in vanilla, trinkets will not spawn if they have already been removed from the trinket
- * pool. This function cannot replicate that behavior because there is no way to check to see if a
- * trinket is still in the pool. Thus, it will always have a chance to spawn the respective trinket
- * (e.g. Swallowed Penny from urns).
+ * Note that in vanilla, collectibles and trinkets will not spawn if they have already been removed
+ * from the respective pool. This function cannot replicate that behavior because there is no way to
+ * check to see if a collectible or trinket is still in the pool. Thus, it will always have a chance
+ * to spawn the respective collectible/trinket (e.g. Swallowed Penny from urns).
  *
  * The logic in this function is based on the rewards listed on the wiki:
  * https://bindingofisaacrebirth.fandom.com/wiki/Rocks

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

@@ -1 +1 @@
-{"version":3,"file":"rockAlt.d.ts","sourceRoot":"","sources":["../../src/functions/rockAlt.ts"],"names":[],"mappings":";;;AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AA+BnD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAK5C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,EACxB,OAAO,SAAI,EACX,SAAS,GAAE,IAAI,GAAG,GAAqB,GACtC,OAAO,CAwBT"}
+{"version":3,"file":"rockAlt.d.ts","sourceRoot":"","sources":["../../src/functions/rockAlt.ts"],"names":[],"mappings":";;;AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AA8BnD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAK5C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,EACxB,OAAO,SAAI,EACX,SAAS,GAAE,IAAI,GAAG,GAAqB,GACtC,OAAO,CAwBT"}

package/dist/functions/rockAlt.lua

@@ -7,7 +7,6 @@ local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local HeartSubType = ____isaac_2Dtypescript_2Ddefinitions.HeartSubType
-local ItemPoolType = ____isaac_2Dtypescript_2Ddefinitions.ItemPoolType
 local PillColor = ____isaac_2Dtypescript_2Ddefinitions.PillColor
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
@@ -22,8 +21,6 @@ local BACKDROP_TYPE_TO_ROCK_ALT_TYPE = ____backdropTypeToRockAltType.BACKDROP_TY
 local ____entitiesSpecific = require("functions.entitiesSpecific")
 local spawnEffectWithSeed = ____entitiesSpecific.spawnEffectWithSeed
 local spawnNPCWithSeed = ____entitiesSpecific.spawnNPCWithSeed
-local ____itemPool = require("functions.itemPool")
-local isCollectibleInItemPool = ____itemPool.isCollectibleInItemPool
 local ____pickupsSpecific = require("functions.pickupsSpecific")
 local spawnCardWithSeed = ____pickupsSpecific.spawnCardWithSeed
 local spawnCoinWithSeed = ____pickupsSpecific.spawnCoinWithSeed
@@ -80,12 +77,8 @@ function spawnRockAltRewardUrn(self, position, rng)
     end
     totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
-        local stillInPools = isCollectibleInItemPool(nil, CollectibleType.QUARTER, ItemPoolType.DEVIL)
-        if stillInPools then
-            spawnCollectible(nil, CollectibleType.QUARTER, position, rng)
-            return true
-        end
-        return false
+        spawnCollectible(nil, CollectibleType.QUARTER, position, rng)
+        return true
     end
     local numSpidersChance = getRandom(nil, rng)
     local numSpiders = numSpidersChance < 0.5 and 1 or 2
@@ -132,30 +125,14 @@ function spawnRockAltRewardMushroom(self, position, rng)
         if roomType == RoomType.SECRET then
             local wavyCapChance = getRandom(nil, rng)
             if wavyCapChance < 0.0272 then
-                local stillInPools = isCollectibleInItemPool(nil, CollectibleType.WAVY_CAP, ItemPoolType.SECRET)
-                if stillInPools then
-                    spawnCollectible(nil, CollectibleType.WAVY_CAP, position, rng)
-                    return true
-                end
+                spawnCollectible(nil, CollectibleType.WAVY_CAP, position, rng)
+                return true
             end
         end
-        local magicMushroomStillInPools = isCollectibleInItemPool(nil, CollectibleType.MAGIC_MUSHROOM, ItemPoolType.TREASURE)
-        local miniMushStillInPools = isCollectibleInItemPool(nil, CollectibleType.MINI_MUSH, ItemPoolType.TREASURE)
-        if magicMushroomStillInPools and miniMushStillInPools then
-            local collectibleChance = getRandom(nil, rng)
-            local collectibleType = collectibleChance < 0.5 and CollectibleType.MAGIC_MUSHROOM or CollectibleType.MINI_MUSH
-            spawnCollectible(nil, collectibleType, position, rng)
-            return true
-        end
-        if magicMushroomStillInPools then
-            spawnCollectible(nil, CollectibleType.MINI_MUSH, position, rng)
-            return true
-        end
-        if miniMushStillInPools then
-            spawnCollectible(nil, CollectibleType.MAGIC_MUSHROOM, position, rng)
-            return true
-        end
-        return false
+        local collectibleChance = getRandom(nil, rng)
+        local collectibleType = collectibleChance < 0.5 and CollectibleType.MAGIC_MUSHROOM or CollectibleType.MINI_MUSH
+        spawnCollectible(nil, collectibleType, position, rng)
+        return true
     end
     spawnEffectWithSeed(
         nil,
@@ -185,23 +162,10 @@ function spawnRockAltRewardSkull(self, position, rng)
     end
     totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
-        local ghostBabyStillInPools = isCollectibleInItemPool(nil, CollectibleType.GHOST_BABY, ItemPoolType.TREASURE)
-        local dryBabyStillInPools = isCollectibleInItemPool(nil, CollectibleType.DRY_BABY, ItemPoolType.TREASURE)
-        if ghostBabyStillInPools and dryBabyStillInPools then
-            local collectibleChance = getRandom(nil, rng)
-            local collectibleType = collectibleChance < 0.5 and CollectibleType.GHOST_BABY or CollectibleType.DRY_BABY
-            spawnCollectible(nil, collectibleType, position, rng)
-            return true
-        end
-        if ghostBabyStillInPools then
-            spawnCollectible(nil, CollectibleType.DRY_BABY, position, rng)
-            return true
-        end
-        if dryBabyStillInPools then
-            spawnCollectible(nil, CollectibleType.GHOST_BABY, position, rng)
-            return true
-        end
-        return false
+        local collectibleChance = getRandom(nil, rng)
+        local collectibleType = collectibleChance < 0.5 and CollectibleType.GHOST_BABY or CollectibleType.DRY_BABY
+        spawnCollectible(nil, collectibleType, position, rng)
+        return true
     end
     spawnNPCWithSeed(
         nil,
@@ -232,23 +196,10 @@ function spawnRockAltRewardPolyp(self, position, rng)
     end
     totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
-        local placentaStillInPools = isCollectibleInItemPool(nil, CollectibleType.PLACENTA, ItemPoolType.BOSS)
-        local bloodClotStillInPools = isCollectibleInItemPool(nil, CollectibleType.BLOOD_CLOT, ItemPoolType.BOSS)
-        if bloodClotStillInPools and placentaStillInPools then
-            local collectibleChance = getRandom(nil, rng)
-            local collectibleType = collectibleChance < 0.5 and CollectibleType.PLACENTA or CollectibleType.BLOOD_CLOT
-            spawnCollectible(nil, collectibleType, position, rng)
-            return true
-        end
-        if bloodClotStillInPools then
-            spawnCollectible(nil, CollectibleType.MINI_MUSH, position, rng)
-            return true
-        end
-        if placentaStillInPools then
-            spawnCollectible(nil, CollectibleType.MAGIC_MUSHROOM, position, rng)
-            return true
-        end
-        return false
+        local collectibleChance = getRandom(nil, rng)
+        local collectibleType = collectibleChance < 0.5 and CollectibleType.PLACENTA or CollectibleType.BLOOD_CLOT
+        spawnCollectible(nil, collectibleType, position, rng)
+        return true
     end
     spawnEffectWithSeed(
         nil,
@@ -301,10 +252,10 @@ end
 -- Most of the time, this function will do nothing, similar to how most of the time, when an
 -- individual urn is destroyed, nothing will spawn.
 -- 
--- Note that in vanilla, trinkets will not spawn if they have already been removed from the trinket
--- pool. This function cannot replicate that behavior because there is no way to check to see if a
--- trinket is still in the pool. Thus, it will always have a chance to spawn the respective trinket
--- (e.g. Swallowed Penny from urns).
+-- Note that in vanilla, collectibles and trinkets will not spawn if they have already been removed
+-- from the respective pool. This function cannot replicate that behavior because there is no way to
+-- check to see if a collectible or trinket is still in the pool. Thus, it will always have a chance
+-- to spawn the respective collectible/trinket (e.g. Swallowed Penny from urns).
 -- 
 -- The logic in this function is based on the rewards listed on the wiki:
 -- https://bindingofisaacrebirth.fandom.com/wiki/Rocks

package/dist/functions/saveFile.d.ts

@@ -12,6 +12,11 @@ import { CollectibleType, ItemPoolType } from "isaac-typescript-definitions";
  * - 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. Unfortunately, this is not a general-purpose
+ * "isCollectibleInItemPool" algorithm, because when a pool is depleted, it will automatically pull
+ * items from the Treasure Room pool, and there is no way to distinguish when this happens.
  */
 export declare function isCollectibleUnlocked(collectibleType: CollectibleType, itemPoolType: ItemPoolType): boolean;
 //# sourceMappingURL=saveFile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"saveFile.d.ts","sourceRoot":"","sources":["../../src/functions/saveFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAI7E;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAMT"}
+{"version":3,"file":"saveFile.d.ts","sourceRoot":"","sources":["../../src/functions/saveFile.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAoBtC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CA2DT"}

package/dist/functions/saveFile.lua

@@ -1,8 +1,85 @@
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__Iterator = ____lualib.__TS__Iterator
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____itemPool = require("functions.itemPool")
-local isCollectibleInItemPool = ____itemPool.isCollectibleInItemPool
+local removeItemsAndTrinketsThatAffectItemPools, restoreItemsAndTrinketsThatAffectItemPools, COLLECTIBLES_THAT_AFFECT_ITEM_POOLS, TRINKETS_THAT_AFFECT_ITEM_POOLS
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
+local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
+local ____cachedClasses = require("cachedClasses")
+local game = ____cachedClasses.game
+local ____collectibleSet = require("functions.collectibleSet")
+local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local ____collectibleTag = require("functions.collectibleTag")
+local collectibleHasTag = ____collectibleTag.collectibleHasTag
+local ____playerDataStructures = require("functions.playerDataStructures")
+local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
+local ____playerIndex = require("functions.playerIndex")
+local getPlayers = ____playerIndex.getPlayers
 local ____players = require("functions.players")
 local anyPlayerHasCollectible = ____players.anyPlayerHasCollectible
+local getPlayersOfType = ____players.getPlayersOfType
+local ____utils = require("functions.utils")
+local ____repeat = ____utils["repeat"]
+function removeItemsAndTrinketsThatAffectItemPools(self)
+    local removedItemsMap = __TS__New(Map)
+    local removedTrinketsMap = __TS__New(Map)
+    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
+        end
+        mapSetPlayer(nil, removedItemsMap, player, removedItems)
+        local removedTrinkets = {}
+        for ____, trinketToRemove in ipairs(TRINKETS_THAT_AFFECT_ITEM_POOLS) do
+            if player:HasTrinket(trinketToRemove) then
+                local numTrinkets = player:GetTrinketMultiplier(trinketToRemove)
+                ____repeat(
+                    nil,
+                    numTrinkets,
+                    function()
+                        player:TryRemoveTrinket(trinketToRemove)
+                        removedTrinkets[#removedTrinkets + 1] = trinketToRemove
+                    end
+                )
+            end
+        end
+        mapSetPlayer(nil, removedTrinketsMap, player, removedTrinkets)
+    end
+    return {removedItemsMap, removedTrinketsMap}
+end
+function restoreItemsAndTrinketsThatAffectItemPools(self, removedItemsMap, removedTrinketsMap)
+    for ____, player in ipairs(getPlayers(nil)) do
+        local removedItems = mapGetPlayer(nil, removedItemsMap, player)
+        if removedItems ~= nil then
+            for ____, collectibleType in ipairs(removedItems) do
+                player:AddCollectible(collectibleType, 0, false)
+            end
+        end
+        local removedTrinkets = mapGetPlayer(nil, removedTrinketsMap, player)
+        if removedTrinkets ~= nil then
+            for ____, trinketType in ipairs(removedTrinkets) do
+                player:AddTrinket(trinketType, false)
+            end
+        end
+    end
+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 unlocked on the current save file. This
 -- requires providing the corresponding item pool that the collectible is located in.
 -- 
@@ -15,10 +92,42 @@ local anyPlayerHasCollectible = ____players.anyPlayerHasCollectible
 -- - 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. Unfortunately, this is not a general-purpose
+-- "isCollectibleInItemPool" algorithm, because when a pool is depleted, it will automatically pull
+-- items from the Treasure Room pool, and there is no way to distinguish when this happens.
 function ____exports.isCollectibleUnlocked(self, collectibleType, itemPoolType)
     if anyPlayerHasCollectible(nil, collectibleType) then
         return true
     end
-    return isCollectibleInItemPool(nil, 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 seed = 1
+    local retrievedCollectibleType = itemPool:GetCollectible(itemPoolType, false, seed)
+    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
 return ____exports

package/dist/index.d.ts

@@ -74,7 +74,6 @@ export * from "./functions/gridEntities";
 export * from "./functions/gridEntitiesSpecific";
 export * from "./functions/input";
 export * from "./functions/isaacAPIClass";
-export * from "./functions/itemPool";
 export * from "./functions/jsonHelpers";
 export * from "./functions/jsonRoom";
 export * from "./functions/kColor";

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

@@ -590,14 +590,6 @@ do
         end
     end
 end
-do
-    local ____export = require("functions.itemPool")
-    for ____exportKey, ____exportValue in pairs(____export) do
-        if ____exportKey ~= "default" then
-            ____exports[____exportKey] = ____exportValue
-        end
-    end
-end
 do
     local ____export = require("functions.jsonHelpers")
     for ____exportKey, ____exportValue in pairs(____export) do

package/package.json

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

package/src/functions/rockAlt.ts

@@ -5,7 +5,6 @@ import {
   EffectVariant,
   EntityType,
   HeartSubType,
-  ItemPoolType,
   PillColor,
   RoomType,
   TrinketType,
@@ -15,7 +14,6 @@ import { DISTANCE_OF_GRID_TILE } from "../constants";
 import { RockAltType } from "../enums/RockAltType";
 import { BACKDROP_TYPE_TO_ROCK_ALT_TYPE } from "../objects/backdropTypeToRockAltType";
 import { spawnEffectWithSeed, spawnNPCWithSeed } from "./entitiesSpecific";
-import { isCollectibleInItemPool } from "./itemPool";
 import {
   spawnCardWithSeed,
   spawnCoinWithSeed,
@@ -71,10 +69,10 @@ export function getRockAltType(): RockAltType {
  * Most of the time, this function will do nothing, similar to how most of the time, when an
  * individual urn is destroyed, nothing will spawn.
  *
- * Note that in vanilla, trinkets will not spawn if they have already been removed from the trinket
- * pool. This function cannot replicate that behavior because there is no way to check to see if a
- * trinket is still in the pool. Thus, it will always have a chance to spawn the respective trinket
- * (e.g. Swallowed Penny from urns).
+ * Note that in vanilla, collectibles and trinkets will not spawn if they have already been removed
+ * from the respective pool. This function cannot replicate that behavior because there is no way to
+ * check to see if a collectible or trinket is still in the pool. Thus, it will always have a chance
+ * to spawn the respective collectible/trinket (e.g. Swallowed Penny from urns).
  *
  * The logic in this function is based on the rewards listed on the wiki:
  * https://bindingofisaacrebirth.fandom.com/wiki/Rocks
@@ -152,16 +150,8 @@ function spawnRockAltRewardUrn(position: Vector, rng: RNG): boolean {
 
   totalChance += ROCK_ALT_CHANCES.COLLECTIBLE;
   if (chance < totalChance) {
-    const stillInPools = isCollectibleInItemPool(
-      CollectibleType.QUARTER,
-      ItemPoolType.DEVIL,
-    );
-    if (stillInPools) {
-      spawnCollectible(CollectibleType.QUARTER, position, rng);
-      return true;
-    }
-
-    return false;
+    spawnCollectible(CollectibleType.QUARTER, position, rng);
+    return true;
   }
 
   // Since the detrimental effect is the final option, we don't need to check the chance.
@@ -206,46 +196,18 @@ function spawnRockAltRewardMushroom(position: Vector, rng: RNG): boolean {
     if (roomType === RoomType.SECRET) {
       const wavyCapChance = getRandom(rng);
       if (wavyCapChance < 0.0272) {
-        const stillInPools = isCollectibleInItemPool(
-          CollectibleType.WAVY_CAP,
-          ItemPoolType.SECRET,
-        );
-        if (stillInPools) {
-          spawnCollectible(CollectibleType.WAVY_CAP, position, rng);
-          return true;
-        }
+        spawnCollectible(CollectibleType.WAVY_CAP, position, rng);
+        return true;
       }
     }
 
-    const magicMushroomStillInPools = isCollectibleInItemPool(
-      CollectibleType.MAGIC_MUSHROOM,
-      ItemPoolType.TREASURE,
-    );
-    const miniMushStillInPools = isCollectibleInItemPool(
-      CollectibleType.MINI_MUSH,
-      ItemPoolType.TREASURE,
-    );
-    if (magicMushroomStillInPools && miniMushStillInPools) {
-      const collectibleChance = getRandom(rng);
-      const collectibleType =
-        collectibleChance < 0.5
-          ? CollectibleType.MAGIC_MUSHROOM // 12
-          : CollectibleType.MINI_MUSH; // 71
-      spawnCollectible(collectibleType, position, rng);
-      return true;
-    }
-
-    if (magicMushroomStillInPools) {
-      spawnCollectible(CollectibleType.MINI_MUSH, position, rng);
-      return true;
-    }
-
-    if (miniMushStillInPools) {
-      spawnCollectible(CollectibleType.MAGIC_MUSHROOM, position, rng);
-      return true;
-    }
-
-    return false;
+    const collectibleChance = getRandom(rng);
+    const collectibleType =
+      collectibleChance < 0.5
+        ? CollectibleType.MAGIC_MUSHROOM // 12
+        : CollectibleType.MINI_MUSH; // 71
+    spawnCollectible(collectibleType, position, rng);
+    return true;
   }
 
   // Since the detrimental effect is the final option, we don't need to check the chance.
@@ -276,35 +238,13 @@ function spawnRockAltRewardSkull(position: Vector, rng: RNG): boolean {
 
   totalChance += ROCK_ALT_CHANCES.COLLECTIBLE;
   if (chance < totalChance) {
-    const ghostBabyStillInPools = isCollectibleInItemPool(
-      CollectibleType.GHOST_BABY,
-      ItemPoolType.TREASURE,
-    );
-    const dryBabyStillInPools = isCollectibleInItemPool(
-      CollectibleType.DRY_BABY,
-      ItemPoolType.TREASURE,
-    );
-    if (ghostBabyStillInPools && dryBabyStillInPools) {
-      const collectibleChance = getRandom(rng);
-      const collectibleType =
-        collectibleChance < 0.5
-          ? CollectibleType.GHOST_BABY // 163
-          : CollectibleType.DRY_BABY; // 265
-      spawnCollectible(collectibleType, position, rng);
-      return true;
-    }
-
-    if (ghostBabyStillInPools) {
-      spawnCollectible(CollectibleType.DRY_BABY, position, rng);
-      return true;
-    }
-
-    if (dryBabyStillInPools) {
-      spawnCollectible(CollectibleType.GHOST_BABY, position, rng);
-      return true;
-    }
-
-    return false;
+    const collectibleChance = getRandom(rng);
+    const collectibleType =
+      collectibleChance < 0.5
+        ? CollectibleType.GHOST_BABY // 163
+        : CollectibleType.DRY_BABY; // 265
+    spawnCollectible(collectibleType, position, rng);
+    return true;
   }
 
   // Since the detrimental effect is the final option, we don't need to check the chance.
@@ -335,35 +275,13 @@ function spawnRockAltRewardPolyp(position: Vector, rng: RNG): boolean {
 
   totalChance += ROCK_ALT_CHANCES.COLLECTIBLE;
   if (chance < totalChance) {
-    const placentaStillInPools = isCollectibleInItemPool(
-      CollectibleType.PLACENTA,
-      ItemPoolType.BOSS,
-    );
-    const bloodClotStillInPools = isCollectibleInItemPool(
-      CollectibleType.BLOOD_CLOT,
-      ItemPoolType.BOSS,
-    );
-    if (bloodClotStillInPools && placentaStillInPools) {
-      const collectibleChance = getRandom(rng);
-      const collectibleType =
-        collectibleChance < 0.5
-          ? CollectibleType.PLACENTA // 218
-          : CollectibleType.BLOOD_CLOT; // 254
-      spawnCollectible(collectibleType, position, rng);
-      return true;
-    }
-
-    if (bloodClotStillInPools) {
-      spawnCollectible(CollectibleType.MINI_MUSH, position, rng);
-      return true;
-    }
-
-    if (placentaStillInPools) {
-      spawnCollectible(CollectibleType.MAGIC_MUSHROOM, position, rng);
-      return true;
-    }
-
-    return false;
+    const collectibleChance = getRandom(rng);
+    const collectibleType =
+      collectibleChance < 0.5
+        ? CollectibleType.PLACENTA // 218
+        : CollectibleType.BLOOD_CLOT; // 254
+    spawnCollectible(collectibleType, position, rng);
+    return true;
   }
 
   // Since the detrimental effect is the final option, we don't need to check the chance.

package/src/functions/saveFile.ts

@@ -1,6 +1,28 @@
-import { CollectibleType, ItemPoolType } from "isaac-typescript-definitions";
-import { isCollectibleInItemPool } from "./itemPool";
-import { anyPlayerHasCollectible } from "./players";
+import {
+  CollectibleType,
+  ItemConfigTag,
+  ItemPoolType,
+  PlayerType,
+  TrinketType,
+} from "isaac-typescript-definitions";
+import { game } from "../cachedClasses";
+import { PlayerIndex } from "../types/PlayerIndex";
+import { getCollectibleSet } from "./collectibleSet";
+import { collectibleHasTag } from "./collectibleTag";
+import { mapGetPlayer, mapSetPlayer } from "./playerDataStructures";
+import { getPlayers } from "./playerIndex";
+import { anyPlayerHasCollectible, getPlayersOfType } from "./players";
+import { repeat } from "./utils";
+
+const COLLECTIBLES_THAT_AFFECT_ITEM_POOLS: readonly CollectibleType[] = [
+  CollectibleType.CHAOS, // 402
+  CollectibleType.SACRED_ORB, // 691
+  CollectibleType.TMTRAINER, // 721
+];
+
+const TRINKETS_THAT_AFFECT_ITEM_POOLS: readonly TrinketType[] = [
+  TrinketType.NO,
+];
 
 /**
  * Helper function to see if the given collectible is unlocked on the current save file. This
@@ -15,6 +37,11 @@ import { anyPlayerHasCollectible } from "./players";
  * - 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. Unfortunately, this is not a general-purpose
+ * "isCollectibleInItemPool" algorithm, because when a pool is depleted, it will automatically pull
+ * items from the Treasure Room pool, and there is no way to distinguish when this happens.
  */
 export function isCollectibleUnlocked(
   collectibleType: CollectibleType,
@@ -24,5 +51,120 @@ export function isCollectibleUnlocked(
     return true;
   }
 
-  return isCollectibleInItemPool(collectibleType, itemPoolType);
+  // 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);
+  const isOffensive = collectibleHasTag(
+    collectibleType,
+    ItemConfigTag.OFFENSIVE,
+  );
+  let changedPlayerTypes = false;
+  if (!isOffensive) {
+    changedPlayerTypes = true;
+    for (const player of taintedLosts) {
+      player.ChangePlayerType(PlayerType.ISAAC);
+    }
+  }
+
+  const [removedItemsMap, removedTrinketsMap] =
+    removeItemsAndTrinketsThatAffectItemPools();
+
+  // Blacklist every collectible in the game except for the provided collectible.
+  const itemPool = game.GetItemPool();
+  const collectibleSet = getCollectibleSet();
+  for (const collectibleTypeInSet of collectibleSet.values()) {
+    if (collectibleTypeInSet !== collectibleType) {
+      itemPool.AddRoomBlacklist(collectibleTypeInSet);
+    }
+  }
+
+  // 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,
+    seed,
+  );
+
+  const collectibleUnlocked = retrievedCollectibleType === collectibleType;
+
+  // Reset the blacklist
+  itemPool.ResetRoomBlacklist();
+
+  restoreItemsAndTrinketsThatAffectItemPools(
+    removedItemsMap,
+    removedTrinketsMap,
+  );
+
+  // Change any players back to Tainted Lost, if necessary.
+  if (changedPlayerTypes) {
+    for (const player of taintedLosts) {
+      player.ChangePlayerType(PlayerType.THE_LOST_B);
+    }
+  }
+
+  return collectibleUnlocked;
+}
+
+/**
+ * Before checking the item pools, remove any collectibles or trinkets that would affect the
+ * retrieved collectible types.
+ */
+function removeItemsAndTrinketsThatAffectItemPools(): [
+  removedItemsMap: Map<PlayerIndex, CollectibleType[]>,
+  removedTrinketsMap: Map<PlayerIndex, TrinketType[]>,
+] {
+  const removedItemsMap = new Map<PlayerIndex, CollectibleType[]>();
+  const removedTrinketsMap = new Map<PlayerIndex, TrinketType[]>();
+  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);
+        });
+      }
+    }
+
+    mapSetPlayer(removedItemsMap, player, removedItems);
+
+    const removedTrinkets: TrinketType[] = [];
+    for (const trinketToRemove of TRINKETS_THAT_AFFECT_ITEM_POOLS) {
+      if (player.HasTrinket(trinketToRemove)) {
+        const numTrinkets = player.GetTrinketMultiplier(trinketToRemove);
+        repeat(numTrinkets, () => {
+          player.TryRemoveTrinket(trinketToRemove);
+          removedTrinkets.push(trinketToRemove);
+        });
+      }
+    }
+
+    mapSetPlayer(removedTrinketsMap, player, removedTrinkets);
+  }
+
+  return [removedItemsMap, removedTrinketsMap];
+}
+
+function restoreItemsAndTrinketsThatAffectItemPools(
+  removedItemsMap: Map<PlayerIndex, CollectibleType[]>,
+  removedTrinketsMap: Map<PlayerIndex, TrinketType[]>,
+) {
+  for (const player of getPlayers()) {
+    const removedItems = mapGetPlayer(removedItemsMap, player);
+    if (removedItems !== undefined) {
+      for (const collectibleType of removedItems) {
+        player.AddCollectible(collectibleType, 0, false); // Prevent Chaos from spawning pickups
+      }
+    }
+
+    const removedTrinkets = mapGetPlayer(removedTrinketsMap, player);
+    if (removedTrinkets !== undefined) {
+      for (const trinketType of removedTrinkets) {
+        player.AddTrinket(trinketType, false);
+      }
+    }
+  }
 }

package/src/index.ts

@@ -117,7 +117,6 @@ export * from "./functions/gridEntities";
 export * from "./functions/gridEntitiesSpecific";
 export * from "./functions/input";
 export * from "./functions/isaacAPIClass";
-export * from "./functions/itemPool";
 export * from "./functions/jsonHelpers";
 export * from "./functions/jsonRoom";
 export * from "./functions/kColor";

package/dist/functions/itemPool.d.ts

@@ -1,10 +0,0 @@
-import { CollectibleType, ItemPoolType } from "isaac-typescript-definitions";
-/**
- * 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).
- */
-export declare function isCollectibleInItemPool(collectibleType: CollectibleType, itemPoolType: ItemPoolType): boolean;
-//# sourceMappingURL=itemPool.d.ts.map

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

@@ -1 +0,0 @@
-{"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"}

package/dist/functions/itemPool.lua

@@ -1,116 +0,0 @@
-local ____lualib = require("lualib_bundle")
-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 ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
-local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
-local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
-local ____cachedClasses = require("cachedClasses")
-local game = ____cachedClasses.game
-local ____collectibleSet = require("functions.collectibleSet")
-local getCollectibleSet = ____collectibleSet.getCollectibleSet
-local ____collectibleTag = require("functions.collectibleTag")
-local collectibleHasTag = ____collectibleTag.collectibleHasTag
-local ____playerDataStructures = require("functions.playerDataStructures")
-local mapGetPlayer = ____playerDataStructures.mapGetPlayer
-local mapSetPlayer = ____playerDataStructures.mapSetPlayer
-local ____playerIndex = require("functions.playerIndex")
-local getPlayers = ____playerIndex.getPlayers
-local ____players = require("functions.players")
-local getPlayersOfType = ____players.getPlayersOfType
-local ____utils = require("functions.utils")
-local ____repeat = ____utils["repeat"]
-function removeItemsAndTrinketsThatAffectItemPools(self)
-    local removedItemsMap = __TS__New(Map)
-    local removedTrinketsMap = __TS__New(Map)
-    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
-        end
-        mapSetPlayer(nil, removedItemsMap, player, removedItems)
-        local removedTrinkets = {}
-        for ____, trinketToRemove in ipairs(TRINKETS_THAT_AFFECT_ITEM_POOLS) do
-            if player:HasTrinket(trinketToRemove) then
-                local numTrinkets = player:GetTrinketMultiplier(trinketToRemove)
-                ____repeat(
-                    nil,
-                    numTrinkets,
-                    function()
-                        player:TryRemoveTrinket(trinketToRemove)
-                        removedTrinkets[#removedTrinkets + 1] = trinketToRemove
-                    end
-                )
-            end
-        end
-        mapSetPlayer(nil, removedTrinketsMap, player, removedTrinkets)
-    end
-    return {removedItemsMap, removedTrinketsMap}
-end
-function restoreItemsAndTrinketsThatAffectItemPools(self, removedItemsMap, removedTrinketsMap)
-    for ____, player in ipairs(getPlayers(nil)) do
-        local removedItems = mapGetPlayer(nil, removedItemsMap, player)
-        if removedItems ~= nil then
-            for ____, collectibleType in ipairs(removedItems) do
-                player:AddCollectible(collectibleType, 0, false)
-            end
-        end
-        local removedTrinkets = mapGetPlayer(nil, removedTrinketsMap, player)
-        if removedTrinkets ~= nil then
-            for ____, trinketType in ipairs(removedTrinkets) do
-                player:AddTrinket(trinketType, false)
-            end
-        end
-    end
-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
-end
-return ____exports

package/src/functions/itemPool.ts

@@ -1,153 +0,0 @@
-import {
-  CollectibleType,
-  ItemConfigTag,
-  ItemPoolType,
-  PlayerType,
-  TrinketType,
-} from "isaac-typescript-definitions";
-import { game } from "../cachedClasses";
-import { PlayerIndex } from "../types/PlayerIndex";
-import { getCollectibleSet } from "./collectibleSet";
-import { collectibleHasTag } from "./collectibleTag";
-import { mapGetPlayer, mapSetPlayer } from "./playerDataStructures";
-import { getPlayers } from "./playerIndex";
-import { getPlayersOfType } from "./players";
-import { repeat } from "./utils";
-
-const COLLECTIBLES_THAT_AFFECT_ITEM_POOLS: readonly CollectibleType[] = [
-  CollectibleType.CHAOS, // 402
-  CollectibleType.SACRED_ORB, // 691
-  CollectibleType.TMTRAINER, // 721
-];
-
-const TRINKETS_THAT_AFFECT_ITEM_POOLS: readonly TrinketType[] = [
-  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).
- */
-export function isCollectibleInItemPool(
-  collectibleType: CollectibleType,
-  itemPoolType: ItemPoolType,
-): boolean {
-  // 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);
-  const isOffensive = collectibleHasTag(
-    collectibleType,
-    ItemConfigTag.OFFENSIVE,
-  );
-  let changedPlayerTypes = false;
-  if (!isOffensive) {
-    changedPlayerTypes = true;
-    for (const player of taintedLosts) {
-      player.ChangePlayerType(PlayerType.ISAAC);
-    }
-  }
-
-  const [removedItemsMap, removedTrinketsMap] =
-    removeItemsAndTrinketsThatAffectItemPools();
-
-  // Blacklist every collectible in the game except for the provided collectible.
-  const itemPool = game.GetItemPool();
-  const collectibleSet = getCollectibleSet();
-  for (const collectibleTypeInSet of collectibleSet.values()) {
-    if (collectibleTypeInSet !== collectibleType) {
-      itemPool.AddRoomBlacklist(collectibleTypeInSet);
-    }
-  }
-
-  // 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 retrievedCollectibleType = itemPool.GetCollectible(
-    itemPoolType,
-    false,
-    1 as Seed,
-  );
-
-  const collectibleUnlocked = retrievedCollectibleType === collectibleType;
-
-  // Reset the blacklist
-  itemPool.ResetRoomBlacklist();
-
-  restoreItemsAndTrinketsThatAffectItemPools(
-    removedItemsMap,
-    removedTrinketsMap,
-  );
-
-  // Change any players back to Tainted Lost, if necessary.
-  if (changedPlayerTypes) {
-    for (const player of taintedLosts) {
-      player.ChangePlayerType(PlayerType.THE_LOST_B);
-    }
-  }
-
-  return collectibleUnlocked;
-}
-
-/**
- * Before checking the item pools, remove any collectibles or trinkets that would affect the
- * retrieved collectible types.
- */
-function removeItemsAndTrinketsThatAffectItemPools(): [
-  removedItemsMap: Map<PlayerIndex, CollectibleType[]>,
-  removedTrinketsMap: Map<PlayerIndex, TrinketType[]>,
-] {
-  const removedItemsMap = new Map<PlayerIndex, CollectibleType[]>();
-  const removedTrinketsMap = new Map<PlayerIndex, TrinketType[]>();
-  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);
-        });
-      }
-    }
-
-    mapSetPlayer(removedItemsMap, player, removedItems);
-
-    const removedTrinkets: TrinketType[] = [];
-    for (const trinketToRemove of TRINKETS_THAT_AFFECT_ITEM_POOLS) {
-      if (player.HasTrinket(trinketToRemove)) {
-        const numTrinkets = player.GetTrinketMultiplier(trinketToRemove);
-        repeat(numTrinkets, () => {
-          player.TryRemoveTrinket(trinketToRemove);
-          removedTrinkets.push(trinketToRemove);
-        });
-      }
-    }
-
-    mapSetPlayer(removedTrinketsMap, player, removedTrinkets);
-  }
-
-  return [removedItemsMap, removedTrinketsMap];
-}
-
-function restoreItemsAndTrinketsThatAffectItemPools(
-  removedItemsMap: Map<PlayerIndex, CollectibleType[]>,
-  removedTrinketsMap: Map<PlayerIndex, TrinketType[]>,
-) {
-  for (const player of getPlayers()) {
-    const removedItems = mapGetPlayer(removedItemsMap, player);
-    if (removedItems !== undefined) {
-      for (const collectibleType of removedItems) {
-        player.AddCollectible(collectibleType, 0, false); // Prevent Chaos from spawning pickups
-      }
-    }
-
-    const removedTrinkets = mapGetPlayer(removedTrinketsMap, player);
-    if (removedTrinkets !== undefined) {
-      for (const trinketType of removedTrinkets) {
-        player.AddTrinket(trinketType, false);
-      }
-    }
-  }
-}