isaacscript-common 1.2.292 → 2.0.0

package/dist/functions/cacheFlag.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="isaac-typescript-definitions" />
+import { CacheFlag } from "isaac-typescript-definitions";
 /**
  * Returns the starting stat that Isaac (the default character) starts with. For example, if you
- * pass this function `CacheFlag.CACHE_DAMAGE`, it will return 3.5.
+ * pass this function `CacheFlag.DAMAGE`, it will return 3.5.
  *
  * Note that the default fire delay is represented in the tear stat, not the `MaxFireDelay` value.
  */

package/dist/functions/cacheFlag.lua

@@ -1,4 +1,3 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local ____defaultPlayerStatMap = require("maps.defaultPlayerStatMap")
 local DEFAULT_PLAYER_STAT_MAP = ____defaultPlayerStatMap.DEFAULT_PLAYER_STAT_MAP

package/dist/functions/cards.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="isaac-typescript-definitions" />
-import { CardType } from "../enums/CardType";
+import { Card, ItemConfigCardType } from "isaac-typescript-definitions";
 /**
  * Helper function to get a card description from a Card enum value.
  *
  * Example:
  * ```ts
- * const card = Card.CARD_FOOL;
+ * const card = Card.FOOL;
  * const cardDescription = getCardDescription(card); // cardDescription is "Where journey begins"
  * ```
  */
@@ -15,26 +14,19 @@ export declare function getCardDescription(card: Card | int): string;
  *
  * Example:
  * ```ts
- * const card = Card.CARD_FOOL;
+ * const card = Card.FOOL;
  * const cardName = getCardName(card); // cardName is "0 - The Fool"
  * ```
  */
 export declare function getCardName(card: Card | int): string;
-export declare function getCardType(card: Card | int): CardType;
+export declare function getCardType(card: Card | int): ItemConfigCardType;
 /**
  * Helper function to get a set of cards matching the type. Also see the [[`CardType`]] enum.
  *
  * This function is variadic, meaning that you can you can specify N card types to get a set
  * containing cards that match any of the specified types.
  */
-export declare function getCardsOfType(...cardTypes: CardType[]): Set<Card>;
-/**
- * Helper function to get the final card sub-type in the game.
- *
- * This cannot be reliably determined before run-time due to mods adding a variable amount of new
- * cards.
- */
-export declare function getMaxCards(): int;
+export declare function getCardsOfType(...cardTypes: ItemConfigCardType[]): Set<Card>;
 /**
  * Has an equal chance of returning any card (e.g. Fool, Reverse Fool, Wild Card, etc.).
  *
@@ -42,7 +34,7 @@ export declare function getMaxCards(): int;
  * - any runes
  * - any objects like Dice Shard
  * - any modded cards (since there is not a way to distinguish between modded cards and modded
- * runes/objects)
+ *   runes/objects)
  *
  * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
  * `RNG.Next` method will be called. Default is `getRandomSeed()`.
@@ -55,7 +47,7 @@ export declare function getRandomCard(seedOrRNG?: Seed | RNG, exceptions?: Card[
  * `RNG.Next` method will be called. Default is `getRandomSeed()`.
  * @param exceptions Optional. An array of cards to not select.
  */
-export declare function getRandomCardOfType(cardType: CardType, seedOrRNG?: Seed | RNG, exceptions?: Card[]): Card;
+export declare function getRandomCardOfType(cardType: ItemConfigCardType, seedOrRNG?: Seed | RNG, exceptions?: Card[]): Card;
 /**
  * Has an equal chance of returning any rune (e.g. Rune of Hagalaz, Blank Rune, Black Rune, Soul of
  * Isaac, etc.). This will never return a Rune Shard.
@@ -74,10 +66,10 @@ export declare function getRandomRune(seedOrRNG?: Seed | RNG, exceptions?: Card[
  */
 export declare function isCard(card: Card): boolean;
 /** Returns whether or not the given card matches the specified card type. */
-export declare function isCardType(card: Card, cardType: CardType): boolean;
+export declare function isCardType(card: Card, cardType: ItemConfigCardType): boolean;
 /** Returns true for cards that have `CardType.MODDED`. */
 export declare function isModdedCard(card: Card): boolean;
-/** Returns true for cards that have `CardType.OBJECT`. */
+/** Returns true for cards that have `CardType.SPECIAL_OBJECT`. */
 export declare function isPocketItemObject(card: Card): boolean;
 /** Returns true for cards that have `CardType.TAROT_REVERSE`. */
 export declare function isReverseTarotCard(card: Card): boolean;

package/dist/functions/cards.lua

@@ -5,10 +5,13 @@ local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
 local initCardObjects, CARD_TYPE_TO_CARDS_MAP, CARD_SET
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local Card = ____isaac_2Dtypescript_2Ddefinitions.Card
+local ItemConfigCardType = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigCardType
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____CardType = require("enums.CardType")
-local CardType = ____CardType.CardType
+local ____constantsMax = require("constantsMax")
+local MAX_CARD = ____constantsMax.MAX_CARD
 local ____cardDescriptions = require("objects.cardDescriptions")
 local CARD_DESCRIPTIONS = ____cardDescriptions.CARD_DESCRIPTIONS
 local DEFAULT_CARD_DESCRIPTION = ____cardDescriptions.DEFAULT_CARD_DESCRIPTION
@@ -18,24 +21,23 @@ local DEFAULT_CARD_NAME = ____cardNames.DEFAULT_CARD_NAME
 local ____cardTypes = require("objects.cardTypes")
 local CARD_TYPES = ____cardTypes.CARD_TYPES
 local DEFAULT_CARD_TYPE = ____cardTypes.DEFAULT_CARD_TYPE
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 local ____math = require("functions.math")
-local range = ____math.range
+local irange = ____math.irange
 local ____rng = require("functions.rng")
 local getRandomSeed = ____rng.getRandomSeed
 local ____set = require("functions.set")
 local addSetsToSet = ____set.addSetsToSet
 local getRandomSetElement = ____set.getRandomSetElement
-local ____utils = require("functions.utils")
-local getEnumValues = ____utils.getEnumValues
 function initCardObjects(self)
-    local maxCards = ____exports.getMaxCards(nil)
-    for ____, cardType in ipairs(getEnumValues(nil, CardType)) do
+    for ____, cardType in ipairs(getEnumValues(nil, ItemConfigCardType)) do
         CARD_TYPE_TO_CARDS_MAP:set(
             cardType,
             __TS__New(Set)
         )
     end
-    for ____, card in ipairs(range(nil, 1, maxCards)) do
+    for ____, card in ipairs(irange(nil, 1, MAX_CARD)) do
         local cardType = ____exports.getCardType(nil, card)
         local cardTypeSet = CARD_TYPE_TO_CARDS_MAP:get(cardType)
         if cardTypeSet == nil then
@@ -45,10 +47,10 @@ function initCardObjects(self)
     end
     local cards = ____exports.getCardsOfType(
         nil,
-        CardType.TAROT,
-        CardType.SUIT,
-        CardType.SPECIAL,
-        CardType.TAROT_REVERSE
+        ItemConfigCardType.TAROT,
+        ItemConfigCardType.SUIT,
+        ItemConfigCardType.SPECIAL,
+        ItemConfigCardType.TAROT_REVERSE
     )
     addSetsToSet(nil, CARD_SET, cards)
 end
@@ -73,9 +75,6 @@ function ____exports.getCardsOfType(self, ...)
     end
     return matchingCards
 end
-function ____exports.getMaxCards(self)
-    return itemConfig:GetCards().Size - 1
-end
 CARD_TYPE_TO_CARDS_MAP = __TS__New(Map)
 CARD_SET = __TS__New(Set)
 function ____exports.getCardDescription(self, card)
@@ -126,7 +125,7 @@ function ____exports.getRandomRune(self, seedOrRNG, exceptions)
     if exceptions == nil then
         exceptions = {}
     end
-    local runesSet = ____exports.getCardsOfType(nil, CardType.RUNE)
+    local runesSet = ____exports.getCardsOfType(nil, ItemConfigCardType.RUNE)
     runesSet:delete(Card.RUNE_SHARD)
     return getRandomSetElement(nil, runesSet, seedOrRNG, exceptions)
 end
@@ -137,24 +136,24 @@ function ____exports.isCardType(self, card, cardType)
     return cardType == ____exports.getCardType(nil, card)
 end
 function ____exports.isModdedCard(self, card)
-    return ____exports.isCardType(nil, card, CardType.MODDED)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.MODDED)
 end
 function ____exports.isPocketItemObject(self, card)
-    return ____exports.isCardType(nil, card, CardType.OBJECT)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.SPECIAL_OBJECT)
 end
 function ____exports.isReverseTarotCard(self, card)
-    return ____exports.isCardType(nil, card, CardType.TAROT_REVERSE)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.TAROT_REVERSE)
 end
 function ____exports.isRune(self, card)
-    return ____exports.isCardType(nil, card, CardType.RUNE)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.RUNE)
 end
 function ____exports.isSpecialCard(self, card)
-    return ____exports.isCardType(nil, card, CardType.SPECIAL)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.SPECIAL)
 end
 function ____exports.isSuitCard(self, card)
-    return ____exports.isCardType(nil, card, CardType.SUIT)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.SUIT)
 end
 function ____exports.isTarotCard(self, card)
-    return ____exports.isCardType(nil, card, CardType.TAROT)
+    return ____exports.isCardType(nil, card, ItemConfigCardType.TAROT)
 end
 return ____exports

package/dist/functions/challenges.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="isaac-typescript-definitions" />
+import { Challenge } from "isaac-typescript-definitions";
 /** Get the proper name for a `Challenge` enum. This will only work for vanilla challenges. */
 export declare function getChallengeName(challenge: Challenge): string;

package/dist/functions/challenges.lua

@@ -1,4 +1,3 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local ____challengeNames = require("objects.challengeNames")
 local CHALLENGE_NAMES = ____challengeNames.CHALLENGE_NAMES

package/dist/functions/character.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
+import { PlayerType } from "isaac-typescript-definitions";
 /**
  * Helper function to determine if the given character can have red heart containers. Returns true
  * for characters like Isaac, Magdalene, or Cain. Returns true for Keeper and Tainted Keeper, even
@@ -31,9 +31,9 @@ export declare function characterGetsBlackHeartFromEternalHeart(character: Playe
  */
 export declare function characterStartsWithActiveItem(character: PlayerType | int): boolean;
 /**
- * Most characters have a 56 frame death animation (i.e. the "Death" animation).
- * The Lost and Tainted Lost have a 38 frame death animation (i.e. the "LostDeath" animation).
- * Tainted Forgotten have a 20 frame death animation (i.e. the "ForgottenDeath" animation).
+ * - Most characters have a 56 frame death animation (i.e. the "Death" animation).
+ * - The Lost and Tainted Lost have a 38 frame death animation (i.e. the "LostDeath" animation).
+ * - Tainted Forgotten have a 20 frame death animation (i.e. the "ForgottenDeath" animation).
  */
 export declare function getCharacterDeathAnimationName(character: PlayerType | int): string;
 /**
@@ -44,3 +44,5 @@ export declare function getCharacterDeathAnimationName(character: PlayerType | i
 export declare function getCharacterMaxHeartContainers(character: PlayerType | int): int;
 /** Helper function to get the name of a character. Returns "unknown" for modded characters. */
 export declare function getCharacterName(character: PlayerType | int): string;
+export declare function isModdedCharacter(character: PlayerType | int): boolean;
+export declare function isVanillaCharacter(character: PlayerType | int): boolean;

package/dist/functions/character.lua

@@ -1,5 +1,8 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
+local ____constants = require("constants")
+local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____characterNames = require("objects.characterNames")
 local CHARACTER_NAMES = ____characterNames.CHARACTER_NAMES
 local DEFAULT_CHARACTER_NAME = ____characterNames.DEFAULT_CHARACTER_NAME
@@ -15,6 +18,9 @@ local ____charactersWithNoSoulHeartsSet = require("sets.charactersWithNoSoulHear
 local CHARACTERS_WITH_NO_SOUL_HEARTS_SET = ____charactersWithNoSoulHeartsSet.CHARACTERS_WITH_NO_SOUL_HEARTS_SET
 local ____lostStyleCharactersSet = require("sets.lostStyleCharactersSet")
 local LOST_STYLE_CHARACTERS_SET = ____lostStyleCharactersSet.LOST_STYLE_CHARACTERS_SET
+function ____exports.isVanillaCharacter(self, character)
+    return character <= MAX_VANILLA_CHARACTER
+end
 function ____exports.characterCanHaveRedHearts(self, character)
     return not CHARACTERS_WITH_NO_RED_HEARTS_SET:has(character)
 end
@@ -34,31 +40,34 @@ function ____exports.getCharacterDeathAnimationName(self, character)
     if LOST_STYLE_CHARACTERS_SET:has(character) then
         return "LostDeath"
     end
-    if character == PlayerType.PLAYER_THEFORGOTTEN_B then
+    if character == PlayerType.THE_FORGOTTEN_B then
         return "ForgottenDeath"
     end
     return "Death"
 end
 function ____exports.getCharacterMaxHeartContainers(self, character)
-    if character == PlayerType.PLAYER_KEEPER then
+    if character == PlayerType.KEEPER then
         return 3
     end
-    if character == PlayerType.PLAYER_THEFORGOTTEN then
+    if character == PlayerType.THE_FORGOTTEN then
         return 6
     end
-    if character == PlayerType.PLAYER_THESOUL then
+    if character == PlayerType.THE_SOUL then
         return 6
     end
-    if character == PlayerType.PLAYER_KEEPER_B then
+    if character == PlayerType.KEEPER_B then
         return 2
     end
     return 12
 end
 function ____exports.getCharacterName(self, character)
-    if character >= PlayerType.NUM_PLAYER_TYPES then
+    if ____exports.isVanillaCharacter(nil, character) then
         return "unknown"
     end
     local characterName = CHARACTER_NAMES[character]
     return characterName == nil and DEFAULT_CHARACTER_NAME or characterName
 end
+function ____exports.isModdedCharacter(self, character)
+    return not ____exports.isVanillaCharacter(nil, character)
+end
 return ____exports

package/dist/functions/charge.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
+import { ActiveSlot } from "isaac-typescript-definitions";
 /**
  * Helper function to add a charge to a player's active item, emulating what happens when a room is
  * cleared.

package/dist/functions/charge.lua

@@ -1,6 +1,11 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local getNumChargesToAdd, getNumChargesWithAAAModifier, shouldPlayFullRechargeSound
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
+local SoundEffect = ____isaac_2Dtypescript_2Ddefinitions.SoundEffect
+local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local sfxManager = ____cachedClasses.sfxManager
@@ -33,7 +38,7 @@ function getNumChargesToAdd(self, player, activeSlot, ignoreBigRoomDoubleCharge)
     local activeItem = player:GetActiveItem(activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)
-    local hasBattery = player:HasCollectible(CollectibleType.COLLECTIBLE_BATTERY)
+    local hasBattery = player:HasCollectible(CollectibleType.BATTERY)
     local maxCharges = getCollectibleMaxCharges(nil, activeItem)
     if not hasBattery and activeCharge == maxCharges then
         return 0
@@ -47,7 +52,7 @@ function getNumChargesToAdd(self, player, activeSlot, ignoreBigRoomDoubleCharge)
     if hasBattery and batteryCharge + 1 == maxCharges then
         return 1
     end
-    if roomShape >= RoomShape.ROOMSHAPE_2x2 and not ignoreBigRoomDoubleCharge then
+    if roomShape >= RoomShape.SHAPE_2x2 and not ignoreBigRoomDoubleCharge then
         return 2
     end
     return 1
@@ -56,8 +61,8 @@ function getNumChargesWithAAAModifier(self, player, activeSlot, chargesToAdd)
     local activeItem = player:GetActiveItem(activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)
-    local hasBattery = player:HasCollectible(CollectibleType.COLLECTIBLE_BATTERY)
-    local hasAAABattery = player:HasTrinket(TrinketType.TRINKET_AAA_BATTERY)
+    local hasBattery = player:HasCollectible(CollectibleType.BATTERY)
+    local hasAAABattery = player:HasTrinket(TrinketType.AAA_BATTERY)
     local maxCharges = getCollectibleMaxCharges(nil, activeItem)
     if not hasAAABattery then
         return chargesToAdd
@@ -76,17 +81,17 @@ function ____exports.getTotalCharge(self, player, activeSlot)
     return activeCharge + batteryCharge
 end
 function ____exports.playChargeSoundEffect(self, player, activeSlot)
-    for ____, soundEffect in ipairs({SoundEffect.SOUND_BATTERYCHARGE, SoundEffect.SOUND_BEEP}) do
+    for ____, soundEffect in ipairs({SoundEffect.BATTERY_CHARGE, SoundEffect.BEEP}) do
         sfxManager:Stop(soundEffect)
     end
-    local chargeSoundEffect = shouldPlayFullRechargeSound(nil, player, activeSlot) and SoundEffect.SOUND_BATTERYCHARGE or SoundEffect.SOUND_BEEP
+    local chargeSoundEffect = shouldPlayFullRechargeSound(nil, player, activeSlot) and SoundEffect.BATTERY_CHARGE or SoundEffect.BEEP
     sfxManager:Play(chargeSoundEffect)
 end
 function shouldPlayFullRechargeSound(self, player, activeSlot)
     local activeItem = player:GetActiveItem(activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)
-    local hasBattery = player:HasCollectible(CollectibleType.COLLECTIBLE_BATTERY)
+    local hasBattery = player:HasCollectible(CollectibleType.BATTERY)
     local maxCharges = getCollectibleMaxCharges(nil, activeItem)
     if not hasBattery then
         return not player:NeedsCharge(activeSlot)
@@ -97,7 +102,7 @@ function ____exports.addRoomClearCharge(self, player, ignoreBigRoomDoubleCharge)
     if ignoreBigRoomDoubleCharge == nil then
         ignoreBigRoomDoubleCharge = false
     end
-    for ____, activeSlot in ipairs({ActiveSlot.SLOT_PRIMARY, ActiveSlot.SLOT_SECONDARY, ActiveSlot.SLOT_POCKET}) do
+    for ____, activeSlot in ipairs({ActiveSlot.PRIMARY, ActiveSlot.SECONDARY, ActiveSlot.POCKET}) do
         ____exports.addRoomClearChargeToSlot(nil, player, activeSlot, ignoreBigRoomDoubleCharge)
     end
 end

package/dist/functions/chargeBar.lua

@@ -1,4 +1,3 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local getChargeBarClamp
 local ____constants = require("constants")

package/dist/functions/collectibleCacheFlag.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
+import { CacheFlag, CollectibleType } from "isaac-typescript-definitions";
 /**
  * Returns a set containing every collectible type with the given cache flag, including modded
  * collectibles.
@@ -13,9 +13,9 @@ export declare function getCollectiblesForCacheFlag(cacheFlag: CacheFlag): Set<C
  *
  * ```ts
  * [
- *   CollectibleType.COLLECTIBLE_LORD_OF_THE_PIT,
- *   CollectibleType.COLLECTIBLE_TRANSCENDENCE,
- *   CollectibleType.COLLECTIBLE_TRANSCENDENCE,
+ *   CollectibleType.LORD_OF_THE_PIT,
+ *   CollectibleType.TRANSCENDENCE,
+ *   CollectibleType.TRANSCENDENCE,
  * ]
  * ```
  */

package/dist/functions/collectibleCacheFlag.lua

@@ -3,23 +3,26 @@ local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
 local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
+local ____constantsMax = require("constantsMax")
+local MAX_COLLECTIBLE_TYPE = ____constantsMax.MAX_COLLECTIBLE_TYPE
 local ____collectibles = require("functions.collectibles")
 local collectibleHasCacheFlag = ____collectibles.collectibleHasCacheFlag
-local getMaxCollectibleType = ____collectibles.getMaxCollectibleType
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 local ____math = require("functions.math")
-local range = ____math.range
+local irange = ____math.irange
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local getSortedSetValues = ____set.getSortedSetValues
 local ____utils = require("functions.utils")
-local getEnumValues = ____utils.getEnumValues
 local ____repeat = ____utils["repeat"]
 local CACHE_FLAG_TO_COLLECTIBLES_MAP = __TS__New(Map)
 local function initCacheFlagMap(self)
-    local maxCollectibleType = getMaxCollectibleType(nil)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local collectiblesSet = __TS__New(Set)
-        for ____, collectibleType in ipairs(range(nil, 1, maxCollectibleType)) do
+        for ____, collectibleType in ipairs(irange(nil, 1, MAX_COLLECTIBLE_TYPE)) do
             if collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
                 collectiblesSet:add(collectibleType)
             end

package/dist/functions/collectibleSet.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="isaac-typescript-definitions" />
+import { CollectibleType } from "isaac-typescript-definitions";
 /** Returns a set containing every valid collectible type in the game, including modded items. */
 export declare function getCollectibleSet(): Set<CollectibleType | int>;

package/dist/functions/collectibleSet.lua

@@ -4,16 +4,15 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____collectibles = require("functions.collectibles")
-local getMaxCollectibleType = ____collectibles.getMaxCollectibleType
+local ____constantsMax = require("constantsMax")
+local MAX_COLLECTIBLE_TYPE = ____constantsMax.MAX_COLLECTIBLE_TYPE
 local ____math = require("functions.math")
-local range = ____math.range
+local irange = ____math.irange
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local COLLECTIBLE_SET = __TS__New(Set)
 local function initCollectibleSet(self)
-    local maxCollectibleType = getMaxCollectibleType(nil)
-    for ____, collectibleType in ipairs(range(nil, 1, maxCollectibleType)) do
+    for ____, collectibleType in ipairs(irange(nil, 1, MAX_COLLECTIBLE_TYPE)) do
         local itemConfigItem = itemConfig:GetCollectible(collectibleType)
         if itemConfigItem ~= nil then
             COLLECTIBLE_SET:add(collectibleType)

package/dist/functions/collectibleTag.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
-import { ItemConfigTag } from "../enums/ItemConfigTag";
+import { CollectibleType, ItemConfigTag } from "isaac-typescript-definitions";
 export declare function collectibleHasTag(collectibleType: CollectibleType | int, tag: ItemConfigTag): boolean;
 /**
  * Helper function to get all of the collectible types in the game that have a certain tag.

package/dist/functions/collectibleTag.lua

@@ -4,20 +4,22 @@ local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
 local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____ItemConfigTag = require("enums.ItemConfigTag")
-local ItemConfigTag = ____ItemConfigTag.ItemConfigTag
-local ____collectibles = require("functions.collectibles")
-local getMaxCollectibleType = ____collectibles.getMaxCollectibleType
+local ____constantsMax = require("constantsMax")
+local MAX_COLLECTIBLE_TYPE = ____constantsMax.MAX_COLLECTIBLE_TYPE
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
+local ____flag = require("functions.flag")
+local getFlagName = ____flag.getFlagName
 local ____math = require("functions.math")
-local range = ____math.range
+local irange = ____math.irange
 local ____player = require("functions.player")
 local getPlayerCollectibleCount = ____player.getPlayerCollectibleCount
 local ____set = require("functions.set")
 local copySet = ____set.copySet
-local ____utils = require("functions.utils")
-local getEnumValues = ____utils.getEnumValues
 function ____exports.collectibleHasTag(self, collectibleType, tag)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
@@ -27,14 +29,13 @@ function ____exports.collectibleHasTag(self, collectibleType, tag)
 end
 local TAG_TO_COLLECTIBLE_TYPES_MAP = __TS__New(Map)
 local function initTagMap(self)
-    local maxCollectibleType = getMaxCollectibleType(nil)
     for ____, itemConfigTag in ipairs(getEnumValues(nil, ItemConfigTag)) do
         TAG_TO_COLLECTIBLE_TYPES_MAP:set(
             itemConfigTag,
             __TS__New(Set)
         )
     end
-    for ____, collectibleType in ipairs(range(nil, 1, maxCollectibleType)) do
+    for ____, collectibleType in ipairs(irange(nil, 1, MAX_COLLECTIBLE_TYPE)) do
         for ____, itemConfigTag in ipairs(getEnumValues(nil, ItemConfigTag)) do
             do
                 if not ____exports.collectibleHasTag(nil, collectibleType, itemConfigTag) then
@@ -42,7 +43,8 @@ local function initTagMap(self)
                 end
                 local collectibleTypesSet = TAG_TO_COLLECTIBLE_TYPES_MAP:get(itemConfigTag)
                 if collectibleTypesSet == nil then
-                    error("Failed to get the collectible types for item tag: " .. ItemConfigTag[itemConfigTag])
+                    local flagName = getFlagName(nil, itemConfigTag, ItemConfigTag)
+                    error("Failed to get the collectible types for item tag: " .. tostring(flagName))
                 end
                 collectibleTypesSet:add(collectibleType)
             end

package/dist/functions/collectibles.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
-import { CollectiblePedestalType } from "../enums/CollectiblePedestalType";
+import { CacheFlag, CollectiblePedestalType, CollectibleType, ItemConfigTag, ItemType, PickupPrice } from "isaac-typescript-definitions";
 import { CollectibleIndex } from "../types/CollectibleIndex";
 export declare function clearCollectibleSprite(collectible: EntityPickup): void;
 export declare function collectibleHasCacheFlag(collectibleType: CollectibleType | int, cacheFlag: CacheFlag): boolean;
@@ -12,7 +11,7 @@ export declare function collectibleSpriteEquals(sprite1: Sprite, sprite2: Sprite
 export declare function getCollectibleDescription(collectibleType: CollectibleType | int): string;
 /**
  * Helper function to get the heart cost that a collectible item would be if it were being offered
- * in a Devil Room deal. Returns 0 if passed CollectibleType.COLLECTIBLE_NULL.
+ * in a Devil Room deal. Returns 0 if passed CollectibleType.NULL.
  */
 export declare function getCollectibleDevilHeartPrice(collectibleType: CollectibleType | int, player: EntityPlayer): PickupPrice;
 /**
@@ -36,25 +35,26 @@ export declare function getCollectibleGfxFilename(collectibleType: CollectibleTy
  *
  * Note that:
  * - The grid index is a necessary part of the collectible index because Diplopia and Crooked Penny
- * can cause two or more collectibles with the same SubType and InitSeed to exist in the same room.
+ *   can cause two or more collectibles with the same SubType and InitSeed to exist in the same
+ *   room.
  * - This index will fail in the case where the player uses Diplopia or a successful Crooked Penny
- * seven or more times in the same room, since that will cause two or more collectibles with the
- * same grid index, SubType, and InitSeed to exist.
+ *   seven or more times in the same room, since that will cause two or more collectibles with the
+ *   same grid index, SubType, and InitSeed to exist.
  * - The SubType is a necessary part of the collectible index because Tainted Isaac will
- * continuously cause collectibles to morph into new sub-types with the same InitSeed.
+ *   continuously cause collectibles to morph into new sub-types with the same InitSeed.
  * - Using a collectible's position as part of the index is problematic, since players can push a
- * pedestal. (Even using the grid index does not solve this problem, since it is possible in certain
- * cases for collectibles to be spawned at a position that is not aligned with the grid, and the
- * pedestal pushed to an adjacent tile, but this case should be extremely rare.)
+ *   pedestal. (Even using the grid index does not solve this problem, since it is possible in
+ *   certain cases for collectibles to be spawned at a position that is not aligned with the grid,
+ *   and the pedestal pushed to an adjacent tile, but this case should be extremely rare.)
  * - Mega Chests spawn two collectibles on the exact same position. However, both of them will have
- * different InitSeeds, so this is not a problem for this indexing scheme.
+ *   different InitSeeds, so this is not a problem for this indexing scheme.
  * - The indexing scheme used is different for collectibles that are inside of a Treasure Room, in
- * order to handle the case of the player seeing the same collectible again in a post-Ascent
- * Treasure Room. A 5-tuple of stage, stage type, grid index, SubType, and InitSeed is used in this
- * case. (Using the room list index or the room grid index is not suitable for this purpose, since
- * both of these values can change in the post-Ascent Treasure Room.) Even though there can be two
- * Treasure Rooms on an XL floor, both Treasure Rooms should not have collectibles with the same
- * grid index, Subtype, and InitSeed.
+ *   order to handle the case of the player seeing the same collectible again in a post-Ascent
+ *   Treasure Room. A 5-tuple of stage, stage type, grid index, SubType, and InitSeed is used in
+ *   this case. (Using the room list index or the room grid index is not suitable for this purpose,
+ *   since both of these values can change in the post-Ascent Treasure Room.) Even though there can
+ *   be two Treasure Rooms on an XL floor, both Treasure Rooms should not have collectibles with the
+ *   same grid index, Subtype, and InitSeed.
  */
 export declare function getCollectibleIndex(collectible: EntityPickup): CollectibleIndex;
 /**
@@ -78,7 +78,7 @@ export declare function getCollectibleMaxCharges(collectibleType: CollectibleTyp
  *
  * Example:
  * ```ts
- * const collectibleType = CollectibleType.COLLECTIBLE_SAD_ONION;
+ * const collectibleType = CollectibleType.SAD_ONION;
  * const collectibleName = getCollectibleName(collectibleType); // collectibleName is "Sad Onion"
  * ```
  */
@@ -95,18 +95,11 @@ export declare function getCollectibleQuality(collectibleType: CollectibleType |
  *
  * Example:
  * ```ts
- * const collectibleType = CollectibleType.COLLECTIBLE_SAD_ONION;
+ * const collectibleType = CollectibleType.SAD_ONION;
  * const itemConfigTags = getCollectibleTags(collectibleType); // itemConfigTags is "18350080"
  * ```
  */
-export declare function getCollectibleTags(collectibleType: CollectibleType | int): int;
-/**
- * Helper function to get the final collectible type in the game.
- *
- * This cannot be reliably determined before run-time due to mods adding a variable amount of new
- * collectibles.
- */
-export declare function getMaxCollectibleType(): int;
+export declare function getCollectibleTags(collectibleType: CollectibleType | int): BitFlags<ItemConfigTag>;
 /** Returns true if the item type in the item config is equal to `ItemType.ITEM_ACTIVE`. */
 export declare function isActiveCollectible(collectibleType: CollectibleType | int): boolean;
 /** Returns true if the collectible has a red question mark sprite. */
@@ -149,7 +142,7 @@ export declare function setCollectibleBlind(collectible: EntityPickup): void;
 /**
  * Helper function to remove the collectible from a collectible pedestal and make it appear as if a
  * player has already taken the item. This is accomplished by changing the sub-type to
- * `CollectibleType.COLLECTIBLE_NULL` and then setting the sprite to an empty/missing PNG file.
+ * `CollectibleType.NULL` and then setting the sprite to an empty/missing PNG file.
  *
  * For more information, see the documentation for the "clearSprite" helper function.
  */