isaacscript-common 1.2.94 → 1.2.95

package/dist/callbacks/postPlayerChangeHealth.lua

@@ -6,6 +6,8 @@ local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, getCurrentHealthValue, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
+local ____math = require("functions.math")
+local countSetBits = ____math.countSetBits
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____utils = require("functions.utils")
@@ -63,7 +65,8 @@ function getCurrentHealthValue(self, player, healthType)
         ____cond11 = ____cond11 or ____switch11 == HealthType.BLACK
         if ____cond11 then
             do
-                return player:GetBlackHearts()
+                local blackHearts = player:GetBlackHearts()
+                return countSetBits(nil, blackHearts)
             end
         end
         ____cond11 = ____cond11 or ____switch11 == HealthType.GOLDEN

package/dist/functions/player.d.ts

@@ -48,6 +48,14 @@ export declare function getAllPlayers(): EntityPlayer[];
  * The formula for calculating it is: 32 - 2.5 * player.TearHeight
  */
 export declare function getAzazelBrimstoneDistance(playerOrTearHeight: EntityPlayer | float): number;
+/**
+ * Returns the number of black hearts that the player has, excluding any soul hearts. For example,
+ * if the player has one full black heart, one full soul heart, and one half black heart, this
+ * function returns 3.
+ *
+ * This is different from the `EntityPlayer.GetBlackHearts` method, since that returns a bitmask.
+ */
+export declare function getBlackHearts(player: EntityPlayer): int;
 /**
  * Returns the maximum heart containers that the provided character can have. Normally, this is 12,
  * but with Keeper it is 3, with Tainted Keeper it is 2. Does not account for Birthright or Mother's
@@ -176,6 +184,15 @@ export declare function getPlayers(performCharacterExclusions?: boolean): Entity
  * for. Returns true if any of the characters supplied are present.
  */
 export declare function getPlayersOfType(...characters: Array<PlayerType | int>): EntityPlayer[];
+/**
+ * Returns the number of soul hearts that the player has, excluding any black hearts. For example,
+ * if the player has one full black heart, one full soul heart, and one half black heart, this
+ * function returns 2.
+ *
+ * This is different from the `EntityPlayer.GetSoulHearts` method, since that returns the combined
+ * number of soul hearts and black hearts.
+ */
+export declare function getSoulHearts(player: EntityPlayer): int;
 /**
  * Helper function to get a parent `EntityPlayer` object for a given `EntitySubPlayer` object. This
  * is useful because calling the `EntityPlayer.GetSubPlayer` method on a sub-player object will

package/dist/functions/player.lua

@@ -31,6 +31,8 @@ local ____collectibles = require("functions.collectibles")
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
 local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local ____math = require("functions.math")
+local countSetBits = ____math.countSetBits
 local ____string = require("functions.string")
 local stringContains = ____string.stringContains
 local trimPrefix = ____string.trimPrefix
@@ -90,15 +92,15 @@ end
 function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
     local character = player:GetPlayerType()
     repeat
-        local ____switch64 = character
-        local ____cond64 = ____switch64 == PlayerType.PLAYER_THESOUL
-        if ____cond64 then
+        local ____switch65 = character
+        local ____cond65 = ____switch65 == PlayerType.PLAYER_THESOUL
+        if ____cond65 then
             do
                 return differentiateForgottenAndSoul and CollectibleType.COLLECTIBLE_SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
             end
         end
-        ____cond64 = ____cond64 or ____switch64 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond64 then
+        ____cond65 = ____cond65 or ____switch65 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond65 then
             do
                 return CollectibleType.COLLECTIBLE_INNER_EYE
             end
@@ -126,39 +128,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch77 = character
-        local ____cond77 = ____switch77 == PlayerType.PLAYER_BLUEBABY or ____switch77 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond77 then
+        local ____switch78 = character
+        local ____cond78 = ____switch78 == PlayerType.PLAYER_BLUEBABY or ____switch78 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond78 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_LAZARUS2
-        if ____cond77 then
+        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_LAZARUS2
+        if ____cond78 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond77 then
+        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond78 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_JACOB
-        if ____cond77 then
+        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_JACOB
+        if ____cond78 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond77 then
+        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond78 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_JACOB2_B
-        if ____cond77 then
+        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_JACOB2_B
+        if ____cond78 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -294,6 +296,10 @@ function ____exports.getAzazelBrimstoneDistance(self, playerOrTearHeight)
     end
     return 32 - 2.5 * tearHeight
 end
+function ____exports.getBlackHearts(self, player)
+    local blackHearts = player:GetBlackHearts()
+    return countSetBits(nil, blackHearts)
+end
 function ____exports.getClosestPlayer(self, position)
     local closestPlayer = nil
     local closestDistance = math.huge
@@ -475,6 +481,11 @@ function ____exports.getPlayersOfType(self, ...)
         end
     )
 end
+function ____exports.getSoulHearts(self, player)
+    local soulHearts = player:GetSoulHearts()
+    local blackHearts = ____exports.getBlackHearts(nil, player)
+    return soulHearts - blackHearts
+end
 function ____exports.getTotalCharge(self, player, activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)
@@ -573,9 +584,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch122 = activeSlot
-        local ____cond122 = ____switch122 == ActiveSlot.SLOT_PRIMARY
-        if ____cond122 then
+        local ____switch124 = activeSlot
+        local ____cond124 = ____switch124 == ActiveSlot.SLOT_PRIMARY
+        if ____cond124 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -584,8 +595,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond122 = ____cond122 or ____switch122 == ActiveSlot.SLOT_SECONDARY
-        if ____cond122 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_SECONDARY
+        if ____cond124 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -600,16 +611,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond122 = ____cond122 or ____switch122 == ActiveSlot.SLOT_POCKET
-        if ____cond122 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET
+        if ____cond124 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond122 = ____cond122 or ____switch122 == ActiveSlot.SLOT_POCKET2
-        if ____cond122 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET2
+        if ____cond124 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/package.json

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