isaacscript-common 83.4.0 → 83.4.1

package/dist/classes/callbacks/PostPlayerFatalDamage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../src/classes/callbacks/PostPlayerFatalDamage.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAWlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IACnF,CAAC;;YANf,6DAA6D;;;MAMzC;;IAetB,UAAmB,UAAU,0BAAoB;IAEjD;;;OAGG;IAGH,OAAO,CAAC,QAAQ,CAAC,eAAe,CA8B9B;IAGF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAyClC;CACH"}
+{"version":3,"file":"PostPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../src/classes/callbacks/PostPlayerFatalDamage.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAYlE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IACnF,CAAC;;YANf,6DAA6D;;;MAMzC;;IAetB,UAAmB,UAAU,0BAAoB;IAEjD;;;OAGG;IAGH,OAAO,CAAC,QAAQ,CAAC,eAAe,CA8B9B;IAGF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CA+ClC;CACH"}

package/dist/classes/callbacks/PostPlayerFatalDamage.lua

@@ -7,12 +7,15 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
 local DamageFlagZero = ____isaac_2Dtypescript_2Ddefinitions.DamageFlagZero
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____flag = require("functions.flag")
+local hasFlag = ____flag.hasFlag
 local ____playerDataStructures = require("functions.playerDataStructures")
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
@@ -62,6 +65,9 @@ function PostPlayerFatalDamage.prototype.____constructor(self)
         local gameFrameCount = game:GetFrameCount()
         local lastDamageGameFrame = mapGetPlayer(nil, v.run.playersLastDamageGameFrame, player)
         mapSetPlayer(nil, v.run.playersLastDamageGameFrame, player, gameFrameCount)
+        if hasFlag(nil, damageFlags, DamageFlag.NO_KILL) then
+            return nil
+        end
         if willPlayerRevive(nil, player) then
             return nil
         end

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 83.3.0
+isaacscript-common 83.4.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -37042,12 +37042,15 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.index")
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
 local DamageFlagZero = ____isaac_2Dtypescript_2Ddefinitions.DamageFlagZero
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____flag = require("functions.flag")
+local hasFlag = ____flag.hasFlag
 local ____playerDataStructures = require("functions.playerDataStructures")
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
@@ -37097,6 +37100,9 @@ function PostPlayerFatalDamage.prototype.____constructor(self)
         local gameFrameCount = game:GetFrameCount()
         local lastDamageGameFrame = mapGetPlayer(nil, v.run.playersLastDamageGameFrame, player)
         mapSetPlayer(nil, v.run.playersLastDamageGameFrame, player, gameFrameCount)
+        if hasFlag(nil, damageFlags, DamageFlag.NO_KILL) then
+            return nil
+        end
         if willPlayerRevive(nil, player) then
             return nil
         end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "83.4.0",
+  "version": "83.4.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/callbacks/PostPlayerFatalDamage.ts

@@ -1,16 +1,14 @@
-import type {
-  ActiveSlot,
-  DamageFlag,
-  UseFlag,
-} from "isaac-typescript-definitions";
+import type { ActiveSlot, UseFlag } from "isaac-typescript-definitions";
 import {
   BossID,
   CollectibleType,
+  DamageFlag,
   DamageFlagZero,
   ModCallback,
 } from "isaac-typescript-definitions";
 import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
+import { hasFlag } from "../../functions/flag";
 import {
   mapGetPlayer,
   mapSetPlayer,
@@ -109,6 +107,12 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
     );
     mapSetPlayer(v.run.playersLastDamageGameFrame, player, gameFrameCount);
 
+    // If the damage has the damage flag of `DamageFlag.NO_KILL` (1 << 0), this will not be fatal
+    // damage. (This is present on things like the Bad Trip pill.)
+    if (hasFlag(damageFlags, DamageFlag.NO_KILL)) {
+      return undefined;
+    }
+
     // If the player has a revival item such as Dead Cat, this will not be fatal damage.
     if (willPlayerRevive(player)) {
       return undefined;