isaacscript-common 1.2.62 → 1.2.65

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/constants.d.ts

@@ -102,6 +102,7 @@ export declare const MAX_PLAYER_TRINKET_SLOTS = 2;
 export declare const MAX_ROOM_INDEX = 168;
 export declare const MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B;
 export declare const MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING;
+export declare const NUM_DIMENSIONS = 3;
 export declare const SECOND_IN_MILLISECONDS = 1000;
 export declare const MINUTE_IN_MILLISECONDS: number;
 export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;

package/dist/constants.lua

@@ -88,6 +88,7 @@ ____exports.MAX_PLAYER_TRINKET_SLOTS = 2
 ____exports.MAX_ROOM_INDEX = 168
 ____exports.MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B
 ____exports.MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING
+____exports.NUM_DIMENSIONS = 3
 ____exports.SECOND_IN_MILLISECONDS = 1000
 ____exports.MINUTE_IN_MILLISECONDS = 60 * ____exports.SECOND_IN_MILLISECONDS
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135

package/dist/features/deployJSONRoom.lua

@@ -23,6 +23,8 @@ local ____jsonRoom = require("functions.jsonRoom")
 local getRandomJSONRoom = ____jsonRoom.getRandomJSONRoom
 local ____log = require("functions.log")
 local log = ____log.log
+local ____math = require("functions.math")
+local range = ____math.range
 local ____npc = require("functions.npc")
 local getNPCs = ____npc.getNPCs
 local ____random = require("functions.random")
@@ -121,24 +123,20 @@ function fillRoomWithDecorations(self)
     local gridSize = room:GetGridSize()
     local roomListIndex = getRoomListIndex(nil)
     local decorationGridIndexes = v.level.roomToDecorationGridIndexesMap:getAndSetDefault(roomListIndex)
-    do
-        local gridIndex = 0
-        while gridIndex < gridSize do
-            do
-                local existingGridEntity = room:GetGridEntity(gridIndex)
-                if existingGridEntity ~= nil then
-                    goto __continue33
-                end
-                local position = room:GetGridPosition(gridIndex)
-                local decoration = Isaac.GridSpawn(GridEntityType.GRID_DECORATION, 0, position, true)
-                if decoration ~= nil then
-                    setGridEntityInvisible(nil, decoration)
-                end
-                __TS__ArrayPush(decorationGridIndexes, gridIndex)
+    for ____, gridIndex in ipairs(range(nil, 0, gridSize - 1)) do
+        do
+            local existingGridEntity = room:GetGridEntity(gridIndex)
+            if existingGridEntity ~= nil then
+                goto __continue33
+            end
+            local position = room:GetGridPosition(gridIndex)
+            local decoration = Isaac.GridSpawn(GridEntityType.GRID_DECORATION, 0, position, true)
+            if decoration ~= nil then
+                setGridEntityInvisible(nil, decoration)
             end
-            ::__continue33::
-            gridIndex = gridIndex + 1
+            __TS__ArrayPush(decorationGridIndexes, gridIndex)
         end
+        ::__continue33::
     end
 end
 function spawnAllEntities(self, jsonRoom, seed, verbose)

package/dist/functions/collectibleCacheFlag.lua

@@ -9,6 +9,8 @@ local ____exports = {}
 local ____collectibles = require("functions.collectibles")
 local collectibleHasCacheFlag = ____collectibles.collectibleHasCacheFlag
 local getMaxCollectibleID = ____collectibles.getMaxCollectibleID
+local ____math = require("functions.math")
+local range = ____math.range
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local ____utils = require("functions.utils")
@@ -18,13 +20,9 @@ local function initCacheFlagMap(self)
     local maxCollectibleID = getMaxCollectibleID(nil)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local collectiblesSet = __TS__New(Set)
-        do
-            local collectibleType = 1
-            while collectibleType <= maxCollectibleID do
-                if collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
-                    collectiblesSet:add(collectibleType)
-                end
-                collectibleType = collectibleType + 1
+        for ____, collectibleType in ipairs(range(nil, 1, maxCollectibleID)) do
+            if collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
+                collectiblesSet:add(collectibleType)
             end
         end
         CACHE_FLAG_TO_COLLECTIBLES_MAP:set(cacheFlag, collectiblesSet)

package/dist/functions/collectibleSet.lua

@@ -5,20 +5,18 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____collectibles = require("functions.collectibles")
 local getMaxCollectibleID = ____collectibles.getMaxCollectibleID
+local ____math = require("functions.math")
+local range = ____math.range
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local COLLECTIBLE_SET = __TS__New(Set)
 local function initCollectibleSet(self)
     local itemConfig = Isaac.GetItemConfig()
     local maxCollectibleID = getMaxCollectibleID(nil)
-    do
-        local collectibleType = 1
-        while collectibleType <= maxCollectibleID do
-            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
-            if itemConfigItem ~= nil then
-                COLLECTIBLE_SET:add(collectibleType)
-            end
-            collectibleType = collectibleType + 1
+    for ____, collectibleType in ipairs(range(nil, 1, maxCollectibleID)) do
+        local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+        if itemConfigItem ~= nil then
+            COLLECTIBLE_SET:add(collectibleType)
         end
     end
 end

package/dist/functions/gridEntity.lua

@@ -15,6 +15,7 @@ local DEFAULT_TOP_LEFT_WALL_GRID_INDEX = ____roomShapeToTopLeftWallGridIndexMap.
 local ROOM_SHAPE_TO_TOP_LEFT_WALL_GRID_INDEX_MAP = ____roomShapeToTopLeftWallGridIndexMap.ROOM_SHAPE_TO_TOP_LEFT_WALL_GRID_INDEX_MAP
 local ____math = require("functions.math")
 local isCircleIntersectingRectangle = ____math.isCircleIntersectingRectangle
+local range = ____math.range
 local ____rooms = require("functions.rooms")
 local roomUpdateSafe = ____rooms.roomUpdateSafe
 local ____sprite = require("functions.sprite")
@@ -101,26 +102,22 @@ function ____exports.getGridEntities(self, ...)
     local gridSize = room:GetGridSize()
     local gridEntityTypesSet = __TS__New(Set, gridEntityTypes)
     local gridEntities = {}
-    do
-        local gridIndex = 0
-        while gridIndex < gridSize do
-            do
-                local gridEntity = room:GetGridEntity(gridIndex)
-                if gridEntity == nil then
-                    goto __continue10
-                end
-                if #gridEntityTypes == 0 then
+    for ____, gridIndex in ipairs(range(nil, 0, gridSize - 1)) do
+        do
+            local gridEntity = room:GetGridEntity(gridIndex)
+            if gridEntity == nil then
+                goto __continue10
+            end
+            if #gridEntityTypes == 0 then
+                __TS__ArrayPush(gridEntities, gridEntity)
+            else
+                local thisGridEntityType = gridEntity:GetType()
+                if gridEntityTypesSet:has(thisGridEntityType) then
                     __TS__ArrayPush(gridEntities, gridEntity)
-                else
-                    local thisGridEntityType = gridEntity:GetType()
-                    if gridEntityTypesSet:has(thisGridEntityType) then
-                        __TS__ArrayPush(gridEntities, gridEntity)
-                    end
                 end
             end
-            ::__continue10::
-            gridIndex = gridIndex + 1
         end
+        ::__continue10::
     end
     return gridEntities
 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/pocketItems.lua

@@ -8,6 +8,8 @@ local ____constants = require("constants")
 local MAX_PLAYER_POCKET_ITEM_SLOTS = ____constants.MAX_PLAYER_POCKET_ITEM_SLOTS
 local ____PocketItemType = require("types.PocketItemType")
 local PocketItemType = ____PocketItemType.PocketItemType
+local ____math = require("functions.math")
+local range = ____math.range
 function ____exports.getPocketItems(self, player)
     local pocketItem = player:GetActiveItem(ActiveSlot.SLOT_POCKET)
     local hasPocketItem = pocketItem ~= CollectibleType.COLLECTIBLE_NULL
@@ -17,30 +19,26 @@ function ____exports.getPocketItems(self, player)
     local pocketItems = {}
     local pocketItemIdentified = false
     local pocketItem2Identified = false
-    do
-        local slot = 0
-        while slot < MAX_PLAYER_POCKET_ITEM_SLOTS do
-            local card = player:GetCard(slot)
-            local pill = player:GetPill(slot)
-            if card ~= Card.CARD_NULL then
-                __TS__ArrayPush(pocketItems, {type = PocketItemType.CARD, id = card, slot = slot})
-            elseif pill ~= PillColor.PILL_NULL then
-                __TS__ArrayPush(pocketItems, {type = PocketItemType.PILL, id = pill, slot = slot})
-            elseif hasPocketItem and not hasPocketItem2 and not pocketItemIdentified then
-                pocketItemIdentified = true
-                __TS__ArrayPush(pocketItems, {type = PocketItemType.ACTIVE_ITEM, id = pocketItem, slot = slot})
-            elseif not hasPocketItem and hasPocketItem2 and not pocketItem2Identified then
-                pocketItem2Identified = true
-                __TS__ArrayPush(pocketItems, {type = PocketItemType.DICE_BAG_DICE, id = pocketItem2, slot = slot})
-            elseif hasPocketItem and hasPocketItem2 then
-                __TS__ArrayPush(pocketItems, {type = PocketItemType.UNDETERMINABLE, id = 0, slot = slot})
-            else
-                __TS__ArrayPush(pocketItems, {type = PocketItemType.EMPTY, id = 0, slot = slot})
-            end
-            if slot + 1 == maxPocketItems then
-                break
-            end
-            slot = slot + 1
+    for ____, slot in ipairs(range(nil, 0, MAX_PLAYER_POCKET_ITEM_SLOTS - 1)) do
+        local card = player:GetCard(slot)
+        local pillColor = player:GetPill(slot)
+        if card ~= Card.CARD_NULL then
+            __TS__ArrayPush(pocketItems, {slot = slot, type = PocketItemType.CARD, subType = card})
+        elseif pillColor ~= PillColor.PILL_NULL then
+            __TS__ArrayPush(pocketItems, {slot = slot, type = PocketItemType.PILL, subType = pillColor})
+        elseif hasPocketItem and not hasPocketItem2 and not pocketItemIdentified then
+            pocketItemIdentified = true
+            __TS__ArrayPush(pocketItems, {slot = slot, type = PocketItemType.ACTIVE_ITEM, subType = pocketItem})
+        elseif not hasPocketItem and hasPocketItem2 and not pocketItem2Identified then
+            pocketItem2Identified = true
+            __TS__ArrayPush(pocketItems, {slot = slot, type = PocketItemType.DICE_BAG_DICE, subType = pocketItem2})
+        elseif hasPocketItem and hasPocketItem2 then
+            __TS__ArrayPush(pocketItems, {slot = slot, type = PocketItemType.UNDETERMINABLE, subType = 0})
+        else
+            __TS__ArrayPush(pocketItems, {slot = slot, type = PocketItemType.EMPTY, subType = 0})
+        end
+        if slot + 1 == maxPocketItems then
+            break
         end
     end
     return pocketItems

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/functions/rooms.lua

@@ -13,6 +13,7 @@ local ____constants = require("constants")
 local GENESIS_ROOM_SUBTYPE = ____constants.GENESIS_ROOM_SUBTYPE
 local GENESIS_ROOM_VARIANT = ____constants.GENESIS_ROOM_VARIANT
 local MAX_ROOM_INDEX = ____constants.MAX_ROOM_INDEX
+local NUM_DIMENSIONS = ____constants.NUM_DIMENSIONS
 local ____doors = require("functions.doors")
 local closeAllDoors = ____doors.closeAllDoors
 local getDoors = ____doors.getDoors
@@ -26,6 +27,8 @@ local setEntityPositions = ____entity.setEntityPositions
 local setEntityVelocities = ____entity.setEntityVelocities
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
+local ____math = require("functions.math")
+local range = ____math.range
 function ____exports.getCurrentRoomDescriptorReadOnly(self)
     local game = Game()
     local level = game:GetLevel()
@@ -116,15 +119,11 @@ function ____exports.getCurrentDimension(self)
     local startingRoomGridIndex = level:GetStartingRoomIndex()
     local startingRoomDesc = level:GetRoomByIdx(startingRoomGridIndex, -1)
     local startingRoomHash = GetPtrHash(startingRoomDesc)
-    do
-        local dimension = 0
-        while dimension <= 2 do
-            local dimensionRoomDesc = level:GetRoomByIdx(startingRoomGridIndex, dimension)
-            local dimensionRoomHash = GetPtrHash(dimensionRoomDesc)
-            if dimensionRoomHash == startingRoomHash then
-                return dimension
-            end
-            dimension = dimension + 1
+    for ____, dimension in ipairs(range(nil, 0, NUM_DIMENSIONS - 1)) do
+        local dimensionRoomDesc = level:GetRoomByIdx(startingRoomGridIndex, dimension)
+        local dimensionRoomHash = GetPtrHash(dimensionRoomDesc)
+        if dimensionRoomHash == startingRoomHash then
+            return dimension
         end
     end
     return error("Failed to get the current dimension using the starting room index of: " .. tostring(startingRoomGridIndex))
@@ -298,12 +297,12 @@ function ____exports.setRoomCleared(self)
     for ____, door in ipairs(getDoors(nil)) do
         do
             if isHiddenSecretRoomDoor(nil, door) then
-                goto __continue55
+                goto __continue56
             end
             openDoorFast(nil, door)
             door.ExtraVisible = false
         end
-        ::__continue55::
+        ::__continue56::
     end
     sfx:Stop(SoundEffect.SOUND_DOOR_HEAVY_OPEN)
     game:ShakeScreen(0)

package/dist/functions/transformations.lua

@@ -10,6 +10,8 @@ local TRANSFORMATION_NAME_MAP = ____transformationNameMap.TRANSFORMATION_NAME_MA
 local ____collectibles = require("functions.collectibles")
 local collectibleHasTag = ____collectibles.collectibleHasTag
 local getMaxCollectibleID = ____collectibles.getMaxCollectibleID
+local ____math = require("functions.math")
+local range = ____math.range
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local TRANSFORMATION_TO_TAG_MAP = __TS__New(Map, {
@@ -38,31 +40,27 @@ local function initMaps(self)
             __TS__New(Set)
         )
     end
-    do
-        local collectibleType = 1
-        while collectibleType <= maxCollectibleID do
-            for ____, ____value in __TS__Iterator(TRANSFORMATION_TO_TAG_MAP:entries()) do
-                local playerForm = ____value[1]
-                local tag = ____value[2]
-                do
-                    if not collectibleHasTag(nil, collectibleType, tag) then
-                        goto __continue6
-                    end
-                    local collectibleTypesSet = TRANSFORMATION_TO_COLLECTIBLE_TYPES_MAP:get(playerForm)
-                    if collectibleTypesSet == nil then
-                        error("Failed to get the collectible types for transformation: " .. tostring(playerForm))
-                    end
-                    collectibleTypesSet:add(collectibleType)
-                    local transformations = COLLECTIBLE_TYPE_TO_TRANSFORMATION_MAP:get(collectibleType)
-                    if transformations == nil then
-                        transformations = __TS__New(Set)
-                        COLLECTIBLE_TYPE_TO_TRANSFORMATION_MAP:set(collectibleType, transformations)
-                    end
-                    transformations:add(playerForm)
+    for ____, collectibleType in ipairs(range(nil, 1, maxCollectibleID)) do
+        for ____, ____value in __TS__Iterator(TRANSFORMATION_TO_TAG_MAP:entries()) do
+            local playerForm = ____value[1]
+            local tag = ____value[2]
+            do
+                if not collectibleHasTag(nil, collectibleType, tag) then
+                    goto __continue6
                 end
-                ::__continue6::
+                local collectibleTypesSet = TRANSFORMATION_TO_COLLECTIBLE_TYPES_MAP:get(playerForm)
+                if collectibleTypesSet == nil then
+                    error("Failed to get the collectible types for transformation: " .. tostring(playerForm))
+                end
+                collectibleTypesSet:add(collectibleType)
+                local transformations = COLLECTIBLE_TYPE_TO_TRANSFORMATION_MAP:get(collectibleType)
+                if transformations == nil then
+                    transformations = __TS__New(Set)
+                    COLLECTIBLE_TYPE_TO_TRANSFORMATION_MAP:set(collectibleType, transformations)
+                end
+                transformations:add(playerForm)
             end
-            collectibleType = collectibleType + 1
+            ::__continue6::
         end
     end
 end

package/dist/functions/trinketCacheFlag.lua

@@ -5,6 +5,8 @@ local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
+local ____math = require("functions.math")
+local range = ____math.range
 local ____set = require("functions.set")
 local copySet = ____set.copySet
 local ____trinkets = require("functions.trinkets")
@@ -17,13 +19,9 @@ local function initCacheFlagMap(self)
     local maxTrinketID = getMaxTrinketID(nil)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local trinketsSet = __TS__New(Set)
-        do
-            local trinketType = 1
-            while trinketType <= maxTrinketID do
-                if trinketHasCacheFlag(nil, trinketType, cacheFlag) then
-                    trinketsSet:add(trinketType)
-                end
-                trinketType = trinketType + 1
+        for ____, trinketType in ipairs(range(nil, 1, maxTrinketID)) do
+            if trinketHasCacheFlag(nil, trinketType, cacheFlag) then
+                trinketsSet:add(trinketType)
             end
         end
         CACHE_FLAG_TO_TRINKETS_MAP:set(cacheFlag, trinketsSet)

package/dist/types/DefaultMap.d.ts

@@ -1,6 +1,6 @@
-declare type FactoryFunction<K, V> = (k: K) => V;
-declare type FirstArg<K, V> = Iterable<[K, V]> | V | FactoryFunction<K, V>;
-declare type SecondArg<K, V> = V | FactoryFunction<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 some new methods:
  *
@@ -31,36 +31,44 @@ declare type SecondArg<K, V> = V | FactoryFunction<K, V>;
  * ], "bar");
  * ```
  *
- * If specified, the first argument of a factory function must be equal to the key:
+ * 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 factoryFunction = (_key: string, arg2: boolean) => arg2 ? 0 : 1;
+ * const defaultMapWithExtraArgs = new DefaultMap<string, string, [arg2: boolean]>(factoryFunction);
+ * ```
  */
-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;
+    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>;
+    getConstructorArg(): V | FactoryFunction<K, V, A>;
 }
 export {};

package/dist/types/DefaultMap.lua

@@ -55,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/dist/types/PocketItemDescription.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="isaac-typescript-definitions" />
 import { PocketItemType } from "./PocketItemType";
 export interface PocketItemDescription {
-    type: PocketItemType;
-    id: int;
     slot: PocketItemSlot;
+    type: PocketItemType;
+    subType: int;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.62",
+  "version": "1.2.65",
   "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"