isaacscript-common 8.4.5 → 8.4.6

package/dist/callbacks/postCursedTeleport.lua

@@ -28,17 +28,17 @@ local postCursedTeleportHasSubscriptions = ____postCursedTeleport.postCursedTele
 function hasSubscriptions(self)
     return postCursedTeleportHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, _amount, damageFlags, _source, _countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
     incrementNumSacrifices(nil, damageFlags)
-    setDamageFrame(nil, tookDamage, damageFlags)
+    setDamageFrame(nil, entity, damageFlags)
     return nil
 end
-function setDamageFrame(self, tookDamage, damageFlags)
+function setDamageFrame(self, entity, damageFlags)
     local gameFrameCount = game:GetFrameCount()
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return
     end

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -29,11 +29,11 @@ local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlay
 function hasSubscriptions(self)
     return postPlayerFatalDamageHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damageSource, damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, amount, damageFlags, source, countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return nil
     end
@@ -49,8 +49,8 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     if not isDamageToPlayerFatal(
         nil,
         player,
-        damageAmount,
-        damageSource,
+        amount,
+        source,
         lastDamageGameFrame
     ) then
         return nil
@@ -58,10 +58,10 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     local shouldSustainDeath = postPlayerFatalDamageFire(
         nil,
         player,
-        damageAmount,
+        amount,
         damageFlags,
-        damageSource,
-        damageCountdownFrames
+        source,
+        countdownFrames
     )
     if shouldSustainDeath ~= nil then
         return shouldSustainDeath

package/dist/callbacks/postSacrifice.lua

@@ -17,11 +17,11 @@ local postSacrificeHasSubscriptions = ____postSacrifice.postSacrificeHasSubscrip
 function hasSubscriptions(self)
     return postSacrificeHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, _amount, damageFlags, _source, _countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return nil
     end

package/dist/callbacks/postTrinketBreak.lua

@@ -22,11 +22,11 @@ local postTrinketBreakHasSubscriptions = ____postTrinketBreak.postTrinketBreakHa
 function hasSubscriptions(self)
     return postTrinketBreakHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, _amount, _damageFlags, _source, _countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return nil
     end

package/dist/callbacks/subscriptions/postPlayerFatalDamage.d.ts

@@ -1,10 +1,10 @@
 import { DamageFlag, PlayerType, PlayerVariant } from "isaac-typescript-definitions";
 export declare type PostPlayerFatalDamageRegisterParameters = [
-    callback: (player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int) => boolean | undefined,
+    callback: (player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined,
     playerVariant?: PlayerVariant,
     character?: PlayerType
 ];
 export declare function postPlayerFatalDamageHasSubscriptions(): boolean;
 export declare function postPlayerFatalDamageRegister(...args: PostPlayerFatalDamageRegisterParameters): void;
-export declare function postPlayerFatalDamageFire(player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int): boolean | undefined;
+export declare function postPlayerFatalDamageFire(player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int): boolean | undefined;
 //# sourceMappingURL=postPlayerFatalDamage.d.ts.map

package/dist/callbacks/subscriptions/postPlayerFatalDamage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../src/callbacks/subscriptions/postPlayerFatalDamage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACd,MAAM,8BAA8B,CAAC;AAEtC,oBAAY,uCAAuC,GAAG;IACpD,QAAQ,EAAE,CACR,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,KAAK,EACnB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,YAAY,EAAE,SAAS,EACvB,qBAAqB,EAAE,GAAG,KACvB,OAAO,GAAG,SAAS;IACxB,aAAa,CAAC,EAAE,aAAa;IAC7B,SAAS,CAAC,EAAE,UAAU;CACvB,CAAC;AAIF,wBAAgB,qCAAqC,IAAI,OAAO,CAE/D;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,IAAI,EAAE,uCAAuC,GAC/C,IAAI,CAEN;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,KAAK,EACnB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,YAAY,EAAE,SAAS,EACvB,qBAAqB,EAAE,GAAG,GACzB,OAAO,GAAG,SAAS,CA4BrB"}
+{"version":3,"file":"postPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../src/callbacks/subscriptions/postPlayerFatalDamage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACd,MAAM,8BAA8B,CAAC;AAEtC,oBAAY,uCAAuC,GAAG;IACpD,QAAQ,EAAE,CACR,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,GAAG,KACjB,OAAO,GAAG,SAAS;IACxB,aAAa,CAAC,EAAE,aAAa;IAC7B,SAAS,CAAC,EAAE,UAAU;CACvB,CAAC;AAIF,wBAAgB,qCAAqC,IAAI,OAAO,CAE/D;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,IAAI,EAAE,uCAAuC,GAC/C,IAAI,CAEN;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,GAAG,GACnB,OAAO,GAAG,SAAS,CA4BrB"}

package/dist/callbacks/subscriptions/postPlayerFatalDamage.lua

@@ -7,7 +7,7 @@ function ____exports.postPlayerFatalDamageRegister(self, ...)
     local args = {...}
     subscriptions[#subscriptions + 1] = args
 end
-function ____exports.postPlayerFatalDamageFire(self, player, damageAmount, damageFlags, damageSource, damageCountdownFrames)
+function ____exports.postPlayerFatalDamageFire(self, player, amount, damageFlags, source, countdownFrames)
     local character = player:GetPlayerType()
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
@@ -23,10 +23,10 @@ function ____exports.postPlayerFatalDamageFire(self, player, damageAmount, damag
             local shouldSustainDeath = callback(
                 nil,
                 player,
-                damageAmount,
+                amount,
                 damageFlags,
-                damageSource,
-                damageCountdownFrames
+                source,
+                countdownFrames
             )
             if shouldSustainDeath ~= nil then
                 return shouldSustainDeath

package/dist/features/customGridEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customGridEntity.d.ts","sourceRoot":"","sources":["../../src/features/customGridEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,kBAAkB,EAClB,cAAc,EAGf,MAAM,8BAA8B,CAAC;AAkBtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AA4K1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,cAAc,EACpC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,kBAAkB,iBAA4B,EAC9C,qBAAqB,SAAI,GACxB,UAAU,CA8CZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,+BAA+B,EAAE,GAAG,GAAG,MAAM,GAAG,UAAU,EAC1D,UAAU,UAAO,GAChB,UAAU,GAAG,SAAS,CAuCxB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,KAAK,CAC5C;IAAC,UAAU,EAAE,UAAU;IAAE,IAAI,EAAE,oBAAoB;CAAC,CACrD,CAqBA;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,cAAc,GAAG,SAAS,CAsB5B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,OAAO,CAOT"}
+{"version":3,"file":"customGridEntity.d.ts","sourceRoot":"","sources":["../../src/features/customGridEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,cAAc,EAGf,MAAM,8BAA8B,CAAC;AAgBtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAyH1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,cAAc,EACpC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,kBAAkB,iBAA4B,EAC9C,qBAAqB,SAAI,GACxB,UAAU,CA8CZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,+BAA+B,EAAE,GAAG,GAAG,MAAM,GAAG,UAAU,EAC1D,UAAU,UAAO,GAChB,UAAU,GAAG,SAAS,CAuCxB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,KAAK,CAC5C;IAAC,UAAU,EAAE,UAAU;IAAE,IAAI,EAAE,oBAAoB;CAAC,CACrD,CAqBA;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,cAAc,GAAG,SAAS,CAsB5B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,OAAO,CAOT"}

package/dist/features/customGridEntity.lua

@@ -4,16 +4,12 @@ local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local entityTakeDmgGenericProp, preUseItemWeNeedToGoDeeper, postNewRoomReordered, v
+local preUseItemWeNeedToGoDeeper, postNewRoomReordered, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local GridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.GridCollisionClass
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____postGridEntityCustomBroken = require("callbacks.subscriptions.postGridEntityCustomBroken")
-local postGridEntityCustomBrokenFire = ____postGridEntityCustomBroken.postGridEntityCustomBrokenFire
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____cachedClasses = require("core.cachedClasses")
@@ -23,8 +19,6 @@ local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____featuresInitialized = require("featuresInitialized")
 local areFeaturesInitialized = ____featuresInitialized.areFeaturesInitialized
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
-local ____flag = require("functions.flag")
-local hasFlag = ____flag.hasFlag
 local ____gridEntities = require("functions.gridEntities")
 local removeGridEntity = ____gridEntities.removeGridEntity
 local spawnGridEntityWithVariant = ____gridEntities.spawnGridEntityWithVariant
@@ -38,32 +32,6 @@ local ____runInNFrames = require("features.runInNFrames")
 local runNextGameFrame = ____runInNFrames.runNextGameFrame
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-function entityTakeDmgGenericProp(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
-    local ptrHash = GetPtrHash(tookDamage)
-    if not v.room.genericPropPtrHashes:has(ptrHash) then
-        return nil
-    end
-    if not hasFlag(nil, damageFlags, DamageFlag.EXPLOSION) then
-        return false
-    end
-    local room = game:GetRoom()
-    local roomListIndex = getRoomListIndex(nil)
-    local roomCustomGridEntities = v.level.customGridEntities:get(roomListIndex)
-    if roomCustomGridEntities == nil then
-        return false
-    end
-    local gridIndex = room:GetGridIndex(tookDamage.Position)
-    local data = roomCustomGridEntities:get(gridIndex)
-    if data == nil then
-        return false
-    end
-    local gridEntity = room:GetGridEntity(gridIndex)
-    if gridEntity == nil then
-        error("Failed to get the grid entity for a custom grid entity that broke at grid index: " .. tostring(gridIndex))
-    end
-    postGridEntityCustomBrokenFire(nil, gridEntity, data.gridEntityTypeCustom)
-    return false
-end
 function preUseItemWeNeedToGoDeeper(self, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
     local room = game:GetRoom()
     local roomListIndex = getRoomListIndex(nil)
@@ -113,7 +81,7 @@ function postNewRoomReordered(self)
             local decoration = room:GetGridEntity(gridIndex)
             if decoration == nil then
                 roomCustomGridEntities:delete(gridIndex)
-                goto __continue19
+                goto __continue13
             end
             if data.anm2Path ~= nil then
                 local sprite = decoration:GetSprite()
@@ -122,7 +90,7 @@ function postNewRoomReordered(self)
                 sprite:Play(animationToPlay, true)
             end
         end
-        ::__continue19::
+        ::__continue13::
     end
 end
 local FEATURE_NAME = "customGridEntity"
@@ -140,7 +108,6 @@ v = {
 -- @internal
 function ____exports.customGridEntityInit(self, mod)
     saveDataManager(nil, FEATURE_NAME, v)
-    mod:AddCallback(ModCallback.ENTITY_TAKE_DMG, entityTakeDmgGenericProp, EntityType.GENERIC_PROP)
     mod:AddCallback(ModCallback.PRE_USE_ITEM, preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER)
     mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end

package/dist/features/extraConsoleCommands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/extraConsoleCommands/init.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAWxD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAK/D"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/extraConsoleCommands/init.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAWxD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAK/D"}

package/dist/features/extraConsoleCommands/init.lua

@@ -208,7 +208,7 @@ function evaluateCacheFlying(self, player)
         player.CanFly = true
     end
 end
-function entityTakeDmgPlayer(self)
+function entityTakeDmgPlayer(self, _entity, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
     if v.run.spamBloodRights then
         return false
     end

package/dist/functions/flag.d.ts

@@ -74,7 +74,7 @@ export declare function hasFlag<T extends BitFlag | BitFlag128>(flags: T | BitFl
  */
 export declare function isEmptyFlag<T extends BitFlag | BitFlag128>(flag: T): boolean;
 /**
- * Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+ * Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
  * self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
  * would count as self-inflicted damage.
  */

package/dist/functions/flag.lua

@@ -92,7 +92,7 @@ end
 function ____exports.isEmptyFlag(self, flag)
     return flag == 0
 end
---- Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+--- Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
 -- self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
 -- would count as self-inflicted damage.
 function ____exports.isSelfDamage(self, damageFlags)

package/dist/functions/revive.d.ts

@@ -5,7 +5,7 @@
  * 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 | undefined): boolean;
+export declare function isDamageToPlayerFatal(player: EntityPlayer, amount: int, source: EntityRef, lastDamageGameFrame: int | undefined): boolean;
 /**
  * Assuming that we are on the frame of fatal damage, this function returns whether or not
  * Mysterious Paper would rotate to Missing Poster on the frame that the "Game Over" screen would

package/dist/functions/revive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revive.d.ts","sourceRoot":"","sources":["../../src/functions/revive.ts"],"names":[],"mappings":";;;AAsBA;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,GAAG,EACjB,YAAY,EAAE,SAAS,EACvB,mBAAmB,EAAE,GAAG,GAAG,SAAS,GACnC,OAAO,CAuFT;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAavE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAa9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAYtE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAe1E"}
+{"version":3,"file":"revive.d.ts","sourceRoot":"","sources":["../../src/functions/revive.ts"],"names":[],"mappings":";;;AAsBA;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,SAAS,EACjB,mBAAmB,EAAE,GAAG,GAAG,SAAS,GACnC,OAAO,CAuFT;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAavE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAa9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAYtE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAe1E"}

package/dist/functions/revive.lua

@@ -48,12 +48,12 @@ function ____exports.willReviveFromSpiritShackles(self, player)
 end
 --- Uses the player's current health and other miscellaneous things to determine if incoming damage
 -- will be fatal.
-function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageGameFrame)
+function ____exports.isDamageToPlayerFatal(self, player, amount, source, lastDamageGameFrame)
     local gameFrameCount = game:GetFrameCount()
     local character = player:GetPlayerType()
     local effects = player:GetEffects()
     local isBerserk = effects:HasCollectibleEffect(CollectibleType.BERSERK)
-    if character == PlayerType.JACOB_B and damageSource.Type == EntityType.DARK_ESAU then
+    if character == PlayerType.JACOB_B and source.Type == EntityType.DARK_ESAU then
         return false
     end
     if isBerserk then
@@ -73,7 +73,7 @@ function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSou
         return true
     end
     local playerNumAllHearts = getPlayerNumHitsRemaining(nil, player)
-    if damageAmount < playerNumAllHearts then
+    if amount < playerNumAllHearts then
         return false
     end
     if ____exports.willReviveFromHeartbreak(nil, player) then

package/dist/index.d.ts

@@ -5662,7 +5662,7 @@ export declare function isDamageFromPlayer(damageSource: Entity): boolean;
  * 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 | undefined): boolean;
+export declare function isDamageToPlayerFatal(player: EntityPlayer, amount: int, source: EntityRef, lastDamageGameFrame: int | undefined): boolean;
 
 /**
  * Helper function to check if the given room grid index is a dead end. Specifically, this is
@@ -6069,7 +6069,7 @@ export declare function isSack(pickup: EntityPickup): pickup is EntityPickupSack
 export declare function isSecretRoomDoor(door: GridEntityDoor): boolean;
 
 /**
- * Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+ * Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
  * self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
  * would count as self-inflicted damage.
  */
@@ -8705,7 +8705,7 @@ collectibleType?: CollectibleType
 ];
 
 declare type PostPlayerFatalDamageRegisterParameters = [
-callback: (player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int) => boolean | undefined,
+callback: (player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined,
 playerVariant?: PlayerVariant,
 character?: PlayerType
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "8.4.5",
+  "version": "8.4.6",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.5.1"
+    "isaac-typescript-definitions": "^3.5.2"
   }
 }

package/src/callbacks/postCursedTeleport.ts

@@ -54,26 +54,26 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
   incrementNumSacrifices(damageFlags); // Has to be before setting the damage frame
-  setDamageFrame(tookDamage, damageFlags);
+  setDamageFrame(entity, damageFlags);
 
   return undefined;
 }
 
-function setDamageFrame(tookDamage: Entity, damageFlags: BitFlags<DamageFlag>) {
+function setDamageFrame(entity: Entity, damageFlags: BitFlags<DamageFlag>) {
   const gameFrameCount = game.GetFrameCount();
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return;
   }

package/src/callbacks/postPlayerFatalDamage.ts

@@ -50,17 +50,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  damageAmount: float,
+  entity: Entity,
+  amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  damageSource: EntityRef,
-  damageCountdownFrames: int,
+  source: EntityRef,
+  countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }
@@ -83,23 +83,16 @@ function entityTakeDmgPlayer(
     return undefined;
   }
 
-  if (
-    !isDamageToPlayerFatal(
-      player,
-      damageAmount,
-      damageSource,
-      lastDamageGameFrame,
-    )
-  ) {
+  if (!isDamageToPlayerFatal(player, amount, source, lastDamageGameFrame)) {
     return undefined;
   }
 
   const shouldSustainDeath = postPlayerFatalDamageFire(
     player,
-    damageAmount,
+    amount,
     damageFlags,
-    damageSource,
-    damageCountdownFrames,
+    source,
+    countdownFrames,
   );
   if (shouldSustainDeath !== undefined) {
     return shouldSustainDeath;

package/src/callbacks/postSacrifice.ts

@@ -35,17 +35,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }

package/src/callbacks/postTrinketBreak.ts

@@ -52,17 +52,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   _damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }

package/src/callbacks/subscriptions/postPlayerFatalDamage.ts

@@ -7,10 +7,10 @@ import {
 export type PostPlayerFatalDamageRegisterParameters = [
   callback: (
     player: EntityPlayer,
-    damageAmount: float,
+    amount: float,
     damageFlags: BitFlags<DamageFlag>,
-    damageSource: EntityRef,
-    damageCountdownFrames: int,
+    source: EntityRef,
+    countdownFrames: int,
   ) => boolean | undefined,
   playerVariant?: PlayerVariant,
   character?: PlayerType,
@@ -30,10 +30,10 @@ export function postPlayerFatalDamageRegister(
 
 export function postPlayerFatalDamageFire(
   player: EntityPlayer,
-  damageAmount: float,
+  amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  damageSource: EntityRef,
-  damageCountdownFrames: int,
+  source: EntityRef,
+  countdownFrames: int,
 ): boolean | undefined {
   const character = player.GetPlayerType();
 
@@ -50,10 +50,10 @@ export function postPlayerFatalDamageFire(
 
     const shouldSustainDeath = callback(
       player,
-      damageAmount,
+      amount,
       damageFlags,
-      damageSource,
-      damageCountdownFrames,
+      source,
+      countdownFrames,
     );
 
     if (shouldSustainDeath !== undefined) {

package/src/features/customGridEntity.ts

@@ -1,14 +1,11 @@
 import {
   ActiveSlot,
   CollectibleType,
-  DamageFlag,
-  EntityType,
   GridCollisionClass,
   GridEntityType,
   ModCallback,
   UseFlag,
 } from "isaac-typescript-definitions";
-import { postGridEntityCustomBrokenFire } from "../callbacks/subscriptions/postGridEntityCustomBroken";
 import { DefaultMap } from "../classes/DefaultMap";
 import { ModUpgraded } from "../classes/ModUpgraded";
 import { game } from "../core/cachedClasses";
@@ -17,7 +14,6 @@ import {
   areFeaturesInitialized,
   errorIfFeaturesNotInitialized,
 } from "../featuresInitialized";
-import { hasFlag } from "../functions/flag";
 import {
   removeGridEntity,
   spawnGridEntityWithVariant,
@@ -49,12 +45,6 @@ const v = {
 export function customGridEntityInit(mod: ModUpgraded): void {
   saveDataManager(FEATURE_NAME, v);
 
-  mod.AddCallback(
-    ModCallback.ENTITY_TAKE_DMG,
-    entityTakeDmgGenericProp,
-    EntityType.GENERIC_PROP,
-  ); // 11
-
   mod.AddCallback(
     ModCallback.PRE_USE_ITEM,
     preUseItemWeNeedToGoDeeper,
@@ -67,51 +57,6 @@ export function customGridEntityInit(mod: ModUpgraded): void {
   );
 }
 
-// ModCallback.ENTITY_TAKE_DMG (11)
-// EntityType.GENERIC_PROP (960)
-function entityTakeDmgGenericProp(
-  tookDamage: Entity,
-  _damageAmount: float,
-  damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
-): boolean | undefined {
-  const ptrHash = GetPtrHash(tookDamage);
-  if (!v.room.genericPropPtrHashes.has(ptrHash)) {
-    return undefined;
-  }
-
-  if (!hasFlag(damageFlags, DamageFlag.EXPLOSION)) {
-    return false;
-  }
-
-  const room = game.GetRoom();
-  const roomListIndex = getRoomListIndex();
-  const roomCustomGridEntities = v.level.customGridEntities.get(roomListIndex);
-  if (roomCustomGridEntities === undefined) {
-    return false;
-  }
-
-  const gridIndex = room.GetGridIndex(tookDamage.Position);
-  const data = roomCustomGridEntities.get(gridIndex);
-  if (data === undefined) {
-    return false;
-  }
-
-  const gridEntity = room.GetGridEntity(gridIndex);
-  if (gridEntity === undefined) {
-    error(
-      `Failed to get the grid entity for a custom grid entity that broke at grid index: ${gridIndex}`,
-    );
-  }
-
-  postGridEntityCustomBrokenFire(gridEntity, data.gridEntityTypeCustom);
-
-  // Even though the custom grid entity is now broken, we do not want to remove it, as the end-user
-  // could intend for it to persist with different graphics (or take multiple hits to be destroyed).
-  return false;
-}
-
 // ModCallback.PRE_USE_ITEM (23)
 // CollectibleType.WE_NEED_TO_GO_DEEPER (84)
 function preUseItemWeNeedToGoDeeper(

package/src/features/extraConsoleCommands/init.ts

@@ -1,6 +1,7 @@
 import {
   CacheFlag,
   CollectibleType,
+  DamageFlag,
   EntityType,
   LevelCurse,
   ModCallback,
@@ -348,7 +349,13 @@ function evaluateCacheFlying(player: EntityPlayer) {
 
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
-function entityTakeDmgPlayer() {
+function entityTakeDmgPlayer(
+  _entity: Entity,
+  _damageAmount: float,
+  _damageFlags: BitFlags<DamageFlag>,
+  _damageSource: EntityRef,
+  _damageCountdownFrames: int,
+) {
   if (v.run.spamBloodRights) {
     return false;
   }

package/src/functions/flag.ts

@@ -119,7 +119,7 @@ export function isEmptyFlag<T extends BitFlag | BitFlag128>(flag: T): boolean {
 }
 
 /**
- * Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+ * Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
  * self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
  * would count as self-inflicted damage.
  */

package/src/functions/revive.ts

@@ -26,8 +26,8 @@ import { giveTrinketsBack, temporarilyRemoveTrinket } from "./trinketGive";
  */
 export function isDamageToPlayerFatal(
   player: EntityPlayer,
-  damageAmount: int,
-  damageSource: EntityRef,
+  amount: int,
+  source: EntityRef,
   lastDamageGameFrame: int | undefined,
 ): boolean {
   const gameFrameCount = game.GetFrameCount();
@@ -39,7 +39,7 @@ export function isDamageToPlayerFatal(
   // (because we will transform into Tainted Jacob's lost form).
   if (
     character === PlayerType.JACOB_B &&
-    damageSource.Type === EntityType.DARK_ESAU
+    source.Type === EntityType.DARK_ESAU
   ) {
     return false;
   }
@@ -79,7 +79,7 @@ export function isDamageToPlayerFatal(
   }
 
   const playerNumAllHearts = getPlayerNumHitsRemaining(player);
-  if (damageAmount < playerNumAllHearts) {
+  if (amount < playerNumAllHearts) {
     return false;
   }