isaacscript-common 1.0.593 → 1.0.597

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/stage.d.ts

@@ -11,6 +11,7 @@ export declare function getStage(): LevelStage;
 export declare function getStageType(): StageType;
 /** Helper function to directly warp to a specific stage using the "stage" console command. */
 export declare function goToStage(stage: LevelStage, stageType: StageType): void;
+export declare function isRepentanceStage(stageType: int): boolean;
 export declare function onCathedral(): boolean;
 export declare function onChest(): boolean;
 export declare function onDarkRoom(): boolean;

package/dist/functions/stage.lua

@@ -2,47 +2,50 @@
 local ____exports = {}
 local ____util = require("functions.util")
 local ensureAllCases = ____util.ensureAllCases
+function ____exports.isRepentanceStage(self, stageType)
+    return stageType == StageType.STAGETYPE_REPENTANCE or stageType == StageType.STAGETYPE_REPENTANCE_B
+end
 function ____exports.onRepentanceStage(self)
     local game = Game()
     local level = game:GetLevel()
     local stageType = level:GetStageType()
-    return stageType == StageType.STAGETYPE_REPENTANCE or stageType == StageType.STAGETYPE_REPENTANCE_B
+    return ____exports.isRepentanceStage(nil, stageType)
 end
 function ____exports.stageTypeToLetter(self, stageType)
     repeat
-        local ____switch14 = stageType
-        local ____cond14 = ____switch14 == StageType.STAGETYPE_ORIGINAL
-        if ____cond14 then
+        local ____switch15 = stageType
+        local ____cond15 = ____switch15 == StageType.STAGETYPE_ORIGINAL
+        if ____cond15 then
             do
                 return ""
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_WOTL
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_WOTL
+        if ____cond15 then
             do
                 return "a"
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_AFTERBIRTH
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_AFTERBIRTH
+        if ____cond15 then
             do
                 return "b"
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_GREEDMODE
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_GREEDMODE
+        if ____cond15 then
             do
                 return ""
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_REPENTANCE
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_REPENTANCE
+        if ____cond15 then
             do
                 return "c"
             end
         end
-        ____cond14 = ____cond14 or ____switch14 == StageType.STAGETYPE_REPENTANCE_B
-        if ____cond14 then
+        ____cond15 = ____cond15 or ____switch15 == StageType.STAGETYPE_REPENTANCE_B
+        if ____cond15 then
             do
                 return "d"
             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

@@ -1,20 +1,14 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local getHeartRowLength
 local ____constants = require("constants")
 local UI_HEART_WIDTH = ____constants.UI_HEART_WIDTH
-function getHeartRowLength(self, player)
-    local game = Game()
-    local level = game:GetLevel()
-    local curses = level:GetCurses()
+function ____exports.getHeartRowLength(self, player)
     local maxHearts = player:GetMaxHearts()
     local soulHearts = player:GetSoulHearts()
     local boneHearts = player:GetBoneHearts()
-    if curses == LevelCurse.CURSE_OF_THE_UNKNOWN then
-        return 1
-    end
     local combinedHearts = maxHearts + soulHearts + boneHearts * 2
-    return math.max(combinedHearts / 2, 6)
+    local heartRowLength = combinedHearts / 2
+    return math.min(heartRowLength, 6)
 end
 function ____exports.getScreenBottomRightPos(self)
     local screenWidth = Isaac.GetScreenWidth()
@@ -22,11 +16,20 @@ function ____exports.getScreenBottomRightPos(self)
     return Vector(screenWidth, screenHeight)
 end
 function ____exports.getHeartsUIWidth(self)
+    local game = Game()
+    local level = game:GetLevel()
+    local curses = level:GetCurses()
     local player = Isaac.GetPlayer()
     local extraLives = player:GetExtraLives()
     local effects = player:GetEffects()
     local hasHolyMantleEffect = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_HOLY_MANTLE)
-    local heartRowLength = getHeartRowLength(nil, player)
+    local heartRowLength = ____exports.getHeartRowLength(nil, player)
+    if hasHolyMantleEffect then
+        heartRowLength = heartRowLength + 1
+    end
+    if curses == LevelCurse.CURSE_OF_THE_UNKNOWN then
+        heartRowLength = 1
+    end
     local width = heartRowLength * UI_HEART_WIDTH
     if extraLives > 9 then
         width = width + 20
@@ -39,9 +42,6 @@ function ____exports.getHeartsUIWidth(self)
             width = width + 4
         end
     end
-    if hasHolyMantleEffect then
-        width = width + UI_HEART_WIDTH
-    end
     return width
 end
 function ____exports.getHUDOffsetVector(self)

package/dist/lualib_bundle.lua

@@ -1335,6 +1335,15 @@ Map = Map
 
 __TS__MathAtan2 = math.atan2 or math.atan
 
+function __TS__MathSign(val)
+    if val > 0 then
+        return 1
+    elseif val < 0 then
+        return -1
+    end
+    return 0
+end
+
 function __TS__Number(value)
     local valueType = type(value)
     if valueType == "number" then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.593",
+  "version": "1.0.597",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -28,8 +28,8 @@
     "isaac-typescript-definitions": "^1.0.331",
     "isaacscript-lint": "^1.0.79",
     "isaacscript-tsconfig": "^1.1.8",
-    "typedoc": "^0.22.10",
-    "typescript": "^4.5.4",
-    "typescript-to-lua": "^1.3.1"
+    "typedoc": "^0.22.11",
+    "typescript": "^4.5.5",
+    "typescript-to-lua": "^1.3.3"
   }
 }