isaacscript-common 2.0.26 → 2.0.27

package/dist/constants.d.ts

@@ -71,14 +71,14 @@ export declare const MAX_PLAYER_HEART_CONTAINERS = 18;
 export declare const MAX_PLAYER_SPEED_IN_UNITS = 9.8;
 export declare const MAX_PLAYER_TRINKET_SLOTS: number;
 export declare const FIRST_ROOM_TYPE = RoomType.DEFAULT;
-export declare const MAX_ROOM_TYPE: RoomType;
+export declare const LAST_ROOM_TYPE: RoomType;
 /**
  * The maximum speed stat that a player can have. Any additional speed beyond this will not take
  * effect.
  */
 export declare const MAX_SPEED_STAT = 2;
 export declare const FIRST_STAGE = LevelStage.BASEMENT_1;
-export declare const MAX_STAGE: LevelStage;
+export declare const LAST_STAGE: LevelStage;
 /** Corresponds to the maximum value for `EntityPlayer.SamsonBerserkCharge`. */
 export declare const MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000;
 export declare const NUM_DIMENSIONS: number;

package/dist/constants.lua

@@ -29,10 +29,10 @@ ____exports.MAX_PLAYER_HEART_CONTAINERS = 18
 ____exports.MAX_PLAYER_SPEED_IN_UNITS = 9.8
 ____exports.MAX_PLAYER_TRINKET_SLOTS = getEnumLength(nil, TrinketSlot)
 ____exports.FIRST_ROOM_TYPE = RoomType.DEFAULT
-____exports.MAX_ROOM_TYPE = getLastEnumValue(nil, RoomType)
+____exports.LAST_ROOM_TYPE = getLastEnumValue(nil, RoomType)
 ____exports.MAX_SPEED_STAT = 2
 ____exports.FIRST_STAGE = LevelStage.BASEMENT_1
-____exports.MAX_STAGE = getLastEnumValue(nil, LevelStage)
+____exports.LAST_STAGE = getLastEnumValue(nil, LevelStage)
 ____exports.MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000
 ____exports.NUM_DIMENSIONS = getEnumLength(nil, Dimension) - 1
 ____exports.SECOND_IN_MILLISECONDS = 1000

package/dist/constantsMax.d.ts

@@ -1,22 +1,4 @@
 import { Card, CollectibleType, PillColor, PillEffect, PlayerType, TrinketType } from "isaac-typescript-definitions";
-/** Equal to `Card.FOOL`. */
-export declare const FIRST_CARD = Card.FOOL;
-/**
- * Will change depending on how many modded cards there are.
- *
- * Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
- */
-export declare const NUM_CARDS: number;
-/**
- * Will change depending on how many modded cards there are.
- *
- * Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
- */
-export declare const MAX_CARD: Card;
-/** Calculated from the `Card` enum. `Card.NULL` is not included. */
-export declare const NUM_VANILLA_CARDS: number;
-/** Calculated from the `Card` enum. */
-export declare const MAX_VANILLA_CARD: Card;
 /** Equal to `CollectibleType.SAD_ONION`. */
 export declare const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
 /**
@@ -25,64 +7,100 @@ export declare const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
  * Equal to `itemConfig.GetCollectibles().Size - 1`. (`Size` includes invalid collectibles. We
  * subtract one to account for `CollectibleType.NULL`.)
  */
-export declare const MAX_COLLECTIBLE_TYPE: CollectibleType;
-/** Calculated from the `CollectibleType` enum. `CollectibleType.NULL` is not included. */
-export declare const NUM_VANILLA_COLLECTIBLE_TYPES: number;
+export declare const LAST_COLLECTIBLE_TYPE: CollectibleType;
 /**
  * Calculated from the `CollectibleType` enum.
  *
  * Note that this cannot be calculated from the length of the enum, because unlike all of the other
- * enums, the collectible types are not contiguous.
+ * enums, collectible types are not contiguous.
  */
-export declare const MAX_VANILLA_COLLECTIBLE_TYPE: CollectibleType;
-/** Equal to `PillEffect.BAD_GAS`. */
-export declare const FIRST_PILL_EFFECT = PillEffect.BAD_GAS;
+export declare const LAST_VANILLA_COLLECTIBLE_TYPE: CollectibleType;
 /**
- * Will change depending on how many modded pill effects there are.
+ * If there are no modded collectibles, this constant will represent a collectible type that does
+ * not exist.
+ */
+export declare const FIRST_MODDED_COLLECTIBLE_TYPE: CollectibleType;
+/** Calculated from the `CollectibleType` enum. `CollectibleType.NULL` is not included. */
+export declare const NUM_VANILLA_COLLECTIBLE_TYPES: number;
+/** Unlike vanilla collectible types, modded collectible types are always contiguous. */
+export declare const NUM_MODDED_COLLECTIBLE_TYPES: number;
+export declare const NUM_COLLECTIBLE_TYPES: number;
+/**
+ * Will change depending on how many modded cards there are.
  *
- * Equal to `itemConfig.GetPillEffects().Size - 1`. (We subtract one to account for
- * `PillEffect.NULL`.)
+ * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
+ * `TrinketType.NULL`.)
  */
-export declare const NUM_PILL_EFFECTS: number;
+export declare const NUM_TRINKET_TYPES: number;
+/** Calculated from the `TrinketType` enum. `TrinketType.NULL` is not included. */
+export declare const NUM_VANILLA_TRINKET_TYPES: number;
+export declare const NUM_MODDED_TRINKET_TYPES: number;
+/** Equal to `TrinketType.SWALLOWED_PENNY`. */
+export declare const FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY;
+/**
+ * Will change depending on how many modded cards there are.
+ *
+ * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
+ * `TrinketType.NULL`.)
+ */
+export declare const LAST_TRINKET_TYPE: TrinketType;
+/** Calculated from the `TrinketType` enum. */
+export declare const LAST_VANILLA_TRINKET_TYPE: TrinketType;
+/**
+ * If there are no modded trinkets, this constant will represent a trinket type that does not exist.
+ */
+export declare const FIRST_MODDED_TRINKET_TYPE: TrinketType;
+/**
+ * Will change depending on how many modded cards there are.
+ *
+ * Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
+ */
+export declare const NUM_CARDS: number;
+/** Calculated from the `Card` enum. `Card.NULL` is not included. */
+export declare const NUM_VANILLA_CARDS: number;
+export declare const NUM_MODDED_CARDS: number;
+/** Equal to `Card.FOOL`. */
+export declare const FIRST_CARD = Card.FOOL;
+/**
+ * Will change depending on how many modded cards there are.
+ *
+ * Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
+ */
+export declare const LAST_CARD: Card;
+/** Calculated from the `Card` enum. */
+export declare const MAX_VANILLA_CARD: Card;
+/** If there are no modded cards, this constant will represent a card that does not exist. */
+export declare const FIRST_MODDED_CARD: Card;
 /**
  * Will change depending on how many modded pill effects there are.
  *
  * Equal to `itemConfig.GetPillEffects().Size - 1`. (We subtract one to account for
  * `PillEffect.NULL`.)
  */
-export declare const MAX_PILL_EFFECT: PillEffect;
+export declare const NUM_PILL_EFFECTS: number;
 /**
  * Calculated from the `PillEffect` enum.
  *
  * (There is no `PillEffect.NULL` in the custom enum, so we don't have to subtract one here.)
  */
 export declare const NUM_VANILLA_PILL_EFFECTS: number;
-/** Calculated from the `PillEffect` enum. */
-export declare const MAX_VANILLA_PILL_EFFECT: PillEffect;
-/** Equal to `TrinketType.SWALLOWED_PENNY`. */
-export declare const FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY;
+export declare const NUM_MODDED_PILL_EFFECTS: number;
+/** Equal to `PillEffect.BAD_GAS`. */
+export declare const FIRST_PILL_EFFECT = PillEffect.BAD_GAS;
 /**
- * Will change depending on how many modded cards there are.
+ * Will change depending on how many modded pill effects there are.
  *
- * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
- * `TrinketType.NULL`.)
+ * Equal to `itemConfig.GetPillEffects().Size - 1`. (We subtract one to account for
+ * `PillEffect.NULL`.)
  */
-export declare const NUM_TRINKET_TYPES: number;
+export declare const LAST_PILL_EFFECT: PillEffect;
+/** Calculated from the `PillEffect` enum. */
+export declare const LAST_VANILLA_PILL_EFFECT: PillEffect;
 /**
- * Will change depending on how many modded cards there are.
- *
- * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
- * `TrinketType.NULL`.)
+ * If there are no modded pill effects, this constant will represent a pill effect that does not
+ * exist.
  */
-export declare const MAX_TRINKET_TYPE: TrinketType;
-/** Calculated from the `TrinketType` enum. `TrinketType.NULL` is not included. */
-export declare const NUM_VANILLA_TRINKET_TYPES: number;
-/** Calculated from the `TrinketType` enum. */
-export declare const MAX_VANILLA_TRINKET_TYPE: TrinketType;
-/** Equal to `PlayerType.ISAAC`. */
-export declare const FIRST_CHARACTER = PlayerType.ISAAC;
-/** Calculated from the `PlayerType` enum. */
-export declare const MAX_VANILLA_CHARACTER: PlayerType;
+export declare const FIRST_MODDED_PILL_EFFECT: PillEffect;
 /** Equal to `PillColor.BLUE_BLUE`. */
 export declare const FIRST_PILL_COLOR = PillColor.BLUE_BLUE;
 /**
@@ -91,7 +109,7 @@ export declare const FIRST_PILL_COLOR = PillColor.BLUE_BLUE;
  * Note that `PillColor.GOLD` is technically higher, but that is not considered for the purposes of
  * this constant.
  */
-export declare const MAX_NORMAL_PILL_COLOR = PillColor.WHITE_YELLOW;
+export declare const LAST_NORMAL_PILL_COLOR = PillColor.WHITE_YELLOW;
 /** Equal to `PillColor.HORSE_BLUE_BLUE`. */
 export declare const FIRST_HORSE_PILL_COLOR = PillColor.HORSE_BLUE_BLUE;
 /**
@@ -100,4 +118,13 @@ export declare const FIRST_HORSE_PILL_COLOR = PillColor.HORSE_BLUE_BLUE;
  * Note that `PillColor.HORSE_GOLD` is technically higher, but that is not considered for the
  * purposes of this constant.
  */
-export declare const MAX_HORSE_PILL_COLOR = PillColor.HORSE_WHITE_YELLOW;
+export declare const LAST_HORSE_PILL_COLOR = PillColor.HORSE_WHITE_YELLOW;
+export declare const NUM_NORMAL_PILL_COLORS: number;
+/** Equal to `PlayerType.ISAAC`. */
+export declare const FIRST_CHARACTER = PlayerType.ISAAC;
+/** Calculated from the `PlayerType` enum. */
+export declare const LAST_VANILLA_CHARACTER: PlayerType;
+/**
+ * If there are no modded characters, this constant will represent a character that does not exist.
+ */
+export declare const FIRST_MODDED_CHARACTER: PlayerType;

package/dist/constantsMax.lua

@@ -11,29 +11,40 @@ local itemConfig = ____cachedClasses.itemConfig
 local ____enums = require("functions.enums")
 local getEnumLength = ____enums.getEnumLength
 local getLastEnumValue = ____enums.getLastEnumValue
-____exports.FIRST_CARD = Card.FOOL
+____exports.FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION
+____exports.LAST_COLLECTIBLE_TYPE = itemConfig:GetCollectibles().Size - 1
+____exports.LAST_VANILLA_COLLECTIBLE_TYPE = getLastEnumValue(nil, CollectibleType)
+____exports.FIRST_MODDED_COLLECTIBLE_TYPE = ____exports.LAST_VANILLA_COLLECTIBLE_TYPE + 1
+____exports.NUM_VANILLA_COLLECTIBLE_TYPES = getEnumLength(nil, CollectibleType) - 1
+____exports.NUM_MODDED_COLLECTIBLE_TYPES = ____exports.LAST_COLLECTIBLE_TYPE - ____exports.LAST_VANILLA_COLLECTIBLE_TYPE
+____exports.NUM_COLLECTIBLE_TYPES = ____exports.NUM_VANILLA_COLLECTIBLE_TYPES + ____exports.NUM_MODDED_COLLECTIBLE_TYPES
+____exports.NUM_TRINKET_TYPES = itemConfig:GetTrinkets().Size - 1
+____exports.NUM_VANILLA_TRINKET_TYPES = getEnumLength(nil, TrinketType) - 1
+____exports.NUM_MODDED_TRINKET_TYPES = ____exports.NUM_TRINKET_TYPES - ____exports.NUM_VANILLA_TRINKET_TYPES
+____exports.FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY
+____exports.LAST_TRINKET_TYPE = ____exports.NUM_TRINKET_TYPES
+____exports.LAST_VANILLA_TRINKET_TYPE = getLastEnumValue(nil, TrinketType)
+____exports.FIRST_MODDED_TRINKET_TYPE = ____exports.LAST_VANILLA_TRINKET_TYPE + 1
 ____exports.NUM_CARDS = itemConfig:GetCards().Size - 1
-____exports.MAX_CARD = ____exports.NUM_CARDS
 ____exports.NUM_VANILLA_CARDS = getEnumLength(nil, Card) - 1
+____exports.NUM_MODDED_CARDS = ____exports.NUM_CARDS - ____exports.NUM_VANILLA_CARDS
+____exports.FIRST_CARD = Card.FOOL
+____exports.LAST_CARD = ____exports.NUM_CARDS
 ____exports.MAX_VANILLA_CARD = getLastEnumValue(nil, Card)
-____exports.FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION
-____exports.MAX_COLLECTIBLE_TYPE = itemConfig:GetCollectibles().Size - 1
-____exports.NUM_VANILLA_COLLECTIBLE_TYPES = getEnumLength(nil, CollectibleType) - 1
-____exports.MAX_VANILLA_COLLECTIBLE_TYPE = getLastEnumValue(nil, CollectibleType)
-____exports.FIRST_PILL_EFFECT = PillEffect.BAD_GAS
+____exports.FIRST_MODDED_CARD = ____exports.MAX_VANILLA_CARD + 1
 ____exports.NUM_PILL_EFFECTS = itemConfig:GetPillEffects().Size - 1
-____exports.MAX_PILL_EFFECT = ____exports.NUM_PILL_EFFECTS
 ____exports.NUM_VANILLA_PILL_EFFECTS = getEnumLength(nil, PillEffect)
-____exports.MAX_VANILLA_PILL_EFFECT = getLastEnumValue(nil, PillEffect)
-____exports.FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY
-____exports.NUM_TRINKET_TYPES = itemConfig:GetTrinkets().Size - 1
-____exports.MAX_TRINKET_TYPE = ____exports.NUM_TRINKET_TYPES
-____exports.NUM_VANILLA_TRINKET_TYPES = getEnumLength(nil, TrinketType) - 1
-____exports.MAX_VANILLA_TRINKET_TYPE = getLastEnumValue(nil, TrinketType)
-____exports.FIRST_CHARACTER = PlayerType.ISAAC
-____exports.MAX_VANILLA_CHARACTER = getLastEnumValue(nil, PlayerType)
+____exports.NUM_MODDED_PILL_EFFECTS = ____exports.NUM_PILL_EFFECTS - ____exports.NUM_VANILLA_PILL_EFFECTS
+____exports.FIRST_PILL_EFFECT = PillEffect.BAD_GAS
+____exports.LAST_PILL_EFFECT = ____exports.NUM_PILL_EFFECTS
+____exports.LAST_VANILLA_PILL_EFFECT = getLastEnumValue(nil, PillEffect)
+____exports.FIRST_MODDED_PILL_EFFECT = ____exports.LAST_VANILLA_PILL_EFFECT + 1
 ____exports.FIRST_PILL_COLOR = PillColor.BLUE_BLUE
-____exports.MAX_NORMAL_PILL_COLOR = PillColor.WHITE_YELLOW
+____exports.LAST_NORMAL_PILL_COLOR = PillColor.WHITE_YELLOW
 ____exports.FIRST_HORSE_PILL_COLOR = PillColor.HORSE_BLUE_BLUE
-____exports.MAX_HORSE_PILL_COLOR = PillColor.HORSE_WHITE_YELLOW
+____exports.LAST_HORSE_PILL_COLOR = PillColor.HORSE_WHITE_YELLOW
+____exports.NUM_NORMAL_PILL_COLORS = ____exports.LAST_NORMAL_PILL_COLOR - ____exports.FIRST_PILL_COLOR
+____exports.FIRST_CHARACTER = PlayerType.ISAAC
+____exports.LAST_VANILLA_CHARACTER = getLastEnumValue(nil, PlayerType)
+____exports.FIRST_MODDED_CHARACTER = ____exports.LAST_VANILLA_CHARACTER + 1
 return ____exports

package/dist/features/extraConsoleCommands/commands.lua

@@ -21,16 +21,16 @@ local sfxManager = ____cachedClasses.sfxManager
 local ____constants = require("constants")
 local FIRST_ROOM_TYPE = ____constants.FIRST_ROOM_TYPE
 local FIRST_STAGE = ____constants.FIRST_STAGE
+local LAST_ROOM_TYPE = ____constants.LAST_ROOM_TYPE
+local LAST_STAGE = ____constants.LAST_STAGE
 local MAX_LEVEL_GRID_INDEX = ____constants.MAX_LEVEL_GRID_INDEX
-local MAX_ROOM_TYPE = ____constants.MAX_ROOM_TYPE
-local MAX_STAGE = ____constants.MAX_STAGE
 local ____constantsMax = require("constantsMax")
 local FIRST_CARD = ____constantsMax.FIRST_CARD
 local FIRST_CHARACTER = ____constantsMax.FIRST_CHARACTER
 local FIRST_PILL_EFFECT = ____constantsMax.FIRST_PILL_EFFECT
-local MAX_CARD = ____constantsMax.MAX_CARD
-local MAX_PILL_EFFECT = ____constantsMax.MAX_PILL_EFFECT
-local MAX_VANILLA_CHARACTER = ____constantsMax.MAX_VANILLA_CHARACTER
+local LAST_CARD = ____constantsMax.LAST_CARD
+local LAST_PILL_EFFECT = ____constantsMax.LAST_PILL_EFFECT
+local LAST_VANILLA_CHARACTER = ____constantsMax.LAST_VANILLA_CHARACTER
 local ____HealthType = require("enums.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____cards = require("functions.cards")
@@ -282,7 +282,7 @@ function ____exports.card(self, params)
         end
         cardNum = match[2]
     else
-        if num < FIRST_CARD or num > MAX_CARD then
+        if num < FIRST_CARD or num > LAST_CARD then
             printConsole(
                 nil,
                 "Invalid card sub-type: " .. tostring(num)
@@ -306,7 +306,7 @@ function ____exports.cards(self)
             do
                 local x = 0
                 while x <= 12 do
-                    if cardType == MAX_CARD then
+                    if cardType == LAST_CARD then
                         return
                     end
                     local position = gridCoordinatesToWorldPosition(nil, x, y)
@@ -337,7 +337,7 @@ function ____exports.characterCommand(self, params)
         end
         character = match[2]
     else
-        if num < FIRST_CHARACTER or num > MAX_VANILLA_CHARACTER then
+        if num < FIRST_CHARACTER or num > LAST_VANILLA_CHARACTER then
             printConsole(
                 nil,
                 "Invalid player sub-type: " .. tostring(num)
@@ -559,7 +559,7 @@ function ____exports.pill(self, params)
         end
         pillEffect = match[2]
     else
-        if num < FIRST_PILL_EFFECT or num > MAX_PILL_EFFECT then
+        if num < FIRST_PILL_EFFECT or num > LAST_PILL_EFFECT then
             printConsole(
                 nil,
                 "Invalid pill effect ID: " .. tostring(num)
@@ -678,10 +678,10 @@ function ____exports.s(self, params)
         )
         return
     end
-    if stage < FIRST_STAGE or stage > MAX_STAGE then
+    if stage < FIRST_STAGE or stage > LAST_STAGE then
         printConsole(
             nil,
-            ((("Invalid stage number; must be between " .. tostring(FIRST_STAGE)) .. " and ") .. tostring(MAX_STAGE)) .. "."
+            ((("Invalid stage number; must be between " .. tostring(FIRST_STAGE)) .. " and ") .. tostring(LAST_STAGE)) .. "."
         )
         return
     end
@@ -882,7 +882,7 @@ function ____exports.warp(self, params)
         end
         roomType = match[2]
     else
-        if num < FIRST_ROOM_TYPE or num > MAX_ROOM_TYPE then
+        if num < FIRST_ROOM_TYPE or num > LAST_ROOM_TYPE then
             printConsole(
                 nil,
                 "Invalid room type: " .. tostring(num)

package/dist/functions/cards.d.ts

@@ -31,6 +31,12 @@ export declare function getCardType(card: Card): ItemConfigCardType;
  * containing cards that match any of the specified types.
  */
 export declare function getCardsOfType(...cardTypes: ItemConfigCardType[]): Set<Card>;
+/**
+ * Helper function to get an array with every modded card sub-type.
+ *
+ * Returns an empty array if there are no modded cards.
+ */
+export declare function getModdedCards(): Card[];
 /**
  * Has an equal chance of returning any card (e.g. Fool, Reverse Fool, Wild Card, etc.).
  *
@@ -61,6 +67,8 @@ export declare function getRandomCardOfType(cardType: ItemConfigCardType, seedOr
  * @param exceptions Optional. An array of runes to not select.
  */
 export declare function getRandomRune(seedOrRNG?: Seed | RNG, exceptions?: Card[]): Card;
+/** Helper function to get an array with every valid vanilla card sub-type. */
+export declare function getVanillaCards(): Card[];
 /**
  * Returns true for cards that have the following card type:
  * - CardType.TAROT

package/dist/functions/cards.lua

@@ -12,7 +12,9 @@ local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsMax = require("constantsMax")
 local FIRST_CARD = ____constantsMax.FIRST_CARD
-local MAX_CARD = ____constantsMax.MAX_CARD
+local FIRST_MODDED_CARD = ____constantsMax.FIRST_MODDED_CARD
+local LAST_CARD = ____constantsMax.LAST_CARD
+local MAX_VANILLA_CARD = ____constantsMax.MAX_VANILLA_CARD
 local ____cardDescriptions = require("objects.cardDescriptions")
 local CARD_DESCRIPTIONS = ____cardDescriptions.CARD_DESCRIPTIONS
 local DEFAULT_CARD_DESCRIPTION = ____cardDescriptions.DEFAULT_CARD_DESCRIPTION
@@ -56,7 +58,7 @@ function initCardObjects(self)
     addSetsToSet(nil, CARD_SET, cards)
 end
 function ____exports.getAllCards(self)
-    return irange(nil, FIRST_CARD, MAX_CARD)
+    return irange(nil, FIRST_CARD, LAST_CARD)
 end
 function ____exports.getCardType(self, card)
     local cardType = CARD_TYPES[card]
@@ -103,6 +105,12 @@ function ____exports.getCardName(self, card)
     end
     return DEFAULT_CARD_NAME
 end
+function ____exports.getModdedCards(self)
+    if MAX_VANILLA_CARD == LAST_CARD then
+        return {}
+    end
+    return irange(nil, FIRST_MODDED_CARD, LAST_CARD)
+end
 function ____exports.getRandomCard(self, seedOrRNG, exceptions)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
@@ -133,6 +141,9 @@ function ____exports.getRandomRune(self, seedOrRNG, exceptions)
     runesSet:delete(Card.RUNE_SHARD)
     return getRandomSetElement(nil, runesSet, seedOrRNG, exceptions)
 end
+function ____exports.getVanillaCards(self)
+    return irange(nil, FIRST_CARD, MAX_VANILLA_CARD)
+end
 function ____exports.isCard(self, card)
     return CARD_SET:has(card)
 end

package/dist/functions/character.lua

@@ -2,7 +2,7 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local ____constantsMax = require("constantsMax")
-local MAX_VANILLA_CHARACTER = ____constantsMax.MAX_VANILLA_CHARACTER
+local LAST_VANILLA_CHARACTER = ____constantsMax.LAST_VANILLA_CHARACTER
 local ____characterNames = require("objects.characterNames")
 local CHARACTER_NAMES = ____characterNames.CHARACTER_NAMES
 local DEFAULT_CHARACTER_NAME = ____characterNames.DEFAULT_CHARACTER_NAME
@@ -19,7 +19,7 @@ local CHARACTERS_WITH_NO_SOUL_HEARTS_SET = ____charactersWithNoSoulHeartsSet.CHA
 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
+    return character <= LAST_VANILLA_CHARACTER
 end
 function ____exports.characterCanHaveRedHearts(self, character)
     return not CHARACTERS_WITH_NO_RED_HEARTS_SET:has(character)

package/dist/functions/collectibleSet.d.ts

@@ -1,11 +1,9 @@
 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>;
 /**
- * Helper function to get the number of valid collectibles that exist. (This is not simply equal to
- * the highest collectible type, because collectible types are not contiguous.)
- *
- * Note that there is no corresponding `getTrinketsNum` function because trinket types are
- * contiguous. Use the `NUM_TRINKET_TYPES` constant instead.
+ * Returns a set containing every valid collectible type in the game, including modded collectibles.
  */
-export declare function getCollectiblesNum(): int;
+export declare function getCollectibleSet(): Set<CollectibleType>;
+/** Returns a set containing every modded collectible type in the game. */
+export declare function getModdedCollectibleSet(): Set<CollectibleType>;
+/** Returns a set containing every valid vanilla collectible type in the game. */
+export declare function getVanillaCollectibleSet(): Set<CollectibleType>;

package/dist/functions/collectibleSet.lua

@@ -4,29 +4,44 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
+local ____constantsMax = require("constantsMax")
+local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsMax.LAST_VANILLA_COLLECTIBLE_TYPE
 local ____collectibles = require("functions.collectibles")
 local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
 local ____set = require("functions.set")
 local copySet = ____set.copySet
-local COLLECTIBLE_SET = __TS__New(Set)
-local function initCollectibleSet(self)
+local ALL_COLLECTIBLES_SET = __TS__New(Set)
+local VANILLA_COLLECTIBLES_SET = __TS__New(Set)
+local MODDED_COLLECTIBLES_SET = __TS__New(Set)
+local function initCollectibleSets(self)
     for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
         local itemConfigItem = itemConfig:GetCollectible(collectibleType)
         if itemConfigItem ~= nil then
-            COLLECTIBLE_SET:add(collectibleType)
+            ALL_COLLECTIBLES_SET:add(collectibleType)
+            if collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE then
+                VANILLA_COLLECTIBLES_SET:add(collectibleType)
+            else
+                MODDED_COLLECTIBLES_SET:add(collectibleType)
+            end
         end
     end
 end
 function ____exports.getCollectibleSet(self)
-    if COLLECTIBLE_SET.size == 0 then
-        initCollectibleSet(nil)
+    if ALL_COLLECTIBLES_SET.size == 0 then
+        initCollectibleSets(nil)
     end
-    return copySet(nil, COLLECTIBLE_SET)
+    return copySet(nil, ALL_COLLECTIBLES_SET)
 end
-function ____exports.getCollectiblesNum(self)
-    if COLLECTIBLE_SET.size == 0 then
-        initCollectibleSet(nil)
+function ____exports.getModdedCollectibleSet(self)
+    if ALL_COLLECTIBLES_SET.size == 0 then
+        initCollectibleSets(nil)
     end
-    return COLLECTIBLE_SET.size
+    return copySet(nil, MODDED_COLLECTIBLES_SET)
+end
+function ____exports.getVanillaCollectibleSet(self)
+    if ALL_COLLECTIBLES_SET.size == 0 then
+        initCollectibleSets(nil)
+    end
+    return copySet(nil, VANILLA_COLLECTIBLES_SET)
 end
 return ____exports

package/dist/functions/collectibles.d.ts

@@ -110,6 +110,28 @@ export declare function getCollectibleTags(collectibleType: CollectibleType): Bi
  * should use the `getCollectibleSet` helper function instead.
  */
 export declare function getCollectibleTypeRange(): CollectibleType[];
+/**
+ * Helper function to get an array that represents the all modded collectible types.
+ *
+ * This function is only useful when building collectible type objects. For most purposes, you
+ * should use the `getModdedCollectibleSet` helper function instead.
+ *
+ * Returns an empty array if there are no modded collectible types.
+ *
+ * (This function is named differently from the `getVanillaCollectibleTypeRange` function because
+ * all modded collectible types are contiguous. Thus, each value represents a real
+ * `CollectibleType`.)
+ */
+export declare function getModdedCollectibleTypes(): CollectibleType[];
+/**
+ * Helper function to get an array that represents the range from the first collectible type to the
+ * last vanilla collectible type. This will include integers that do not represent any valid
+ * collectible types.
+ *
+ * This function is only useful when building collectible type objects. For most purposes, you
+ * should use the `getVanillaCollectibleSet` helper function instead.
+ */
+export declare function getVanillaCollectibleTypeRange(): CollectibleType[];
 /** Returns true if the item type in the item config is equal to `ItemType.ITEM_ACTIVE`. */
 export declare function isActiveCollectible(collectibleType: CollectibleType): boolean;
 /** Returns true if the collectible has a red question mark sprite. */

package/dist/functions/collectibles.lua

@@ -15,7 +15,9 @@ local ____constants = require("constants")
 local BLIND_ITEM_PNG_PATH = ____constants.BLIND_ITEM_PNG_PATH
 local ____constantsMax = require("constantsMax")
 local FIRST_COLLECTIBLE_TYPE = ____constantsMax.FIRST_COLLECTIBLE_TYPE
-local MAX_COLLECTIBLE_TYPE = ____constantsMax.MAX_COLLECTIBLE_TYPE
+local FIRST_MODDED_COLLECTIBLE_TYPE = ____constantsMax.FIRST_MODDED_COLLECTIBLE_TYPE
+local LAST_COLLECTIBLE_TYPE = ____constantsMax.LAST_COLLECTIBLE_TYPE
+local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsMax.LAST_VANILLA_COLLECTIBLE_TYPE
 local ____collectibleDescriptionMap = require("maps.collectibleDescriptionMap")
 local COLLECTIBLE_DESCRIPTION_MAP = ____collectibleDescriptionMap.COLLECTIBLE_DESCRIPTION_MAP
 local DEFAULT_COLLECTIBLE_DESCRIPTION = ____collectibleDescriptionMap.DEFAULT_COLLECTIBLE_DESCRIPTION
@@ -185,7 +187,16 @@ function ____exports.getCollectibleTags(self, collectibleType)
     return itemConfigItem == nil and ItemConfigTagZero or itemConfigItem.Tags
 end
 function ____exports.getCollectibleTypeRange(self)
-    return irange(nil, FIRST_COLLECTIBLE_TYPE, MAX_COLLECTIBLE_TYPE)
+    return irange(nil, FIRST_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE)
+end
+function ____exports.getModdedCollectibleTypes(self)
+    if LAST_VANILLA_COLLECTIBLE_TYPE == LAST_COLLECTIBLE_TYPE then
+        return {}
+    end
+    return irange(nil, FIRST_MODDED_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE)
+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)

package/dist/functions/pills.d.ts

@@ -1,8 +1,4 @@
 import { ItemConfigPillEffectClass, ItemConfigPillEffectType, PillColor, PillEffect } from "isaac-typescript-definitions";
-/** Helper function to get an array with every non-gold horse pill color. */
-export declare function getAllHorsePillColors(): PillColor[];
-/** Helper function to get an array with every non-gold and non-horse pill color. */
-export declare function getAllNormalPillColors(): PillColor[];
 /**
  * Helper function to get an array with every non-null pill color. This includes all gold colors and
  * all horse colors.
@@ -19,6 +15,14 @@ export declare function getAllPillEffects(): PillEffect[];
  * corresponds to the horse pill color for blue/blue.
  */
 export declare function getHorsePillColor(pillColor: PillColor): PillColor;
+/** Helper function to get an array with every non-gold horse pill color. */
+export declare function getHorsePillColors(): PillColor[];
+/**
+ * Helper function to get an array with every modded pill effect.
+ *
+ * Returns an empty array if there are no modded pill effects.
+ */
+export declare function getModdedPillEffects(): PillEffect[];
 /**
  * Helper function to get the corresponding normal pill color from a horse pill color.
  *
@@ -27,6 +31,8 @@ export declare function getHorsePillColor(pillColor: PillColor): PillColor;
  * If called with a non-horse pill color, this function will return back the same color.
  */
 export declare function getNormalPillColorFromHorse(pillColor: PillColor): PillColor;
+/** Helper function to get an array with every non-gold and non-horse pill color. */
+export declare function getNormalPillColors(): PillColor[];
 /**
  * Helper function to get a pill effect class from a PillEffect enum value. In this context, the
  * class is equal to the numerical prefix in the "class" tag in the "pocketitems.xml" file. Use the
@@ -58,4 +64,6 @@ export declare function getPillEffectName(pillEffect: PillEffect): string;
  * will always return `DEFAULT_PILL_EFFECT_TYPE` in those cases.
  */
 export declare function getPillEffectType(pillEffect: PillEffect): ItemConfigPillEffectType;
+/** Helper function to get an array with every vanilla pill effect. */
+export declare function getVanillaPillEffects(): PillEffect[];
 export declare function isHorsePill(pillColor: PillColor): boolean;

package/dist/functions/pills.lua

@@ -7,11 +7,13 @@ local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsMax = require("constantsMax")
 local FIRST_HORSE_PILL_COLOR = ____constantsMax.FIRST_HORSE_PILL_COLOR
+local FIRST_MODDED_PILL_EFFECT = ____constantsMax.FIRST_MODDED_PILL_EFFECT
 local FIRST_PILL_COLOR = ____constantsMax.FIRST_PILL_COLOR
 local FIRST_PILL_EFFECT = ____constantsMax.FIRST_PILL_EFFECT
-local MAX_HORSE_PILL_COLOR = ____constantsMax.MAX_HORSE_PILL_COLOR
-local MAX_NORMAL_PILL_COLOR = ____constantsMax.MAX_NORMAL_PILL_COLOR
-local MAX_PILL_EFFECT = ____constantsMax.MAX_PILL_EFFECT
+local LAST_HORSE_PILL_COLOR = ____constantsMax.LAST_HORSE_PILL_COLOR
+local LAST_NORMAL_PILL_COLOR = ____constantsMax.LAST_NORMAL_PILL_COLOR
+local LAST_PILL_EFFECT = ____constantsMax.LAST_PILL_EFFECT
+local LAST_VANILLA_PILL_EFFECT = ____constantsMax.LAST_VANILLA_PILL_EFFECT
 local ____pillEffectClasses = require("objects.pillEffectClasses")
 local DEFAULT_PILL_EFFECT_CLASS = ____pillEffectClasses.DEFAULT_PILL_EFFECT_CLASS
 local PILL_EFFECT_CLASSES = ____pillEffectClasses.PILL_EFFECT_CLASSES
@@ -29,27 +31,33 @@ local ____utils = require("functions.utils")
 local irange = ____utils.irange
 local HORSE_PILL_FLAG = 2047
 local HORSE_PILL_ADJUSTMENT = 2048
-function ____exports.getAllHorsePillColors(self)
-    return irange(nil, FIRST_HORSE_PILL_COLOR, MAX_HORSE_PILL_COLOR)
-end
-function ____exports.getAllNormalPillColors(self)
-    return irange(nil, FIRST_PILL_COLOR, MAX_NORMAL_PILL_COLOR)
-end
 function ____exports.getAllPillColors(self)
     local pillColors = getEnumValues(nil, PillColor)
     __TS__ArraySlice(pillColors)
     return pillColors
 end
 function ____exports.getAllPillEffects(self)
-    return irange(nil, FIRST_PILL_EFFECT, MAX_PILL_EFFECT)
+    return irange(nil, FIRST_PILL_EFFECT, LAST_PILL_EFFECT)
 end
 function ____exports.getHorsePillColor(self, pillColor)
     return pillColor + HORSE_PILL_ADJUSTMENT
 end
+function ____exports.getHorsePillColors(self)
+    return irange(nil, FIRST_HORSE_PILL_COLOR, LAST_HORSE_PILL_COLOR)
+end
+function ____exports.getModdedPillEffects(self)
+    if LAST_VANILLA_PILL_EFFECT == LAST_PILL_EFFECT then
+        return {}
+    end
+    return irange(nil, FIRST_MODDED_PILL_EFFECT, LAST_PILL_EFFECT)
+end
 function ____exports.getNormalPillColorFromHorse(self, pillColor)
     local normalPillColor = pillColor - HORSE_PILL_ADJUSTMENT
     return normalPillColor > PillColor.NULL and normalPillColor or pillColor
 end
+function ____exports.getNormalPillColors(self)
+    return irange(nil, FIRST_PILL_COLOR, LAST_NORMAL_PILL_COLOR)
+end
 function ____exports.getPillEffectClass(self, pillEffect)
     local pillEffectClass = PILL_EFFECT_CLASSES[pillEffect]
     return pillEffectClass == nil and DEFAULT_PILL_EFFECT_CLASS or pillEffectClass
@@ -69,6 +77,9 @@ function ____exports.getPillEffectType(self, pillEffect)
     local pillEffectClass = PILL_EFFECT_TYPES[pillEffect]
     return pillEffectClass == nil and DEFAULT_PILL_EFFECT_TYPE or pillEffectClass
 end
+function ____exports.getVanillaPillEffects(self)
+    return irange(nil, FIRST_PILL_EFFECT, LAST_VANILLA_PILL_EFFECT)
+end
 function ____exports.isHorsePill(self, pillColor)
     return hasFlag(nil, pillColor, HORSE_PILL_FLAG)
 end

package/dist/functions/trinketCacheFlag.lua

@@ -12,12 +12,12 @@ local getEnumValues = ____enums.getEnumValues
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local ____trinkets = require("functions.trinkets")
-local getTrinketTypeRange = ____trinkets.getTrinketTypeRange
+local getTrinketTypes = ____trinkets.getTrinketTypes
 local trinketHasCacheFlag = ____trinkets.trinketHasCacheFlag
 function initCacheFlagMap(self)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local trinketsSet = __TS__New(Set)
-        for ____, trinketType in ipairs(getTrinketTypeRange(nil)) do
+        for ____, trinketType in ipairs(getTrinketTypes(nil)) do
             if trinketHasCacheFlag(nil, trinketType, cacheFlag) then
                 trinketsSet:add(trinketType)
             end

package/dist/functions/trinkets.d.ts

@@ -6,6 +6,12 @@ import { CacheFlag, TrinketType } from "isaac-typescript-definitions";
  * corresponds to the golden trinket sub-type for Swallowed Penny.
  */
 export declare function getGoldenTrinketType(trinketType: TrinketType): TrinketType;
+/**
+ * Helper function to get an array that represents every modded trinket type.
+ *
+ * Returns an empty array if there are no modded trinket types.
+ */
+export declare function getModdedTrinketTypes(): TrinketType[];
 /**
  * Returns the slot number corresponding to where a trinket can be safely inserted.
  *
@@ -38,14 +44,10 @@ export declare function getTrinketDescription(trinketType: TrinketType): string;
  * ```
  */
 export declare function getTrinketName(trinketType: TrinketType): string;
-/**
- * Helper function to get an array that represents the range from the first trinket type to the last
- * trinket type. This will include integers that do not represent any valid trinket types.
- *
- * This function is only useful when building trinket type objects. For most purposes, you should
- * use the `getTrinketSet` helper function instead.
- */
-export declare function getTrinketTypeRange(): TrinketType[];
+/** Helper function to get an array that contains every trinket type. */
+export declare function getTrinketTypes(): TrinketType[];
+/** Helper function to get an array that represents every vanilla trinket type. */
+export declare function getVanillaTrinketTypes(): TrinketType[];
 /**
  * Returns whether or not the player can hold an additional trinket, beyond what they are currently
  * carrying. This takes into account items that modify the max number of trinkets, like Mom's Purse.

package/dist/functions/trinkets.lua

@@ -6,8 +6,10 @@ local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsMax = require("constantsMax")
+local FIRST_MODDED_TRINKET_TYPE = ____constantsMax.FIRST_MODDED_TRINKET_TYPE
 local FIRST_TRINKET_TYPE = ____constantsMax.FIRST_TRINKET_TYPE
-local MAX_TRINKET_TYPE = ____constantsMax.MAX_TRINKET_TYPE
+local LAST_TRINKET_TYPE = ____constantsMax.LAST_TRINKET_TYPE
+local LAST_VANILLA_TRINKET_TYPE = ____constantsMax.LAST_VANILLA_TRINKET_TYPE
 local ____trinketDescriptionMap = require("maps.trinketDescriptionMap")
 local DEFAULT_TRINKET_DESCRIPTION = ____trinketDescriptionMap.DEFAULT_TRINKET_DESCRIPTION
 local TRINKET_DESCRIPTION_MAP = ____trinketDescriptionMap.TRINKET_DESCRIPTION_MAP
@@ -32,6 +34,12 @@ local TRINKET_SPRITE_LAYER = 0
 function ____exports.getGoldenTrinketType(self, trinketType)
     return trinketType + GOLDEN_TRINKET_ADJUSTMENT
 end
+function ____exports.getModdedTrinketTypes(self)
+    if LAST_VANILLA_TRINKET_TYPE == LAST_TRINKET_TYPE then
+        return {}
+    end
+    return irange(nil, FIRST_MODDED_TRINKET_TYPE, LAST_TRINKET_TYPE)
+end
 function ____exports.getOpenTrinketSlot(self, player)
     local maxTrinkets = player:GetMaxTrinkets()
     local trinketType1 = player:GetTrinket(TrinketSlot.SLOT_1)
@@ -69,8 +77,11 @@ function ____exports.getTrinketName(self, trinketType)
     end
     return DEFAULT_TRINKET_NAME
 end
-function ____exports.getTrinketTypeRange(self)
-    return irange(nil, FIRST_TRINKET_TYPE, MAX_TRINKET_TYPE)
+function ____exports.getTrinketTypes(self)
+    return irange(nil, FIRST_TRINKET_TYPE, LAST_TRINKET_TYPE)
+end
+function ____exports.getVanillaTrinketTypes(self)
+    return irange(nil, FIRST_TRINKET_TYPE, LAST_VANILLA_TRINKET_TYPE)
 end
 function ____exports.hasOpenTrinketSlot(self, player)
     if isCharacter(nil, player, PlayerType.THE_SOUL_B) then

package/dist/index.d.ts

@@ -101,7 +101,6 @@ export * from "./functions/transformations";
 export * from "./functions/trinketCacheFlag";
 export * from "./functions/trinketGive";
 export * from "./functions/trinkets";
-export * from "./functions/trinketSet";
 export * from "./functions/tstlClass";
 export * from "./functions/ui";
 export * from "./functions/utils";

package/dist/index.lua

@@ -818,14 +818,6 @@ do
         end
     end
 end
-do
-    local ____export = require("functions.trinketSet")
-    for ____exportKey, ____exportValue in pairs(____export) do
-        if ____exportKey ~= "default" then
-            ____exports[____exportKey] = ____exportValue
-        end
-    end
-end
 do
     local ____export = require("functions.tstlClass")
     for ____exportKey, ____exportValue in pairs(____export) do

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -28,7 +28,7 @@
     "isaac-typescript-definitions": "^2.0.45"
   },
   "devDependencies": {
-    "isaacscript-lint": "^1.0.157",
+    "isaacscript-lint": "^1.0.159",
     "isaacscript-spell": "^1.0.3",
     "isaacscript-tsconfig": "^1.1.16",
     "npm-check-updates": "^13.0.1",