isaacscript-common 1.0.529 → 1.0.533

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -2,6 +2,7 @@
 local ____exports = {}
 local hasSubscriptions, entityTakeDmgPlayer, damageIsFatal
 local ____player = require("functions.player")
+local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
 local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
 local hasLostCurse = ____player.hasLostCurse
 local ____revive = require("functions.revive")
@@ -41,6 +42,10 @@ function damageIsFatal(self, player, damageAmount)
     if damageAmount < playerNumAllHearts then
         return false
     end
+    local playerAvailableHeartSlots = getPlayerAvailableHeartSlots(nil, player)
+    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and (playerAvailableHeartSlots >= 2) then
+        return false
+    end
     local hearts = player:GetHearts()
     local eternalHearts = player:GetEternalHearts()
     local soulHearts = player:GetSoulHearts()

package/dist/functions/player.d.ts

@@ -47,6 +47,7 @@ export declare function getClosestPlayer(position: Vector): EntityPlayer;
  * Tainted Forgotten have a 20 frame death animation (i.e. the "ForgottenDeath" animation).
  */
 export declare function getDeathAnimationName(player: EntityPlayer): string;
+export declare function getFinalPlayer(): EntityPlayer;
 /**
  * Helper function that returns the type of the rightmost heart, not including golden hearts since
  * they can't be damaged directly.
@@ -58,7 +59,18 @@ export declare function getLastHeart(player: EntityPlayer): HealthType;
  * will be spawned on the same frame.
  */
 export declare function getNewestPlayer(): EntityPlayer;
-export declare function getFinalPlayer(): EntityPlayer;
+/**
+ * Returns the number of slots that the player has remaining for heart containers, accounting for
+ * broken hearts. For example, if the player is Judas and has 1 red heart containers and 2 full soul
+ * hearts and 3 broken hearts, then this function would return 6 (i.e. 12 - 1 - 2 - 3).
+ */
+export declare function getPlayerAvailableHeartSlots(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
+ * Kiss; use the `getPlayerMaxHeartContainers()` function for that.
+ */
+export declare function getCharacterMaxHeartContainers(character: PlayerType): int;
 /**
  * Iterates over all players and checks if any are close enough to the specified position.
  *
@@ -71,15 +83,6 @@ export declare function getPlayerCloserThan(position: Vector, distance: float):
  */
 export declare function getPlayerCollectibleMap(player: EntityPlayer): Map<CollectibleType | int, int>;
 export declare function getPlayerFromIndex(playerIndex: PlayerIndex): EntityPlayer | undefined;
-/**
- * This function always excludes players with a non-undefined parent, since they are not real
- * players. (e.g. the Strawman Keeper)
- *
- * @param performExclusions Whether or not to exclude characters that are not directly controlled by
- * the player (i.e. Esau & Tainted Soul). False by default.
- */
-export declare function getPlayers(performExclusions?: boolean): EntityPlayer[];
-export declare function getPlayersOfType(playerType: PlayerType): EntityPlayer[];
 /**
  * Mods often have to track variables relating to the player. In naive mods, information will only
  * be stored about the first player. However, in order to be robust, mods must handle up to 4
@@ -108,11 +111,26 @@ export declare function getPlayerIndex(player: EntityPlayer): PlayerIndex;
  * `Isaac.GetPlayer()` function.
  */
 export declare function getPlayerIndexVanilla(playerToFind: EntityPlayer): int | undefined;
+/**
+ * Returns the maximum heart containers that the provided player can have. Normally, this is 12, but
+ * it can change depending on the character (e.g. Keeper) and other things (e.g. Mother's Kiss).
+ * Does not account for Broken Hearts; use the `getPlayerAvailableHeartSlots()` function for that.
+ */
+export declare function getPlayerMaxHeartContainers(player: EntityPlayer): int;
 /**
  * Returns the combined value of all of the player's red hearts, soul/black hearts, and bone hearts.
  * This is equivalent to the number of hits that the player can currently take.
  */
 export declare function getPlayerNumAllHearts(player: EntityPlayer): int;
+/**
+ * This function always excludes players with a non-undefined parent, since they are not real
+ * players. (e.g. the Strawman Keeper)
+ *
+ * @param performExclusions Whether or not to exclude characters that are not directly controlled by
+ * 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 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

@@ -6,6 +6,7 @@ local ____constants = require("constants")
 local CHARACTERS_WITH_NO_RED_HEARTS = ____constants.CHARACTERS_WITH_NO_RED_HEARTS
 local CHARACTERS_WITH_NO_SOUL_HEARTS = ____constants.CHARACTERS_WITH_NO_SOUL_HEARTS
 local LOST_STYLE_PLAYER_TYPES = ____constants.LOST_STYLE_PLAYER_TYPES
+local MAX_PLAYER_HEART_CONTAINERS = ____constants.MAX_PLAYER_HEART_CONTAINERS
 local ____HealthType = require("types.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____bitwise = require("functions.bitwise")
@@ -17,6 +18,35 @@ local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
 local ____util = require("functions.util")
 local ensureAllCases = ____util.ensureAllCases
+function ____exports.getCharacterMaxHeartContainers(self, character)
+    if character == PlayerType.PLAYER_KEEPER then
+        return 3
+    end
+    if character == PlayerType.PLAYER_KEEPER_B then
+        return 2
+    end
+    return 12
+end
+function ____exports.getPlayerIndex(self, player)
+    local character = player:GetPlayerType()
+    local collectibleToUse = ((character == PlayerType.PLAYER_LAZARUS2_B) and CollectibleType.COLLECTIBLE_INNER_EYE) or CollectibleType.COLLECTIBLE_SAD_ONION
+    local collectibleRNG = player:GetCollectibleRNG(collectibleToUse)
+    local seed = collectibleRNG:GetSeed()
+    return seed
+end
+function ____exports.getPlayerMaxHeartContainers(self, player)
+    local character = player:GetPlayerType()
+    local maxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
+    if (character == PlayerType.PLAYER_MAGDALENE) and player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT) then
+        maxHeartContainers = maxHeartContainers + 6
+    end
+    local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
+    maxHeartContainers = maxHeartContainers + numMothersKisses
+    if maxHeartContainers > MAX_PLAYER_HEART_CONTAINERS then
+        maxHeartContainers = MAX_PLAYER_HEART_CONTAINERS
+    end
+    return maxHeartContainers
+end
 function ____exports.getPlayers(self, performExclusions)
     if performExclusions == nil then
         performExclusions = false
@@ -29,30 +59,23 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue53
+                    goto __continue66
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue53
+                    goto __continue66
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue53
+                    goto __continue66
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue53::
+            ::__continue66::
             i = i + 1
         end
     end
     return players
 end
-function ____exports.getPlayerIndex(self, player)
-    local character = player:GetPlayerType()
-    local collectibleToUse = ((character == PlayerType.PLAYER_LAZARUS2_B) and CollectibleType.COLLECTIBLE_INNER_EYE) or CollectibleType.COLLECTIBLE_SAD_ONION
-    local collectibleRNG = player:GetCollectibleRNG(collectibleToUse)
-    local seed = collectibleRNG:GetSeed()
-    return seed
-end
 function ____exports.isChildPlayer(self, player)
     return player.Parent ~= nil
 end
@@ -155,6 +178,10 @@ function ____exports.getDeathAnimationName(self, player)
     end
     return "Death"
 end
+function ____exports.getFinalPlayer(self)
+    local players = ____exports.getPlayers(nil)
+    return players[#players]
+end
 function ____exports.getLastHeart(self, player)
     local hearts = player:GetHearts()
     local effectiveMaxHearts = player:GetEffectiveMaxHearts()
@@ -212,9 +239,16 @@ function ____exports.getNewestPlayer(self)
     end
     return newestPlayer
 end
-function ____exports.getFinalPlayer(self)
-    local players = ____exports.getPlayers(nil)
-    return players[#players]
+function ____exports.getPlayerAvailableHeartSlots(self, player)
+    local maxHeartContainers = ____exports.getPlayerMaxHeartContainers(nil, player)
+    local effectiveMaxHearts = player:GetEffectiveMaxHearts()
+    local normalAndBoneHeartContainers = effectiveMaxHearts / 2
+    local soulHearts = player:GetSoulHearts()
+    local soulHeartContainers = math.ceil(soulHearts / 2)
+    local totalHeartContainers = normalAndBoneHeartContainers + soulHeartContainers
+    local brokenHearts = player:GetBrokenHearts()
+    local totalOccupiedHeartSlots = totalHeartContainers + brokenHearts
+    return maxHeartContainers - totalOccupiedHeartSlots
 end
 function ____exports.getPlayerCloserThan(self, position, distance)
     for ____, player in ipairs(
@@ -250,18 +284,6 @@ function ____exports.getPlayerFromIndex(self, playerIndex)
     end
     return nil
 end
-function ____exports.getPlayersOfType(self, playerType)
-    local players = {}
-    for ____, player in ipairs(
-        ____exports.getPlayers(nil)
-    ) do
-        local character = player:GetPlayerType()
-        if character == playerType then
-            __TS__ArrayPush(players, player)
-        end
-    end
-    return players
-end
 function ____exports.getPlayerIndexVanilla(self, playerToFind)
     local game = Game()
     local playerToFindHash = GetPtrHash(playerToFind)
@@ -271,14 +293,14 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue62
+                    goto __continue58
                 end
                 local playerHash = GetPtrHash(player)
                 if playerHash == playerToFindHash then
                     return i
                 end
             end
-            ::__continue62::
+            ::__continue58::
             i = i + 1
         end
     end
@@ -289,7 +311,20 @@ function ____exports.getPlayerNumAllHearts(self, player)
     local soulHearts = player:GetSoulHearts()
     local boneHearts = player:GetBoneHearts()
     local eternalHearts = player:GetEternalHearts()
-    return ((hearts + soulHearts) + boneHearts) + eternalHearts
+    local rottenHearts = player:GetRottenHearts()
+    return (((hearts + soulHearts) + boneHearts) + eternalHearts) - rottenHearts
+end
+function ____exports.getPlayersOfType(self, playerType)
+    local players = {}
+    for ____, player in ipairs(
+        ____exports.getPlayers(nil)
+    ) do
+        local character = player:GetPlayerType()
+        if character == playerType then
+            __TS__ArrayPush(players, player)
+        end
+    end
+    return players
 end
 function ____exports.getTotalCharge(self, player, activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
@@ -386,9 +421,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch89 = activeSlot
-        local ____cond89 = ____switch89 == ActiveSlot.SLOT_PRIMARY
-        if ____cond89 then
+        local ____switch96 = activeSlot
+        local ____cond96 = ____switch96 == ActiveSlot.SLOT_PRIMARY
+        if ____cond96 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -397,8 +432,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond89 = ____cond89 or (____switch89 == ActiveSlot.SLOT_SECONDARY)
-        if ____cond89 then
+        ____cond96 = ____cond96 or (____switch96 == ActiveSlot.SLOT_SECONDARY)
+        if ____cond96 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -413,16 +448,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond89 = ____cond89 or (____switch89 == ActiveSlot.SLOT_POCKET)
-        if ____cond89 then
+        ____cond96 = ____cond96 or (____switch96 == ActiveSlot.SLOT_POCKET)
+        if ____cond96 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond89 = ____cond89 or (____switch89 == ActiveSlot.SLOT_POCKET2)
-        if ____cond89 then
+        ____cond96 = ____cond96 or (____switch96 == ActiveSlot.SLOT_POCKET2)
+        if ____cond96 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/upgradeMod.lua

@@ -81,8 +81,6 @@ local areFeaturesInitialized = ____initialized.areFeaturesInitialized
 local setFeaturesInitialized = ____initialized.setFeaturesInitialized
 local ____patchErrorFunctions = require("patchErrorFunctions")
 local patchErrorFunction = ____patchErrorFunctions.patchErrorFunction
-local ____patchPrintFunction = require("patchPrintFunction")
-local patchPrintFunction = ____patchPrintFunction.patchPrintFunction
 local ____ModUpgraded = require("types.ModUpgraded")
 local ModUpgraded = ____ModUpgraded.ModUpgraded
 function initCustomCallbacks(self, mod)
@@ -129,7 +127,6 @@ function ____exports.upgradeMod(self, modVanilla, verbose)
         verbose = false
     end
     patchErrorFunction(nil)
-    patchPrintFunction(nil)
     local mod = __TS__New(ModUpgraded, modVanilla, verbose)
     if not areFeaturesInitialized(nil) then
         setFeaturesInitialized(nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.529",
+  "version": "1.0.533",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.296",
+    "isaac-typescript-definitions": "^1.0.298",
     "isaacscript-lint": "^1.0.72",
     "typedoc": "^0.22.10",
     "typescript": "4.4.4",