isaacscript-common 8.9.1 → 9.1.0

package/dist/callbacks/postPlayerCollectible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postPlayerCollectible.d.ts","sourceRoot":"","sources":["../../src/callbacks/postPlayerCollectible.ts"],"names":[],"mappings":";AAkCA,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAIjE"}
+{"version":3,"file":"postPlayerCollectible.d.ts","sourceRoot":"","sources":["../../src/callbacks/postPlayerCollectible.ts"],"names":[],"mappings":";AA4CA,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAIjE"}

package/dist/callbacks/postPlayerCollectible.lua

@@ -1,19 +1,27 @@
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
+local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
 local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
+local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArraySort = ____lualib.__TS__ArraySort
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdate, collectibleCountChanged, v
+local hasSubscriptions, postPEffectUpdate, collectibleCountChanged, checkActiveItemsChanged, activeItemsChanged, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
+local ____array = require("functions.array")
+local arrayEquals = ____array.arrayEquals
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 local ____playerDataStructures = require("functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
@@ -43,30 +51,37 @@ function postPEffectUpdate(self, player)
     end
     local difference = newCollectibleCount - oldCollectibleCount
     if difference > 0 then
-        collectibleCountChanged(nil, player, difference, true)
+        collectibleCountChanged(nil, player, difference)
     elseif difference < 0 then
-        collectibleCountChanged(nil, player, difference * -1, false)
+        collectibleCountChanged(nil, player, difference * -1)
+    elseif difference == 0 then
+        checkActiveItemsChanged(nil, player)
     end
 end
-function collectibleCountChanged(self, player, numCollectiblesChanged, increased)
+function collectibleCountChanged(self, player, numCollectiblesChanged)
     local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player)
     local newCollectibleMap = getPlayerCollectibleMap(nil, player)
     mapSetPlayer(nil, v.run.playersCollectibleMap, player, newCollectibleMap)
+    local ____Set_1 = Set
     local ____array_0 = __TS__SparseArrayNew(__TS__Spread(oldCollectibleMap:keys()))
     __TS__SparseArrayPush(
         ____array_0,
         __TS__Spread(newCollectibleMap:keys())
     )
-    local collectibleTypes = {__TS__SparseArraySpread(____array_0)}
-    __TS__ArraySort(collectibleTypes)
+    local collectibleTypeSet = __TS__New(
+        ____Set_1,
+        {__TS__SparseArraySpread(____array_0)}
+    )
     local numFired = 0
-    for ____, collectibleType in ipairs(collectibleTypes) do
+    for ____, collectibleType in __TS__Iterator(collectibleTypeSet:values()) do
         local oldNum = oldCollectibleMap:get(collectibleType) or 0
         local newNum = newCollectibleMap:get(collectibleType) or 0
-        local difference = math.abs(newNum - oldNum)
+        local difference = newNum - oldNum
+        local increased = difference > 0
+        local absoluteDifference = math.abs(difference)
         ____repeat(
             nil,
-            difference,
+            absoluteDifference,
             function()
                 if increased then
                     postPlayerCollectibleAddedFire(nil, player, collectibleType)
@@ -81,11 +96,65 @@ function collectibleCountChanged(self, player, numCollectiblesChanged, increased
         end
     end
 end
+function checkActiveItemsChanged(self, player)
+    local activeItemMap = defaultMapGetPlayer(nil, v.run.playersActiveItemMap, player)
+    local oldCollectibleTypes = {}
+    local newCollectibleTypes = {}
+    for ____, activeSlot in ipairs(getEnumValues(nil, ActiveSlot)) do
+        local oldCollectibleType = activeItemMap:get(activeSlot) or CollectibleType.NULL
+        local newCollectibleType = player:GetActiveItem(activeSlot)
+        activeItemMap:set(activeSlot, newCollectibleType)
+        oldCollectibleTypes[#oldCollectibleTypes + 1] = oldCollectibleType
+        newCollectibleTypes[#newCollectibleTypes + 1] = newCollectibleType
+    end
+    __TS__ArraySort(oldCollectibleTypes)
+    __TS__ArraySort(newCollectibleTypes)
+    if not arrayEquals(nil, oldCollectibleTypes, newCollectibleTypes) then
+        local ____Set_3 = Set
+        local ____array_2 = __TS__SparseArrayNew(table.unpack(oldCollectibleTypes))
+        __TS__SparseArrayPush(
+            ____array_2,
+            table.unpack(newCollectibleTypes)
+        )
+        local collectibleTypeSet = __TS__New(
+            ____Set_3,
+            {__TS__SparseArraySpread(____array_2)}
+        )
+        activeItemsChanged(nil, player, collectibleTypeSet)
+    end
+end
+function activeItemsChanged(self, player, collectibleTypesSet)
+    local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player)
+    local newCollectibleMap = getPlayerCollectibleMap(nil, player)
+    mapSetPlayer(nil, v.run.playersCollectibleMap, player, newCollectibleMap)
+    for ____, collectibleType in __TS__Iterator(collectibleTypesSet:values()) do
+        local oldNum = oldCollectibleMap:get(collectibleType) or 0
+        local newNum = newCollectibleMap:get(collectibleType) or 0
+        local difference = newNum - oldNum
+        local increased = difference > 0
+        local absoluteDifference = math.abs(difference)
+        ____repeat(
+            nil,
+            absoluteDifference,
+            function()
+                if increased then
+                    postPlayerCollectibleAddedFire(nil, player, collectibleType)
+                else
+                    postPlayerCollectibleRemovedFire(nil, player, collectibleType)
+                end
+            end
+        )
+    end
+end
 v = {run = {
     playersCollectibleCount = __TS__New(Map),
     playersCollectibleMap = __TS__New(
         DefaultMap,
         function() return __TS__New(Map) end
+    ),
+    playersActiveItemMap = __TS__New(
+        DefaultMap,
+        function() return __TS__New(Map) end
     )
 }}
 function ____exports.postPlayerCollectibleCallbacksInit(self, mod)

package/dist/core/constantsFirstLast.d.ts

@@ -1,4 +1,4 @@
-import { Card, CollectibleType, LevelStage, PillColor, PillEffect, PlayerType, RoomType, TrinketType } from "isaac-typescript-definitions";
+import { CardType, CollectibleType, LevelStage, PillColor, PillEffect, PlayerType, RoomType, TrinketType } from "isaac-typescript-definitions";
 /** Equal to `CollectibleType.SAD_ONION`. */
 export declare const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
 /**
@@ -17,11 +17,11 @@ export declare const LAST_VANILLA_TRINKET_TYPE: TrinketType;
 /** Calculated from the `TrinketType` enum. (`TrinketType.NULL` is not included.) */
 export declare const NUM_VANILLA_TRINKET_TYPES: number;
 /** Equal to `Card.FOOL`. */
-export declare const FIRST_CARD = Card.FOOL;
+export declare const FIRST_CARD_TYPE = CardType.FOOL;
 /** Calculated from the `Card` enum. */
-export declare const LAST_VANILLA_CARD: Card;
+export declare const LAST_VANILLA_CARD_TYPE: CardType;
 /** Calculated from the `Card` enum. `Card.NULL` is not included. */
-export declare const NUM_VANILLA_CARDS: number;
+export declare const NUM_VANILLA_CARD_TYPES: number;
 /** Equal to `PillEffect.BAD_GAS`. */
 export declare const FIRST_PILL_EFFECT = PillEffect.BAD_GAS;
 /** Calculated from the `PillEffect` enum. */

package/dist/core/constantsFirstLast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constantsFirstLast.d.ts","sourceRoot":"","sources":["../../src/core/constantsFirstLast.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,IAAI,EACJ,eAAe,EACf,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAOtC,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,iBAAoC,CAAC;AAE/E,4FAA4F;AAC5F,eAAO,MAAM,6BAA6B,QAAqC,CAAC;AAMhF,8CAA8C;AAC9C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAE9D,8CAA8C;AAC9C,eAAO,MAAM,yBAAyB,aAAgC,CAAC;AAEvE,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,QAAiC,CAAC;AAMxE,4BAA4B;AAC5B,eAAO,MAAM,UAAU,YAAY,CAAC;AAEpC,uCAAuC;AACvC,eAAO,MAAM,iBAAiB,MAAyB,CAAC;AAExD,oEAAoE;AACpE,eAAO,MAAM,iBAAiB,QAA0B,CAAC;AAMzD,qCAAqC;AACrC,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AAEpD,6CAA6C;AAC7C,eAAO,MAAM,wBAAwB,YAA+B,CAAC;AAErE;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,QAA4B,CAAC;AAMlE,sCAAsC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,eAAO,MAAM,sBAAsB,QAA4C,CAAC;AAMhF,mCAAmC;AACnC,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAIhD,6CAA6C;AAC7C,eAAO,MAAM,sBAAsB,YAA+B,CAAC;AAMnE,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,cAAc,UAA6B,CAAC;AAMzD,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,UAAU,YAA+B,CAAC"}
+{"version":3,"file":"constantsFirstLast.d.ts","sourceRoot":"","sources":["../../src/core/constantsFirstLast.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAOtC,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,iBAAoC,CAAC;AAE/E,4FAA4F;AAC5F,eAAO,MAAM,6BAA6B,QAAqC,CAAC;AAMhF,8CAA8C;AAC9C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAE9D,8CAA8C;AAC9C,eAAO,MAAM,yBAAyB,aAAgC,CAAC;AAEvE,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,QAAiC,CAAC;AAMxE,4BAA4B;AAC5B,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,uCAAuC;AACvC,eAAO,MAAM,sBAAsB,UAA6B,CAAC;AAEjE,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,QAA8B,CAAC;AAMlE,qCAAqC;AACrC,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AAEpD,6CAA6C;AAC7C,eAAO,MAAM,wBAAwB,YAA+B,CAAC;AAErE;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,QAA4B,CAAC;AAMlE,sCAAsC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,eAAO,MAAM,sBAAsB,QAA4C,CAAC;AAMhF,mCAAmC;AACnC,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAIhD,6CAA6C;AAC7C,eAAO,MAAM,sBAAsB,YAA+B,CAAC;AAMnE,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,cAAc,UAA6B,CAAC;AAMzD,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,UAAU,YAA+B,CAAC"}

package/dist/core/constantsFirstLast.lua

@@ -1,6 +1,6 @@
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local Card = ____isaac_2Dtypescript_2Ddefinitions.Card
+local CardType = ____isaac_2Dtypescript_2Ddefinitions.CardType
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local PillColor = ____isaac_2Dtypescript_2Ddefinitions.PillColor
@@ -27,11 +27,11 @@ ____exports.LAST_VANILLA_TRINKET_TYPE = getLastEnumValue(nil, TrinketType)
 --- Calculated from the `TrinketType` enum. (`TrinketType.NULL` is not included.)
 ____exports.NUM_VANILLA_TRINKET_TYPES = getEnumLength(nil, TrinketType) - 1
 --- Equal to `Card.FOOL`.
-____exports.FIRST_CARD = Card.FOOL
+____exports.FIRST_CARD_TYPE = CardType.FOOL
 --- Calculated from the `Card` enum.
-____exports.LAST_VANILLA_CARD = getLastEnumValue(nil, Card)
+____exports.LAST_VANILLA_CARD_TYPE = getLastEnumValue(nil, CardType)
 --- Calculated from the `Card` enum. `Card.NULL` is not included.
-____exports.NUM_VANILLA_CARDS = getEnumLength(nil, Card) - 1
+____exports.NUM_VANILLA_CARD_TYPES = getEnumLength(nil, CardType) - 1
 --- Equal to `PillEffect.BAD_GAS`.
 ____exports.FIRST_PILL_EFFECT = PillEffect.BAD_GAS
 --- Calculated from the `PillEffect` enum.

package/dist/features/extraConsoleCommands/listCommands.lua

@@ -23,7 +23,7 @@ local sfxManager = ____cachedClasses.sfxManager
 local ____constants = require("core.constants")
 local MAX_LEVEL_GRID_INDEX = ____constants.MAX_LEVEL_GRID_INDEX
 local ____constantsFirstLast = require("core.constantsFirstLast")
-local FIRST_CARD = ____constantsFirstLast.FIRST_CARD
+local FIRST_CARD_TYPE = ____constantsFirstLast.FIRST_CARD_TYPE
 local FIRST_CHARACTER = ____constantsFirstLast.FIRST_CHARACTER
 local FIRST_PILL_EFFECT = ____constantsFirstLast.FIRST_PILL_EFFECT
 local FIRST_ROOM_TYPE = ____constantsFirstLast.FIRST_ROOM_TYPE
@@ -86,7 +86,7 @@ local setUnseeded = ____run.setUnseeded
 local ____trinkets = require("functions.trinkets")
 local getGoldenTrinketType = ____trinkets.getGoldenTrinketType
 local ____types = require("functions.types")
-local asCard = ____types.asCard
+local asCardType = ____types.asCardType
 local ____utils = require("functions.utils")
 local irange = ____utils.irange
 local printConsole = ____utils.printConsole
@@ -100,7 +100,7 @@ local PILL_EFFECT_MAP = ____pillEffectMap.PILL_EFFECT_MAP
 local ____roomTypeMap = require("maps.roomTypeMap")
 local ROOM_TYPE_MAP = ____roomTypeMap.ROOM_TYPE_MAP
 local ____firstLast = require("features.firstLast")
-local getLastCard = ____firstLast.getLastCard
+local getLastCardType = ____firstLast.getLastCardType
 local getLastPillEffect = ____firstLast.getLastPillEffect
 local ____commandsSubroutines = require("features.extraConsoleCommands.commandsSubroutines")
 local addHeart = ____commandsSubroutines.addHeart
@@ -356,7 +356,7 @@ function ____exports.card(self, params)
         printConsole(nil, "You must specify a card name or number.")
         return
     end
-    local cardNum
+    local cardType
     local num = tonumber(params)
     if num == nil then
         local match = getMapPartialMatch(nil, params, CARD_MAP)
@@ -364,28 +364,28 @@ function ____exports.card(self, params)
             printConsole(nil, "Unknown card: " .. params)
             return
         end
-        cardNum = match[2]
+        cardType = match[2]
     else
-        local lastCard = getLastCard(nil)
-        if num < FIRST_CARD or num > lastCard then
+        local lastCardType = getLastCardType(nil)
+        if num < FIRST_CARD_TYPE or num > lastCardType then
             printConsole(
                 nil,
                 "Invalid card sub-type: " .. tostring(num)
             )
             return
         end
-        cardNum = num
+        cardType = num
     end
-    local cardName = getCardName(nil, cardNum)
-    Isaac.ExecuteCommand("g k" .. tostring(cardNum))
+    local cardName = getCardName(nil, cardType)
+    Isaac.ExecuteCommand("g k" .. tostring(cardType))
     printConsole(
         nil,
-        ((("Gave card: " .. cardName) .. " (") .. tostring(cardNum)) .. ")"
+        ((("Gave card: " .. cardName) .. " (") .. tostring(cardType)) .. ")"
     )
 end
 --- Spawns every card on the ground, starting at the top-left-most tile.
 function ____exports.cards(self)
-    local lastCard = getLastCard(nil)
+    local lastCardType = getLastCardType(nil)
     local cardType = 1
     do
         local y = 0
@@ -393,13 +393,13 @@ function ____exports.cards(self)
             do
                 local x = 0
                 while x <= 12 do
-                    if asCard(nil, cardType) == lastCard then
+                    if asCardType(nil, cardType) == lastCardType then
                         return
                     end
                     local position = gridCoordinatesToWorldPosition(nil, x, y)
                     spawnCard(
                         nil,
-                        asCard(nil, cardType),
+                        asCardType(nil, cardType),
                         position
                     )
                     cardType = cardType + 1

package/dist/features/firstLast.d.ts

@@ -1,4 +1,4 @@
-import { Card, CollectibleType, PillEffect, TrinketType } from "isaac-typescript-definitions";
+import { CardType, CollectibleType, PillEffect, TrinketType } from "isaac-typescript-definitions";
 /**
  * Returns the first modded collectible type, or undefined if there are no modded collectibles.
  *
@@ -52,7 +52,7 @@ export declare function getNumModdedCollectibleTypes(): int;
  */
 export declare function getFirstModdedTrinketType(): TrinketType | undefined;
 /**
- * Will change depending on how many modded cards there are.
+ * Will change depending on how many modded trinkets there are.
  *
  * This is equal to the number of trinket types, since all trinket types are contiguous (unlike
  * collectibles).
@@ -74,7 +74,7 @@ export declare function getLastTrinketType(): TrinketType;
  */
 export declare function getModdedTrinketTypes(): TrinketType[];
 /**
- * Will change depending on how many modded cards there are.
+ * Will change depending on how many modded trinkets there are.
  *
  * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
  * `TrinketType.NULL`.)
@@ -101,14 +101,14 @@ export declare function getTrinketTypes(): TrinketType[];
  * This function can only be called if at least one callback has been executed. This is because not
  * all cards will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getAllCards(): Card[];
+export declare function getAllCardTypes(): CardType[];
 /**
  * Returns the first modded card sub-type, or undefined if there are no modded cards.
  *
  * This function can only be called if at least one callback has been executed. This is because not
  * all cards will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getFirstModdedCard(): Card | undefined;
+export declare function getFirstModdedCardType(): CardType | undefined;
 /**
  * Will change depending on how many modded cards there are.
  *
@@ -118,7 +118,7 @@ export declare function getFirstModdedCard(): Card | undefined;
  * This function can only be called if at least one callback has been executed. This is because not
  * all cards will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getLastCard(): Card;
+export declare function getLastCardType(): CardType;
 /**
  * Helper function to get an array with every modded card sub-type.
  *
@@ -127,7 +127,7 @@ export declare function getLastCard(): Card;
  * This function can only be called if at least one callback has been executed. This is because not
  * all cards will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getModdedCards(): Card[];
+export declare function getModdedCardTypes(): CardType[];
 /**
  * Will change depending on how many modded cards there are.
  *
@@ -136,12 +136,12 @@ export declare function getModdedCards(): Card[];
  * This function can only be called if at least one callback has been executed. This is because not
  * all cards will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getNumCards(): int;
+export declare function getNumCardTypes(): int;
 /**
  * This function can only be called if at least one callback has been executed. This is because not
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getNumModdedCards(): int;
+export declare function getNumModdedCardTypes(): int;
 /**
  * Helper function to get an array with every valid pill effect. This includes modded pill effects.
  *

package/dist/features/firstLast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstLast.d.ts","sourceRoot":"","sources":["../../src/features/firstLast.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,eAAe,EACf,UAAU,EACV,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAwDtC;;;;;GAKG;AACH,wBAAgB,6BAA6B,IAAI,eAAe,GAAG,SAAS,CAS3E;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,IAAI,eAAe,CAKxD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,IAAI,eAAe,EAAE,CAW7D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,GAAG,CAM5C;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,IAAI,GAAG,CAMlD;AAMD;;;;;GAKG;AACH,wBAAgB,yBAAyB,IAAI,WAAW,GAAG,SAAS,CASnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,WAAW,CAMhD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,IAAI,WAAW,EAAE,CAQrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,GAAG,CAKxC;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,GAAG,CAM9C;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,IAAI,WAAW,EAAE,CAG/C;AAMD;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,IAAI,EAAE,CAGpC;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,GAAG,SAAS,CAOrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,IAAI,IAAI,EAAE,CAQvC;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,IAAI,GAAG,CAKjC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,GAAG,CAMvC;AAMD;;;;;GAKG;AACH,wBAAgB,iBAAiB,IAAI,UAAU,EAAE,CAGhD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,UAAU,GAAG,SAAS,CASjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,IAAI,UAAU,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,IAAI,UAAU,EAAE,CAQnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,IAAI,GAAG,CAKvC;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,GAAG,CAM7C"}
+{"version":3,"file":"firstLast.d.ts","sourceRoot":"","sources":["../../src/features/firstLast.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,UAAU,EACV,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAwDtC;;;;;GAKG;AACH,wBAAgB,6BAA6B,IAAI,eAAe,GAAG,SAAS,CAS3E;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,IAAI,eAAe,CAKxD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,IAAI,eAAe,EAAE,CAW7D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,GAAG,CAM5C;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,IAAI,GAAG,CAMlD;AAMD;;;;;GAKG;AACH,wBAAgB,yBAAyB,IAAI,WAAW,GAAG,SAAS,CASnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,WAAW,CAMhD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,IAAI,WAAW,EAAE,CAQrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,GAAG,CAKxC;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,GAAG,CAM9C;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,IAAI,WAAW,EAAE,CAG/C;AAMD;;;;;GAKG;AACH,wBAAgB,eAAe,IAAI,QAAQ,EAAE,CAG5C;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,QAAQ,GAAG,SAAS,CAO7D;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,QAAQ,CAM1C;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,EAAE,CAQ/C;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,IAAI,GAAG,CAKrC;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,GAAG,CAM3C;AAMD;;;;;GAKG;AACH,wBAAgB,iBAAiB,IAAI,UAAU,EAAE,CAGhD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,UAAU,GAAG,SAAS,CASjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,IAAI,UAAU,CAM9C;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,IAAI,UAAU,EAAE,CAQnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,IAAI,GAAG,CAKvC;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,GAAG,CAM7C"}

package/dist/features/firstLast.lua

@@ -3,14 +3,14 @@ local postNewRoomEarly, errorIfNoCallbacksFired, FEATURE_NAME, atLeastOneCallbac
 local ____cachedClasses = require("core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsFirstLast = require("core.constantsFirstLast")
-local FIRST_CARD = ____constantsFirstLast.FIRST_CARD
+local FIRST_CARD_TYPE = ____constantsFirstLast.FIRST_CARD_TYPE
 local FIRST_PILL_EFFECT = ____constantsFirstLast.FIRST_PILL_EFFECT
 local FIRST_TRINKET_TYPE = ____constantsFirstLast.FIRST_TRINKET_TYPE
-local LAST_VANILLA_CARD = ____constantsFirstLast.LAST_VANILLA_CARD
+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
-local NUM_VANILLA_CARDS = ____constantsFirstLast.NUM_VANILLA_CARDS
+local NUM_VANILLA_CARD_TYPES = ____constantsFirstLast.NUM_VANILLA_CARD_TYPES
 local NUM_VANILLA_COLLECTIBLE_TYPES = ____constantsFirstLast.NUM_VANILLA_COLLECTIBLE_TYPES
 local NUM_VANILLA_PILL_EFFECTS = ____constantsFirstLast.NUM_VANILLA_PILL_EFFECTS
 local NUM_VANILLA_TRINKET_TYPES = ____constantsFirstLast.NUM_VANILLA_TRINKET_TYPES
@@ -19,7 +19,7 @@ local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
 local ____types = require("functions.types")
-local asCard = ____types.asCard
+local asCardType = ____types.asCardType
 local asCollectibleType = ____types.asCollectibleType
 local asNumber = ____types.asNumber
 local asPillEffect = ____types.asPillEffect
@@ -56,7 +56,7 @@ function ____exports.getNumModdedCollectibleTypes(self)
     local lastCollectibleType = ____exports.getLastCollectibleType(nil)
     return lastCollectibleType - LAST_VANILLA_COLLECTIBLE_TYPE
 end
---- Will change depending on how many modded cards there are.
+--- Will change depending on how many modded trinkets there are.
 -- 
 -- Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
 -- `TrinketType.NULL`.)
@@ -75,11 +75,11 @@ end
 -- 
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all cards will necessarily be present when a mod first loads (due to mod load order).
-function ____exports.getLastCard(self)
+function ____exports.getLastCardType(self)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     errorIfNoCallbacksFired(nil, "card")
-    local numCards = ____exports.getNumCards(nil)
-    return asCard(nil, numCards)
+    local numCards = ____exports.getNumCardTypes(nil)
+    return asCardType(nil, numCards)
 end
 --- Will change depending on how many modded cards there are.
 -- 
@@ -87,7 +87,7 @@ end
 -- 
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all cards will necessarily be present when a mod first loads (due to mod load order).
-function ____exports.getNumCards(self)
+function ____exports.getNumCardTypes(self)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     errorIfNoCallbacksFired(nil, "card")
     return itemConfig:GetCards().Size - 1
@@ -195,7 +195,7 @@ function ____exports.getFirstModdedTrinketType(self)
     end
     return ____temp_1
 end
---- Will change depending on how many modded cards there are.
+--- Will change depending on how many modded trinkets there are.
 -- 
 -- This is equal to the number of trinket types, since all trinket types are contiguous (unlike
 -- collectibles).
@@ -245,27 +245,27 @@ end
 -- 
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all cards will necessarily be present when a mod first loads (due to mod load order).
-function ____exports.getAllCards(self)
-    local lastCard = ____exports.getLastCard(nil)
-    return irange(nil, FIRST_CARD, lastCard)
+function ____exports.getAllCardTypes(self)
+    local lastCardType = ____exports.getLastCardType(nil)
+    return irange(nil, FIRST_CARD_TYPE, lastCardType)
 end
 --- Returns the first modded card sub-type, or undefined if there are no modded cards.
 -- 
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all cards will necessarily be present when a mod first loads (due to mod load order).
-function ____exports.getFirstModdedCard(self)
+function ____exports.getFirstModdedCardType(self)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     errorIfNoCallbacksFired(nil, "card")
-    local firstModdedCard = asCard(
+    local firstModdedCardType = asCardType(
         nil,
-        asNumber(nil, LAST_VANILLA_CARD) + 1
+        asNumber(nil, LAST_VANILLA_CARD_TYPE) + 1
     )
-    local itemConfigCard = itemConfig:GetCard(firstModdedCard)
+    local itemConfigCard = itemConfig:GetCard(firstModdedCardType)
     local ____temp_2
     if itemConfigCard == nil then
         ____temp_2 = nil
     else
-        ____temp_2 = firstModdedCard
+        ____temp_2 = firstModdedCardType
     end
     return ____temp_2
 end
@@ -275,21 +275,21 @@ end
 -- 
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all cards will necessarily be present when a mod first loads (due to mod load order).
-function ____exports.getModdedCards(self)
-    local firstModdedCard = ____exports.getFirstModdedCard(nil)
-    if firstModdedCard == nil then
+function ____exports.getModdedCardTypes(self)
+    local firstModdedCardType = ____exports.getFirstModdedCardType(nil)
+    if firstModdedCardType == nil then
         return {}
     end
-    local lastCard = ____exports.getLastCard(nil)
-    return irange(nil, firstModdedCard, lastCard)
+    local lastCardType = ____exports.getLastCardType(nil)
+    return irange(nil, firstModdedCardType, lastCardType)
 end
 --- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
-function ____exports.getNumModdedCards(self)
+function ____exports.getNumModdedCardTypes(self)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     errorIfNoCallbacksFired(nil, "card")
-    local numCards = ____exports.getNumCards(nil)
-    return numCards - NUM_VANILLA_CARDS
+    local numCardTypes = ____exports.getNumCardTypes(nil)
+    return numCardTypes - NUM_VANILLA_CARD_TYPES
 end
 --- Helper function to get an array with every valid pill effect. This includes modded pill effects.
 -- 

package/dist/features/playerInventory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AAsH5E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS,CAK7B"}
+{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AAkH5E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS,CAK7B"}

package/dist/features/playerInventory.lua

@@ -33,16 +33,14 @@ local saveDataManager = ____exports.saveDataManager
 function newPlayerInventory(self, player)
     local inventory = {}
     for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
-        if player:HasCollectible(collectibleType) then
-            local numCollectibles = player:GetCollectibleNum(collectibleType, true)
-            ____repeat(
-                nil,
-                numCollectibles,
-                function()
-                    inventory[#inventory + 1] = collectibleType
-                end
-            )
-        end
+        local numCollectibles = player:GetCollectibleNum(collectibleType, true)
+        ____repeat(
+            nil,
+            numCollectibles,
+            function()
+                inventory[#inventory + 1] = collectibleType
+            end
+        )
     end
     return inventory
 end

package/dist/features/preventCollectibleRotation.lua

@@ -4,7 +4,7 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local useCardSoulOfIsaac, postPickupUpdateCollectible, getMapIndex, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local Card = ____isaac_2Dtypescript_2Ddefinitions.Card
+local CardType = ____isaac_2Dtypescript_2Ddefinitions.CardType
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
@@ -45,7 +45,7 @@ v = {room = {trackedCollectibles = __TS__New(Map)}}
 -- @internal
 function ____exports.preventCollectibleRotationInit(self, mod)
     saveDataManager(nil, FEATURE_NAME, v)
-    mod:AddCallback(ModCallback.POST_USE_CARD, useCardSoulOfIsaac, Card.SOUL_ISAAC)
+    mod:AddCallback(ModCallback.POST_USE_CARD, useCardSoulOfIsaac, CardType.SOUL_ISAAC)
     mod:AddCallback(ModCallback.POST_PICKUP_UPDATE, postPickupUpdateCollectible, PickupVariant.COLLECTIBLE)
 end
 --- Helper function to prevent a collectible from being affected by Tainted Isaac's rotation