isaacscript-common 1.2.61 → 1.2.64

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -1,6 +1,5 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local hasSubscriptions, entityTakeDmgPlayer, v
@@ -9,9 +8,11 @@ local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local isChildPlayer = ____player.isChildPlayer
-local isDamageToPlayerFatal = ____player.isDamageToPlayerFatal
 local ____revive = require("functions.revive")
+local isDamageToPlayerFatal = ____revive.isDamageToPlayerFatal
 local willPlayerRevive = ____revive.willPlayerRevive
+local ____DefaultMap = require("types.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
 local ____postPlayerFatalDamage = require("callbacks.subscriptions.postPlayerFatalDamage")
 local postPlayerFatalDamageFire = ____postPlayerFatalDamage.postPlayerFatalDamageFire
 local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlayerFatalDamageHasSubscriptions
@@ -32,8 +33,7 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     local game = Game()
     local gameFrameCount = game:GetFrameCount()
     local playerIndex = getPlayerIndex(nil, player)
-    local lastDamageFrame = v.run.playerLastDamageFrame:get(playerIndex)
-    v.run.playerLastDamageFrame:set(playerIndex, gameFrameCount)
+    local lastDamageGameFrame = v.run.playersLastDamageGameFrame:getAndSetDefault(playerIndex, gameFrameCount)
     if willPlayerRevive(nil, player) then
         return nil
     end
@@ -42,7 +42,7 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
         player,
         damageAmount,
         damageSource,
-        lastDamageFrame
+        lastDamageGameFrame
     ) then
         return nil
     end
@@ -59,7 +59,10 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     end
     return nil
 end
-v = {run = {playerLastDamageFrame = __TS__New(Map)}}
+v = {run = {playersLastDamageGameFrame = __TS__New(
+    DefaultMap,
+    function(____, _key, gameFrameCount) return gameFrameCount end
+)}}
 function ____exports.postPlayerFatalDamageCallbackInit(self, mod)
     saveDataManager(nil, "postPlayerFatalDamage", v)
     mod:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, entityTakeDmgPlayer, EntityType.ENTITY_PLAYER)

package/dist/callbacks/postPurchase.lua

@@ -3,8 +3,10 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__Iterator = ____lualib.__TS__Iterator
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local hasSubscriptions, postUpdate, checkPickupsPurchased, storePickupsInMap, storePlayersInMap, pickupIndexExists, v
+local hasSubscriptions, postUpdate, checkPickupsPurchased, getPlayerThatIsNoLongerHoldingAnItem, storePickupsInMap, storePlayersInMap, pickupAtIndexStillExists, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____entity = require("functions.entity")
@@ -33,44 +35,42 @@ function checkPickupsPurchased(self, pickups, players)
         local index = ____value[1]
         local pickupDescription = ____value[2]
         do
-            if pickupIndexExists(nil, index, pickups) then
+            if pickupAtIndexStillExists(nil, index, pickups) then
                 goto __continue7
             end
             v.room.pickupMap:delete(index)
-            for ____, player in ipairs(players) do
-                do
-                    local playerHoldingItem = player:IsHoldingItem()
-                    local playerIndex = getPlayerIndex(nil, player)
-                    local playerHoldingItemLastFrame = v.room.playerHoldingItemLastFrameMap:get(playerIndex)
-                    if playerHoldingItemLastFrame == nil then
-                        goto __continue9
-                    end
-                    if not playerHoldingItemLastFrame and playerHoldingItem then
-                        postPurchaseFire(
-                            nil,
-                            player,
-                            pickupDescription.variant,
-                            pickupDescription.subtype,
-                            pickupDescription.price
-                        )
-                        break
-                    end
-                end
-                ::__continue9::
+            local player = getPlayerThatIsNoLongerHoldingAnItem(nil, players)
+            if player ~= nil then
+                postPurchaseFire(
+                    nil,
+                    player,
+                    pickupDescription.variant,
+                    pickupDescription.subtype,
+                    pickupDescription.price
+                )
             end
         end
         ::__continue7::
     end
 end
-function storePickupsInMap(self, pickups)
-    for ____, pickup in ipairs(pickups) do
-        do
-            if pickup.Price == 0 then
-                goto __continue15
-            end
-            v.room.pickupMap:set(pickup.Index, {variant = pickup.Variant, subtype = pickup.SubType, price = pickup.Price})
+function getPlayerThatIsNoLongerHoldingAnItem(self, players)
+    return __TS__ArrayFind(
+        players,
+        function(____, player)
+            local playerHoldingItem = player:IsHoldingItem()
+            local playerIndex = getPlayerIndex(nil, player)
+            local playerHoldingItemLastFrame = v.room.playerHoldingItemLastFrameMap:get(playerIndex)
+            return playerHoldingItemLastFrame == false and playerHoldingItem
         end
-        ::__continue15::
+    )
+end
+function storePickupsInMap(self, pickups)
+    local pickupsWithPrice = __TS__ArrayFilter(
+        pickups,
+        function(____, pickup) return pickup.Price ~= 0 end
+    )
+    for ____, pickup in ipairs(pickupsWithPrice) do
+        v.room.pickupMap:set(pickup.Index, {variant = pickup.Variant, subtype = pickup.SubType, price = pickup.Price})
     end
 end
 function storePlayersInMap(self, players)
@@ -80,13 +80,12 @@ function storePlayersInMap(self, players)
         v.room.playerHoldingItemLastFrameMap:set(playerIndex, holdingItem)
     end
 end
-function pickupIndexExists(self, index, pickups)
-    for ____, pickup in ipairs(pickups) do
-        if pickup.Index == index and pickup:Exists() then
-            return true
-        end
-    end
-    return false
+function pickupAtIndexStillExists(self, index, pickups)
+    local pickupAtIndex = __TS__ArrayFind(
+        pickups,
+        function(____, pickup) return pickup.Index end
+    )
+    return pickupAtIndex ~= nil and pickupAtIndex:Exists()
 end
 v = {room = {
     pickupMap = __TS__New(Map),

package/dist/callbacks/postTransformation.lua

@@ -2,13 +2,13 @@
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
-local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, VALID_TRANSFORMATIONS, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____array = require("functions.array")
-local copyArray = ____array.copyArray
+local ____math = require("functions.math")
+local range = ____math.range
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____DefaultMap = require("types.DefaultMap")
@@ -37,17 +37,11 @@ function postPEffectUpdateReordered(self, player)
     end
 end
 local UNUSED_TRANSFORMATIONS = __TS__New(Set, {PlayerForm.PLAYERFORM_FLIGHT})
-local tempTransformations = {}
-do
-    local i = 0
-    while i < PlayerForm.NUM_PLAYER_FORMS do
-        if not UNUSED_TRANSFORMATIONS:has(i) then
-            __TS__ArrayPush(tempTransformations, i)
-        end
-        i = i + 1
-    end
-end
-VALID_TRANSFORMATIONS = copyArray(nil, tempTransformations)
+local ALL_TRANSFORMATIONS = range(nil, 0, PlayerForm.NUM_PLAYER_FORMS - 1)
+VALID_TRANSFORMATIONS = __TS__ArrayFilter(
+    ALL_TRANSFORMATIONS,
+    function(____, playerForm) return not UNUSED_TRANSFORMATIONS:has(playerForm) end
+)
 v = {run = {playersTransformationsMap = __TS__New(
     DefaultMap,
     function() return __TS__New(DefaultMap, false) end

package/dist/functions/array.lua

@@ -164,8 +164,7 @@ function ____exports.isArray(self, ____table)
     local numEntries = 0
     for key in pairs(____table) do
         numEntries = numEntries + 1
-        local keyType = type(key)
-        if keyType ~= "number" then
+        if type(key) ~= "number" then
             return false
         end
     end

package/dist/functions/player.d.ts

@@ -210,8 +210,6 @@ export declare function isBethany(player: EntityPlayer): boolean;
  * (For example, the Strawman Keeper.)
  */
 export declare function isChildPlayer(player: EntityPlayer): boolean;
-/** Uses the player's current health and character to determine if incoming damage will be fatal. */
-export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageFrame?: int): boolean;
 export declare function isFirstPlayer(player: EntityPlayer): boolean;
 /**
  * Helper function for detecting when a player is Jacob or Esau. This will only match the

package/dist/functions/player.lua

@@ -484,44 +484,6 @@ function ____exports.isBethany(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_BETHANY or character == PlayerType.PLAYER_BETHANY_B
 end
-function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageFrame)
-    local game = Game()
-    local gameFrameCount = game:GetFrameCount()
-    local character = player:GetPlayerType()
-    local effects = player:GetEffects()
-    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
-    if character == PlayerType.PLAYER_JACOB_B and damageSource.Type == EntityType.ENTITY_DARK_ESAU then
-        return false
-    end
-    if isBerserk then
-        return false
-    end
-    if character == PlayerType.PLAYER_JACOB2_B then
-        return true
-    end
-    if ____exports.hasLostCurse(nil, player) then
-        return true
-    end
-    local playerNumAllHearts = ____exports.getPlayerNumHitsRemaining(nil, player)
-    if damageAmount < playerNumAllHearts then
-        return false
-    end
-    local playerAvailableHeartSlots = ____exports.getPlayerAvailableHeartSlots(nil, player)
-    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and playerAvailableHeartSlots >= 2 then
-        return false
-    end
-    if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageFrame then
-        return false
-    end
-    local hearts = player:GetHearts()
-    local eternalHearts = player:GetEternalHearts()
-    local soulHearts = player:GetSoulHearts()
-    local boneHearts = player:GetBoneHearts()
-    if hearts > 0 and soulHearts > 0 or hearts > 0 and boneHearts > 0 or soulHearts > 0 and boneHearts > 0 or soulHearts > 0 and eternalHearts > 0 or boneHearts >= 2 then
-        return false
-    end
-    return true
-end
 function ____exports.isFirstPlayer(self, player)
     return ____exports.getPlayerIndexVanilla(nil, player) == 0
 end
@@ -586,9 +548,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch127 = activeSlot
-        local ____cond127 = ____switch127 == ActiveSlot.SLOT_PRIMARY
-        if ____cond127 then
+        local ____switch118 = activeSlot
+        local ____cond118 = ____switch118 == ActiveSlot.SLOT_PRIMARY
+        if ____cond118 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -597,8 +559,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_SECONDARY
-        if ____cond127 then
+        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_SECONDARY
+        if ____cond118 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -613,16 +575,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET
-        if ____cond127 then
+        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_POCKET
+        if ____cond118 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET2
-        if ____cond127 then
+        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_POCKET2
+        if ____cond118 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/revive.d.ts

@@ -1,4 +1,9 @@
 /// <reference types="isaac-typescript-definitions" />
+/**
+ * Uses the player's current health and other miscellaneous things to determine if incoming damage
+ * will be fatal.
+ */
+export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int): boolean;
 /**
  * The `EntityPlayer.WillPlayerRevive()` function does not properly account for Mysterious Paper,
  * so use this helper function instead for more robust revival detection.

package/dist/functions/revive.lua

@@ -2,6 +2,9 @@
 local ____exports = {}
 local ____player = require("functions.player")
 local getDeathAnimationName = ____player.getDeathAnimationName
+local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
+local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
+local hasLostCurse = ____player.hasLostCurse
 local ____sprite = require("functions.sprite")
 local getFinalFrameOfAnimation = ____sprite.getFinalFrameOfAnimation
 local ____trinketGive = require("functions.trinketGive")
@@ -16,12 +19,6 @@ function ____exports.willMysteriousPaperRevive(self, player)
     local frameOfDeath = gameFrameCount + deathAnimationFrames + 1
     return frameOfDeath % 4 == 3
 end
-function ____exports.willPlayerRevive(self, player)
-    local trinketSituation = temporarilyRemoveTrinket(nil, player, TrinketType.TRINKET_MYSTERIOUS_PAPER)
-    local willRevive = player:WillPlayerRevive() or trinketSituation ~= nil and ____exports.willMysteriousPaperRevive(nil, player)
-    giveTrinketsBack(nil, player, trinketSituation)
-    return willRevive
-end
 function ____exports.willReviveFromSpiritShackles(self, player)
     if not player:HasCollectible(CollectibleType.COLLECTIBLE_SPIRIT_SHACKLES) then
         return false
@@ -31,4 +28,51 @@ function ____exports.willReviveFromSpiritShackles(self, player)
     local playerInSoulForm = effects:HasNullEffect(NullItemID.ID_SPIRIT_SHACKLES_SOUL)
     return spiritShacklesEnabled and not playerInSoulForm
 end
+function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageGameFrame)
+    local game = Game()
+    local gameFrameCount = game:GetFrameCount()
+    local character = player:GetPlayerType()
+    local effects = player:GetEffects()
+    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
+    if character == PlayerType.PLAYER_JACOB_B and damageSource.Type == EntityType.ENTITY_DARK_ESAU then
+        return false
+    end
+    if isBerserk then
+        return false
+    end
+    if ____exports.willReviveFromSpiritShackles(nil, player) then
+        return false
+    end
+    if character == PlayerType.PLAYER_JACOB2_B then
+        return true
+    end
+    if hasLostCurse(nil, player) then
+        return true
+    end
+    local playerNumAllHearts = getPlayerNumHitsRemaining(nil, player)
+    if damageAmount < playerNumAllHearts then
+        return false
+    end
+    local playerAvailableHeartSlots = getPlayerAvailableHeartSlots(nil, player)
+    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and playerAvailableHeartSlots >= 2 then
+        return false
+    end
+    if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageGameFrame then
+        return false
+    end
+    local hearts = player:GetHearts()
+    local eternalHearts = player:GetEternalHearts()
+    local soulHearts = player:GetSoulHearts()
+    local boneHearts = player:GetBoneHearts()
+    if hearts > 0 and soulHearts > 0 or hearts > 0 and boneHearts > 0 or soulHearts > 0 and boneHearts > 0 or soulHearts > 0 and eternalHearts > 0 or boneHearts >= 2 then
+        return false
+    end
+    return true
+end
+function ____exports.willPlayerRevive(self, player)
+    local trinketSituation = temporarilyRemoveTrinket(nil, player, TrinketType.TRINKET_MYSTERIOUS_PAPER)
+    local willRevive = player:WillPlayerRevive() or trinketSituation ~= nil and ____exports.willMysteriousPaperRevive(nil, player)
+    giveTrinketsBack(nil, player, trinketSituation)
+    return willRevive
+end
 return ____exports

package/dist/types/DefaultMap.d.ts

@@ -1,7 +1,8 @@
-declare type FirstArg<K, V> = Iterable<[K, V]> | V | ((k: K) => V);
-declare type SecondArg<K, V> = V | ((k: K) => V);
+declare type FactoryFunction<K, V, A extends unknown[]> = (k: K, ...extraArgs: A) => V;
+declare type FirstArg<K, V, A extends unknown[]> = Iterable<[K, V]> | V | FactoryFunction<K, V, A>;
+declare type SecondArg<K, V, A extends unknown[]> = V | FactoryFunction<K, V, A>;
 /**
- * An extended Map with two new methods:
+ * An extended Map with some new methods:
  *
  * - `getAndSetDefault` - If the key exists, this will return the same thing as the `get` method.
  *   Otherwise, it will set a default value to the key, and then return the default value.
@@ -20,7 +21,7 @@ declare type SecondArg<K, V> = V | ((k: K) => V);
  *
  * // Initializes a new empty DefaultMap with a default value of a new Map
  * const defaultMapWithFactory = new DefaultMap<string, Map<string, string>>(() => {
- *   return new Map<string, string>();
+ *   return new Map();
  * })
  *
  * // Initializes a DefaultMap with some initial values and a default value of "bar"
@@ -29,25 +30,46 @@ declare type SecondArg<K, V> = V | ((k: K) => V);
  *   ["b1", "b2"],
  * ], "bar");
  * ```
+ *
+ * If specified, the first argument of a factory function must always be equal to the key:
+ *
+ * ```ts
+ * const defaultMapWithConditionalDefaultValue = new DefaultMap<number, number>((key: number) => {
+ *   return isOdd(key) ? 0 : 1;
+ * });
+ * ```
+ *
+ * You can also specify a factory function that takes a generic amount of arguments beyond the
+ * first:
+ *
+ * ```ts
+ * const defaultMapWithExtraArgs = new DefaultMap<string, string>((_key: string, arg2: boolean) => {
+ *   return arg2 ? 0 : 1;
+ * })
+ * ```
  */
-export declare class DefaultMap<K, V> extends Map<K, V> {
+export declare class DefaultMap<K, V, A extends unknown[] = []> extends Map<K, V> {
     private defaultValue;
     private defaultValueFactory;
     /**
      * See the DefaultMap documentation:
      * https://isaacscript.github.io/isaacscript-common/classes/types_DefaultMap.DefaultMap.html
      */
-    constructor(iterableOrDefaultValueOrDefaultValueFactory: FirstArg<K, V>, defaultValueOrDefaultValueFactory?: SecondArg<K, V>);
+    constructor(iterableOrDefaultValueOrDefaultValueFactory: FirstArg<K, V, A>, defaultValueOrDefaultValueFactory?: SecondArg<K, V, A>);
     /**
      * If the key exists, this will return the same thing as the `get` method. Otherwise, it will set
      * a default value to the key, and then return the default value.
      */
-    getAndSetDefault(key: K): V;
+    getAndSetDefault(key: K, ...extraArgs: A): V;
     /**
      * Returns the default value to be used for a new key. (If a factory function was provided during
      * instantiation, this will execute the factory function.)
      */
-    getDefaultValue(key: K): V;
-    getConstructorArg(): V | ((k: K) => V);
+    getDefaultValue(key: K, ...extraArgs: A): V;
+    /**
+     * Helper method for cloning the map. Returns either the default value or a reference to the
+     * factory function.
+     */
+    getConstructorArg(): V | FactoryFunction<K, V, A>;
 }
 export {};

package/dist/types/DefaultMap.lua

@@ -3,13 +3,15 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local Map = ____lualib.Map
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__TypeOf = ____lualib.__TS__TypeOf
 local ____exports = {}
 local parseArguments, parseArgumentsOne, parseArgumentsTwo, parseDefaultValueOrDefaultValueFactory
 function parseArguments(self, firstArg, secondArg)
     return secondArg == nil and parseArgumentsOne(nil, firstArg) or parseArgumentsTwo(nil, firstArg, secondArg)
 end
 function parseArgumentsOne(self, firstArg)
-    local ____parseDefaultValueOrDefaultValueFactory_result_1 = parseDefaultValueOrDefaultValueFactory(nil, firstArg)
+    local arg = firstArg
+    local ____parseDefaultValueOrDefaultValueFactory_result_1 = parseDefaultValueOrDefaultValueFactory(nil, arg)
     local defaultValue = ____parseDefaultValueOrDefaultValueFactory_result_1.defaultValue
     local defaultValueFactory = ____parseDefaultValueOrDefaultValueFactory_result_1.defaultValueFactory
     return {iterable = nil, defaultValue = defaultValue, defaultValueFactory = defaultValueFactory}
@@ -17,7 +19,7 @@ end
 function parseArgumentsTwo(self, firstArg, secondArg)
     local firstArgType = type(firstArg)
     if firstArgType ~= "table" then
-        error("A DefaultMap constructor with two arguments must have the first argument be an array.")
+        error("A DefaultMap constructor with two arguments must have the first argument be the initializer list.")
     end
     local ____parseDefaultValueOrDefaultValueFactory_result_2 = parseDefaultValueOrDefaultValueFactory(nil, secondArg)
     local defaultValue = ____parseDefaultValueOrDefaultValueFactory_result_2.defaultValue
@@ -25,14 +27,13 @@ function parseArgumentsTwo(self, firstArg, secondArg)
     return {iterable = firstArg, defaultValue = defaultValue, defaultValueFactory = defaultValueFactory}
 end
 function parseDefaultValueOrDefaultValueFactory(self, arg)
-    local argType = type(arg)
-    if argType == "function" then
+    if type(arg) == "function" then
         return {defaultValue = nil, defaultValueFactory = arg}
     end
-    if argType == "boolean" or argType == "number" or argType == "string" then
+    if type(arg) == "boolean" or type(arg) == "number" or type(arg) == "string" then
         return {defaultValue = arg, defaultValueFactory = nil}
     end
-    return error("A DefaultMap was instantiated with an unknown type of: " .. argType)
+    return error("A DefaultMap was instantiated with an unknown type of: " .. __TS__TypeOf(arg))
 end
 ____exports.DefaultMap = __TS__Class()
 local DefaultMap = ____exports.DefaultMap
@@ -54,21 +55,21 @@ function DefaultMap.prototype.____constructor(self, iterableOrDefaultValueOrDefa
     self.defaultValue = defaultValue
     self.defaultValueFactory = defaultValueFactory
 end
-function DefaultMap.prototype.getAndSetDefault(self, key)
+function DefaultMap.prototype.getAndSetDefault(self, key, ...)
     local value = self:get(key)
     if value ~= nil then
         return value
     end
-    local defaultValue = self:getDefaultValue(key)
+    local defaultValue = self:getDefaultValue(key, ...)
     self:set(key, defaultValue)
     return defaultValue
 end
-function DefaultMap.prototype.getDefaultValue(self, key)
+function DefaultMap.prototype.getDefaultValue(self, key, ...)
     if self.defaultValue ~= nil then
         return self.defaultValue
     end
     if self.defaultValueFactory ~= nil then
-        return self:defaultValueFactory(key)
+        return self:defaultValueFactory(key, ...)
     end
     return error("A DefaultMap was incorrectly instantiated.")
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.61",
+  "version": "1.2.64",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
     "isaac-typescript-definitions": "^1.0.349",
-    "isaacscript-lint": "^1.0.79",
+    "isaacscript-lint": "^1.0.81",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.12",
     "typescript": "^4.5.5"