isaacscript-common 1.0.531 → 1.0.535

package/dist/callbacks/itemPickup.lua

@@ -37,9 +37,12 @@ function queueEmpty(self, player, pickingUpItem)
 end
 function queueNotEmpty(self, player, pickingUpItem)
     local queuedItem = player.QueuedItem.Item
-    if (queuedItem ~= nil) and (queuedItem.ID ~= pickingUpItem.id) then
-        pickingUpItem.id = queuedItem.ID
+    if queuedItem == nil then
+        return
+    end
+    if (queuedItem.Type ~= pickingUpItem.type) or (queuedItem.ID ~= pickingUpItem.id) then
         pickingUpItem.type = queuedItem.Type
+        pickingUpItem.id = queuedItem.ID
         preItemPickupFire(nil, player, pickingUpItem)
     end
 end

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -5,6 +5,7 @@ local ____player = require("functions.player")
 local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
 local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
 local hasLostCurse = ____player.hasLostCurse
+local isChildPlayer = ____player.isChildPlayer
 local ____revive = require("functions.revive")
 local willPlayerRevive = ____revive.willPlayerRevive
 local ____postPlayerFatalDamage = require("callbacks.subscriptions.postPlayerFatalDamage")
@@ -21,6 +22,12 @@ 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
     if willPlayerRevive(nil, player) then
         return nil
     end

package/dist/functions/player.lua

@@ -311,7 +311,8 @@ function ____exports.getPlayerNumAllHearts(self, player)
     local soulHearts = player:GetSoulHearts()
     local boneHearts = player:GetBoneHearts()
     local eternalHearts = player:GetEternalHearts()
-    return ((hearts + soulHearts) + boneHearts) + eternalHearts
+    local rottenHearts = player:GetRottenHearts()
+    return (((hearts + soulHearts) + boneHearts) + eternalHearts) - rottenHearts
 end
 function ____exports.getPlayersOfType(self, playerType)
     local players = {}

package/dist/upgradeMod.lua

@@ -81,8 +81,6 @@ local areFeaturesInitialized = ____initialized.areFeaturesInitialized
 local setFeaturesInitialized = ____initialized.setFeaturesInitialized
 local ____patchErrorFunctions = require("patchErrorFunctions")
 local patchErrorFunction = ____patchErrorFunctions.patchErrorFunction
-local ____patchPrintFunction = require("patchPrintFunction")
-local patchPrintFunction = ____patchPrintFunction.patchPrintFunction
 local ____ModUpgraded = require("types.ModUpgraded")
 local ModUpgraded = ____ModUpgraded.ModUpgraded
 function initCustomCallbacks(self, mod)
@@ -129,7 +127,6 @@ function ____exports.upgradeMod(self, modVanilla, verbose)
         verbose = false
     end
     patchErrorFunction(nil)
-    patchPrintFunction(nil)
     local mod = __TS__New(ModUpgraded, modVanilla, verbose)
     if not areFeaturesInitialized(nil) then
         setFeaturesInitialized(nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.531",
+  "version": "1.0.535",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.297",
+    "isaac-typescript-definitions": "^1.0.300",
     "isaacscript-lint": "^1.0.72",
     "typedoc": "^0.22.10",
     "typescript": "4.4.4",