isaacscript-common 1.0.592 → 1.0.596

package/dist/functions/player.d.ts

@@ -142,7 +142,13 @@ export declare function getPlayerNumAllHearts(player: EntityPlayer): int;
  * the player (i.e. Esau & Tainted Soul). False by default.
  */
 export declare function getPlayers(performExclusions?: boolean): EntityPlayer[];
-export declare function getPlayersOfType(playerType: PlayerType): EntityPlayer[];
+/**
+ * Helper function to get all of the players that are a certain character.
+ *
+ * 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 getPlayersOfType(...characters: PlayerType[]): EntityPlayer[];
 /**
  * Helper function to return the active charge and the battery charge combined. This is useful
  * because you are not able to set the battery charge directly.

package/dist/functions/player.lua

@@ -302,11 +302,13 @@ function ____exports.getPlayerNumAllHearts(self, player)
     local rottenHearts = player:GetRottenHearts()
     return hearts + soulHearts + boneHearts + eternalHearts - rottenHearts
 end
-function ____exports.getPlayersOfType(self, playerType)
+function ____exports.getPlayersOfType(self, ...)
+    local characters = {...}
+    local charactersSet = __TS__New(Set, characters)
     local players = {}
     for ____, player in ipairs(____exports.getPlayers(nil)) do
         local character = player:GetPlayerType()
-        if character == playerType then
+        if charactersSet:has(character) then
             __TS__ArrayPush(players, player)
         end
     end

package/dist/functions/ui.d.ts

@@ -5,6 +5,11 @@
  * combination with the `getHUDOffsetVector()` helper function.
  */
 export declare function getHeartsUIWidth(): int;
+/**
+ * Returns how many hearts are in the heart UI row. If the player has more than 6 hearts, this
+ * function will return 6.
+ */
+export declare function getHeartRowLength(player: EntityPlayer): int;
 /**
  * In the options menu, players have the ability to set a HUD offset. However, mods do not have
  * access to this value. To get around this, Mod Config Menu provides a separate HUD offset setting

package/dist/functions/ui.lua

@@ -2,6 +2,14 @@
 local ____exports = {}
 local ____constants = require("constants")
 local UI_HEART_WIDTH = ____constants.UI_HEART_WIDTH
+function ____exports.getHeartRowLength(self, player)
+    local maxHearts = player:GetMaxHearts()
+    local soulHearts = player:GetSoulHearts()
+    local boneHearts = player:GetBoneHearts()
+    local combinedHearts = maxHearts + soulHearts + boneHearts * 2
+    local heartRowLength = combinedHearts / 2
+    return math.min(heartRowLength, 6)
+end
 function ____exports.getScreenBottomRightPos(self)
     local screenWidth = Isaac.GetScreenWidth()
     local screenHeight = Isaac.GetScreenHeight()
@@ -12,18 +20,17 @@ function ____exports.getHeartsUIWidth(self)
     local level = game:GetLevel()
     local curses = level:GetCurses()
     local player = Isaac.GetPlayer()
-    local maxHearts = player:GetMaxHearts()
-    local soulHearts = player:GetSoulHearts()
-    local boneHearts = player:GetBoneHearts()
     local extraLives = player:GetExtraLives()
-    local combinedHearts = maxHearts + soulHearts + boneHearts * 2
-    if combinedHearts > 12 then
-        combinedHearts = 12
+    local effects = player:GetEffects()
+    local hasHolyMantleEffect = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_HOLY_MANTLE)
+    local heartRowLength = ____exports.getHeartRowLength(nil, player)
+    if hasHolyMantleEffect then
+        heartRowLength = heartRowLength + 1
     end
     if curses == LevelCurse.CURSE_OF_THE_UNKNOWN then
-        combinedHearts = 2
+        heartRowLength = 1
     end
-    local width = combinedHearts / 2 * UI_HEART_WIDTH
+    local width = heartRowLength * UI_HEART_WIDTH
     if extraLives > 9 then
         width = width + 20
         if player:HasCollectible(CollectibleType.COLLECTIBLE_GUPPYS_COLLAR) then

package/package.json

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