isaacscript-common 1.0.601 → 1.0.602

package/dist/functions/jsonRoom.lua

@@ -2,56 +2,66 @@
 require("lualib_bundle");
 local ____exports = {}
 local getTotalWeightOfJSONRooms, getJSONRoomWithChosenWeight
+local ____array = require("functions.array")
+local arraySum = ____array.arraySum
 local ____log = require("functions.log")
 local log = ____log.log
 local ____random = require("functions.random")
 local getRandomFloat = ____random.getRandomFloat
 function getTotalWeightOfJSONRooms(self, jsonRooms)
-    local totalWeight = 0
-    for ____, jsonRoom in ipairs(jsonRooms) do
-        local roomWeightString = jsonRoom["$"].weight
-        local roomWeight = tonumber(roomWeightString)
-        if roomWeight == nil then
-            error(("Failed to parse the weight of a room: " .. roomWeightString) .. ".")
+    local weights = __TS__ArrayMap(
+        jsonRooms,
+        function(____, jsonRoom)
+            local roomWeightString = jsonRoom["$"].weight
+            local roomWeight = tonumber(roomWeightString)
+            if roomWeight == nil then
+                error(("Failed to parse the weight of a JSON room: " .. roomWeightString) .. ".")
+            end
+            return roomWeight
         end
-        totalWeight = totalWeight + roomWeight
-    end
-    return totalWeight
+    )
+    return arraySum(nil, weights)
 end
 function getJSONRoomWithChosenWeight(self, jsonRooms, chosenWeight)
     for ____, jsonRoom in ipairs(jsonRooms) do
         local roomWeightString = jsonRoom["$"].weight
         local roomWeight = tonumber(roomWeightString)
         if roomWeight == nil then
-            error("Failed to parse the weight of a room: " .. roomWeightString)
+            error("Failed to parse the weight of a JSON room: " .. roomWeightString)
         end
         if chosenWeight < roomWeight then
             return jsonRoom
         end
         chosenWeight = chosenWeight - roomWeight
     end
-    return error("Failed to get a room with chosen weight: " .. tostring(chosenWeight))
+    return error("Failed to get a JSON room with chosen weight: " .. tostring(chosenWeight))
 end
 function ____exports.getJSONRoomOfVariant(self, jsonRooms, variant)
-    for ____, jsonRoom in ipairs(jsonRooms) do
-        local roomVariantString = jsonRoom["$"].variant
-        local roomVariant = tonumber(roomVariantString)
-        if roomVariant == variant then
-            return jsonRoom
+    local jsonRoomsOfVariant = __TS__ArrayFilter(
+        jsonRooms,
+        function(____, jsonRoom)
+            local roomVariantString = jsonRoom["$"].variant
+            local roomVariant = tonumber(roomVariantString)
+            return roomVariant == variant
         end
+    )
+    if #jsonRoomsOfVariant == 0 then
+        return nil
+    end
+    if #jsonRoomsOfVariant == 1 then
+        return jsonRoomsOfVariant[1]
     end
-    return nil
+    return error(((("Found " .. tostring(#jsonRoomsOfVariant)) .. " JSON rooms with a variant of ") .. tostring(variant)) .. ", when there should only be 1.")
 end
 function ____exports.getJSONRoomsOfSubType(self, jsonRooms, subType)
-    local jsonRoomsOfSubType = {}
-    for ____, jsonRoom in ipairs(jsonRooms) do
-        local roomSubTypeString = jsonRoom["$"].subtype
-        local roomSubType = tonumber(roomSubTypeString)
-        if roomSubType == subType then
-            __TS__ArrayPush(jsonRoomsOfSubType, jsonRoom)
+    return __TS__ArrayFilter(
+        jsonRooms,
+        function(____, jsonRoom)
+            local roomSubTypeString = jsonRoom["$"].subtype
+            local roomSubType = tonumber(roomSubTypeString)
+            return roomSubType == subType
         end
-    end
-    return jsonRoomsOfSubType
+    )
 end
 function ____exports.getRandomJSONRoom(self, jsonRooms, seed, verbose)
     if seed == nil then
@@ -66,7 +76,7 @@ function ____exports.getRandomJSONRoom(self, jsonRooms, seed, verbose)
     end
     local chosenWeight = getRandomFloat(nil, 0, totalWeight, seed)
     if verbose then
-        log("Randomly chose weight: " .. tostring(chosenWeight))
+        log("Randomly chose weight for JSON room: " .. tostring(chosenWeight))
     end
     return getJSONRoomWithChosenWeight(nil, jsonRooms, chosenWeight)
 end

package/dist/functions/npc.lua

@@ -9,14 +9,12 @@ local getEntities = ____entity.getEntities
 local getFilteredNewEntities = ____entity.getFilteredNewEntities
 local getProjectiles = ____entity.getProjectiles
 local removeEntities = ____entity.removeEntities
-function ____exports.getBosses(self)
-    local bosses = {}
-    for ____, npc in ipairs(____exports.getNPCs(nil)) do
-        if npc:IsBoss() then
-            __TS__ArrayPush(bosses, npc)
-        end
-    end
-    return bosses
+function ____exports.getAliveNPCs(self)
+    local npcs = ____exports.getNPCs(nil)
+    return __TS__ArrayFilter(
+        npcs,
+        function(____, npc) return not npc:IsDead() and not ____exports.isAliveExceptionNPC(nil, npc) end
+    )
 end
 function ____exports.getNPCs(self, matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
     if ignoreFriendly == nil then
@@ -92,22 +90,18 @@ function ____exports.fireProjectiles(self, npc, position, velocity, projectilesM
     return getFilteredNewEntities(nil, oldProjectiles, newProjectiles)
 end
 function ____exports.getAliveBosses(self)
-    local aliveBosses = {}
-    for ____, boss in ipairs(____exports.getBosses(nil)) do
-        if not boss:IsDead() and not ____exports.isAliveExceptionNPC(nil, boss) then
-            __TS__ArrayPush(aliveBosses, boss)
-        end
-    end
-    return aliveBosses
+    local aliveNPCs = ____exports.getAliveNPCs(nil)
+    return __TS__ArrayFilter(
+        aliveNPCs,
+        function(____, aliveNPC) return aliveNPC:IsBoss() end
+    )
 end
-function ____exports.getAliveNPCs(self)
-    local aliveNPCs = {}
-    for ____, npc in ipairs(____exports.getNPCs(nil)) do
-        if not npc:IsDead() and not ____exports.isAliveExceptionNPC(nil, npc) then
-            __TS__ArrayPush(aliveNPCs, npc)
-        end
-    end
-    return aliveNPCs
+function ____exports.getBosses(self)
+    local npcs = ____exports.getNPCs(nil)
+    return __TS__ArrayFilter(
+        npcs,
+        function(____, npc) return npc:IsBoss() end
+    )
 end
 function ____exports.removeAllNPCs(self, cap)
     local npcs = ____exports.getNPCs(nil)

package/dist/functions/player.d.ts

@@ -25,7 +25,7 @@ export declare function anyPlayerHasTrinket(trinketType: TrinketType | int): boo
  * This function is variadic, meaning that you can supply as many characters as you want to check
  * for. Returns true if any of the characters supplied are present.
  */
-export declare function anyPlayerIs(...characters: PlayerType[]): boolean;
+export declare function anyPlayerIs(...matchingCharacters: PlayerType[]): boolean;
 /**
  * Helper function to determine if the provided character can have red heart containers. Returns
  * true for characters like Isaac, Magdalene, or Cain. Returns true for Keeper and Tainted Keeper,
@@ -83,6 +83,8 @@ export declare function getPlayerAvailableHeartSlots(player: EntityPlayer): int;
  * Kiss; use the `getPlayerMaxHeartContainers()` function for that.
  */
 export declare function getCharacterMaxHeartContainers(character: PlayerType): int;
+/** Helper function to get an array containing the characters of all of the current players. */
+export declare function getCharacters(): number[];
 /**
  * Iterates over all players and checks if any are close enough to the specified position.
  *

package/dist/functions/player.lua

@@ -29,6 +29,13 @@ function ____exports.getCharacterMaxHeartContainers(self, character)
     end
     return 12
 end
+function ____exports.getCharacters(self)
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArrayMap(
+        players,
+        function(____, player) return player:GetPlayerType() end
+    )
+end
 function ____exports.getPlayerIndex(self, player)
     local character = player:GetPlayerType()
     local collectibleToUse = character == PlayerType.PLAYER_LAZARUS2_B and CollectibleType.COLLECTIBLE_INNER_EYE or CollectibleType.COLLECTIBLE_SAD_ONION
@@ -61,18 +68,18 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue76
+                    goto __continue70
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue76
+                    goto __continue70
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue76
+                    goto __continue70
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue76::
+            ::__continue70::
             i = i + 1
         end
     end
@@ -99,39 +106,34 @@ function ____exports.addTrinketCostume(self, player, trinketType)
     player:AddCostume(itemConfigTrinket, false)
 end
 function ____exports.anyPlayerCloserThan(self, position, distance)
-    for ____, player in ipairs(____exports.getPlayers(nil)) do
-        if player.Position:Distance(position) <= distance then
-            return true
-        end
-    end
-    return false
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArraySome(
+        players,
+        function(____, player) return player.Position:Distance(position) <= distance end
+    )
 end
 function ____exports.anyPlayerHasCollectible(self, collectibleType)
-    for ____, player in ipairs(____exports.getPlayers(nil)) do
-        if player:HasCollectible(collectibleType) then
-            return true
-        end
-    end
-    return false
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArraySome(
+        players,
+        function(____, player) return player:HasCollectible(collectibleType) end
+    )
 end
 function ____exports.anyPlayerHasTrinket(self, trinketType)
-    for ____, player in ipairs(____exports.getPlayers(nil)) do
-        if player:HasTrinket(trinketType) then
-            return true
-        end
-    end
-    return false
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArraySome(
+        players,
+        function(____, player) return player:HasTrinket(trinketType) end
+    )
 end
 function ____exports.anyPlayerIs(self, ...)
-    local characters = {...}
-    local characterSet = __TS__New(Set, characters)
-    for ____, player in ipairs(____exports.getPlayers(nil)) do
-        local character = player:GetPlayerType()
-        if characterSet:has(character) then
-            return true
-        end
-    end
-    return false
+    local matchingCharacters = {...}
+    local matchingCharacterSet = __TS__New(Set, matchingCharacters)
+    local characters = ____exports.getCharacters(nil)
+    return __TS__ArraySome(
+        characters,
+        function(____, character) return matchingCharacterSet:has(character) end
+    )
 end
 function ____exports.characterCanHaveRedHearts(self, character)
     return not CHARACTERS_WITH_NO_RED_HEARTS:has(character)
@@ -282,14 +284,14 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue68
+                    goto __continue62
                 end
                 local playerHash = GetPtrHash(player)
                 if playerHash == playerToFindHash then
                     return i
                 end
             end
-            ::__continue68::
+            ::__continue62::
             i = i + 1
         end
     end
@@ -450,9 +452,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch118 = activeSlot
-        local ____cond118 = ____switch118 == ActiveSlot.SLOT_PRIMARY
-        if ____cond118 then
+        local ____switch112 = activeSlot
+        local ____cond112 = ____switch112 == ActiveSlot.SLOT_PRIMARY
+        if ____cond112 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -461,8 +463,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_SECONDARY
-        if ____cond118 then
+        ____cond112 = ____cond112 or ____switch112 == ActiveSlot.SLOT_SECONDARY
+        if ____cond112 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -477,16 +479,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_POCKET
-        if ____cond118 then
+        ____cond112 = ____cond112 or ____switch112 == ActiveSlot.SLOT_POCKET
+        if ____cond112 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_POCKET2
-        if ____cond118 then
+        ____cond112 = ____cond112 or ____switch112 == ActiveSlot.SLOT_POCKET2
+        if ____cond112 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.601",
+  "version": "1.0.602",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",