isaacscript-common 4.2.4 → 4.2.5

package/functions/collectibleCacheFlag.lua

@@ -7,8 +7,8 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____collectibles = require("functions.collectibles")
-local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ____collectibleSet = require("functions.collectibleSet")
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____flag = require("functions.flag")
@@ -29,7 +29,7 @@ local CACHE_FLAG_TO_COLLECTIBLES_MAP = __TS__New(Map)
 local function initCacheFlagMap(self)
     for ____, cacheFlag in ipairs(getEnumValues(nil, CacheFlag)) do
         local collectiblesSet = __TS__New(Set)
-        for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
+        for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
             if ____exports.collectibleHasCacheFlag(nil, collectibleType, cacheFlag) then
                 collectiblesSet:add(collectibleType)
             end

package/functions/collectibleSet.lua

@@ -6,9 +6,11 @@ local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
 local ____constantsFirstLast = require("constantsFirstLast")
+local FIRST_COLLECTIBLE_TYPE = ____constantsFirstLast.FIRST_COLLECTIBLE_TYPE
+local LAST_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_COLLECTIBLE_TYPE
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
-local ____collectibles = require("functions.collectibles")
-local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ____utils = require("functions.utils")
+local irange = ____utils.irange
 local ALL_COLLECTIBLES_ARRAY = {}
 local VANILLA_COLLECTIBLES_ARRAY = {}
 local MODDED_COLLECTIBLES_ARRAY = {}
@@ -19,7 +21,8 @@ local function initCollectibleArraysAndSets(self)
     if #ALL_COLLECTIBLES_ARRAY ~= 0 then
         return
     end
-    for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
+    local collectibleTypeRange = irange(nil, FIRST_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE)
+    for ____, collectibleType in ipairs(collectibleTypeRange) do
         do
             local itemConfigItem = itemConfig:GetCollectible(collectibleType)
             if itemConfigItem == nil then

package/functions/collectibleTag.lua

@@ -8,8 +8,8 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitio
 local ItemConfigTag = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigTag
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____collectibles = require("functions.collectibles")
-local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
+local ____collectibleSet = require("functions.collectibleSet")
+local getCollectibleArray = ____collectibleSet.getCollectibleArray
 local ____enums = require("functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____flag = require("functions.flag")
@@ -33,7 +33,7 @@ local function initTagMap(self)
             __TS__New(Set)
         )
     end
-    for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
+    for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
         for ____, itemConfigTag in ipairs(getEnumValues(nil, ItemConfigTag)) do
             do
                 if not ____exports.collectibleHasTag(nil, collectibleType, itemConfigTag) then

package/functions/collectibles.d.ts

@@ -106,15 +106,6 @@ export declare function getCollectibleQuality(collectibleType: CollectibleType):
  * ```
  */
 export declare function getCollectibleTags(collectibleType: CollectibleType): BitFlags<ItemConfigTag>;
-/**
- * Helper function to get an array that represents the range from the first collectible type to the
- * last collectible type. This will include integers that do not represent any valid collectible
- * types.
- *
- * This function is only useful when building collectible type objects. For most purposes, you
- * should use the `getCollectibleSet` helper function instead.
- */
-export declare function getCollectibleTypeRange(): CollectibleType[];
 /**
  * Helper function to get an array that represents the all modded collectible types.
  *

package/functions/collectibles.lua

@@ -311,15 +311,6 @@ function ____exports.getCollectibleTags(self, collectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     return itemConfigItem == nil and ItemConfigTagZero or itemConfigItem.Tags
 end
---- Helper function to get an array that represents the range from the first collectible type to the
--- last collectible type. This will include integers that do not represent any valid collectible
--- types.
--- 
--- This function is only useful when building collectible type objects. For most purposes, you
--- should use the `getCollectibleSet` helper function instead.
-function ____exports.getCollectibleTypeRange(self)
-    return irange(nil, FIRST_COLLECTIBLE_TYPE, LAST_COLLECTIBLE_TYPE)
-end
 --- Helper function to get an array that represents the all modded collectible types.
 -- 
 -- This function is only useful when building collectible type objects. For most purposes, you

package/functions/playerHealth.lua

@@ -20,10 +20,7 @@ local getPlayerBlackHearts = ____player.getPlayerBlackHearts
 local getPlayerHearts = ____player.getPlayerHearts
 local getPlayerSoulHearts = ____player.getPlayerSoulHearts
 local isCharacter = ____player.isCharacter
-local isKeeper = ____player.isKeeper
 local setActiveItem = ____player.setActiveItem
-local ____utils = require("functions.utils")
-local ____repeat = ____utils["repeat"]
 function ____exports.removeAllPlayerHealth(self, player)
     local goldenHearts = player:GetGoldenHearts()
     local eternalHearts = player:GetEternalHearts()
@@ -89,24 +86,15 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
             end
         end
     )
-    if isKeeper(nil, player) then
-        local numCoinsToHeal = playerHealth.hearts / 2
-        player:AddCoins(numCoinsToHeal)
+    player:AddRottenHearts(playerHealth.rottenHearts)
+    if character == PlayerType.MAGDALENE_B then
+        local effectiveHearts = playerHealth.hearts / 2
+        player:AddHearts(effectiveHearts)
     else
-        player:AddRottenHearts(playerHealth.rottenHearts)
-        ____repeat(
-            nil,
-            playerHealth.hearts,
-            function()
-                player:AddHearts(1)
-                if character == PlayerType.MAGDALENE_B then
-                    player:AddHearts(-1)
-                end
-            end
-        )
-        player:AddGoldenHearts(playerHealth.goldenHearts)
-        player:AddBrokenHearts(playerHealth.brokenHearts)
+        player:AddHearts(playerHealth.hearts)
     end
+    player:AddGoldenHearts(playerHealth.goldenHearts)
+    player:AddBrokenHearts(playerHealth.brokenHearts)
     if character == PlayerType.BETHANY then
         player:SetSoulCharge(playerHealth.soulCharges)
     elseif character == PlayerType.BETHANY_B then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "4.2.4",
+  "version": "4.2.5",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",