isaacscript-common 1.0.588 → 1.0.592

package/dist/callbacks/customRevive.lua

@@ -1,6 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, postPEffectUpdateReorderedWaitingForBerserkToEnd, postPEffectUpdateReorderedWaitingForItemAnimation, postPlayerFatalDamage, CustomReviveState, v
+local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____collectibles = require("functions.collectibles")
@@ -37,29 +37,9 @@ function postNewRoom(self)
     end
 end
 function postPEffectUpdateReordered(self, player)
-    postPEffectUpdateReorderedWaitingForBerserkToEnd(nil, player)
-    postPEffectUpdateReorderedWaitingForItemAnimation(nil, player)
+    checkWaitingForItemAnimation(nil, player)
 end
-function postPEffectUpdateReorderedWaitingForBerserkToEnd(self, player)
-    if v.run.state ~= CustomReviveState.WAITING_FOR_BERSERK_TO_END then
-        return
-    end
-    if v.run.dyingPlayerIndex == nil then
-        return
-    end
-    local playerIndex = getPlayerIndex(nil, player)
-    local effects = player:GetEffects()
-    if playerIndex ~= v.run.dyingPlayerIndex then
-        return
-    end
-    removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
-    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
-    if isBerserk then
-        return
-    end
-    v.run.state = CustomReviveState.CHANGING_ROOMS
-end
-function postPEffectUpdateReorderedWaitingForItemAnimation(self, player)
+function checkWaitingForItemAnimation(self, player)
     if v.run.state ~= CustomReviveState.WAITING_FOR_ITEM_ANIMATION then
         return
     end
@@ -92,14 +72,20 @@ function postPlayerFatalDamage(self, player)
     if not hasSubscriptions(nil) then
         return
     end
+    playerIsAboutToDie(nil, player)
+end
+function preBerserkDeath(self, player)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    playerIsAboutToDie(nil, player)
+end
+function playerIsAboutToDie(self, player)
     local revivalType = preCustomReviveFire(nil, player)
     if revivalType == nil then
         return
     end
-    local effects = player:GetEffects()
-    local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
-    local newState = isBerserk and CustomReviveState.WAITING_FOR_BERSERK_TO_END or CustomReviveState.CHANGING_ROOMS
-    v.run.state = newState
+    v.run.state = CustomReviveState.CHANGING_ROOMS
     v.run.revivalType = revivalType
     v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
     player:AddCollectible(CollectibleType.COLLECTIBLE_1UP, 0, false)
@@ -109,11 +95,9 @@ end
 CustomReviveState = CustomReviveState or ({})
 CustomReviveState.DISABLED = 0
 CustomReviveState[CustomReviveState.DISABLED] = "DISABLED"
-CustomReviveState.WAITING_FOR_BERSERK_TO_END = 1
-CustomReviveState[CustomReviveState.WAITING_FOR_BERSERK_TO_END] = "WAITING_FOR_BERSERK_TO_END"
-CustomReviveState.CHANGING_ROOMS = 2
+CustomReviveState.CHANGING_ROOMS = 1
 CustomReviveState[CustomReviveState.CHANGING_ROOMS] = "CHANGING_ROOMS"
-CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 3
+CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 2
 CustomReviveState[CustomReviveState.WAITING_FOR_ITEM_ANIMATION] = "WAITING_FOR_ITEM_ANIMATION"
 v = {run = {state = CustomReviveState.DISABLED, revivalType = nil, dyingPlayerIndex = nil}}
 function ____exports.customReviveCallbacksInit(self, mod)
@@ -122,5 +106,6 @@ function ____exports.customReviveCallbacksInit(self, mod)
     mod:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, postNewRoom)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PEFFECT_UPDATE_REORDERED, postPEffectUpdateReordered)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE, postPlayerFatalDamage)
+    mod:AddCallbackCustom(ModCallbacksCustom.MC_PRE_BERSERK_DEATH, preBerserkDeath)
 end
 return ____exports

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -1,15 +1,13 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
-local hasSubscriptions, entityTakeDmgPlayer, damageIsFatal, v
+local hasSubscriptions, entityTakeDmgPlayer, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
-local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
 local getPlayerIndex = ____player.getPlayerIndex
-local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
-local hasLostCurse = ____player.hasLostCurse
 local isChildPlayer = ____player.isChildPlayer
+local isDamageToPlayerFatal = ____player.isDamageToPlayerFatal
 local ____revive = require("functions.revive")
 local willPlayerRevive = ____revive.willPlayerRevive
 local ____postPlayerFatalDamage = require("callbacks.subscriptions.postPlayerFatalDamage")
@@ -18,7 +16,7 @@ local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlay
 function hasSubscriptions(self)
     return postPlayerFatalDamageHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, damageSource, _damageCountdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
@@ -26,9 +24,6 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     if player == nil then
         return nil
     end
-    if player.Variant ~= 0 then
-        return nil
-    end
     if isChildPlayer(nil, player) then
         return nil
     end
@@ -40,7 +35,13 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     if willPlayerRevive(nil, player) then
         return nil
     end
-    if not damageIsFatal(nil, player, damageAmount, lastDamageFrame) and not hasLostCurse(nil, player) then
+    if not isDamageToPlayerFatal(
+        nil,
+        player,
+        damageAmount,
+        damageSource,
+        lastDamageFrame
+    ) then
         return nil
     end
     local shouldSustainDeath = postPlayerFatalDamageFire(nil, player)
@@ -49,33 +50,6 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     end
     return nil
 end
-function damageIsFatal(self, player, damageAmount, lastDamageFrame)
-    local game = Game()
-    local gameFrameCount = game:GetFrameCount()
-    local character = player:GetPlayerType()
-    if character == PlayerType.PLAYER_JACOB2_B then
-        return true
-    end
-    local playerNumAllHearts = getPlayerNumAllHearts(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 == 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
 v = {run = {playerLastDamageFrame = __TS__New(Map)}}
 function ____exports.postPlayerFatalDamageCallbackInit(self, mod)
     saveDataManager(nil, "postPlayerFatalDamage", v)

package/dist/callbacks/postTrinketBreak.lua

@@ -1,27 +1,19 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdate, entityTakeDmgPlayer, getTrinketMap, TRINKETS_THAT_CAN_BREAK, v
+local hasSubscriptions, entityTakeDmgPlayer, postPEffectUpdateReordered, getTrinketMap, TRINKETS_THAT_CAN_BREAK, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
+local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
+local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
 local ____postTrinketBreak = require("callbacks.subscriptions.postTrinketBreak")
 local postTrinketBreakFire = ____postTrinketBreak.postTrinketBreakFire
 local postTrinketBreakHasSubscriptions = ____postTrinketBreak.postTrinketBreakHasSubscriptions
 function hasSubscriptions(self)
     return postTrinketBreakHasSubscriptions(nil)
 end
-function postPEffectUpdate(self, player)
-    if not hasSubscriptions(nil) then
-        return
-    end
-    local trinketMap = getTrinketMap(nil, player)
-    for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
-        local numTrinkets = player:GetTrinketMultiplier(trinketType)
-        trinketMap:set(trinketType, numTrinkets)
-    end
-end
 function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
     if not hasSubscriptions(nil) then
         return
@@ -36,16 +28,26 @@ function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _dam
             local numTrinketsHeld = player:GetTrinketMultiplier(trinketType)
             local oldNumTrinketsHeld = trinketMap:get(trinketType)
             if oldNumTrinketsHeld == nil or numTrinketsHeld >= oldNumTrinketsHeld then
-                goto __continue11
+                goto __continue7
             end
             trinketMap:set(trinketType, numTrinketsHeld)
             local numTrinketsOnGround = Isaac.CountEntities(nil, EntityType.ENTITY_PICKUP, PickupVariant.PICKUP_TRINKET, trinketType)
             if numTrinketsOnGround > 0 then
-                goto __continue11
+                goto __continue7
             end
             postTrinketBreakFire(nil, player, trinketType)
         end
-        ::__continue11::
+        ::__continue7::
+    end
+end
+function postPEffectUpdateReordered(self, player)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    local trinketMap = getTrinketMap(nil, player)
+    for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
+        local numTrinkets = player:GetTrinketMultiplier(trinketType)
+        trinketMap:set(trinketType, numTrinkets)
     end
 end
 function getTrinketMap(self, player)
@@ -61,7 +63,7 @@ TRINKETS_THAT_CAN_BREAK = {TrinketType.TRINKET_WISH_BONE, TrinketType.TRINKET_WA
 v = {run = {playerTrinketMap = __TS__New(Map)}}
 function ____exports.postTrinketBreakCallbackInit(self, mod)
     saveDataManager(nil, "postTrinketBreak", v, hasSubscriptions)
-    mod:AddCallback(ModCallbacks.MC_POST_PEFFECT_UPDATE, postPEffectUpdate)
     mod:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, entityTakeDmgPlayer, EntityType.ENTITY_PLAYER)
+    mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PEFFECT_UPDATE_REORDERED, postPEffectUpdateReordered)
 end
 return ____exports

package/dist/callbacks/preBerserkDeath.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/callbacks/preBerserkDeath.lua

@@ -0,0 +1,32 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local hasSubscriptions, postPEffectUpdateReordered
+local ____player = require("functions.player")
+local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
+local isChildPlayer = ____player.isChildPlayer
+local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
+local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
+local ____preBerserkDeath = require("callbacks.subscriptions.preBerserkDeath")
+local preBerserkDeathFire = ____preBerserkDeath.preBerserkDeathFire
+local preBerserkDeathHasSubscriptions = ____preBerserkDeath.preBerserkDeathHasSubscriptions
+function hasSubscriptions(self)
+    return preBerserkDeathHasSubscriptions(nil)
+end
+function postPEffectUpdateReordered(self, player)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    if isChildPlayer(nil, player) then
+        return
+    end
+    local effects = player:GetEffects()
+    local berserkEffect = effects:GetCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
+    local playerNumAllHearts = getPlayerNumAllHearts(nil, player)
+    if berserkEffect ~= nil and berserkEffect.Cooldown == 1 and playerNumAllHearts == 0 then
+        preBerserkDeathFire(nil, player)
+    end
+end
+function ____exports.preBerserkDeathCallbackInit(self, mod)
+    mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PEFFECT_UPDATE_REORDERED, postPEffectUpdateReordered)
+end
+return ____exports

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

@@ -0,0 +1,2 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare type PreBerserkDeathCallbackType = (player: EntityPlayer) => boolean | void;

package/dist/callbacks/subscriptions/preBerserkDeath.lua

@@ -0,0 +1,25 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
+local ____exports = {}
+local subscriptions = {}
+function ____exports.preBerserkDeathHasSubscriptions(self)
+    return #subscriptions > 0
+end
+function ____exports.preBerserkDeathRegister(self, callback, playerVariant)
+    __TS__ArrayPush(subscriptions, {callback, playerVariant})
+end
+function ____exports.preBerserkDeathFire(self, player)
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local playerVariant = ____value[2]
+        do
+            if playerVariant ~= nil and playerVariant ~= player.Variant then
+                goto __continue5
+            end
+            callback(nil, player)
+        end
+        ::__continue5::
+    end
+    return nil
+end
+return ____exports

package/dist/constants.d.ts

@@ -99,6 +99,7 @@ export declare const MAX_PLAYER_TRINKET_SLOTS = 2;
  * on. The maximum room index possible is 168. (It is not 169 because we start at 0 instead of 1.)
  */
 export declare const MAX_ROOM_INDEX = 168;
+export declare const MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B;
 export declare const MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING;
 export declare const MOVEMENT_ACTIONS: Set<ButtonAction>;
 export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;

package/dist/constants.lua

@@ -83,6 +83,7 @@ ____exports.MAX_PLAYER_POCKET_ITEM_SLOTS = 4
 ____exports.MAX_PLAYER_SPEED_IN_UNITS = 9.8
 ____exports.MAX_PLAYER_TRINKET_SLOTS = 2
 ____exports.MAX_ROOM_INDEX = 168
+____exports.MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B
 ____exports.MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING
 ____exports.MOVEMENT_ACTIONS = __TS__New(Set, {ButtonAction.ACTION_LEFT, ButtonAction.ACTION_RIGHT, ButtonAction.ACTION_UP, ButtonAction.ACTION_DOWN})
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135

package/dist/functions/gridEntity.lua

@@ -43,6 +43,8 @@ function ____exports.spawnGridEntityWithVariant(self, gridEntityType, variant, g
         if pit ~= nil then
             pit:UpdateCollision()
         end
+    elseif gridEntityType == GridEntityType.GRID_WALL then
+        gridEntity.CollisionClass = GridCollisionClass.COLLISION_WALL
     end
     return gridEntity
 end

package/dist/functions/player.d.ts

@@ -174,6 +174,8 @@ 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 | undefined): 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

@@ -345,6 +345,44 @@ 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.getPlayerNumAllHearts(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
@@ -405,9 +443,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch108 = activeSlot
-        local ____cond108 = ____switch108 == ActiveSlot.SLOT_PRIMARY
-        if ____cond108 then
+        local ____switch117 = activeSlot
+        local ____cond117 = ____switch117 == ActiveSlot.SLOT_PRIMARY
+        if ____cond117 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -416,8 +454,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond108 = ____cond108 or ____switch108 == ActiveSlot.SLOT_SECONDARY
-        if ____cond108 then
+        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_SECONDARY
+        if ____cond117 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -432,16 +470,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond108 = ____cond108 or ____switch108 == ActiveSlot.SLOT_POCKET
-        if ____cond108 then
+        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_POCKET
+        if ____cond117 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond108 = ____cond108 or ____switch108 == ActiveSlot.SLOT_POCKET2
-        if ____cond108 then
+        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_POCKET2
+        if ____cond117 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/types/CallbackParametersCustom.d.ts

@@ -40,6 +40,7 @@ import { PostTearInitLateCallbackType } from "../callbacks/subscriptions/postTea
 import { PostTearInitVeryLateCallbackType } from "../callbacks/subscriptions/postTearInitVeryLate";
 import { PostTransformationCallbackType } from "../callbacks/subscriptions/postTransformation";
 import { PostTrinketBreakCallbackType } from "../callbacks/subscriptions/postTrinketBreak";
+import { PreBerserkDeathCallbackType } from "../callbacks/subscriptions/preBerserkDeath";
 import { PreCustomReviveCallbackType } from "../callbacks/subscriptions/preCustomRevive";
 import { PreItemPickupCallbackType } from "../callbacks/subscriptions/preItemPickup";
 import { PreNewLevelCallbackType } from "../callbacks/subscriptions/PreNewLevel";
@@ -143,6 +144,10 @@ export interface CallbackParametersCustom {
         callback: PostPlayerFatalDamageCallbackType,
         playerVariant?: PlayerVariant
     ];
+    [ModCallbacksCustom.MC_PRE_BERSERK_DEATH]: [
+        callback: PreBerserkDeathCallbackType,
+        playerVariant?: PlayerVariant
+    ];
     [ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE]: [
         callback: PreCustomReviveCallbackType
     ];

package/dist/types/ModCallbacksCustom.d.ts

@@ -32,22 +32,23 @@ export declare enum ModCallbacksCustom {
     MC_POST_PLAYER_CHANGE_TYPE = 23,
     MC_POST_PLAYER_CHANGE_HEALTH = 24,
     MC_POST_PLAYER_FATAL_DAMAGE = 25,
-    MC_PRE_CUSTOM_REVIVE = 26,
-    MC_POST_CUSTOM_REVIVE = 27,
-    MC_POST_FLIP = 28,
-    MC_POST_FIRST_FLIP = 29,
-    MC_POST_ESAU_JR = 30,
-    MC_POST_FIRST_ESAU_JR = 31,
-    MC_POST_TRANSFORMATION = 32,
-    MC_POST_PURCHASE = 33,
-    MC_POST_SACRIFICE = 34,
-    MC_POST_CURSED_TELEPORT = 35,
-    MC_POST_TRINKET_BREAK = 36,
-    MC_POST_SLOT_INIT = 37,
-    MC_POST_SLOT_UPDATE = 38,
-    MC_POST_SLOT_RENDER = 39,
-    MC_POST_SLOT_DESTROYED = 40,
-    MC_POST_GRID_ENTITY_INIT = 41,
-    MC_POST_GRID_ENTITY_UPDATE = 42,
-    MC_POST_GRID_ENTITY_REMOVE = 43
+    MC_PRE_BERSERK_DEATH = 26,
+    MC_PRE_CUSTOM_REVIVE = 27,
+    MC_POST_CUSTOM_REVIVE = 28,
+    MC_POST_FLIP = 29,
+    MC_POST_FIRST_FLIP = 30,
+    MC_POST_ESAU_JR = 31,
+    MC_POST_FIRST_ESAU_JR = 32,
+    MC_POST_TRANSFORMATION = 33,
+    MC_POST_PURCHASE = 34,
+    MC_POST_SACRIFICE = 35,
+    MC_POST_CURSED_TELEPORT = 36,
+    MC_POST_TRINKET_BREAK = 37,
+    MC_POST_SLOT_INIT = 38,
+    MC_POST_SLOT_UPDATE = 39,
+    MC_POST_SLOT_RENDER = 40,
+    MC_POST_SLOT_DESTROYED = 41,
+    MC_POST_GRID_ENTITY_INIT = 42,
+    MC_POST_GRID_ENTITY_UPDATE = 43,
+    MC_POST_GRID_ENTITY_REMOVE = 44
 }

package/dist/types/ModCallbacksCustom.lua

@@ -53,40 +53,42 @@ ____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_HEALTH = 24
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_HEALTH] = "MC_POST_PLAYER_CHANGE_HEALTH"
 ____exports.ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE = 25
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE] = "MC_POST_PLAYER_FATAL_DAMAGE"
-____exports.ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE = 26
+____exports.ModCallbacksCustom.MC_PRE_BERSERK_DEATH = 26
+____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_PRE_BERSERK_DEATH] = "MC_PRE_BERSERK_DEATH"
+____exports.ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE = 27
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE] = "MC_PRE_CUSTOM_REVIVE"
-____exports.ModCallbacksCustom.MC_POST_CUSTOM_REVIVE = 27
+____exports.ModCallbacksCustom.MC_POST_CUSTOM_REVIVE = 28
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CUSTOM_REVIVE] = "MC_POST_CUSTOM_REVIVE"
-____exports.ModCallbacksCustom.MC_POST_FLIP = 28
+____exports.ModCallbacksCustom.MC_POST_FLIP = 29
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FLIP] = "MC_POST_FLIP"
-____exports.ModCallbacksCustom.MC_POST_FIRST_FLIP = 29
+____exports.ModCallbacksCustom.MC_POST_FIRST_FLIP = 30
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FIRST_FLIP] = "MC_POST_FIRST_FLIP"
-____exports.ModCallbacksCustom.MC_POST_ESAU_JR = 30
+____exports.ModCallbacksCustom.MC_POST_ESAU_JR = 31
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_ESAU_JR] = "MC_POST_ESAU_JR"
-____exports.ModCallbacksCustom.MC_POST_FIRST_ESAU_JR = 31
+____exports.ModCallbacksCustom.MC_POST_FIRST_ESAU_JR = 32
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FIRST_ESAU_JR] = "MC_POST_FIRST_ESAU_JR"
-____exports.ModCallbacksCustom.MC_POST_TRANSFORMATION = 32
+____exports.ModCallbacksCustom.MC_POST_TRANSFORMATION = 33
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_TRANSFORMATION] = "MC_POST_TRANSFORMATION"
-____exports.ModCallbacksCustom.MC_POST_PURCHASE = 33
+____exports.ModCallbacksCustom.MC_POST_PURCHASE = 34
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PURCHASE] = "MC_POST_PURCHASE"
-____exports.ModCallbacksCustom.MC_POST_SACRIFICE = 34
+____exports.ModCallbacksCustom.MC_POST_SACRIFICE = 35
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SACRIFICE] = "MC_POST_SACRIFICE"
-____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT = 35
+____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT = 36
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT] = "MC_POST_CURSED_TELEPORT"
-____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK = 36
+____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK = 37
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK] = "MC_POST_TRINKET_BREAK"
-____exports.ModCallbacksCustom.MC_POST_SLOT_INIT = 37
+____exports.ModCallbacksCustom.MC_POST_SLOT_INIT = 38
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_INIT] = "MC_POST_SLOT_INIT"
-____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE = 38
+____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE = 39
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE] = "MC_POST_SLOT_UPDATE"
-____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER = 39
+____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER = 40
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER] = "MC_POST_SLOT_RENDER"
-____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED = 40
+____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED = 41
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED] = "MC_POST_SLOT_DESTROYED"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT = 41
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT = 42
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT] = "MC_POST_GRID_ENTITY_INIT"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 42
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 43
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE] = "MC_POST_GRID_ENTITY_UPDATE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 43
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 44
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE] = "MC_POST_GRID_ENTITY_REMOVE"
 return ____exports

package/dist/types/ModUpgraded.lua

@@ -84,6 +84,8 @@ local ____postTransformation = require("callbacks.subscriptions.postTransformati
 local postTransformationRegister = ____postTransformation.postTransformationRegister
 local ____postTrinketBreak = require("callbacks.subscriptions.postTrinketBreak")
 local postTrinketBreakRegister = ____postTrinketBreak.postTrinketBreakRegister
+local ____preBerserkDeath = require("callbacks.subscriptions.preBerserkDeath")
+local preBerserkDeathRegister = ____preBerserkDeath.preBerserkDeathRegister
 local ____preCustomRevive = require("callbacks.subscriptions.preCustomRevive")
 local preCustomReviveRegister = ____preCustomRevive.preCustomReviveRegister
 local ____preItemPickup = require("callbacks.subscriptions.preItemPickup")
@@ -265,6 +267,12 @@ function getCallbackRegisterFunction(self, callbackID)
                 return postPlayerFatalDamageRegister
             end
         end
+        ____cond19 = ____cond19 or ____switch19 == ModCallbacksCustom.MC_PRE_BERSERK_DEATH
+        if ____cond19 then
+            do
+                return preBerserkDeathRegister
+            end
+        end
         ____cond19 = ____cond19 or ____switch19 == ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE
         if ____cond19 then
             do

package/dist/upgradeMod.lua

@@ -60,6 +60,8 @@ local ____postTransformation = require("callbacks.postTransformation")
 local postTransformationCallbackInit = ____postTransformation.postTransformationCallbackInit
 local ____postTrinketBreak = require("callbacks.postTrinketBreak")
 local postTrinketBreakCallbackInit = ____postTrinketBreak.postTrinketBreakCallbackInit
+local ____preBerserkDeath = require("callbacks.preBerserkDeath")
+local preBerserkDeathCallbackInit = ____preBerserkDeath.preBerserkDeathCallbackInit
 local ____preNewLevel = require("callbacks.preNewLevel")
 local preNewLevelCallbackInit = ____preNewLevel.preNewLevelCallbackInit
 local ____reorderedCallbacks = require("callbacks.reorderedCallbacks")
@@ -107,6 +109,7 @@ function initCustomCallbacks(self, mod)
     postPlayerChangeTypeCallbackInit(nil, mod)
     postPlayerChangeHealthCallbackInit(nil, mod)
     postPlayerFatalDamageCallbackInit(nil, mod)
+    preBerserkDeathCallbackInit(nil, mod)
     customReviveCallbacksInit(nil, mod)
     postFlipCallbacksInit(nil, mod)
     postEsauJrCallbacksInit(nil, mod)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.588",
+  "version": "1.0.592",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,10 +25,11 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.329",
-    "isaacscript-lint": "^1.0.77",
+    "isaac-typescript-definitions": "^1.0.331",
+    "isaacscript-lint": "^1.0.79",
+    "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.10",
     "typescript": "^4.5.4",
-    "typescript-to-lua": "^1.3.0"
+    "typescript-to-lua": "^1.3.1"
   }
 }