isaacscript-common 40.0.0 → 41.0.0

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

@@ -23,18 +23,21 @@ local ____cachedClasses = require("src.core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constants = require("src.core.constants")
 local FIRST_GLITCHED_COLLECTIBLE_TYPE = ____constants.FIRST_GLITCHED_COLLECTIBLE_TYPE
+local ____constantsVanilla = require("src.core.constantsVanilla")
+local VANILLA_CARD_TYPES = ____constantsVanilla.VANILLA_CARD_TYPES
+local VANILLA_COLLECTIBLE_TYPES = ____constantsVanilla.VANILLA_COLLECTIBLE_TYPES
+local VANILLA_PILL_EFFECTS = ____constantsVanilla.VANILLA_PILL_EFFECTS
+local VANILLA_TRINKET_TYPES = ____constantsVanilla.VANILLA_TRINKET_TYPES
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
 local ____cards = require("src.functions.cards")
 local getItemConfigCardType = ____cards.getItemConfigCardType
-local getVanillaCardTypes = ____cards.getVanillaCardTypes
 local ____collectibleTag = require("src.functions.collectibleTag")
 local collectibleHasTag = ____collectibleTag.collectibleHasTag
 local ____collectibles = require("src.functions.collectibles")
 local collectibleHasCacheFlag = ____collectibles.collectibleHasCacheFlag
-local getVanillaCollectibleTypeRange = ____collectibles.getVanillaCollectibleTypeRange
 local isActiveCollectible = ____collectibles.isActiveCollectible
 local isHiddenCollectible = ____collectibles.isHiddenCollectible
 local isPassiveCollectible = ____collectibles.isPassiveCollectible
@@ -48,10 +51,15 @@ local deleteSetsFromSet = ____set.deleteSetsFromSet
 local getRandomSetElement = ____set.getRandomSetElement
 local getSortedSetValues = ____set.getSortedSetValues
 local ____trinkets = require("src.functions.trinkets")
-local getVanillaTrinketTypeRange = ____trinkets.getVanillaTrinketTypeRange
 local trinketHasCacheFlag = ____trinkets.trinketHasCacheFlag
+local ____types = require("src.functions.types")
+local asCardType = ____types.asCardType
+local asCollectibleType = ____types.asCollectibleType
+local asPillEffect = ____types.asPillEffect
+local asTrinketType = ____types.asTrinketType
 local ____utils = require("src.functions.utils")
 local assertDefined = ____utils.assertDefined
+local iRange = ____utils.iRange
 local ____repeat = ____utils["repeat"]
 local ____itemConfigCardTypesForCardsSet = require("src.sets.itemConfigCardTypesForCardsSet")
 local ITEM_CONFIG_CARD_TYPES_FOR_CARDS_SET = ____itemConfigCardTypesForCardsSet.ITEM_CONFIG_CARD_TYPES_FOR_CARDS_SET
@@ -76,6 +84,12 @@ local TRANSFORMATION_TO_TAG_MAP = __TS__New(ReadonlyMap, {
     {PlayerForm.BOOKWORM, ItemConfigTag.BOOK},
     {PlayerForm.SPIDER_BABY, ItemConfigTag.SPIDER}
 })
+--- A feature that lazy-inits and caches various arrays and sets that include both vanilla and modded
+-- elements. This is useful for performance purposes (so that we do not have to reconstruct the
+-- arrays/sets multiple times).
+-- 
+-- The modded arrays/sets are created using the functions from
+-- `ISCFeature.MODDED_ELEMENT_DETECTION`.
 ____exports.ModdedElementSets = __TS__Class()
 local ModdedElementSets = ____exports.ModdedElementSets
 ModdedElementSets.name = "ModdedElementSets"
@@ -85,28 +99,26 @@ function ModdedElementSets.prototype.____constructor(self, moddedElementDetectio
     self.arraysInitialized = false
     self.allCollectibleTypesArray = {}
     self.allCollectibleTypesSet = __TS__New(Set)
-    self.vanillaCollectibleTypesArray = {}
-    self.vanillaCollectibleTypesSet = __TS__New(Set)
     self.moddedCollectibleTypesArray = {}
     self.moddedCollectibleTypesSet = __TS__New(Set)
     self.allTrinketTypesArray = {}
     self.allTrinketTypesSet = __TS__New(Set)
-    self.vanillaTrinketTypesArray = {}
-    self.vanillaTrinketTypesSet = __TS__New(Set)
     self.moddedTrinketTypesArray = {}
     self.moddedTrinketTypesSet = __TS__New(Set)
     self.allCardTypesArray = {}
     self.allCardTypesSet = __TS__New(Set)
-    self.vanillaCardTypesArray = {}
-    self.vanillaCardTypesSet = __TS__New(Set)
     self.moddedCardTypesArray = {}
     self.moddedCardTypesSet = __TS__New(Set)
-    self.tagToCollectibleTypesMap = __TS__New(Map)
+    self.allPillEffectsArray = {}
+    self.allPillEffectsSet = __TS__New(Set)
+    self.moddedPillEffectsArray = {}
+    self.moddedPillEffectsSet = __TS__New(Set)
     self.cacheFlagToCollectibleTypesMap = __TS__New(Map)
     self.cacheFlagToTrinketTypesMap = __TS__New(Map)
     self.flyingCollectibleTypesSet = __TS__New(Set)
     self.permanentFlyingCollectibleTypesSet = __TS__New(Set)
     self.flyingTrinketTypesSet = __TS__New(Set)
+    self.tagToCollectibleTypesMap = __TS__New(Map)
     self.edenActiveCollectibleTypesSet = __TS__New(Set)
     self.edenPassiveCollectibleTypesSet = __TS__New(Set)
     self.itemConfigCardTypeToCardTypeMap = __TS__New(Map)
@@ -119,12 +131,10 @@ function ModdedElementSets.prototype.lazyInit(self)
         return
     end
     self.arraysInitialized = true
-    self:lazyInitVanillaCollectibleTypes()
     self:lazyInitModdedCollectibleTypes()
-    self:lazyInitVanillaTrinketTypes()
     self:lazyInitModdedTrinketTypes()
-    self:lazyInitVanillaCardTypes()
     self:lazyInitModdedCardTypes()
+    self:lazyInitModdedPillEffects()
     self:lazyInitTagToCollectibleTypesMap()
     self:lazyInitCacheFlagToCollectibleTypesMap()
     self:lazyInitCacheFlagToTrinketTypesMap()
@@ -133,102 +143,103 @@ function ModdedElementSets.prototype.lazyInit(self)
     self:lazyInitEdenCollectibleTypesSet()
     self:lazyInitCardTypes()
 end
-function ModdedElementSets.prototype.lazyInitVanillaCollectibleTypes(self)
-    if #self.vanillaCollectibleTypesArray > 0 then
-        return
-    end
-    local vanillaCollectibleTypeRange = getVanillaCollectibleTypeRange(nil)
-    for ____, collectibleType in ipairs(vanillaCollectibleTypeRange) do
-        local itemConfigItem = itemConfig:GetCollectible(collectibleType)
-        if itemConfigItem ~= nil then
-            local ____self_vanillaCollectibleTypesArray_0 = self.vanillaCollectibleTypesArray
-            ____self_vanillaCollectibleTypesArray_0[#____self_vanillaCollectibleTypesArray_0 + 1] = collectibleType
-            self.vanillaCollectibleTypesSet:add(collectibleType)
-        end
-    end
-end
 function ModdedElementSets.prototype.lazyInitModdedCollectibleTypes(self)
-    for ____, collectibleType in ipairs(self.vanillaCollectibleTypesArray) do
-        local ____self_allCollectibleTypesArray_1 = self.allCollectibleTypesArray
-        ____self_allCollectibleTypesArray_1[#____self_allCollectibleTypesArray_1 + 1] = collectibleType
+    for ____, collectibleType in ipairs(VANILLA_COLLECTIBLE_TYPES) do
+        local ____self_allCollectibleTypesArray_0 = self.allCollectibleTypesArray
+        ____self_allCollectibleTypesArray_0[#____self_allCollectibleTypesArray_0 + 1] = collectibleType
         self.allCollectibleTypesSet:add(collectibleType)
     end
-    local moddedCollectibleTypes = self.moddedElementDetection:getModdedCollectibleTypes()
-    for ____, collectibleType in ipairs(moddedCollectibleTypes) do
+    local firstModdedCollectibleType = self.moddedElementDetection:getFirstModdedCollectibleType()
+    if firstModdedCollectibleType == nil then
+        return
+    end
+    local lastCollectibleType = self.moddedElementDetection:getLastCollectibleType()
+    local moddedCollectibleTypes = iRange(nil, firstModdedCollectibleType, lastCollectibleType)
+    for ____, collectibleTypeInt in ipairs(moddedCollectibleTypes) do
+        local collectibleType = asCollectibleType(nil, collectibleTypeInt)
         local itemConfigItem = itemConfig:GetCollectible(collectibleType)
         if itemConfigItem ~= nil then
-            local ____self_moddedCollectibleTypesArray_2 = self.moddedCollectibleTypesArray
-            ____self_moddedCollectibleTypesArray_2[#____self_moddedCollectibleTypesArray_2 + 1] = collectibleType
+            local ____self_moddedCollectibleTypesArray_1 = self.moddedCollectibleTypesArray
+            ____self_moddedCollectibleTypesArray_1[#____self_moddedCollectibleTypesArray_1 + 1] = collectibleType
             self.moddedCollectibleTypesSet:add(collectibleType)
-            local ____self_allCollectibleTypesArray_3 = self.allCollectibleTypesArray
-            ____self_allCollectibleTypesArray_3[#____self_allCollectibleTypesArray_3 + 1] = collectibleType
+            local ____self_allCollectibleTypesArray_2 = self.allCollectibleTypesArray
+            ____self_allCollectibleTypesArray_2[#____self_allCollectibleTypesArray_2 + 1] = collectibleType
             self.allCollectibleTypesSet:add(collectibleType)
         end
     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)
-        if itemConfigItem ~= nil then
-            local ____self_vanillaTrinketTypesArray_4 = self.vanillaTrinketTypesArray
-            ____self_vanillaTrinketTypesArray_4[#____self_vanillaTrinketTypesArray_4 + 1] = trinketType
-            self.vanillaTrinketTypesSet:add(trinketType)
-        end
-    end
-end
 function ModdedElementSets.prototype.lazyInitModdedTrinketTypes(self)
-    for ____, trinketType in ipairs(self.vanillaTrinketTypesArray) do
-        local ____self_allTrinketTypesArray_5 = self.allTrinketTypesArray
-        ____self_allTrinketTypesArray_5[#____self_allTrinketTypesArray_5 + 1] = trinketType
+    for ____, trinketType in ipairs(VANILLA_TRINKET_TYPES) do
+        local ____self_allTrinketTypesArray_3 = self.allTrinketTypesArray
+        ____self_allTrinketTypesArray_3[#____self_allTrinketTypesArray_3 + 1] = trinketType
         self.allTrinketTypesSet:add(trinketType)
     end
-    local moddedTrinketTypes = self.moddedElementDetection:getModdedTrinketTypes()
-    for ____, trinketType in ipairs(moddedTrinketTypes) do
+    local firstModdedTrinketType = self.moddedElementDetection:getFirstModdedTrinketType()
+    if firstModdedTrinketType == nil then
+        return
+    end
+    local lastTrinketType = self.moddedElementDetection:getLastTrinketType()
+    local moddedTrinketTypes = iRange(nil, firstModdedTrinketType, lastTrinketType)
+    for ____, trinketTypeInt in ipairs(moddedTrinketTypes) do
+        local trinketType = asTrinketType(nil, trinketTypeInt)
         local itemConfigItem = itemConfig:GetTrinket(trinketType)
         if itemConfigItem ~= nil then
-            local ____self_moddedTrinketTypesArray_6 = self.moddedTrinketTypesArray
-            ____self_moddedTrinketTypesArray_6[#____self_moddedTrinketTypesArray_6 + 1] = trinketType
+            local ____self_moddedTrinketTypesArray_4 = self.moddedTrinketTypesArray
+            ____self_moddedTrinketTypesArray_4[#____self_moddedTrinketTypesArray_4 + 1] = trinketType
             self.moddedTrinketTypesSet:add(trinketType)
-            local ____self_allTrinketTypesArray_7 = self.allTrinketTypesArray
-            ____self_allTrinketTypesArray_7[#____self_allTrinketTypesArray_7 + 1] = trinketType
+            local ____self_allTrinketTypesArray_5 = self.allTrinketTypesArray
+            ____self_allTrinketTypesArray_5[#____self_allTrinketTypesArray_5 + 1] = trinketType
             self.allTrinketTypesSet:add(trinketType)
         end
     end
 end
-function ModdedElementSets.prototype.lazyInitVanillaCardTypes(self)
-    if #self.vanillaCardTypesArray > 0 then
+function ModdedElementSets.prototype.lazyInitModdedCardTypes(self)
+    for ____, cardType in ipairs(VANILLA_CARD_TYPES) do
+        local ____self_allCardTypesArray_6 = self.allCardTypesArray
+        ____self_allCardTypesArray_6[#____self_allCardTypesArray_6 + 1] = cardType
+        self.allCardTypesSet:add(cardType)
+    end
+    local firstModdedCardType = self.moddedElementDetection:getFirstModdedCardType()
+    if firstModdedCardType == nil then
         return
     end
-    local vanillaCardTypes = getVanillaCardTypes(nil)
-    for ____, cardType in ipairs(vanillaCardTypes) do
+    local lastCardType = self.moddedElementDetection:getLastCardType()
+    local moddedCardTypes = iRange(nil, firstModdedCardType, lastCardType)
+    for ____, cardTypeInt in ipairs(moddedCardTypes) do
+        local cardType = asCardType(nil, cardTypeInt)
         local itemConfigCard = itemConfig:GetCard(cardType)
         if itemConfigCard ~= nil then
-            local ____self_vanillaCardTypesArray_8 = self.vanillaCardTypesArray
-            ____self_vanillaCardTypesArray_8[#____self_vanillaCardTypesArray_8 + 1] = cardType
-            self.vanillaCardTypesSet:add(cardType)
+            local ____self_moddedCardTypesArray_7 = self.moddedCardTypesArray
+            ____self_moddedCardTypesArray_7[#____self_moddedCardTypesArray_7 + 1] = cardType
+            self.moddedCardTypesSet:add(cardType)
+            local ____self_allCardTypesArray_8 = self.allCardTypesArray
+            ____self_allCardTypesArray_8[#____self_allCardTypesArray_8 + 1] = cardType
+            self.allCardTypesSet:add(cardType)
         end
     end
 end
-function ModdedElementSets.prototype.lazyInitModdedCardTypes(self)
-    for ____, cardType in ipairs(self.vanillaCardTypesArray) do
-        local ____self_allCardTypesArray_9 = self.allCardTypesArray
-        ____self_allCardTypesArray_9[#____self_allCardTypesArray_9 + 1] = cardType
-        self.allCardTypesSet:add(cardType)
+function ModdedElementSets.prototype.lazyInitModdedPillEffects(self)
+    for ____, pillEffect in ipairs(VANILLA_PILL_EFFECTS) do
+        local ____self_allPillEffectsArray_9 = self.allPillEffectsArray
+        ____self_allPillEffectsArray_9[#____self_allPillEffectsArray_9 + 1] = pillEffect
+        self.allPillEffectsSet:add(pillEffect)
     end
-    local moddedCardTypes = self.moddedElementDetection:getModdedCardTypes()
-    for ____, cardType in ipairs(moddedCardTypes) do
-        local itemConfigCard = itemConfig:GetCard(cardType)
-        if itemConfigCard ~= nil then
-            local ____self_moddedCardTypesArray_10 = self.moddedCardTypesArray
-            ____self_moddedCardTypesArray_10[#____self_moddedCardTypesArray_10 + 1] = cardType
-            self.moddedCardTypesSet:add(cardType)
-            local ____self_allCardTypesArray_11 = self.allCardTypesArray
-            ____self_allCardTypesArray_11[#____self_allCardTypesArray_11 + 1] = cardType
-            self.allCardTypesSet:add(cardType)
+    local firstModdedPillEffect = self.moddedElementDetection:getFirstModdedPillEffect()
+    if firstModdedPillEffect == nil then
+        return
+    end
+    local lastPillEffect = self.moddedElementDetection:getLastPillEffect()
+    local moddedPillEffects = iRange(nil, firstModdedPillEffect, lastPillEffect)
+    for ____, pillEffectInt in ipairs(moddedPillEffects) do
+        local pillEffect = asPillEffect(nil, pillEffectInt)
+        local itemConfigPillEffect = itemConfig:GetPillEffect(pillEffect)
+        if itemConfigPillEffect ~= nil then
+            local ____self_moddedPillEffectsArray_10 = self.moddedPillEffectsArray
+            ____self_moddedPillEffectsArray_10[#____self_moddedPillEffectsArray_10 + 1] = pillEffect
+            self.moddedPillEffectsSet:add(pillEffect)
+            local ____self_allPillEffectsArray_11 = self.allPillEffectsArray
+            ____self_allPillEffectsArray_11[#____self_allPillEffectsArray_11 + 1] = pillEffect
+            self.allPillEffectsSet:add(pillEffect)
         end
     end
 end
@@ -239,11 +250,11 @@ function ModdedElementSets.prototype.lazyInitTagToCollectibleTypesMap(self)
             __TS__New(Set)
         )
     end
-    for ____, collectibleType in ipairs(self:getCollectibleArray()) do
+    for ____, collectibleType in ipairs(self:getCollectibleTypes()) do
         for ____, itemConfigTag in ipairs(ITEM_CONFIG_TAG_VALUES) do
             do
                 if not collectibleHasTag(nil, collectibleType, itemConfigTag) then
-                    goto __continue42
+                    goto __continue37
                 end
                 local collectibleTypesSet = self.tagToCollectibleTypesMap:get(itemConfigTag)
                 if collectibleTypesSet == nil then
@@ -252,14 +263,14 @@ function ModdedElementSets.prototype.lazyInitTagToCollectibleTypesMap(self)
                 end
                 collectibleTypesSet:add(collectibleType)
             end
-            ::__continue42::
+            ::__continue37::
         end
     end
 end
 function ModdedElementSets.prototype.lazyInitCacheFlagToCollectibleTypesMap(self)
     for ____, cacheFlag in ipairs(CACHE_FLAG_VALUES) do
         local collectiblesSet = __TS__New(Set)
-        for ____, collectibleType in ipairs(self:getCollectibleArray()) do
+        for ____, collectibleType in ipairs(self:getCollectibleTypes()) do
             if collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
                 collectiblesSet:add(collectibleType)
             end
@@ -270,7 +281,7 @@ end
 function ModdedElementSets.prototype.lazyInitCacheFlagToTrinketTypesMap(self)
     for ____, cacheFlag in ipairs(CACHE_FLAG_VALUES) do
         local trinketsSet = __TS__New(Set)
-        for ____, trinketType in ipairs(self:getTrinketArray()) do
+        for ____, trinketType in ipairs(self:getTrinketTypes()) do
             if trinketHasCacheFlag(nil, trinketType, cacheFlag) then
                 trinketsSet:add(trinketType)
             end
@@ -281,9 +292,9 @@ end
 function ModdedElementSets.prototype.lazyInitFlyingCollectibleTypesSet(self)
     self.flyingCollectibleTypesSet = copySet(
         nil,
-        self:getCollectiblesWithCacheFlag(CacheFlag.FLYING)
+        self:getCollectibleTypesWithCacheFlag(CacheFlag.FLYING)
     )
-    local collectiblesWithAllCacheFlag = self:getCollectiblesWithCacheFlag(CacheFlag.ALL)
+    local collectiblesWithAllCacheFlag = self:getCollectibleTypesWithCacheFlag(CacheFlag.ALL)
     deleteSetsFromSet(nil, self.flyingCollectibleTypesSet, collectiblesWithAllCacheFlag)
     local permanentFlyingCollectibleTypes = copySet(nil, self.flyingCollectibleTypesSet)
     for ____, collectibleType in ipairs(CONDITIONAL_FLYING_COLLECTIBLE_TYPES) do
@@ -296,20 +307,20 @@ end
 function ModdedElementSets.prototype.lazyInitFlyingTrinketTypesSet(self)
     self.flyingTrinketTypesSet = copySet(
         nil,
-        self:getTrinketsWithCacheFlag(CacheFlag.FLYING)
+        self:getTrinketsTypesWithCacheFlag(CacheFlag.FLYING)
     )
     local trinketsWithAllCacheFlag = copySet(
         nil,
-        self:getTrinketsWithCacheFlag(CacheFlag.ALL)
+        self:getTrinketsTypesWithCacheFlag(CacheFlag.ALL)
     )
     trinketsWithAllCacheFlag:delete(TrinketType.AZAZELS_STUMP)
     deleteSetsFromSet(nil, self.flyingTrinketTypesSet, trinketsWithAllCacheFlag)
 end
 function ModdedElementSets.prototype.lazyInitEdenCollectibleTypesSet(self)
-    for ____, collectibleType in ipairs(self:getCollectibleArray()) do
+    for ____, collectibleType in ipairs(self:getCollectibleTypes()) do
         do
             if isHiddenCollectible(nil, collectibleType) or collectibleHasTag(nil, collectibleType, ItemConfigTag.NO_EDEN) then
-                goto __continue66
+                goto __continue61
             end
             if isActiveCollectible(nil, collectibleType) then
                 self.edenActiveCollectibleTypesSet:add(collectibleType)
@@ -318,7 +329,7 @@ function ModdedElementSets.prototype.lazyInitEdenCollectibleTypesSet(self)
                 self.edenPassiveCollectibleTypesSet:add(collectibleType)
             end
         end
-        ::__continue66::
+        ::__continue61::
     end
 end
 function ModdedElementSets.prototype.lazyInitCardTypes(self)
@@ -328,7 +339,7 @@ function ModdedElementSets.prototype.lazyInitCardTypes(self)
             __TS__New(Set)
         )
     end
-    for ____, cardType in ipairs(self:getCardArray()) do
+    for ____, cardType in ipairs(self:getCardTypes()) do
         local itemConfigCardType = getItemConfigCardType(nil, cardType)
         if itemConfigCardType ~= nil then
             local cardTypeSet = self.itemConfigCardTypeToCardTypeMap:get(itemConfigCardType)
@@ -344,126 +355,28 @@ function ModdedElementSets.prototype.lazyInitCardTypes(self)
         end
     end
 end
-function ModdedElementSets.prototype.getCardArray(self)
-    self:lazyInit()
-    return self.allCardTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardArray", true)
-function ModdedElementSets.prototype.getCardSet(self)
-    self:lazyInit()
-    return self.allCardTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardSet", true)
-function ModdedElementSets.prototype.getCardTypesOfType(self, ...)
-    local itemConfigCardTypes = {...}
-    self:lazyInit()
-    local matchingCardTypes = __TS__New(Set)
-    for ____, itemConfigCardType in ipairs(itemConfigCardTypes) do
-        local cardTypeSet = self.itemConfigCardTypeToCardTypeMap:get(itemConfigCardType)
-        assertDefined(
-            nil,
-            cardTypeSet,
-            "Failed to get the card type set for item config type: " .. tostring(itemConfigCardType)
-        )
-        for ____, cardType in __TS__Iterator(cardTypeSet) do
-            matchingCardTypes:add(cardType)
-        end
-    end
-    return matchingCardTypes
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardTypesOfType", true)
-function ModdedElementSets.prototype.getCollectibleArray(self)
+function ModdedElementSets.prototype.getCollectibleTypes(self)
     self:lazyInit()
     return self.allCollectibleTypesArray
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleArray", true)
-function ModdedElementSets.prototype.getCollectibleSet(self)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleTypes", true)
+function ModdedElementSets.prototype.getCollectibleTypeSet(self)
     self:lazyInit()
     return self.allCollectibleTypesSet
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleSet", true)
-function ModdedElementSets.prototype.getCollectiblesForTransformation(self, playerForm)
-    local itemConfigTag = TRANSFORMATION_TO_TAG_MAP:get(playerForm)
-    assertDefined(
-        nil,
-        itemConfigTag,
-        ("Failed to get the collectible types for the transformation of " .. tostring(playerForm)) .. " because that transformation is not based on collectibles."
-    )
-    return self:getCollectiblesWithTag(itemConfigTag)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectiblesForTransformation", true)
-function ModdedElementSets.prototype.getCollectiblesWithCacheFlag(self, cacheFlag)
-    self:lazyInit()
-    local collectiblesSet = self.cacheFlagToCollectibleTypesMap:get(cacheFlag)
-    if collectiblesSet == nil then
-        return __TS__New(ReadonlySet)
-    end
-    return collectiblesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectiblesWithCacheFlag", true)
-function ModdedElementSets.prototype.getCollectiblesWithTag(self, itemConfigTag)
-    self:lazyInit()
-    local collectibleTypes = self.tagToCollectibleTypesMap:get(itemConfigTag)
-    assertDefined(
-        nil,
-        collectibleTypes,
-        ("The item config tag of " .. tostring(itemConfigTag)) .. " is not a valid value of the \"ItemConfigTag\" enum."
-    )
-    return collectibleTypes
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectiblesWithTag", true)
-function ModdedElementSets.prototype.getEdenActiveCollectibles(self)
-    self:lazyInit()
-    return self.edenActiveCollectibleTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getEdenActiveCollectibles", true)
-function ModdedElementSets.prototype.getEdenPassiveCollectibles(self)
-    self:lazyInit()
-    return self.edenPassiveCollectibleTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getEdenPassiveCollectibles", true)
-function ModdedElementSets.prototype.getFlyingCollectibles(self, includeConditionalItems)
-    self:lazyInit()
-    return includeConditionalItems and self.flyingCollectibleTypesSet or self.permanentFlyingCollectibleTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getFlyingCollectibles", true)
-function ModdedElementSets.prototype.getFlyingTrinkets(self)
-    self:lazyInit()
-    return self.flyingTrinketTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getFlyingTrinkets", true)
-function ModdedElementSets.prototype.getModdedCardArray(self)
-    self:lazyInit()
-    return self.moddedCardTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCardArray", true)
-function ModdedElementSets.prototype.getModdedCardSet(self)
-    self:lazyInit()
-    return self.moddedCardTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCardSet", true)
-function ModdedElementSets.prototype.getModdedCollectibleArray(self)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleTypeSet", true)
+function ModdedElementSets.prototype.getModdedCollectibleTypes(self)
     self:lazyInit()
     return self.moddedCollectibleTypesArray
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCollectibleArray", true)
-function ModdedElementSets.prototype.getModdedCollectibleSet(self)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCollectibleTypes", true)
+function ModdedElementSets.prototype.getModdedCollectibleTypesSet(self)
     self:lazyInit()
     return self.moddedCollectibleTypesSet
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCollectibleSet", true)
-function ModdedElementSets.prototype.getModdedTrinketArray(self)
-    self:lazyInit()
-    return self.moddedTrinketTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedTrinketArray", true)
-function ModdedElementSets.prototype.getModdedTrinketSet(self)
-    self:lazyInit()
-    return self.moddedTrinketTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedTrinketSet", true)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCollectibleTypesSet", true)
 function ModdedElementSets.prototype.getPlayerCollectibleMap(self, player)
-    local collectibleArray = self:getCollectibleArray()
+    local collectibleArray = self:getCollectibleTypes()
     local collectibleMap = __TS__New(Map)
     for ____, collectibleType in ipairs(collectibleArray) do
         local numCollectibles = player:GetCollectibleNum(collectibleType, true)
@@ -490,8 +403,86 @@ function ModdedElementSets.prototype.getPlayerCollectibleMap(self, player)
     return collectibleMap
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPlayerCollectibleMap", true)
+function ModdedElementSets.prototype.getTrinketTypes(self)
+    self:lazyInit()
+    return self.allTrinketTypesArray
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketTypes", true)
+function ModdedElementSets.prototype.getTrinketTypesSet(self)
+    self:lazyInit()
+    return self.allTrinketTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketTypesSet", true)
+function ModdedElementSets.prototype.getModdedTrinketTypes(self)
+    self:lazyInit()
+    return self.moddedTrinketTypesArray
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedTrinketTypes", true)
+function ModdedElementSets.prototype.getModdedTrinketTypesSet(self)
+    self:lazyInit()
+    return self.moddedTrinketTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedTrinketTypesSet", true)
+function ModdedElementSets.prototype.getCardTypes(self)
+    self:lazyInit()
+    return self.allCardTypesArray
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardTypes", true)
+function ModdedElementSets.prototype.getCardTypesSet(self)
+    self:lazyInit()
+    return self.allCardTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardTypesSet", true)
+function ModdedElementSets.prototype.getModdedCardTypes(self)
+    self:lazyInit()
+    return self.moddedCardTypesArray
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCardTypes", true)
+function ModdedElementSets.prototype.getModdedCardTypesSet(self)
+    self:lazyInit()
+    return self.moddedCardTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedCardTypesSet", true)
+function ModdedElementSets.prototype.getPillEffects(self)
+    self:lazyInit()
+    return self.allPillEffectsArray
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPillEffects", true)
+function ModdedElementSets.prototype.getPillEffectsSet(self)
+    self:lazyInit()
+    return self.allPillEffectsSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPillEffectsSet", true)
+function ModdedElementSets.prototype.getModdedPillEffects(self)
+    self:lazyInit()
+    return self.moddedPillEffectsArray
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedPillEffects", true)
+function ModdedElementSets.prototype.getModdedPillEffectsSet(self)
+    self:lazyInit()
+    return self.moddedPillEffectsSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getModdedPillEffectsSet", true)
+function ModdedElementSets.prototype.getCollectibleTypesWithCacheFlag(self, cacheFlag)
+    self:lazyInit()
+    local collectiblesSet = self.cacheFlagToCollectibleTypesMap:get(cacheFlag)
+    if collectiblesSet == nil then
+        return __TS__New(ReadonlySet)
+    end
+    return collectiblesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleTypesWithCacheFlag", true)
+function ModdedElementSets.prototype.getTrinketsTypesWithCacheFlag(self, cacheFlag)
+    self:lazyInit()
+    local trinketsSet = self.cacheFlagToTrinketTypesMap:get(cacheFlag)
+    if trinketsSet == nil then
+        return __TS__New(ReadonlySet)
+    end
+    return trinketsSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketsTypesWithCacheFlag", true)
 function ModdedElementSets.prototype.getPlayerCollectiblesWithCacheFlag(self, player, cacheFlag)
-    local collectiblesWithCacheFlag = self:getCollectiblesWithCacheFlag(cacheFlag)
+    local collectiblesWithCacheFlag = self:getCollectibleTypesWithCacheFlag(cacheFlag)
     local playerCollectibles = {}
     for ____, collectibleType in ipairs(getSortedSetValues(nil, collectiblesWithCacheFlag)) do
         local numCollectibles = player:GetCollectibleNum(collectibleType, true)
@@ -506,10 +497,43 @@ function ModdedElementSets.prototype.getPlayerCollectiblesWithCacheFlag(self, pl
     return playerCollectibles
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPlayerCollectiblesWithCacheFlag", true)
+function ModdedElementSets.prototype.getPlayerTrinketsWithCacheFlag(self, player, cacheFlag)
+    local trinketTypesWithCacheFlag = self:getTrinketsTypesWithCacheFlag(cacheFlag)
+    local playerTrinkets = __TS__New(Map)
+    for ____, trinketType in __TS__Iterator(trinketTypesWithCacheFlag) do
+        local trinketMultiplier = player:GetTrinketMultiplier(trinketType)
+        if trinketMultiplier > 0 then
+            playerTrinkets:set(trinketType, trinketMultiplier)
+        end
+    end
+    return playerTrinkets
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPlayerTrinketsWithCacheFlag", true)
+function ModdedElementSets.prototype.getFlyingCollectibleTypes(self, includeConditionalItems)
+    self:lazyInit()
+    return includeConditionalItems and self.flyingCollectibleTypesSet or self.permanentFlyingCollectibleTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getFlyingCollectibleTypes", true)
+function ModdedElementSets.prototype.getFlyingTrinketTypes(self)
+    self:lazyInit()
+    return self.flyingTrinketTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getFlyingTrinketTypes", true)
+function ModdedElementSets.prototype.getCollectibleTypesWithTag(self, itemConfigTag)
+    self:lazyInit()
+    local collectibleTypes = self.tagToCollectibleTypesMap:get(itemConfigTag)
+    assertDefined(
+        nil,
+        collectibleTypes,
+        ("The item config tag of " .. tostring(itemConfigTag)) .. " is not a valid value of the \"ItemConfigTag\" enum."
+    )
+    return collectibleTypes
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleTypesWithTag", true)
 function ModdedElementSets.prototype.getPlayerCollectiblesWithTag(self, player, itemConfigTag)
-    local collectiblesWithTag = self:getCollectiblesWithTag(itemConfigTag)
+    local collectibleTypesWithTag = self:getCollectibleTypesWithTag(itemConfigTag)
     local playerCollectibles = {}
-    for ____, collectibleType in ipairs(getSortedSetValues(nil, collectiblesWithTag)) do
+    for ____, collectibleType in ipairs(getSortedSetValues(nil, collectibleTypesWithTag)) do
         local numCollectibles = player:GetCollectibleNum(collectibleType, true)
         ____repeat(
             nil,
@@ -522,8 +546,18 @@ function ModdedElementSets.prototype.getPlayerCollectiblesWithTag(self, player,
     return playerCollectibles
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPlayerCollectiblesWithTag", true)
+function ModdedElementSets.prototype.getCollectibleTypesForTransformation(self, playerForm)
+    local itemConfigTag = TRANSFORMATION_TO_TAG_MAP:get(playerForm)
+    assertDefined(
+        nil,
+        itemConfigTag,
+        ("Failed to get the collectible types for the transformation of " .. tostring(playerForm)) .. " because that transformation is not based on collectibles."
+    )
+    return self:getCollectibleTypesWithTag(itemConfigTag)
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCollectibleTypesForTransformation", true)
 function ModdedElementSets.prototype.getPlayerCollectiblesForTransformation(self, player, playerForm)
-    local collectibleForTransformation = self:getCollectiblesForTransformation(playerForm)
+    local collectibleForTransformation = self:getCollectibleTypesForTransformation(playerForm)
     local playerCollectibles = {}
     for ____, collectibleType in ipairs(getSortedSetValues(nil, collectibleForTransformation)) do
         local numCollectibles = player:GetCollectibleNum(collectibleType, true)
@@ -538,19 +572,17 @@ function ModdedElementSets.prototype.getPlayerCollectiblesForTransformation(self
     return playerCollectibles
 end
 __TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPlayerCollectiblesForTransformation", true)
-function ModdedElementSets.prototype.getPlayerTrinketsWithCacheFlag(self, player, cacheFlag)
-    local trinketsWithCacheFlag = self:getTrinketsWithCacheFlag(cacheFlag)
-    local playerTrinkets = __TS__New(Map)
-    for ____, trinketType in __TS__Iterator(trinketsWithCacheFlag) do
-        local trinketMultiplier = player:GetTrinketMultiplier(trinketType)
-        if trinketMultiplier > 0 then
-            playerTrinkets:set(trinketType, trinketMultiplier)
-        end
-    end
-    return playerTrinkets
+function ModdedElementSets.prototype.getEdenActiveCollectibleTypes(self)
+    self:lazyInit()
+    return self.edenActiveCollectibleTypesSet
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getPlayerTrinketsWithCacheFlag", true)
-function ModdedElementSets.prototype.getRandomCard(self, seedOrRNG, exceptions)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getEdenActiveCollectibleTypes", true)
+function ModdedElementSets.prototype.getEdenPassiveCollectibleTypes(self)
+    self:lazyInit()
+    return self.edenPassiveCollectibleTypesSet
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getEdenPassiveCollectibleTypes", true)
+function ModdedElementSets.prototype.getRandomEdenActiveCollectibleType(self, seedOrRNG, exceptions)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
     end
@@ -558,33 +590,50 @@ function ModdedElementSets.prototype.getRandomCard(self, seedOrRNG, exceptions)
         exceptions = {}
     end
     self:lazyInit()
-    return getRandomSetElement(nil, self.cardSet, seedOrRNG, exceptions)
+    return getRandomSetElement(nil, self.edenPassiveCollectibleTypesSet, seedOrRNG, exceptions)
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomCard", true)
-function ModdedElementSets.prototype.getRandomCardTypeOfType(self, itemConfigCardType, seedOrRNG, exceptions)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomEdenActiveCollectibleType", true)
+function ModdedElementSets.prototype.getRandomEdenPassiveCollectibleType(self, seedOrRNG, exceptions)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
     end
     if exceptions == nil then
         exceptions = {}
     end
-    local cardTypeSet = self:getCardTypesOfType(itemConfigCardType)
-    return getRandomSetElement(nil, cardTypeSet, seedOrRNG, exceptions)
+    self:lazyInit()
+    return getRandomSetElement(nil, self.edenPassiveCollectibleTypesSet, seedOrRNG, exceptions)
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomCardTypeOfType", true)
-function ModdedElementSets.prototype.getRandomRune(self, seedOrRNG, exceptions)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomEdenPassiveCollectibleType", true)
+function ModdedElementSets.prototype.getCardTypesOfType(self, ...)
+    local itemConfigCardTypes = {...}
+    self:lazyInit()
+    local matchingCardTypes = __TS__New(Set)
+    for ____, itemConfigCardType in ipairs(itemConfigCardTypes) do
+        local cardTypeSet = self.itemConfigCardTypeToCardTypeMap:get(itemConfigCardType)
+        assertDefined(
+            nil,
+            cardTypeSet,
+            "Failed to get the card type set for item config type: " .. tostring(itemConfigCardType)
+        )
+        for ____, cardType in __TS__Iterator(cardTypeSet) do
+            matchingCardTypes:add(cardType)
+        end
+    end
+    return matchingCardTypes
+end
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getCardTypesOfType", true)
+function ModdedElementSets.prototype.getRandomCardTypeOfType(self, itemConfigCardType, seedOrRNG, exceptions)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
     end
     if exceptions == nil then
         exceptions = {}
     end
-    local runesSet = self:getCardTypesOfType(ItemConfigCardType.RUNE)
-    runesSet:delete(CardType.RUNE_SHARD)
-    return getRandomSetElement(nil, runesSet, seedOrRNG, exceptions)
+    local cardTypeSet = self:getCardTypesOfType(itemConfigCardType)
+    return getRandomSetElement(nil, cardTypeSet, seedOrRNG, exceptions)
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomRune", true)
-function ModdedElementSets.prototype.getRandomEdenActiveCollectible(self, seedOrRNG, exceptions)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomCardTypeOfType", true)
+function ModdedElementSets.prototype.getRandomCard(self, seedOrRNG, exceptions)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
     end
@@ -592,67 +641,19 @@ function ModdedElementSets.prototype.getRandomEdenActiveCollectible(self, seedOr
         exceptions = {}
     end
     self:lazyInit()
-    return getRandomSetElement(nil, self.edenPassiveCollectibleTypesSet, seedOrRNG, exceptions)
+    return getRandomSetElement(nil, self.cardSet, seedOrRNG, exceptions)
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomEdenActiveCollectible", true)
-function ModdedElementSets.prototype.getRandomEdenPassiveCollectible(self, seedOrRNG, exceptions)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomCard", true)
+function ModdedElementSets.prototype.getRandomRune(self, seedOrRNG, exceptions)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
     end
     if exceptions == nil then
         exceptions = {}
     end
-    self:lazyInit()
-    return getRandomSetElement(nil, self.edenPassiveCollectibleTypesSet, seedOrRNG, exceptions)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomEdenPassiveCollectible", true)
-function ModdedElementSets.prototype.getTrinketArray(self)
-    self:lazyInit()
-    return self.allTrinketTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketArray", true)
-function ModdedElementSets.prototype.getTrinketSet(self)
-    self:lazyInit()
-    return self.allTrinketTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketSet", true)
-function ModdedElementSets.prototype.getTrinketsWithCacheFlag(self, cacheFlag)
-    self:lazyInit()
-    local trinketsSet = self.cacheFlagToTrinketTypesMap:get(cacheFlag)
-    if trinketsSet == nil then
-        return __TS__New(ReadonlySet)
-    end
-    return trinketsSet
+    local runesSet = self:getCardTypesOfType(ItemConfigCardType.RUNE)
+    runesSet:delete(CardType.RUNE_SHARD)
+    return getRandomSetElement(nil, runesSet, seedOrRNG, exceptions)
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getTrinketsWithCacheFlag", true)
-function ModdedElementSets.prototype.getVanillaCardArray(self)
-    self:lazyInitVanillaCardTypes()
-    return self.vanillaCardTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCardArray", true)
-function ModdedElementSets.prototype.getVanillaCardSet(self)
-    self:lazyInitVanillaCardTypes()
-    return self.vanillaCardTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCardSet", true)
-function ModdedElementSets.prototype.getVanillaCollectibleArray(self)
-    self:lazyInitVanillaCollectibleTypes()
-    return self.vanillaCollectibleTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCollectibleArray", true)
-function ModdedElementSets.prototype.getVanillaCollectibleSet(self)
-    self:lazyInitVanillaCollectibleTypes()
-    return self.vanillaCollectibleTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaCollectibleSet", true)
-function ModdedElementSets.prototype.getVanillaTrinketArray(self)
-    self:lazyInitVanillaTrinketTypes()
-    return self.vanillaTrinketTypesArray
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaTrinketArray", true)
-function ModdedElementSets.prototype.getVanillaTrinketSet(self)
-    self:lazyInitVanillaTrinketTypes()
-    return self.vanillaTrinketTypesSet
-end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaTrinketSet", true)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomRune", true)
 return ____exports