isaacscript-common 1.2.93 → 1.2.96

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 ____bitwise = require("functions.bitwise")
+local countSetBits = ____bitwise.countSetBits
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____utils = require("functions.utils")
@@ -45,13 +47,18 @@ function getCurrentHealthValue(self, player, healthType)
         local ____cond11 = ____switch11 == HealthType.RED
         if ____cond11 then
             do
-                return player:GetHearts()
+                local rottenHearts = player:GetRottenHearts()
+                local hearts = player:GetHearts()
+                return hearts - rottenHearts * 2
             end
         end
         ____cond11 = ____cond11 or ____switch11 == HealthType.SOUL
         if ____cond11 then
             do
-                return player:GetSoulHearts()
+                local soulHearts = player:GetSoulHearts()
+                local blackHeartsBitmask = player:GetBlackHearts()
+                local blackHearts = countSetBits(nil, blackHeartsBitmask)
+                return soulHearts - blackHearts
             end
         end
         ____cond11 = ____cond11 or ____switch11 == HealthType.ETERNAL
@@ -63,7 +70,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/bitwise.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="isaac-typescript-definitions" />
+export declare function countSetBits(n: int): int;
 export declare function getKBitOfN(k: int, n: int): int;
 export declare function getNumBitsOfN(n: int): int;

package/dist/functions/bitwise.lua

@@ -1,5 +1,13 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
+function ____exports.countSetBits(self, n)
+    local count = 0
+    while n > 0 do
+        n = n & n - 1
+        count = count + 1
+    end
+    return count
+end
 function ____exports.getKBitOfN(self, k, n)
     return n >> k & 1
 end

package/dist/functions/math.d.ts

@@ -13,7 +13,6 @@ export declare function getAngleDifference(angle1: float, angle2: float): float;
  * this can be optionally changed by specifying this argument.
  */
 export declare function getCircleDiscretizedPoints(centerPos: Vector, radius: float, numPoints: int, xMultiplier?: number, yMultiplier?: number, initialDirection?: Direction): Vector[];
-export declare function getSetBits(n: int): int;
 /**
  * Helper function to check if a given position is within a given rectangle. This is an inclusive
  * check, meaning that it will return true if the position is on the border of the rectangle.

package/dist/functions/math.lua

@@ -74,14 +74,6 @@ function ____exports.getCircleDiscretizedPoints(self, centerPos, radius, numPoin
     end
     return positions
 end
-function ____exports.getSetBits(self, n)
-    local count = 0
-    while n > 0 do
-        n = n & n - 1
-        count = count + 1
-    end
-    return count
-end
 function ____exports.inRectangle(self, position, topLeft, bottomRight)
     return position.X >= topLeft.X and position.X <= bottomRight.X and position.Y <= topLeft.Y and position.Y >= bottomRight.Y
 end

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
@@ -73,6 +81,15 @@ export declare function getEffectsList(player: EntityPlayer): TemporaryEffect[];
  * method.
  */
 export declare function getFinalPlayer(): EntityPlayer;
+/**
+ * Returns the number of red hearts that the player has, excluding any rotten 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.GetHearts` method, since that returns a value that
+ * includes rotten hearts.
+ */
+export declare function getHearts(player: EntityPlayer): int;
 /**
  * Helper function that returns the type of the rightmost heart, not including golden hearts since
  * they can't be damaged directly.
@@ -176,6 +193,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

@@ -25,6 +25,7 @@ local ____array = require("functions.array")
 local getLastElement = ____array.getLastElement
 local sumArray = ____array.sumArray
 local ____bitwise = require("functions.bitwise")
+local countSetBits = ____bitwise.countSetBits
 local getKBitOfN = ____bitwise.getKBitOfN
 local getNumBitsOfN = ____bitwise.getNumBitsOfN
 local ____collectibles = require("functions.collectibles")
@@ -90,15 +91,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 ____switch66 = character
+        local ____cond66 = ____switch66 == PlayerType.PLAYER_THESOUL
+        if ____cond66 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
+        ____cond66 = ____cond66 or ____switch66 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond66 then
             do
                 return CollectibleType.COLLECTIBLE_INNER_EYE
             end
@@ -126,39 +127,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 ____switch79 = character
+        local ____cond79 = ____switch79 == PlayerType.PLAYER_BLUEBABY or ____switch79 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond79 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_LAZARUS2
-        if ____cond77 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2
+        if ____cond79 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond77 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond79 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_JACOB
-        if ____cond77 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB
+        if ____cond79 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond77 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond79 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond77 = ____cond77 or ____switch77 == PlayerType.PLAYER_JACOB2_B
-        if ____cond77 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB2_B
+        if ____cond79 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -294,6 +295,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
@@ -339,6 +344,11 @@ function ____exports.getFinalPlayer(self)
     local players = ____exports.getPlayers(nil)
     return getLastElement(nil, players)
 end
+function ____exports.getHearts(self, player)
+    local rottenHearts = player:GetRottenHearts()
+    local hearts = player:GetHearts()
+    return hearts - rottenHearts * 2
+end
 function ____exports.getLastHeart(self, player)
     local hearts = player:GetHearts()
     local effectiveMaxHearts = player:GetEffectiveMaxHearts()
@@ -475,6 +485,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 +588,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 ____switch125 = activeSlot
+        local ____cond125 = ____switch125 == ActiveSlot.SLOT_PRIMARY
+        if ____cond125 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -584,8 +599,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond122 = ____cond122 or ____switch122 == ActiveSlot.SLOT_SECONDARY
-        if ____cond122 then
+        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_SECONDARY
+        if ____cond125 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -600,16 +615,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond122 = ____cond122 or ____switch122 == ActiveSlot.SLOT_POCKET
-        if ____cond122 then
+        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET
+        if ____cond125 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond122 = ____cond122 or ____switch122 == ActiveSlot.SLOT_POCKET2
-        if ____cond122 then
+        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET2
+        if ____cond125 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/rooms.lua

@@ -92,7 +92,7 @@ end
 function ____exports.inDeathCertificateArea(self)
     local roomStageID = ____exports.getRoomStageID(nil)
     local roomSubType = ____exports.getRoomSubType(nil)
-    return roomStageID == 35 and (roomSubType == 33 or roomSubType == 34)
+    return roomStageID == 35 and (roomSubType == 33 or roomSubType == 33)
 end
 function ____exports.changeRoom(self, roomGridIndex)
     local game = Game()
@@ -214,7 +214,7 @@ function ____exports.inCrawlspace(self)
     local room = game:GetRoom()
     local roomType = room:GetType()
     local roomSubType = ____exports.getRoomSubType(nil)
-    return roomType == RoomType.ROOM_DUNGEON and roomSubType ~= 4
+    return roomType == RoomType.ROOM_DUNGEON and roomSubType == 0
 end
 function ____exports.inDevilsCrownTreasureRoom(self)
     local roomDescriptor = ____exports.getCurrentRoomDescriptorReadOnly(nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.93",
+  "version": "1.2.96",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,10 +25,10 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "@zamiell/typescript-to-lua": "^1.4.0",
-    "isaac-typescript-definitions": "^1.0.355",
-    "isaacscript-lint": "^1.0.83",
-    "isaacscript-tsconfig": "^1.1.8",
+    "@zamiell/typescript-to-lua": "1.4.0",
+    "isaac-typescript-definitions": "1.0.354",
+    "isaacscript-lint": "1.0.81",
+    "isaacscript-tsconfig": "1.1.8",
     "typedoc": "^0.22.12",
     "typescript": "4.5.5"
   }