isaacscript-common 1.0.598 → 1.0.599
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4,6 +4,8 @@ local hasSubscriptions, postPEffectUpdateReordered
|
|
|
4
4
|
local ____player = require("functions.player")
|
|
5
5
|
local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
|
|
6
6
|
local isChildPlayer = ____player.isChildPlayer
|
|
7
|
+
local ____revive = require("functions.revive")
|
|
8
|
+
local willPlayerRevive = ____revive.willPlayerRevive
|
|
7
9
|
local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
|
|
8
10
|
local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
|
|
9
11
|
local ____preBerserkDeath = require("callbacks.subscriptions.preBerserkDeath")
|
|
@@ -22,7 +24,7 @@ function postPEffectUpdateReordered(self, player)
|
|
|
22
24
|
local effects = player:GetEffects()
|
|
23
25
|
local berserkEffect = effects:GetCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
|
|
24
26
|
local playerNumAllHearts = getPlayerNumAllHearts(nil, player)
|
|
25
|
-
if berserkEffect ~= nil and berserkEffect.Cooldown == 1 and playerNumAllHearts == 0 then
|
|
27
|
+
if berserkEffect ~= nil and berserkEffect.Cooldown == 1 and playerNumAllHearts == 0 and not willPlayerRevive(nil, player) then
|
|
26
28
|
preBerserkDeathFire(nil, player)
|
|
27
29
|
end
|
|
28
30
|
end
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "isaacscript-common",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.599",
|
|
4
4
|
"description": "Helper functions for IsaacScript mods",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"isaac",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"dist/**/*.d.ts"
|
|
26
26
|
],
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"isaac-typescript-definitions": "^1.0.
|
|
28
|
+
"isaac-typescript-definitions": "^1.0.332",
|
|
29
29
|
"isaacscript-lint": "^1.0.79",
|
|
30
30
|
"isaacscript-tsconfig": "^1.1.8",
|
|
31
31
|
"typedoc": "^0.22.11",
|