isaacscript-common 1.2.95 → 1.2.96

package/dist/callbacks/postPlayerChangeHealth.lua

@@ -6,8 +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 ____bitwise = require("functions.bitwise")
+local countSetBits = ____bitwise.countSetBits
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____utils = require("functions.utils")
@@ -47,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

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

@@ -1,5 +1,4 @@
 /// <reference types="isaac-typescript-definitions" />
-export declare function countSetBits(n: int): int;
 export declare function getAngleDifference(angle1: float, angle2: float): float;
 /**
  * Helper function to get an array of equidistant points on the circumference around a circle.

package/dist/functions/math.lua

@@ -7,33 +7,33 @@ local ____utils = require("functions.utils")
 local ensureAllCases = ____utils.ensureAllCases
 function getCircleInitialPosition(self, direction, radius)
     repeat
-        local ____switch8 = direction
-        local ____cond8 = ____switch8 == Direction.NO_DIRECTION
-        if ____cond8 then
+        local ____switch6 = direction
+        local ____cond6 = ____switch6 == Direction.NO_DIRECTION
+        if ____cond6 then
             do
                 return Vector.Zero
             end
         end
-        ____cond8 = ____cond8 or ____switch8 == Direction.LEFT
-        if ____cond8 then
+        ____cond6 = ____cond6 or ____switch6 == Direction.LEFT
+        if ____cond6 then
             do
                 return Vector(-radius, 0)
             end
         end
-        ____cond8 = ____cond8 or ____switch8 == Direction.UP
-        if ____cond8 then
+        ____cond6 = ____cond6 or ____switch6 == Direction.UP
+        if ____cond6 then
             do
                 return Vector(0, -radius)
             end
         end
-        ____cond8 = ____cond8 or ____switch8 == Direction.RIGHT
-        if ____cond8 then
+        ____cond6 = ____cond6 or ____switch6 == Direction.RIGHT
+        if ____cond6 then
             do
                 return Vector(radius, 0)
             end
         end
-        ____cond8 = ____cond8 or ____switch8 == Direction.DOWN
-        if ____cond8 then
+        ____cond6 = ____cond6 or ____switch6 == Direction.DOWN
+        if ____cond6 then
             do
                 return Vector(0, radius)
             end
@@ -45,14 +45,6 @@ function getCircleInitialPosition(self, direction, radius)
         end
     until true
 end
-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.getAngleDifference(self, angle1, angle2)
     local subtractedAngle = angle1 - angle2
     return (subtractedAngle + 180) % 360 - 180

package/dist/functions/player.d.ts

@@ -81,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.

package/dist/functions/player.lua

@@ -25,14 +25,13 @@ 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")
 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
@@ -92,15 +91,15 @@ end
 function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
     local character = player:GetPlayerType()
     repeat
-        local ____switch65 = character
-        local ____cond65 = ____switch65 == PlayerType.PLAYER_THESOUL
-        if ____cond65 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
-        ____cond65 = ____cond65 or ____switch65 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond65 then
+        ____cond66 = ____cond66 or ____switch66 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond66 then
             do
                 return CollectibleType.COLLECTIBLE_INNER_EYE
             end
@@ -128,39 +127,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch78 = character
-        local ____cond78 = ____switch78 == PlayerType.PLAYER_BLUEBABY or ____switch78 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond78 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
-        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_LAZARUS2
-        if ____cond78 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2
+        if ____cond79 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond78 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond79 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_JACOB
-        if ____cond78 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB
+        if ____cond79 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond78 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond79 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond78 = ____cond78 or ____switch78 == PlayerType.PLAYER_JACOB2_B
-        if ____cond78 then
+        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB2_B
+        if ____cond79 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -345,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()
@@ -584,9 +588,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch124 = activeSlot
-        local ____cond124 = ____switch124 == ActiveSlot.SLOT_PRIMARY
-        if ____cond124 then
+        local ____switch125 = activeSlot
+        local ____cond125 = ____switch125 == ActiveSlot.SLOT_PRIMARY
+        if ____cond125 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -595,8 +599,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_SECONDARY
-        if ____cond124 then
+        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_SECONDARY
+        if ____cond125 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -611,16 +615,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET
-        if ____cond124 then
+        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET
+        if ____cond125 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET2
-        if ____cond124 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.95",
+  "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"
   }