isaacscript-common 72.3.0 → 72.3.2

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 72.3.0
+isaacscript-common 72.3.2
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -57551,8 +57551,7 @@ local ____exports = {}
 local getItemPoolJSON
 local ____cachedEnumValues = require("src.arrays.cachedEnumValues")
 local ITEM_POOL_TYPE_VALUES = ____cachedEnumValues.ITEM_POOL_TYPE_VALUES
-local ____itempools_2Ejson = require("src.data.itempools")
-local itemPoolsJSON = ____itempools_2Ejson.default
+local itemPoolsJSON = require("src.data.itempools")
 local ____types = require("src.functions.types")
 local asCollectibleType = ____types.asCollectibleType
 local ____itemPoolTypeToItemPoolName = require("src.maps.itemPoolTypeToItemPoolName")
@@ -57651,14 +57650,15 @@ function ____exports.getDefaultCollectibleTypesInItemPool(self, itemPoolType)
     return ITEM_POOL_TYPE_TO_COLLECTIBLE_TYPES_SET[itemPoolType]
 end
 function ____exports.getDefaultItemPoolsForCollectibleType(self, collectibleType)
-    local itemPoolTypes = {}
-    for ____, itemPoolType in ipairs(ITEM_POOL_TYPE_VALUES) do
+    local collectibleItemPoolTypes = {}
+    local itemPoolTypes = game:IsGreedMode() and GREED_MODE_ITEM_POOL_TYPES or NORMAL_MODE_ITEM_POOL_TYPES
+    for ____, itemPoolType in ipairs(itemPoolTypes) do
         local collectibleTypesSet = ITEM_POOL_TYPE_TO_COLLECTIBLE_TYPES_SET[itemPoolType]
         if collectibleTypesSet:has(collectibleType) then
-            itemPoolTypes[#itemPoolTypes + 1] = itemPoolType
+            collectibleItemPoolTypes[#collectibleItemPoolTypes + 1] = itemPoolType
         end
     end
-    return itemPoolTypes
+    return collectibleItemPoolTypes
 end
 function ____exports.getRandomItemPool(self, seedOrRNG)
     local itemPoolTypes = game:IsGreedMode() and GREED_MODE_ITEM_POOL_TYPES or NORMAL_MODE_ITEM_POOL_TYPES

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

@@ -1 +1 @@
-{"version":3,"file":"itemPool.d.ts","sourceRoot":"","sources":["../../../src/functions/itemPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAwC5D;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,YAAY,EAAE,YAAY,GACzB,GAAG,CAAC,eAAe,CAAC,CAEtB;AAED;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CACnD,eAAe,EAAE,eAAe,GAC/B,YAAY,EAAE,CAYhB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,IAAI,GAAG,GAAG,GAAG,SAAS,GAChC,YAAY,CAKd;AAED;;;GAGG;AACH,wBAAgB,kCAAkC,CAChD,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAIT;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,gBAAgB,EAAE,eAAe,EAAE,GACrC,IAAI,CAMN;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAM3E"}
+{"version":3,"file":"itemPool.d.ts","sourceRoot":"","sources":["../../../src/functions/itemPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAwC5D;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,YAAY,EAAE,YAAY,GACzB,GAAG,CAAC,eAAe,CAAC,CAEtB;AAED;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CACnD,eAAe,EAAE,eAAe,GAC/B,YAAY,EAAE,CAgBhB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,IAAI,GAAG,GAAG,GAAG,SAAS,GAChC,YAAY,CAMd;AAED;;;GAGG;AACH,wBAAgB,kCAAkC,CAChD,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAIT;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,gBAAgB,EAAE,eAAe,EAAE,GACrC,IAAI,CAMN;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAM3E"}

package/dist/src/functions/itemPool.lua

@@ -67,14 +67,15 @@ end
 -- This function will automatically account for Greed Mode. In other words, it will not return the
 -- "normal" item pools when playing in Greed Mode.
 function ____exports.getDefaultItemPoolsForCollectibleType(self, collectibleType)
-    local itemPoolTypes = {}
-    for ____, itemPoolType in ipairs(ITEM_POOL_TYPE_VALUES) do
+    local collectibleItemPoolTypes = {}
+    local itemPoolTypes = game:IsGreedMode() and GREED_MODE_ITEM_POOL_TYPES or NORMAL_MODE_ITEM_POOL_TYPES
+    for ____, itemPoolType in ipairs(itemPoolTypes) do
         local collectibleTypesSet = ITEM_POOL_TYPE_TO_COLLECTIBLE_TYPES_SET[itemPoolType]
         if collectibleTypesSet:has(collectibleType) then
-            itemPoolTypes[#itemPoolTypes + 1] = itemPoolType
+            collectibleItemPoolTypes[#collectibleItemPoolTypes + 1] = itemPoolType
         end
     end
-    return itemPoolTypes
+    return collectibleItemPoolTypes
 end
 --- Helper function to get a random item pool. This is not as simple as getting a random value from
 -- the `ItemPoolType` enum, since `ItemPoolType.SHELL_GAME` (7) is not a real item pool and the

package/dist/src/objects/itemPoolTypeToCollectibleTypesSet.lua

@@ -6,8 +6,7 @@ local ____exports = {}
 local getItemPoolJSON
 local ____cachedEnumValues = require("src.arrays.cachedEnumValues")
 local ITEM_POOL_TYPE_VALUES = ____cachedEnumValues.ITEM_POOL_TYPE_VALUES
-local ____itempools_2Ejson = require("src.data.itempools")
-local itemPoolsJSON = ____itempools_2Ejson.default
+local itemPoolsJSON = require("src.data.itempools")
 local ____types = require("src.functions.types")
 local asCollectibleType = ____types.asCollectibleType
 local ____itemPoolTypeToItemPoolName = require("src.maps.itemPoolTypeToItemPoolName")

package/package.json

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

package/src/functions/itemPool.ts

@@ -62,17 +62,21 @@ export function getDefaultCollectibleTypesInItemPool(
 export function getDefaultItemPoolsForCollectibleType(
   collectibleType: CollectibleType,
 ): ItemPoolType[] {
-  const itemPoolTypes: ItemPoolType[] = [];
+  const collectibleItemPoolTypes: ItemPoolType[] = [];
 
-  for (const itemPoolType of ITEM_POOL_TYPE_VALUES) {
+  const itemPoolTypes = game.IsGreedMode()
+    ? GREED_MODE_ITEM_POOL_TYPES
+    : NORMAL_MODE_ITEM_POOL_TYPES;
+
+  for (const itemPoolType of itemPoolTypes) {
     const collectibleTypesSet =
       ITEM_POOL_TYPE_TO_COLLECTIBLE_TYPES_SET[itemPoolType];
     if (collectibleTypesSet.has(collectibleType)) {
-      itemPoolTypes.push(itemPoolType);
+      collectibleItemPoolTypes.push(itemPoolType);
     }
   }
 
-  return itemPoolTypes;
+  return collectibleItemPoolTypes;
 }
 
 /**
@@ -93,6 +97,7 @@ export function getRandomItemPool(
   const itemPoolTypes = game.IsGreedMode()
     ? GREED_MODE_ITEM_POOL_TYPES
     : NORMAL_MODE_ITEM_POOL_TYPES;
+
   return getRandomArrayElement(itemPoolTypes, seedOrRNG);
 }
 

package/src/objects/itemPoolTypeToCollectibleTypesSet.ts

@@ -3,7 +3,7 @@ import type {
   ItemPoolType,
 } from "isaac-typescript-definitions";
 import { ITEM_POOL_TYPE_VALUES } from "../arrays/cachedEnumValues";
-import itemPoolsJSON from "../data/itempools.json";
+import * as itemPoolsJSON from "../data/itempools.json";
 import { asCollectibleType } from "../functions/types";
 import { ITEM_POOL_TYPE_TO_ITEM_POOL_NAME } from "../maps/itemPoolTypeToItemPoolName";