isaacscript-common 1.2.63 → 1.2.64

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -1,6 +1,5 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local hasSubscriptions, entityTakeDmgPlayer, v
@@ -9,9 +8,11 @@ local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local isChildPlayer = ____player.isChildPlayer
-local isDamageToPlayerFatal = ____player.isDamageToPlayerFatal
 local ____revive = require("functions.revive")
+local isDamageToPlayerFatal = ____revive.isDamageToPlayerFatal
 local willPlayerRevive = ____revive.willPlayerRevive
+local ____DefaultMap = require("types.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
 local ____postPlayerFatalDamage = require("callbacks.subscriptions.postPlayerFatalDamage")
 local postPlayerFatalDamageFire = ____postPlayerFatalDamage.postPlayerFatalDamageFire
 local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlayerFatalDamageHasSubscriptions
@@ -32,8 +33,7 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     local game = Game()
     local gameFrameCount = game:GetFrameCount()
     local playerIndex = getPlayerIndex(nil, player)
-    local lastDamageFrame = v.run.playerLastDamageFrame:get(playerIndex)
-    v.run.playerLastDamageFrame:set(playerIndex, gameFrameCount)
+    local lastDamageGameFrame = v.run.playersLastDamageGameFrame:getAndSetDefault(playerIndex, gameFrameCount)
     if willPlayerRevive(nil, player) then
         return nil
     end
@@ -42,7 +42,7 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
         player,
         damageAmount,
         damageSource,
-        lastDamageFrame
+        lastDamageGameFrame
     ) then
         return nil
     end
@@ -59,7 +59,10 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     end
     return nil
 end
-v = {run = {playerLastDamageFrame = __TS__New(Map)}}
+v = {run = {playersLastDamageGameFrame = __TS__New(
+    DefaultMap,
+    function(____, _key, gameFrameCount) return gameFrameCount end
+)}}
 function ____exports.postPlayerFatalDamageCallbackInit(self, mod)
     saveDataManager(nil, "postPlayerFatalDamage", v)
     mod:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, entityTakeDmgPlayer, EntityType.ENTITY_PLAYER)

package/dist/functions/player.d.ts

@@ -210,8 +210,6 @@ export declare function isBethany(player: EntityPlayer): boolean;
  * (For example, the Strawman Keeper.)
  */
 export declare function isChildPlayer(player: EntityPlayer): boolean;
-/** Uses the player's current health and character to determine if incoming damage will be fatal. */
-export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageFrame?: int): boolean;
 export declare function isFirstPlayer(player: EntityPlayer): boolean;
 /**
  * Helper function for detecting when a player is Jacob or Esau. This will only match the

package/dist/functions/player.lua

@@ -484,44 +484,6 @@ function ____exports.isBethany(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_BETHANY or character == PlayerType.PLAYER_BETHANY_B
 end
-function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageFrame)
-    local game = Game()
-    local gameFrameCount = game:GetFrameCount()
-    local character = player:GetPlayerType()
-    local effects = player:GetEffects()
-    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
-    if character == PlayerType.PLAYER_JACOB_B and damageSource.Type == EntityType.ENTITY_DARK_ESAU then
-        return false
-    end
-    if isBerserk then
-        return false
-    end
-    if character == PlayerType.PLAYER_JACOB2_B then
-        return true
-    end
-    if ____exports.hasLostCurse(nil, player) then
-        return true
-    end
-    local playerNumAllHearts = ____exports.getPlayerNumHitsRemaining(nil, player)
-    if damageAmount < playerNumAllHearts then
-        return false
-    end
-    local playerAvailableHeartSlots = ____exports.getPlayerAvailableHeartSlots(nil, player)
-    if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and playerAvailableHeartSlots >= 2 then
-        return false
-    end
-    if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageFrame then
-        return false
-    end
-    local hearts = player:GetHearts()
-    local eternalHearts = player:GetEternalHearts()
-    local soulHearts = player:GetSoulHearts()
-    local boneHearts = player:GetBoneHearts()
-    if hearts > 0 and soulHearts > 0 or hearts > 0 and boneHearts > 0 or soulHearts > 0 and boneHearts > 0 or soulHearts > 0 and eternalHearts > 0 or boneHearts >= 2 then
-        return false
-    end
-    return true
-end
 function ____exports.isFirstPlayer(self, player)
     return ____exports.getPlayerIndexVanilla(nil, player) == 0
 end
@@ -586,9 +548,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch127 = activeSlot
-        local ____cond127 = ____switch127 == ActiveSlot.SLOT_PRIMARY
-        if ____cond127 then
+        local ____switch118 = activeSlot
+        local ____cond118 = ____switch118 == ActiveSlot.SLOT_PRIMARY
+        if ____cond118 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -597,8 +559,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_SECONDARY
-        if ____cond127 then
+        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_SECONDARY
+        if ____cond118 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -613,16 +575,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET
-        if ____cond127 then
+        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_POCKET
+        if ____cond118 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET2
-        if ____cond127 then
+        ____cond118 = ____cond118 or ____switch118 == ActiveSlot.SLOT_POCKET2
+        if ____cond118 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/revive.d.ts

@@ -1,4 +1,9 @@
 /// <reference types="isaac-typescript-definitions" />
+/**
+ * Uses the player's current health and other miscellaneous things to determine if incoming damage
+ * will be fatal.
+ */
+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.

package/dist/functions/revive.lua

@@ -2,6 +2,9 @@
 local ____exports = {}
 local ____player = require("functions.player")
 local getDeathAnimationName = ____player.getDeathAnimationName
+local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
+local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
+local hasLostCurse = ____player.hasLostCurse
 local ____sprite = require("functions.sprite")
 local getFinalFrameOfAnimation = ____sprite.getFinalFrameOfAnimation
 local ____trinketGive = require("functions.trinketGive")
@@ -16,12 +19,6 @@ function ____exports.willMysteriousPaperRevive(self, player)
     local frameOfDeath = gameFrameCount + deathAnimationFrames + 1
     return frameOfDeath % 4 == 3
 end
-function ____exports.willPlayerRevive(self, player)
-    local trinketSituation = temporarilyRemoveTrinket(nil, player, TrinketType.TRINKET_MYSTERIOUS_PAPER)
-    local willRevive = player:WillPlayerRevive() or trinketSituation ~= nil and ____exports.willMysteriousPaperRevive(nil, player)
-    giveTrinketsBack(nil, player, trinketSituation)
-    return willRevive
-end
 function ____exports.willReviveFromSpiritShackles(self, player)
     if not player:HasCollectible(CollectibleType.COLLECTIBLE_SPIRIT_SHACKLES) then
         return false
@@ -31,4 +28,51 @@ function ____exports.willReviveFromSpiritShackles(self, player)
     local playerInSoulForm = effects:HasNullEffect(NullItemID.ID_SPIRIT_SHACKLES_SOUL)
     return spiritShacklesEnabled and not playerInSoulForm
 end
+function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageGameFrame)
+    local game = Game()
+    local gameFrameCount = game:GetFrameCount()
+    local character = player:GetPlayerType()
+    local effects = player:GetEffects()
+    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
+    if character == PlayerType.PLAYER_JACOB_B and damageSource.Type == EntityType.ENTITY_DARK_ESAU then
+        return false
+    end
+    if isBerserk then
+        return false
+    end
+    if ____exports.willReviveFromSpiritShackles(nil, player) then
+        return false
+    end
+    if character == PlayerType.PLAYER_JACOB2_B then
+        return true
+    end
+    if hasLostCurse(nil, player) then
+        return true
+    end
+    local playerNumAllHearts = getPlayerNumHitsRemaining(nil, player)
+    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
+    if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and gameFrameCount == lastDamageGameFrame then
+        return false
+    end
+    local hearts = player:GetHearts()
+    local eternalHearts = player:GetEternalHearts()
+    local soulHearts = player:GetSoulHearts()
+    local boneHearts = player:GetBoneHearts()
+    if hearts > 0 and soulHearts > 0 or hearts > 0 and boneHearts > 0 or soulHearts > 0 and boneHearts > 0 or soulHearts > 0 and eternalHearts > 0 or boneHearts >= 2 then
+        return false
+    end
+    return true
+end
+function ____exports.willPlayerRevive(self, player)
+    local trinketSituation = temporarilyRemoveTrinket(nil, player, TrinketType.TRINKET_MYSTERIOUS_PAPER)
+    local willRevive = player:WillPlayerRevive() or trinketSituation ~= nil and ____exports.willMysteriousPaperRevive(nil, player)
+    giveTrinketsBack(nil, player, trinketSituation)
+    return willRevive
+end
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.63",
+  "version": "1.2.64",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
     "isaac-typescript-definitions": "^1.0.349",
-    "isaacscript-lint": "^1.0.79",
+    "isaacscript-lint": "^1.0.81",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.12",
     "typescript": "^4.5.5"