isaacscript-common 40.0.0 → 41.1.0

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 40.0.0
+isaacscript-common 41.1.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -1118,6 +1118,9 @@ end
 local Error, RangeError, ReferenceError, SyntaxError, TypeError, URIError
 do
     local function getErrorStack(self, constructor)
+        if debug == nil then
+            return nil
+        end
         local level = 1
         while true do
             local info = debug.getinfo(level, "f")
@@ -1499,6 +1502,62 @@ local function __TS__NumberIsNaN(value)
     return value ~= value
 end
 
+local function __TS__StringSubstring(self, start, ____end)
+    if ____end ~= ____end then
+        ____end = 0
+    end
+    if ____end ~= nil and start > ____end then
+        start, ____end = ____end, start
+    end
+    if start >= 0 then
+        start = start + 1
+    else
+        start = 1
+    end
+    if ____end ~= nil and ____end < 0 then
+        ____end = 0
+    end
+    return string.sub(self, start, ____end)
+end
+
+local __TS__ParseInt
+do
+    local parseIntBasePattern = "0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTvVwWxXyYzZ"
+    function __TS__ParseInt(numberString, base)
+        if base == nil then
+            base = 10
+            local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
+            if hexMatch ~= nil then
+                base = 16
+                numberString = (__TS__Match(hexMatch, "-")) and "-" .. __TS__StringSubstring(numberString, #hexMatch) or __TS__StringSubstring(numberString, #hexMatch)
+            end
+        end
+        if base < 2 or base > 36 then
+            return 0 / 0
+        end
+        local allowedDigits = base <= 10 and __TS__StringSubstring(parseIntBasePattern, 0, base) or __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
+        local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
+        local number = tonumber((__TS__Match(numberString, pattern)), base)
+        if number == nil then
+            return 0 / 0
+        end
+        if number >= 0 then
+            return math.floor(number)
+        else
+            return math.ceil(number)
+        end
+    end
+end
+
+local function __TS__ParseFloat(numberString)
+    local infinityMatch = __TS__Match(numberString, "^%s*(-?Infinity)")
+    if infinityMatch ~= nil then
+        return __TS__StringAccess(infinityMatch, 0) == "-" and -math.huge or math.huge
+    end
+    local number = tonumber((__TS__Match(numberString, "^%s*(-?%d+%.?%d*)")))
+    return number or 0 / 0
+end
+
 local __TS__NumberToString
 do
     local radixChars = "0123456789abcdefghijklmnopqrstuvwxyz"
@@ -1673,62 +1732,6 @@ local function __TS__ObjectValues(obj)
     return result
 end
 
-local function __TS__ParseFloat(numberString)
-    local infinityMatch = __TS__Match(numberString, "^%s*(-?Infinity)")
-    if infinityMatch ~= nil then
-        return __TS__StringAccess(infinityMatch, 0) == "-" and -math.huge or math.huge
-    end
-    local number = tonumber((__TS__Match(numberString, "^%s*(-?%d+%.?%d*)")))
-    return number or 0 / 0
-end
-
-local function __TS__StringSubstring(self, start, ____end)
-    if ____end ~= ____end then
-        ____end = 0
-    end
-    if ____end ~= nil and start > ____end then
-        start, ____end = ____end, start
-    end
-    if start >= 0 then
-        start = start + 1
-    else
-        start = 1
-    end
-    if ____end ~= nil and ____end < 0 then
-        ____end = 0
-    end
-    return string.sub(self, start, ____end)
-end
-
-local __TS__ParseInt
-do
-    local parseIntBasePattern = "0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTvVwWxXyYzZ"
-    function __TS__ParseInt(numberString, base)
-        if base == nil then
-            base = 10
-            local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
-            if hexMatch ~= nil then
-                base = 16
-                numberString = (__TS__Match(hexMatch, "-")) and "-" .. __TS__StringSubstring(numberString, #hexMatch) or __TS__StringSubstring(numberString, #hexMatch)
-            end
-        end
-        if base < 2 or base > 36 then
-            return 0 / 0
-        end
-        local allowedDigits = base <= 10 and __TS__StringSubstring(parseIntBasePattern, 0, base) or __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
-        local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
-        local number = tonumber((__TS__Match(numberString, pattern)), base)
-        if number == nil then
-            return 0 / 0
-        end
-        if number >= 0 then
-            return math.floor(number)
-        else
-            return math.ceil(number)
-        end
-    end
-end
-
 local function __TS__PromiseAll(iterable)
     local results = {}
     local toResolve = {}
@@ -2596,6 +2599,8 @@ return {
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
+  __TS__ParseInt = __TS__ParseInt,
+  __TS__ParseFloat = __TS__ParseFloat,
   __TS__NumberToString = __TS__NumberToString,
   __TS__NumberToFixed = __TS__NumberToFixed,
   __TS__ObjectAssign = __TS__ObjectAssign,
@@ -17932,12 +17937,15 @@ ____exports.NUM_VANILLA_CHALLENGES = getEnumLength(nil, Challenge) - 1
 return ____exports
  end,
 ["src.core.constants"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local Dimension = ____isaac_2Dtypescript_2Ddefinitions.Dimension
 local DisplayFlag = ____isaac_2Dtypescript_2Ddefinitions.DisplayFlag
 local ItemPoolType = ____isaac_2Dtypescript_2Ddefinitions.ItemPoolType
+local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local TrinketSlot = ____isaac_2Dtypescript_2Ddefinitions.TrinketSlot
 local ____enums = require("src.functions.enums")
@@ -17950,12 +17958,31 @@ local newReadonlyKColor = ____readOnly.newReadonlyKColor
 local newReadonlyVector = ____readOnly.newReadonlyVector
 local ____types = require("src.functions.types")
 local asCollectibleType = ____types.asCollectibleType
+local ____utils = require("src.functions.utils")
+local eRange = ____utils.eRange
+local ____ReadonlySet = require("src.types.ReadonlySet")
+local ReadonlySet = ____ReadonlySet.ReadonlySet
 local ____constantsFirstLast = require("src.core.constantsFirstLast")
 local NUM_NORMAL_PILL_COLORS = ____constantsFirstLast.NUM_NORMAL_PILL_COLORS
 ____exports.ALL_DISPLAY_FLAGS = addFlag(nil, DisplayFlag.VISIBLE, DisplayFlag.SHADOW, DisplayFlag.SHOW_ICON)
 ____exports.AZAZEL_DEFAULT_BRIMSTONE_DISTANCE = 75.125
 ____exports.BLIND_ITEM_PNG_PATH = "gfx/items/collectibles/questionmark.png"
 ____exports.BOMB_EXPLODE_FRAME = 45
+____exports.CHEST_PICKUP_VARIANTS = {
+    PickupVariant.CHEST,
+    PickupVariant.BOMB_CHEST,
+    PickupVariant.SPIKED_CHEST,
+    PickupVariant.ETERNAL_CHEST,
+    PickupVariant.MIMIC_CHEST,
+    PickupVariant.OLD_CHEST,
+    PickupVariant.WOODEN_CHEST,
+    PickupVariant.MEGA_CHEST,
+    PickupVariant.HAUNTED_CHEST,
+    PickupVariant.LOCKED_CHEST,
+    PickupVariant.RED_CHEST,
+    PickupVariant.MOMS_CHEST
+}
+____exports.CHEST_PICKUP_VARIANTS_SET = __TS__New(ReadonlySet, ____exports.CHEST_PICKUP_VARIANTS)
 ____exports.COLLECTIBLE_INITIAL_WAIT = 20
 ____exports.DEFAULT_ITEM_POOL_TYPE = ItemPoolType.TREASURE
 ____exports.DISTANCE_OF_GRID_TILE = 40
@@ -18041,7 +18068,8 @@ ____exports.NEW_FLOOR_STARTING_POSITION_GREED_MODE = newReadonlyVector(nil, 320,
 ____exports.NEW_RUN_PLAYER_STARTING_POSITION = newReadonlyVector(nil, 320, 380)
 ____exports.MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000
 ____exports.NUM_DIMENSIONS = getEnumLength(nil, Dimension) - 1
-____exports.NUM_PILLS_IN_POOL = NUM_NORMAL_PILL_COLORS
+____exports.DIMENSIONS = eRange(nil, ____exports.NUM_DIMENSIONS)
+____exports.NUM_PILL_COLORS_IN_POOL = NUM_NORMAL_PILL_COLORS
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135
 ____exports.SECOND_IN_MILLISECONDS = 1000
 ____exports.MINUTE_IN_MILLISECONDS = 60 * ____exports.SECOND_IN_MILLISECONDS
@@ -21563,7 +21591,6 @@ local ____constants = require("src.core.constants")
 local BLIND_ITEM_PNG_PATH = ____constants.BLIND_ITEM_PNG_PATH
 local DEFAULT_ITEM_POOL_TYPE = ____constants.DEFAULT_ITEM_POOL_TYPE
 local ____constantsFirstLast = require("src.core.constantsFirstLast")
-local FIRST_COLLECTIBLE_TYPE = ____constantsFirstLast.FIRST_COLLECTIBLE_TYPE
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
 local ____collectibleDescriptionMap = require("src.maps.collectibleDescriptionMap")
 local COLLECTIBLE_DESCRIPTION_MAP = ____collectibleDescriptionMap.COLLECTIBLE_DESCRIPTION_MAP
@@ -21584,8 +21611,6 @@ local clearSprite = ____sprites.clearSprite
 local spriteEquals = ____sprites.spriteEquals
 local ____types = require("src.functions.types")
 local isInteger = ____types.isInteger
-local ____utils = require("src.functions.utils")
-local iRange = ____utils.iRange
 function initQuestionMarkSprite(self)
     local sprite = Sprite()
     sprite:Load("gfx/005.100_collectible.anm2", false)
@@ -21801,9 +21826,6 @@ function ____exports.getCollectibleTags(self, collectibleOrCollectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     return itemConfigItem == nil and ItemConfigTagZero or itemConfigItem.Tags
 end
-function ____exports.getVanillaCollectibleTypeRange(self)
-    return iRange(nil, FIRST_COLLECTIBLE_TYPE, LAST_VANILLA_COLLECTIBLE_TYPE)
-end
 function ____exports.isActiveCollectible(self, collectibleType)
     local itemType = ____exports.getCollectibleItemType(nil, collectibleType)
     return itemType == ItemType.ACTIVE
@@ -27011,20 +27033,15 @@ local Dimension = ____isaac_2Dtypescript_2Ddefinitions.Dimension
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____constants = require("src.core.constants")
-local NUM_DIMENSIONS = ____constants.NUM_DIMENSIONS
+local DIMENSIONS = ____constants.DIMENSIONS
 local ____roomData = require("src.functions.roomData")
 local getRoomGridIndex = ____roomData.getRoomGridIndex
-local ____utils = require("src.functions.utils")
-local eRange = ____utils.eRange
-function ____exports.getAllDimensions(self)
-    return eRange(nil, NUM_DIMENSIONS)
-end
 function ____exports.getDimension(self)
     local level = game:GetLevel()
     local roomGridIndex = getRoomGridIndex(nil)
     local roomDescription = level:GetRoomByIdx(roomGridIndex, Dimension.CURRENT)
     local currentRoomHash = GetPtrHash(roomDescription)
-    for ____, dimension in ipairs(____exports.getAllDimensions(nil)) do
+    for ____, dimension in ipairs(DIMENSIONS) do
         local dimensionRoomDescription = level:GetRoomByIdx(roomGridIndex, dimension)
         local dimensionRoomHash = GetPtrHash(dimensionRoomDescription)
         if dimensionRoomHash == currentRoomHash then
@@ -27752,6 +27769,7 @@ local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local sfxManager = ____cachedClasses.sfxManager
 local ____constants = require("src.core.constants")
+local DIMENSIONS = ____constants.DIMENSIONS
 local MAX_LEVEL_GRID_INDEX = ____constants.MAX_LEVEL_GRID_INDEX
 local ____roomTypeNames = require("src.objects.roomTypeNames")
 local ROOM_TYPE_NAMES = ____roomTypeNames.ROOM_TYPE_NAMES
@@ -27760,7 +27778,6 @@ local MINE_SHAFT_ROOM_SUB_TYPE_SET = ____mineShaftRoomSubTypesSet.MINE_SHAFT_ROO
 local ____ReadonlySet = require("src.types.ReadonlySet")
 local ReadonlySet = ____ReadonlySet.ReadonlySet
 local ____dimensions = require("src.functions.dimensions")
-local getAllDimensions = ____dimensions.getAllDimensions
 local inDimension = ____dimensions.inDimension
 local ____doors = require("src.functions.doors")
 local closeAllDoors = ____doors.closeAllDoors
@@ -27813,7 +27830,7 @@ function ____exports.getRoomsInsideGrid(self, includeExtraDimensionalRooms)
         includeExtraDimensionalRooms = false
     end
     local level = game:GetLevel()
-    local dimensions = includeExtraDimensionalRooms and getAllDimensions(nil) or ({Dimension.CURRENT})
+    local dimensions = includeExtraDimensionalRooms and DIMENSIONS or ({Dimension.CURRENT})
     local roomDescriptorMap = __TS__New(Map)
     for ____, dimension in ipairs(dimensions) do
         for ____, roomGridIndex in ipairs(iRange(nil, MAX_LEVEL_GRID_INDEX)) do
@@ -29602,7 +29619,6 @@ local itemConfig = ____cachedClasses.itemConfig
 local ____constants = require("src.core.constants")
 local BLIND_ITEM_PNG_PATH = ____constants.BLIND_ITEM_PNG_PATH
 local ____constantsFirstLast = require("src.core.constantsFirstLast")
-local FIRST_TRINKET_TYPE = ____constantsFirstLast.FIRST_TRINKET_TYPE
 local LAST_VANILLA_TRINKET_TYPE = ____constantsFirstLast.LAST_VANILLA_TRINKET_TYPE
 local ____MysteriousPaperEffect = require("src.enums.MysteriousPaperEffect")
 local MysteriousPaperEffect = ____MysteriousPaperEffect.MysteriousPaperEffect
@@ -29626,8 +29642,6 @@ local ____sprites = require("src.functions.sprites")
 local clearSprite = ____sprites.clearSprite
 local ____types = require("src.functions.types")
 local asNumber = ____types.asNumber
-local ____utils = require("src.functions.utils")
-local iRange = ____utils.iRange
 function ____exports.isVanillaTrinketType(self, trinketType)
     return trinketType <= LAST_VANILLA_TRINKET_TYPE
 end
@@ -29691,9 +29705,6 @@ function ____exports.getTrinketName(self, trinketType)
     end
     return DEFAULT_TRINKET_NAME
 end
-function ____exports.getVanillaTrinketTypeRange(self)
-    return iRange(nil, FIRST_TRINKET_TYPE, LAST_VANILLA_TRINKET_TYPE)
-end
 function ____exports.hasAnyTrinket(self, player)
     local playerTrinketTypes = __TS__ArrayMap(
         TRINKET_SLOT_VALUES,
@@ -33179,7 +33190,6 @@ local itemConfig = ____cachedClasses.itemConfig
 local ____constantsFirstLast = require("src.core.constantsFirstLast")
 local FIRST_HORSE_PILL_COLOR = ____constantsFirstLast.FIRST_HORSE_PILL_COLOR
 local FIRST_PILL_COLOR = ____constantsFirstLast.FIRST_PILL_COLOR
-local FIRST_PILL_EFFECT = ____constantsFirstLast.FIRST_PILL_EFFECT
 local LAST_HORSE_PILL_COLOR = ____constantsFirstLast.LAST_HORSE_PILL_COLOR
 local LAST_NORMAL_PILL_COLOR = ____constantsFirstLast.LAST_NORMAL_PILL_COLOR
 local LAST_VANILLA_PILL_EFFECT = ____constantsFirstLast.LAST_VANILLA_PILL_EFFECT
@@ -33262,9 +33272,6 @@ function ____exports.getPillEffectType(self, pillEffect)
     local pillEffectClass = PILL_EFFECT_TYPES[pillEffect]
     return pillEffectClass or DEFAULT_PILL_EFFECT_TYPE
 end
-function ____exports.getVanillaPillEffects(self)
-    return iRange(nil, FIRST_PILL_EFFECT, LAST_VANILLA_PILL_EFFECT)
-end
 function ____exports.isGoldPill(self, pillColor)
     return pillColor == PillColor.GOLD or pillColor == PillColor.HORSE_GOLD
 end
@@ -38099,6 +38106,73 @@ function PickupChangeDetection.prototype.____constructor(self, postPickupChanged
     self.postPickupChanged = postPickupChanged
     self.pickupIndexCreation = pickupIndexCreation
 end
+return ____exports
+ end,
+["src.core.constantsVanilla"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+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 iRange = ____utils.iRange
+local ____ReadonlySet = require("src.types.ReadonlySet")
+local ReadonlySet = ____ReadonlySet.ReadonlySet
+local ____cachedClasses = require("src.core.cachedClasses")
+local itemConfig = ____cachedClasses.itemConfig
+local ____constantsFirstLast = require("src.core.constantsFirstLast")
+local FIRST_CARD_TYPE = ____constantsFirstLast.FIRST_CARD_TYPE
+local FIRST_COLLECTIBLE_TYPE = ____constantsFirstLast.FIRST_COLLECTIBLE_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
+local LAST_VANILLA_TRINKET_TYPE = ____constantsFirstLast.LAST_VANILLA_TRINKET_TYPE
+____exports.VANILLA_COLLECTIBLE_TYPE_RANGE = iRange(nil, FIRST_COLLECTIBLE_TYPE, LAST_VANILLA_COLLECTIBLE_TYPE)
+____exports.VANILLA_COLLECTIBLE_TYPES = __TS__ArrayFilter(
+    ____exports.VANILLA_COLLECTIBLE_TYPE_RANGE,
+    function(____, potentialCollectibleType)
+        local collectibleType = asCollectibleType(nil, potentialCollectibleType)
+        local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+        return itemConfigItem ~= nil
+    end
+)
+____exports.VANILLA_COLLECTIBLE_TYPES_SET = __TS__New(ReadonlySet, ____exports.VANILLA_COLLECTIBLE_TYPES)
+____exports.VANILLA_TRINKET_TYPE_RANGE = iRange(nil, FIRST_TRINKET_TYPE, LAST_VANILLA_TRINKET_TYPE)
+____exports.VANILLA_TRINKET_TYPES = __TS__ArrayFilter(
+    ____exports.VANILLA_TRINKET_TYPE_RANGE,
+    function(____, potentialTrinketType)
+        local trinketType = asTrinketType(nil, potentialTrinketType)
+        local itemConfigTrinket = itemConfig:GetTrinket(trinketType)
+        return itemConfigTrinket ~= nil
+    end
+)
+____exports.VANILLA_TRINKET_TYPES_SET = __TS__New(ReadonlySet, ____exports.VANILLA_TRINKET_TYPES)
+____exports.VANILLA_CARD_TYPE_RANGE = iRange(nil, FIRST_CARD_TYPE, LAST_VANILLA_CARD_TYPE)
+____exports.VANILLA_CARD_TYPES = __TS__ArrayFilter(
+    ____exports.VANILLA_CARD_TYPE_RANGE,
+    function(____, potentialCardType)
+        local cardType = asCardType(nil, potentialCardType)
+        local itemConfigCard = itemConfig:GetCard(cardType)
+        return itemConfigCard ~= nil
+    end
+)
+____exports.VANILLA_CARD_TYPES_SET = __TS__New(ReadonlySet, ____exports.VANILLA_CARD_TYPES)
+____exports.VANILLA_PILL_EFFECT_RANGE = iRange(nil, FIRST_PILL_EFFECT, LAST_VANILLA_PILL_EFFECT)
+____exports.VANILLA_PILL_EFFECTS = __TS__ArrayFilter(
+    ____exports.VANILLA_PILL_EFFECT_RANGE,
+    function(____, potentialPillEffect)
+        local pillEffect = asPillEffect(nil, potentialPillEffect)
+        local itemConfigPillEffect = itemConfig:GetPillEffect(pillEffect)
+        return itemConfigPillEffect ~= nil
+    end
+)
+____exports.VANILLA_PILL_EFFECTS_SET = __TS__New(ReadonlySet, ____exports.VANILLA_PILL_EFFECTS)
 return ____exports
  end,
 ["src.objects.cardDescriptions"] = function(...) 
@@ -38334,7 +38408,6 @@ local UseFlag = ____isaac_2Dtypescript_2Ddefinitions.UseFlag
 local ____cachedClasses = require("src.core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsFirstLast = require("src.core.constantsFirstLast")
-local FIRST_CARD_TYPE = ____constantsFirstLast.FIRST_CARD_TYPE
 local LAST_VANILLA_CARD_TYPE = ____constantsFirstLast.LAST_VANILLA_CARD_TYPE
 local ____cardDescriptions = require("src.objects.cardDescriptions")
 local CARD_DESCRIPTIONS = ____cardDescriptions.CARD_DESCRIPTIONS
@@ -38346,8 +38419,6 @@ local ____itemConfigCardTypesForCardsSet = require("src.sets.itemConfigCardTypes
 local ITEM_CONFIG_CARD_TYPES_FOR_CARDS_SET = ____itemConfigCardTypesForCardsSet.ITEM_CONFIG_CARD_TYPES_FOR_CARDS_SET
 local ____flag = require("src.functions.flag")
 local addFlag = ____flag.addFlag
-local ____utils = require("src.functions.utils")
-local iRange = ____utils.iRange
 function ____exports.isVanillaCardType(self, cardType)
     return cardType <= LAST_VANILLA_CARD_TYPE
 end
@@ -38380,9 +38451,6 @@ function ____exports.getItemConfigCardType(self, cardType)
     end
     return itemConfigCard.CardType
 end
-function ____exports.getVanillaCardTypes(self)
-    return iRange(nil, FIRST_CARD_TYPE, LAST_VANILLA_CARD_TYPE)
-end
 function ____exports.isCard(self, cardType)
     local itemConfigCardType = ____exports.getItemConfigCardType(nil, cardType)
     if itemConfigCardType == nil then
@@ -38453,8 +38521,6 @@ local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____cachedClasses = require("src.core.cachedClasses")
 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 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
@@ -38471,8 +38537,6 @@ local asCollectibleType = ____types.asCollectibleType
 local asNumber = ____types.asNumber
 local asPillEffect = ____types.asPillEffect
 local asTrinketType = ____types.asTrinketType
-local ____utils = require("src.functions.utils")
-local iRange = ____utils.iRange
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
 ____exports.ModdedElementDetection = __TS__Class()
@@ -38482,7 +38546,7 @@ __TS__ClassExtends(ModdedElementDetection, Feature)
 function ModdedElementDetection.prototype.____constructor(self)
     Feature.prototype.____constructor(self)
     self.atLeastOneCallbackFired = false
-    self.postPlayerInit = function(____, _player)
+    self.postPlayerInit = function()
         self.atLeastOneCallbackFired = true
     end
     self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, self.postPlayerInit}}
@@ -38513,16 +38577,6 @@ function ModdedElementDetection.prototype.getLastCollectibleType(self)
     return itemConfig:GetCollectibles().Size - 1
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getLastCollectibleType", true)
-function ModdedElementDetection.prototype.getModdedCollectibleTypes(self)
-    self:errorIfNoCallbacksFired("collectible")
-    local firstModdedCollectibleType = self:getFirstModdedCollectibleType()
-    if firstModdedCollectibleType == nil then
-        return {}
-    end
-    local lastCollectibleType = self:getLastCollectibleType()
-    return iRange(nil, firstModdedCollectibleType, lastCollectibleType)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getModdedCollectibleTypes", true)
 function ModdedElementDetection.prototype.getNumCollectibleTypes(self)
     self:errorIfNoCallbacksFired("collectible")
     local numModdedCollectibleTypes = self:getNumModdedCollectibleTypes()
@@ -38556,16 +38610,6 @@ function ModdedElementDetection.prototype.getLastTrinketType(self)
     return itemConfig:GetTrinkets().Size - 1
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getLastTrinketType", true)
-function ModdedElementDetection.prototype.getModdedTrinketTypes(self)
-    self:errorIfNoCallbacksFired("trinket")
-    local firstModdedTrinketType = self:getFirstModdedTrinketType()
-    if firstModdedTrinketType == nil then
-        return {}
-    end
-    local lastTrinketType = self:getLastTrinketType()
-    return iRange(nil, firstModdedTrinketType, lastTrinketType)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getModdedTrinketTypes", true)
 function ModdedElementDetection.prototype.getNumTrinketTypes(self)
     self:errorIfNoCallbacksFired("trinket")
     local numModdedTrinketTypes = self:getNumModdedTrinketTypes()
@@ -38578,12 +38622,6 @@ function ModdedElementDetection.prototype.getNumModdedTrinketTypes(self)
     return lastTrinketType - LAST_VANILLA_TRINKET_TYPE
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedTrinketTypes", true)
-function ModdedElementDetection.prototype.getAllCardTypes(self)
-    self:errorIfNoCallbacksFired("card")
-    local lastCardType = self:getLastCardType()
-    return iRange(nil, FIRST_CARD_TYPE, lastCardType)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getAllCardTypes", true)
 function ModdedElementDetection.prototype.getFirstModdedCardType(self)
     self:errorIfNoCallbacksFired("card")
     local firstModdedCardType = asCardType(
@@ -38606,16 +38644,6 @@ function ModdedElementDetection.prototype.getLastCardType(self)
     return asCardType(nil, numCards)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getLastCardType", true)
-function ModdedElementDetection.prototype.getModdedCardTypes(self)
-    self:errorIfNoCallbacksFired("card")
-    local firstModdedCardType = self:getFirstModdedCardType()
-    if firstModdedCardType == nil then
-        return {}
-    end
-    local lastCardType = self:getLastCardType()
-    return iRange(nil, firstModdedCardType, lastCardType)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getModdedCardTypes", true)
 function ModdedElementDetection.prototype.getNumCardTypes(self)
     self:errorIfNoCallbacksFired("card")
     return itemConfig:GetCards().Size - 1
@@ -38627,12 +38655,6 @@ function ModdedElementDetection.prototype.getNumModdedCardTypes(self)
     return numCardTypes - NUM_VANILLA_CARD_TYPES
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getNumModdedCardTypes", true)
-function ModdedElementDetection.prototype.getAllPillEffects(self)
-    self:errorIfNoCallbacksFired("pill")
-    local lastPillEffect = self:getLastPillEffect()
-    return iRange(nil, FIRST_PILL_EFFECT, lastPillEffect)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getAllPillEffects", true)
 function ModdedElementDetection.prototype.getFirstModdedPillEffect(self)
     self:errorIfNoCallbacksFired("pill")
     local firstModdedPillEffect = asPillEffect(
@@ -38655,16 +38677,6 @@ function ModdedElementDetection.prototype.getLastPillEffect(self)
     return asPillEffect(nil, numPillEffects)
 end
 __TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getLastPillEffect", true)
-function ModdedElementDetection.prototype.getModdedPillEffects(self)
-    self:errorIfNoCallbacksFired("pill")
-    local firstModdedPillEffect = self:getFirstModdedPillEffect()
-    if firstModdedPillEffect == nil then
-        return {}
-    end
-    local lastPillEffect = self:getLastPillEffect()
-    return iRange(nil, firstModdedPillEffect, lastPillEffect)
-end
-__TS__DecorateLegacy({Exported}, ModdedElementDetection.prototype, "getModdedPillEffects", true)
 function ModdedElementDetection.prototype.getNumPillEffects(self)
     self:errorIfNoCallbacksFired("pill")
     return itemConfig:GetPillEffects().Size
@@ -38704,18 +38716,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
@@ -38729,10 +38744,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
@@ -38766,28 +38786,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)
@@ -38800,12 +38818,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()
@@ -38814,102 +38830,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
@@ -38920,11 +38937,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
@@ -38933,14 +38950,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
@@ -38951,7 +38968,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
@@ -38962,9 +38979,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
@@ -38977,20 +38994,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)
@@ -38999,7 +39016,7 @@ function ModdedElementSets.prototype.lazyInitEdenCollectibleTypesSet(self)
                 self.edenPassiveCollectibleTypesSet:add(collectibleType)
             end
         end
-        ::__continue66::
+        ::__continue61::
     end
 end
 function ModdedElementSets.prototype.lazyInitCardTypes(self)
@@ -39009,7 +39026,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)
@@ -39025,126 +39042,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)
@@ -39171,8 +39090,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)
@@ -39187,10 +39184,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,
@@ -39203,8 +39233,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)
@@ -39219,19 +39259,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
@@ -39239,33 +39277,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
@@ -39273,69 +39328,21 @@ 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
-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
+    local runesSet = self:getCardTypesOfType(ItemConfigCardType.RUNE)
+    runesSet:delete(CardType.RUNE_SHARD)
+    return getRandomSetElement(nil, runesSet, seedOrRNG, exceptions)
 end
-__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getVanillaTrinketSet", true)
+__TS__DecorateLegacy({Exported}, ModdedElementSets.prototype, "getRandomRune", true)
 return ____exports
  end,
 ["src.classes.features.callbackLogic.PlayerCollectibleDetection"] = function(...) 
@@ -39801,30 +39808,6 @@ ____exports.COIN_SUB_TYPE_TO_VALUE = {
     [CoinSubType.STICKY_NICKEL] = 5,
     [CoinSubType.GOLDEN] = 1
 }
-return ____exports
- end,
-["src.sets.chestPickupVariantsSet"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__New = ____lualib.__TS__New
-local ____exports = {}
-local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
-local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
-local ____ReadonlySet = require("src.types.ReadonlySet")
-local ReadonlySet = ____ReadonlySet.ReadonlySet
-____exports.CHEST_PICKUP_VARIANTS = __TS__New(ReadonlySet, {
-    PickupVariant.CHEST,
-    PickupVariant.BOMB_CHEST,
-    PickupVariant.SPIKED_CHEST,
-    PickupVariant.ETERNAL_CHEST,
-    PickupVariant.MIMIC_CHEST,
-    PickupVariant.OLD_CHEST,
-    PickupVariant.WOODEN_CHEST,
-    PickupVariant.MEGA_CHEST,
-    PickupVariant.HAUNTED_CHEST,
-    PickupVariant.LOCKED_CHEST,
-    PickupVariant.RED_CHEST,
-    PickupVariant.MOMS_CHEST
-})
 return ____exports
  end,
 ["src.sets.redHeartSubTypesSet"] = function(...) 
@@ -40196,11 +40179,11 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
+local ____constants = require("src.core.constants")
+local CHEST_PICKUP_VARIANTS_SET = ____constants.CHEST_PICKUP_VARIANTS_SET
 local ____coinSubTypeToValue = require("src.objects.coinSubTypeToValue")
 local COIN_SUB_TYPE_TO_VALUE = ____coinSubTypeToValue.COIN_SUB_TYPE_TO_VALUE
 local DEFAULT_COIN_VALUE = ____coinSubTypeToValue.DEFAULT_COIN_VALUE
-local ____chestPickupVariantsSet = require("src.sets.chestPickupVariantsSet")
-local CHEST_PICKUP_VARIANTS = ____chestPickupVariantsSet.CHEST_PICKUP_VARIANTS
 local ____redHeartSubTypesSet = require("src.sets.redHeartSubTypesSet")
 local RED_HEART_SUB_TYPES_SET = ____redHeartSubTypesSet.RED_HEART_SUB_TYPES_SET
 local ____entities = require("src.functions.entities")
@@ -40210,7 +40193,7 @@ local isHeart = ____pickupVariants.isHeart
 local ____pickupsSpecific = require("src.functions.pickupsSpecific")
 local getHearts = ____pickupsSpecific.getHearts
 function ____exports.isChestVariant(self, pickupVariant)
-    return CHEST_PICKUP_VARIANTS:has(pickupVariant)
+    return CHEST_PICKUP_VARIANTS_SET:has(pickupVariant)
 end
 function ____exports.getCoinValue(self, coinSubType)
     local value = COIN_SUB_TYPE_TO_VALUE[coinSubType]
@@ -51152,13 +51135,13 @@ function FlyingDetection.prototype.____constructor(self, moddedElementSets)
 end
 function FlyingDetection.prototype.hasFlyingTemporaryEffect(self, player)
     local effects = player:GetEffects()
-    local flyingCollectibles = self.moddedElementSets:getFlyingCollectibles(true)
+    local flyingCollectibles = self.moddedElementSets:getFlyingCollectibleTypes(true)
     for ____, collectibleType in __TS__Iterator(flyingCollectibles) do
         if effects:HasCollectibleEffect(collectibleType) then
             return true
         end
     end
-    local flyingTrinkets = self.moddedElementSets:getFlyingTrinkets()
+    local flyingTrinkets = self.moddedElementSets:getFlyingTrinketTypes()
     for ____, trinketType in __TS__Iterator(flyingTrinkets) do
         if effects:HasTrinketEffect(trinketType) then
             return true
@@ -51359,7 +51342,7 @@ function ItemPoolDetection.prototype.____constructor(self, moddedElementSets)
     self.moddedElementSets = moddedElementSets
 end
 function ItemPoolDetection.prototype.getCollectiblesInItemPool(self, itemPoolType)
-    local collectibleArray = self.moddedElementSets:getCollectibleArray()
+    local collectibleArray = self.moddedElementSets:getCollectibleTypes()
     return __TS__ArrayFilter(
         collectibleArray,
         function(____, collectibleType) return self:isCollectibleInItemPool(collectibleType, itemPoolType) end
@@ -51384,7 +51367,7 @@ function ItemPoolDetection.prototype.isCollectibleInItemPool(self, collectibleTy
     local removedTrinketsMap = ____removeItemsAndTrinketsThatAffectItemPools_result_0.removedTrinketsMap
     local itemPool = game:GetItemPool()
     itemPool:ResetRoomBlacklist()
-    for ____, collectibleTypeInSet in ipairs(self.moddedElementSets:getCollectibleArray()) do
+    for ____, collectibleTypeInSet in ipairs(self.moddedElementSets:getCollectibleTypes()) do
         if collectibleTypeInSet ~= collectibleType then
             itemPool:AddRoomBlacklist(collectibleTypeInSet)
         end
@@ -53238,6 +53221,9 @@ function initOptionalFeatures(self, mod, features)
         for ____, ____value in ipairs(exportedMethodTuples) do
             local funcName = ____value[1]
             local func = ____value[2]
+            if modRecord[funcName] ~= nil then
+                error(("Failed to upgrade the mod since two or more features share the name function name of \"" .. funcName) .. "\". This should never happen, so report this error to the library authors.")
+            end
             modRecord[funcName] = func
         end
     end
@@ -54580,6 +54566,14 @@ do
         end
     end
 end
+do
+    local ____export = require("src.core.constantsVanilla")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("src.core.upgradeMod")
     for ____exportKey, ____exportValue in pairs(____export) do
@@ -55704,6 +55698,14 @@ do
         end
     end
 end
+do
+    local ____export = require("src.core.constantsVanilla")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("src.core.upgradeMod")
     for ____exportKey, ____exportValue in pairs(____export) do