isaacscript-common 38.0.1 → 39.0.1

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

@@ -10,7 +10,6 @@ local itemConfig = ____cachedClasses.itemConfig
 local ____constantsFirstLast = require("src.core.constantsFirstLast")
 local FIRST_CARD_TYPE = ____constantsFirstLast.FIRST_CARD_TYPE
 local FIRST_PILL_EFFECT = ____constantsFirstLast.FIRST_PILL_EFFECT
-local FIRST_TRINKET_TYPE = ____constantsFirstLast.FIRST_TRINKET_TYPE
 local LAST_VANILLA_CARD_TYPE = ____constantsFirstLast.LAST_VANILLA_CARD_TYPE
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
 local LAST_VANILLA_PILL_EFFECT = ____constantsFirstLast.LAST_VANILLA_PILL_EFFECT
@@ -117,8 +116,7 @@ end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getFirstModdedTrinketType", true)
 function ModdedElementDetection.prototype.getLastTrinketType(self)
     self:errorIfNoCallbacksFired("trinket")
-    local numTrinketTypes = self:getNumTrinketTypes()
-    return asTrinketType(nil, numTrinketTypes)
+    return itemConfig:GetTrinkets().Size - 1
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getLastTrinketType", true)
 function ModdedElementDetection.prototype.getModdedTrinketTypes(self)
@@ -133,21 +131,16 @@ end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getModdedTrinketTypes", true)
 function ModdedElementDetection.prototype.getNumTrinketTypes(self)
     self:errorIfNoCallbacksFired("trinket")
-    return itemConfig:GetTrinkets().Size - 1
+    local numModdedTrinketTypes = self:getNumModdedTrinketTypes()
+    return NUM_VANILLA_TRINKET_TYPES + numModdedTrinketTypes
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumTrinketTypes", true)
 function ModdedElementDetection.prototype.getNumModdedTrinketTypes(self)
-    self:errorIfNoCallbacksFired("trinket")
-    local numTrinketTypes = self:getNumTrinketTypes()
-    return numTrinketTypes - NUM_VANILLA_TRINKET_TYPES
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedTrinketTypes", true)
-function ModdedElementDetection.prototype.getTrinketTypes(self)
     self:errorIfNoCallbacksFired("trinket")
     local lastTrinketType = self:getLastTrinketType()
-    return iRange(nil, FIRST_TRINKET_TYPE, lastTrinketType)
+    return lastTrinketType - LAST_VANILLA_TRINKET_TYPE
 end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getTrinketTypes", true)
+__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedTrinketTypes", true)
 function ModdedElementDetection.prototype.getAllCardTypes(self)
     self:errorIfNoCallbacksFired("card")
     local lastCardType = self:getLastCardType()

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

@@ -1,6 +1,7 @@
 import { CacheFlag, CardType, CollectibleType, ItemConfigCardType, ItemConfigTag, PlayerForm, TrinketType } from "isaac-typescript-definitions";
 import { Feature } from "../../private/Feature";
 export declare class ModdedElementSets extends Feature {
+    private arraysInitialized;
     private readonly allCollectibleTypesArray;
     private readonly allCollectibleTypesSet;
     private readonly vanillaCollectibleTypesArray;
@@ -36,6 +37,7 @@ export declare class ModdedElementSets extends Feature {
      */
     private readonly cardSet;
     private readonly moddedElementDetection;
+    private lazyInit;
     private lazyInitVanillaCollectibleTypes;
     private lazyInitModdedCollectibleTypes;
     private lazyInitVanillaTrinketTypes;

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

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

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

@@ -82,6 +82,7 @@ ModdedElementSets.name = "ModdedElementSets"
 __TS__ClassExtends(ModdedElementSets, Feature)
 function ModdedElementSets.prototype.____constructor(self, moddedElementDetection)
     Feature.prototype.____constructor(self)
+    self.arraysInitialized = false
     self.allCollectibleTypesArray = {}
     self.allCollectibleTypesSet = __TS__New(Set)
     self.vanillaCollectibleTypesArray = {}
@@ -113,10 +114,26 @@ function ModdedElementSets.prototype.____constructor(self, moddedElementDetectio
     self.featuresUsed = {ISCFeature.MODDED_ELEMENT_DETECTION}
     self.moddedElementDetection = moddedElementDetection
 end
-function ModdedElementSets.prototype.lazyInitVanillaCollectibleTypes(self)
-    if #self.vanillaCollectibleTypesArray > 0 then
+function ModdedElementSets.prototype.lazyInit(self)
+    if self.arraysInitialized then
         return
     end
+    self.arraysInitialized = true
+    self:lazyInitVanillaCollectibleTypes()
+    self:lazyInitModdedCollectibleTypes()
+    self:lazyInitVanillaTrinketTypes()
+    self:lazyInitModdedTrinketTypes()
+    self:lazyInitVanillaCardTypes()
+    self:lazyInitModdedCardTypes()
+    self:lazyInitTagToCollectibleTypesMap()
+    self:lazyInitCacheFlagToCollectibleTypesMap()
+    self:lazyInitCacheFlagToTrinketTypesMap()
+    self:lazyInitFlyingCollectibleTypesSet()
+    self:lazyInitFlyingTrinketTypesSet()
+    self:lazyInitEdenCollectibleTypesSet()
+    self:lazyInitCardTypes()
+end
+function ModdedElementSets.prototype.lazyInitVanillaCollectibleTypes(self)
     local vanillaCollectibleTypeRange = getVanillaCollectibleTypeRange(nil)
     for ____, collectibleType in ipairs(vanillaCollectibleTypeRange) do
         local itemConfigItem = itemConfig:GetCollectible(collectibleType)
@@ -128,10 +145,6 @@ function ModdedElementSets.prototype.lazyInitVanillaCollectibleTypes(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitModdedCollectibleTypes(self)
-    if #self.moddedCollectibleTypesArray > 0 then
-        return
-    end
-    self:lazyInitVanillaCollectibleTypes()
     for ____, collectibleType in ipairs(self.vanillaCollectibleTypesArray) do
         local ____self_allCollectibleTypesArray_1 = self.allCollectibleTypesArray
         ____self_allCollectibleTypesArray_1[#____self_allCollectibleTypesArray_1 + 1] = collectibleType
@@ -151,9 +164,6 @@ function ModdedElementSets.prototype.lazyInitModdedCollectibleTypes(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitVanillaTrinketTypes(self)
-    if #self.vanillaTrinketTypesArray > 0 then
-        return
-    end
     local vanillaTrinketTypeRange = getVanillaTrinketTypeRange(nil)
     for ____, trinketType in ipairs(vanillaTrinketTypeRange) do
         local itemConfigItem = itemConfig:GetTrinket(trinketType)
@@ -165,10 +175,6 @@ function ModdedElementSets.prototype.lazyInitVanillaTrinketTypes(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitModdedTrinketTypes(self)
-    if #self.moddedTrinketTypesArray > 0 then
-        return
-    end
-    self:lazyInitVanillaTrinketTypes()
     for ____, trinketType in ipairs(self.vanillaTrinketTypesArray) do
         local ____self_allTrinketTypesArray_5 = self.allTrinketTypesArray
         ____self_allTrinketTypesArray_5[#____self_allTrinketTypesArray_5 + 1] = trinketType
@@ -188,9 +194,6 @@ function ModdedElementSets.prototype.lazyInitModdedTrinketTypes(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitVanillaCardTypes(self)
-    if #self.vanillaCardTypesArray > 0 then
-        return
-    end
     local vanillaCardTypes = getVanillaCardTypes(nil)
     for ____, cardType in ipairs(vanillaCardTypes) do
         local itemConfigCard = itemConfig:GetCard(cardType)
@@ -202,10 +205,6 @@ function ModdedElementSets.prototype.lazyInitVanillaCardTypes(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitModdedCardTypes(self)
-    if #self.moddedCardTypesArray > 0 then
-        return
-    end
-    self:lazyInitVanillaCardTypes()
     for ____, cardType in ipairs(self.vanillaCardTypesArray) do
         local ____self_allCardTypesArray_9 = self.allCardTypesArray
         ____self_allCardTypesArray_9[#____self_allCardTypesArray_9 + 1] = cardType
@@ -225,9 +224,6 @@ function ModdedElementSets.prototype.lazyInitModdedCardTypes(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitTagToCollectibleTypesMap(self)
-    if self.tagToCollectibleTypesMap.size > 0 then
-        return
-    end
     for ____, itemConfigTag in ipairs(ITEM_CONFIG_TAG_VALUES) do
         self.tagToCollectibleTypesMap:set(
             itemConfigTag,
@@ -238,7 +234,7 @@ function ModdedElementSets.prototype.lazyInitTagToCollectibleTypesMap(self)
         for ____, itemConfigTag in ipairs(ITEM_CONFIG_TAG_VALUES) do
             do
                 if not collectibleHasTag(nil, collectibleType, itemConfigTag) then
-                    goto __continue44
+                    goto __continue39
                 end
                 local collectibleTypesSet = self.tagToCollectibleTypesMap:get(itemConfigTag)
                 if collectibleTypesSet == nil then
@@ -247,14 +243,11 @@ function ModdedElementSets.prototype.lazyInitTagToCollectibleTypesMap(self)
                 end
                 collectibleTypesSet:add(collectibleType)
             end
-            ::__continue44::
+            ::__continue39::
         end
     end
 end
 function ModdedElementSets.prototype.lazyInitCacheFlagToCollectibleTypesMap(self)
-    if self.cacheFlagToCollectibleTypesMap.size > 0 then
-        return
-    end
     for ____, cacheFlag in ipairs(CACHE_FLAG_VALUES) do
         local collectiblesSet = __TS__New(Set)
         for ____, collectibleType in ipairs(self:getCollectibleArray()) do
@@ -266,12 +259,9 @@ function ModdedElementSets.prototype.lazyInitCacheFlagToCollectibleTypesMap(self
     end
 end
 function ModdedElementSets.prototype.lazyInitCacheFlagToTrinketTypesMap(self)
-    if self.cacheFlagToTrinketTypesMap.size > 0 then
-        return
-    end
     for ____, cacheFlag in ipairs(CACHE_FLAG_VALUES) do
         local trinketsSet = __TS__New(Set)
-        for ____, trinketType in ipairs(self.moddedElementDetection:getTrinketTypes()) do
+        for ____, trinketType in ipairs(self:getTrinketArray()) do
             if trinketHasCacheFlag(nil, trinketType, cacheFlag) then
                 trinketsSet:add(trinketType)
             end
@@ -280,9 +270,6 @@ function ModdedElementSets.prototype.lazyInitCacheFlagToTrinketTypesMap(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitFlyingCollectibleTypesSet(self)
-    if self.flyingCollectibleTypesSet.size > 0 then
-        return
-    end
     self.flyingCollectibleTypesSet = copySet(
         nil,
         self:getCollectiblesWithCacheFlag(CacheFlag.FLYING)
@@ -298,9 +285,6 @@ function ModdedElementSets.prototype.lazyInitFlyingCollectibleTypesSet(self)
     end
 end
 function ModdedElementSets.prototype.lazyInitFlyingTrinketTypesSet(self)
-    if self.flyingTrinketTypesSet.size > 0 then
-        return
-    end
     self.flyingTrinketTypesSet = copySet(
         nil,
         self:getTrinketsWithCacheFlag(CacheFlag.FLYING)
@@ -313,13 +297,10 @@ function ModdedElementSets.prototype.lazyInitFlyingTrinketTypesSet(self)
     deleteSetsFromSet(nil, self.flyingTrinketTypesSet, trinketsWithAllCacheFlag)
 end
 function ModdedElementSets.prototype.lazyInitEdenCollectibleTypesSet(self)
-    if self.edenActiveCollectibleTypesSet.size > 0 then
-        return
-    end
     for ____, collectibleType in ipairs(self:getCollectibleArray()) do
         do
             if isHiddenCollectible(nil, collectibleType) or collectibleHasTag(nil, collectibleType, ItemConfigTag.NO_EDEN) then
-                goto __continue73
+                goto __continue63
             end
             if isActiveCollectible(nil, collectibleType) then
                 self.edenActiveCollectibleTypesSet:add(collectibleType)
@@ -328,13 +309,10 @@ function ModdedElementSets.prototype.lazyInitEdenCollectibleTypesSet(self)
                 self.edenPassiveCollectibleTypesSet:add(collectibleType)
             end
         end
-        ::__continue73::
+        ::__continue63::
     end
 end
 function ModdedElementSets.prototype.lazyInitCardTypes(self)
-    if self.itemConfigCardTypeToCardTypeMap.size > 0 then
-        return
-    end
     for ____, itemConfigCardType in ipairs(ITEM_CONFIG_CARD_TYPE_VALUES) do
         self.itemConfigCardTypeToCardTypeMap:set(
             itemConfigCardType,
@@ -358,20 +336,18 @@ function ModdedElementSets.prototype.lazyInitCardTypes(self)
     end
 end
 function ModdedElementSets.prototype.getCardArray(self)
-    self:lazyInitModdedCardTypes()
+    self:lazyInit()
     return self.allCardTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardArray", true)
 function ModdedElementSets.prototype.getCardSet(self)
-    self:lazyInitModdedCardTypes()
+    self:lazyInit()
     return self.allCardTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardSet", true)
 function ModdedElementSets.prototype.getCardTypesOfType(self, ...)
     local itemConfigCardTypes = {...}
-    if self.itemConfigCardTypeToCardTypeMap.size == 0 then
-        self:lazyInitCardTypes()
-    end
+    self:lazyInit()
     local matchingCardTypes = __TS__New(Set)
     for ____, itemConfigCardType in ipairs(itemConfigCardTypes) do
         local cardTypeSet = self.itemConfigCardTypeToCardTypeMap:get(itemConfigCardType)
@@ -388,12 +364,12 @@ function ModdedElementSets.prototype.getCardTypesOfType(self, ...)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardTypesOfType", true)
 function ModdedElementSets.prototype.getCollectibleArray(self)
-    self:lazyInitModdedCollectibleTypes()
+    self:lazyInit()
     return self.allCollectibleTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleArray", true)
 function ModdedElementSets.prototype.getCollectibleSet(self)
-    self:lazyInitModdedCollectibleTypes()
+    self:lazyInit()
     return self.allCollectibleTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleSet", true)
@@ -408,7 +384,7 @@ function ModdedElementSets.prototype.getCollectiblesForTransformation(self, play
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectiblesForTransformation", true)
 function ModdedElementSets.prototype.getCollectiblesWithCacheFlag(self, cacheFlag)
-    self:lazyInitCacheFlagToCollectibleTypesMap()
+    self:lazyInit()
     local collectiblesSet = self.cacheFlagToCollectibleTypesMap:get(cacheFlag)
     if collectiblesSet == nil then
         return __TS__New(ReadonlySet)
@@ -417,7 +393,7 @@ function ModdedElementSets.prototype.getCollectiblesWithCacheFlag(self, cacheFla
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectiblesWithCacheFlag", true)
 function ModdedElementSets.prototype.getCollectiblesWithTag(self, itemConfigTag)
-    self:lazyInitTagToCollectibleTypesMap()
+    self:lazyInit()
     local collectibleTypes = self.tagToCollectibleTypesMap:get(itemConfigTag)
     assertDefined(
         nil,
@@ -428,52 +404,52 @@ function ModdedElementSets.prototype.getCollectiblesWithTag(self, itemConfigTag)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectiblesWithTag", true)
 function ModdedElementSets.prototype.getEdenActiveCollectibles(self)
-    self:lazyInitEdenCollectibleTypesSet()
+    self:lazyInit()
     return self.edenActiveCollectibleTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getEdenActiveCollectibles", true)
 function ModdedElementSets.prototype.getEdenPassiveCollectibles(self)
-    self:lazyInitEdenCollectibleTypesSet()
+    self:lazyInit()
     return self.edenPassiveCollectibleTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getEdenPassiveCollectibles", true)
 function ModdedElementSets.prototype.getFlyingCollectibles(self, includeConditionalItems)
-    self:lazyInitFlyingCollectibleTypesSet()
+    self:lazyInit()
     return includeConditionalItems and self.flyingCollectibleTypesSet or self.permanentFlyingCollectibleTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getFlyingCollectibles", true)
 function ModdedElementSets.prototype.getFlyingTrinkets(self)
-    self:lazyInitFlyingTrinketTypesSet()
+    self:lazyInit()
     return self.flyingTrinketTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getFlyingTrinkets", true)
 function ModdedElementSets.prototype.getModdedCardArray(self)
-    self:lazyInitModdedCardTypes()
+    self:lazyInit()
     return self.moddedCardTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCardArray", true)
 function ModdedElementSets.prototype.getModdedCardSet(self)
-    self:lazyInitModdedCardTypes()
+    self:lazyInit()
     return self.moddedCardTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCardSet", true)
 function ModdedElementSets.prototype.getModdedCollectibleArray(self)
-    self:lazyInitModdedCollectibleTypes()
+    self:lazyInit()
     return self.moddedCollectibleTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCollectibleArray", true)
 function ModdedElementSets.prototype.getModdedCollectibleSet(self)
-    self:lazyInitModdedCollectibleTypes()
+    self:lazyInit()
     return self.moddedCollectibleTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCollectibleSet", true)
 function ModdedElementSets.prototype.getModdedTrinketArray(self)
-    self:lazyInitModdedTrinketTypes()
+    self:lazyInit()
     return self.moddedTrinketTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedTrinketArray", true)
 function ModdedElementSets.prototype.getModdedTrinketSet(self)
-    self:lazyInitModdedTrinketTypes()
+    self:lazyInit()
     return self.moddedTrinketTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedTrinketSet", true)
@@ -572,7 +548,7 @@ function ModdedElementSets.prototype.getRandomCard(self, seedOrRNG, exceptions)
     if exceptions == nil then
         exceptions = {}
     end
-    self:lazyInitCardTypes()
+    self:lazyInit()
     return getRandomSetElement(nil, self.cardSet, seedOrRNG, exceptions)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomCard", true)
@@ -606,7 +582,7 @@ function ModdedElementSets.prototype.getRandomEdenActiveCollectible(self, seedOr
     if exceptions == nil then
         exceptions = {}
     end
-    self:lazyInitEdenCollectibleTypesSet()
+    self:lazyInit()
     return getRandomSetElement(nil, self.edenPassiveCollectibleTypesSet, seedOrRNG, exceptions)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomEdenActiveCollectible", true)
@@ -617,22 +593,22 @@ function ModdedElementSets.prototype.getRandomEdenPassiveCollectible(self, seedO
     if exceptions == nil then
         exceptions = {}
     end
-    self:lazyInitEdenCollectibleTypesSet()
+    self:lazyInit()
     return getRandomSetElement(nil, self.edenPassiveCollectibleTypesSet, seedOrRNG, exceptions)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomEdenPassiveCollectible", true)
 function ModdedElementSets.prototype.getTrinketArray(self)
-    self:lazyInitModdedTrinketTypes()
+    self:lazyInit()
     return self.allTrinketTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketArray", true)
 function ModdedElementSets.prototype.getTrinketSet(self)
-    self:lazyInitModdedTrinketTypes()
+    self:lazyInit()
     return self.allTrinketTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketSet", true)
 function ModdedElementSets.prototype.getTrinketsWithCacheFlag(self, cacheFlag)
-    self:lazyInitCacheFlagToTrinketTypesMap()
+    self:lazyInit()
     local trinketsSet = self.cacheFlagToTrinketTypesMap:get(cacheFlag)
     if trinketsSet == nil then
         return __TS__New(ReadonlySet)
@@ -641,32 +617,32 @@ function ModdedElementSets.prototype.getTrinketsWithCacheFlag(self, cacheFlag)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketsWithCacheFlag", true)
 function ModdedElementSets.prototype.getVanillaCardArray(self)
-    self:lazyInitVanillaCardTypes()
+    self:lazyInit()
     return self.vanillaCardTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCardArray", true)
 function ModdedElementSets.prototype.getVanillaCardSet(self)
-    self:lazyInitVanillaCardTypes()
+    self:lazyInit()
     return self.vanillaCardTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCardSet", true)
 function ModdedElementSets.prototype.getVanillaCollectibleArray(self)
-    self:lazyInitVanillaCollectibleTypes()
+    self:lazyInit()
     return self.vanillaCollectibleTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCollectibleArray", true)
 function ModdedElementSets.prototype.getVanillaCollectibleSet(self)
-    self:lazyInitVanillaCollectibleTypes()
+    self:lazyInit()
     return self.vanillaCollectibleTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCollectibleSet", true)
 function ModdedElementSets.prototype.getVanillaTrinketArray(self)
-    self:lazyInitVanillaTrinketTypes()
+    self:lazyInit()
     return self.vanillaTrinketTypesArray
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaTrinketArray", true)
 function ModdedElementSets.prototype.getVanillaTrinketSet(self)
-    self:lazyInitVanillaTrinketTypes()
+    self:lazyInit()
     return self.vanillaTrinketTypesSet
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaTrinketSet", true)

package/package.json

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

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

@@ -9,7 +9,6 @@ import { itemConfig } from "../../../core/cachedClasses";
 import {
   FIRST_CARD_TYPE,
   FIRST_PILL_EFFECT,
-  FIRST_TRINKET_TYPE,
   LAST_VANILLA_CARD_TYPE,
   LAST_VANILLA_COLLECTIBLE_TYPE,
   LAST_VANILLA_PILL_EFFECT,
@@ -101,6 +100,9 @@ export class ModdedElementDetection extends Feature {
    * Equal to `itemConfig.GetCollectibles().Size - 1`. (`Size` includes invalid collectibles, like
    * 666. We subtract one to account for `CollectibleType.NULL`.)
    *
+   * If there are no mods present that add any custom items, this function will return
+   * `CollectibleType.MOMS_RING` (732).
+   *
    * This function can only be called if at least one callback has been executed. This is because
    * not all collectibles will necessarily be present when a mod first loads (due to mod load
    * order).
@@ -116,7 +118,7 @@ export class ModdedElementDetection extends Feature {
   }
 
   /**
-   * Helper function to get an array that represents the all modded collectible types.
+   * Helper function to get an array that represents every modded collectible type.
    *
    * Returns an empty array if there are no modded collectible types.
    *
@@ -149,6 +151,10 @@ export class ModdedElementDetection extends Feature {
   }
 
   /**
+   * Returns the total number of collectibles in the item config, including both vanilla and modded
+   * items. If you just need the number of vanilla collectible types, use the
+   * `NUM_VANILLA_COLLECTIBLE_TYPES` constant.
+   *
    * This function can only be called if at least one callback has been executed. This is because
    * not all collectibles will necessarily be present when a mod first loads (due to mod load
    * order).
@@ -209,8 +215,11 @@ export class ModdedElementDetection extends Feature {
   /**
    * Will change depending on how many modded trinkets there are.
    *
-   * This is equal to the number of trinket types, since all trinket types are contiguous (unlike
-   * collectibles).
+   * Equal to `itemConfig.GetTrinkets().Size - 1`. (`Size` includes invalid trinkets, like 47. We
+   * subtract one to account for `TrinketType.NULL`.)
+   *
+   * If there are no mods present that add any custom trinkets, this function will return
+   * `TrinketType.SIGIL_OF_BAPHOMET` (189).
    *
    * This function can only be called if at least one callback has been executed. This is because
    * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
@@ -222,8 +231,7 @@ export class ModdedElementDetection extends Feature {
   public getLastTrinketType(): TrinketType {
     this.errorIfNoCallbacksFired("trinket");
 
-    const numTrinketTypes = this.getNumTrinketTypes();
-    return asTrinketType(numTrinketTypes);
+    return itemConfig.GetTrinkets().Size - 1;
   }
 
   /**
@@ -231,9 +239,11 @@ export class ModdedElementDetection extends Feature {
    *
    * Returns an empty array if there are no modded trinket types.
    *
-   * This function is only useful when building collectible type objects. For most purposes, you
-   * should use the `getModdedCollectibleArray` or `getModdedCollectibleSet` helper function
-   * instead.
+   * This function is only useful when building trinket type objects. For most purposes, you should
+   * use the `getModdedTrinketArray` or `getModdedTrinketSet` helper function instead.
+   *
+   * (This function is named differently from the `getVanillaTrinketTypeRange` function because all
+   * modded trinket types are contiguous. Thus, each value represents a real `TrinketType`.)
    *
    * This function can only be called if at least one callback has been executed. This is because
    * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
@@ -255,10 +265,9 @@ export class ModdedElementDetection extends Feature {
   }
 
   /**
-   * Will change depending on how many modded trinkets there are.
-   *
-   * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
-   * `TrinketType.NULL`.)
+   * Returns the total number of trinkets in the item config, including both vanilla and modded
+   * items. If you just need the number of vanilla trinket types, use the
+   * `NUM_VANILLA_TRINKET_TYPES` constant.
    *
    * This function can only be called if at least one callback has been executed. This is because
    * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
@@ -270,26 +279,12 @@ export class ModdedElementDetection extends Feature {
   public getNumTrinketTypes(): int {
     this.errorIfNoCallbacksFired("trinket");
 
-    return itemConfig.GetTrinkets().Size - 1;
-  }
-
-  /**
-   * This function can only be called if at least one callback has been executed. This is because
-   * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
-   *
-   * In order to use this function, you must upgrade your mod with
-   * `ISCFeature.MODDED_ELEMENT_DETECTION`.
-   */
-  @Exported
-  public getNumModdedTrinketTypes(): int {
-    this.errorIfNoCallbacksFired("trinket");
-
-    const numTrinketTypes = this.getNumTrinketTypes();
-    return numTrinketTypes - NUM_VANILLA_TRINKET_TYPES;
+    const numModdedTrinketTypes = this.getNumModdedTrinketTypes();
+    return NUM_VANILLA_TRINKET_TYPES + numModdedTrinketTypes;
   }
 
   /**
-   * Helper function to get an array that contains every trinket type.
+   * Unlike vanilla trinket types, modded trinket types are always contiguous.
    *
    * This function can only be called if at least one callback has been executed. This is because
    * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
@@ -298,11 +293,11 @@ export class ModdedElementDetection extends Feature {
    * `ISCFeature.MODDED_ELEMENT_DETECTION`.
    */
   @Exported
-  public getTrinketTypes(): TrinketType[] {
+  public getNumModdedTrinketTypes(): int {
     this.errorIfNoCallbacksFired("trinket");
 
     const lastTrinketType = this.getLastTrinketType();
-    return iRange(FIRST_TRINKET_TYPE, lastTrinketType);
+    return lastTrinketType - LAST_VANILLA_TRINKET_TYPE;
   }
 
   // -----