isaacscript-common 1.2.64 → 1.2.65

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/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/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

@@ -43,9 +43,8 @@ declare type SecondArg<K, V, A extends unknown[]> = V | FactoryFunction<K, V, A>
  * first:
  *
  * ```ts
- * const defaultMapWithExtraArgs = new DefaultMap<string, string>((_key: string, arg2: boolean) => {
- *   return arg2 ? 0 : 1;
- * })
+ * const factoryFunction = (_key: string, arg2: boolean) => arg2 ? 0 : 1;
+ * const defaultMapWithExtraArgs = new DefaultMap<string, string, [arg2: boolean]>(factoryFunction);
  * ```
  */
 export declare class DefaultMap<K, V, A extends unknown[] = []> extends Map<K, V> {

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.64",
+  "version": "1.2.65",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",