isaacscript-common 1.2.81 → 1.2.82

package/dist/functions/player.d.ts

@@ -97,9 +97,9 @@ export declare function getLastHeart(player: EntityPlayer): HealthType;
  */
 export declare function getNewestPlayer(): 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).
+ * Returns the number of slots that the player has remaining for new 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;
 /**

package/dist/functions/revive.d.ts

@@ -5,8 +5,8 @@
  */
 export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int): boolean;
 /**
- * The `EntityPlayer.WillPlayerRevive()` function does not properly account for Mysterious Paper,
- * so use this helper function instead for more robust revival detection.
+ * The `EntityPlayer.WillPlayerRevive()` function does not properly account for Mysterious Paper, so
+ * use this helper function instead for more robust revival detection.
  */
 export declare function willPlayerRevive(player: EntityPlayer): boolean;
 /**
@@ -18,6 +18,12 @@ export declare function willPlayerRevive(player: EntityPlayer): boolean;
  * Mysterious Paper be Missing Power is: `gameFrameCount % 4 === 3`
  */
 export declare function willMysteriousPaperRevive(player: EntityPlayer): boolean;
+/**
+ * Helper function to determine if the player will be revived by the Heartbreak collectible if they
+ * take fatal damage. This is contingent on the character that they are playing as and the amount of
+ * broken hearts that they already have.
+ */
+export declare function willReviveFromHeartbreak(player: EntityPlayer): boolean;
 /**
  * Helper function to determine if the Spirit Shackles item is in an enabled state. (It can be
  * either enabled or disabled.)

package/dist/functions/revive.lua

@@ -2,9 +2,10 @@
 local ____exports = {}
 local ____player = require("functions.player")
 local getDeathAnimationName = ____player.getDeathAnimationName
-local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
+local getPlayerMaxHeartContainers = ____player.getPlayerMaxHeartContainers
 local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
 local hasLostCurse = ____player.hasLostCurse
+local isKeeper = ____player.isKeeper
 local ____sprite = require("functions.sprite")
 local getFinalFrameOfAnimation = ____sprite.getFinalFrameOfAnimation
 local ____trinketGive = require("functions.trinketGive")
@@ -19,6 +20,16 @@ function ____exports.willMysteriousPaperRevive(self, player)
     local frameOfDeath = gameFrameCount + deathAnimationFrames + 1
     return frameOfDeath % 4 == 3
 end
+function ____exports.willReviveFromHeartbreak(self, player)
+    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) then
+        return false
+    end
+    local numBrokenHeartsThatWillBeAdded = isKeeper(nil, player) and 1 or 2
+    local brokenHearts = player:GetBrokenHearts()
+    local numBrokenHeartsAfterRevival = numBrokenHeartsThatWillBeAdded + brokenHearts
+    local maxHeartContainers = getPlayerMaxHeartContainers(nil, player)
+    return numBrokenHeartsAfterRevival < maxHeartContainers
+end
 function ____exports.willReviveFromSpiritShackles(self, player)
     if not player:HasCollectible(CollectibleType.COLLECTIBLE_SPIRIT_SHACKLES) then
         return false
@@ -53,8 +64,7 @@ function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSou
     if damageAmount < playerNumAllHearts then
         return false
     end
-    local playerAvailableHeartSlots = getPlayerAvailableHeartSlots(nil, player)
-    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and playerAvailableHeartSlots >= 2 then
+    if ____exports.willReviveFromHeartbreak(nil, player) then
         return false
     end
     if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageGameFrame then

package/package.json

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