isaacscript-common 1.0.530 → 1.0.534

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

@@ -21,6 +21,9 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     if player == nil then
         return nil
     end
+    if player.Variant ~= 0 then
+        return nil
+    end
     if willPlayerRevive(nil, player) then
         return nil
     end

package/dist/functions/player.lua

@@ -18,6 +18,15 @@ local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
 local ____util = require("functions.util")
 local ensureAllCases = ____util.ensureAllCases
+function ____exports.getCharacterMaxHeartContainers(self, character)
+    if character == PlayerType.PLAYER_KEEPER then
+        return 3
+    end
+    if character == PlayerType.PLAYER_KEEPER_B then
+        return 2
+    end
+    return 12
+end
 function ____exports.getPlayerIndex(self, player)
     local character = player:GetPlayerType()
     local collectibleToUse = ((character == PlayerType.PLAYER_LAZARUS2_B) and CollectibleType.COLLECTIBLE_INNER_EYE) or CollectibleType.COLLECTIBLE_SAD_ONION
@@ -25,6 +34,19 @@ function ____exports.getPlayerIndex(self, player)
     local seed = collectibleRNG:GetSeed()
     return seed
 end
+function ____exports.getPlayerMaxHeartContainers(self, player)
+    local character = player:GetPlayerType()
+    local maxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
+    if (character == PlayerType.PLAYER_MAGDALENE) and player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT) then
+        maxHeartContainers = maxHeartContainers + 6
+    end
+    local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
+    maxHeartContainers = maxHeartContainers + numMothersKisses
+    if maxHeartContainers > MAX_PLAYER_HEART_CONTAINERS then
+        maxHeartContainers = MAX_PLAYER_HEART_CONTAINERS
+    end
+    return maxHeartContainers
+end
 function ____exports.getPlayers(self, performExclusions)
     if performExclusions == nil then
         performExclusions = false
@@ -218,22 +240,15 @@ function ____exports.getNewestPlayer(self)
     return newestPlayer
 end
 function ____exports.getPlayerAvailableHeartSlots(self, player)
+    local maxHeartContainers = ____exports.getPlayerMaxHeartContainers(nil, player)
     local effectiveMaxHearts = player:GetEffectiveMaxHearts()
     local normalAndBoneHeartContainers = effectiveMaxHearts / 2
     local soulHearts = player:GetSoulHearts()
     local soulHeartContainers = math.ceil(soulHearts / 2)
     local totalHeartContainers = normalAndBoneHeartContainers + soulHeartContainers
     local brokenHearts = player:GetBrokenHearts()
-    return totalHeartContainers - brokenHearts
-end
-function ____exports.getCharacterMaxHeartContainers(self, character)
-    if character == PlayerType.PLAYER_KEEPER then
-        return 3
-    end
-    if character == PlayerType.PLAYER_KEEPER_B then
-        return 2
-    end
-    return 12
+    local totalOccupiedHeartSlots = totalHeartContainers + brokenHearts
+    return maxHeartContainers - totalOccupiedHeartSlots
 end
 function ____exports.getPlayerCloserThan(self, position, distance)
     for ____, player in ipairs(
@@ -291,25 +306,13 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
     end
     return nil
 end
-function ____exports.getPlayerMaxHeartContainers(self, player)
-    local character = player:GetPlayerType()
-    local maxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
-    if (character == PlayerType.PLAYER_MAGDALENE) and player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT) then
-        maxHeartContainers = maxHeartContainers + 6
-    end
-    local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
-    maxHeartContainers = maxHeartContainers + numMothersKisses
-    if maxHeartContainers > MAX_PLAYER_HEART_CONTAINERS then
-        maxHeartContainers = MAX_PLAYER_HEART_CONTAINERS
-    end
-    return maxHeartContainers
-end
 function ____exports.getPlayerNumAllHearts(self, player)
     local hearts = player:GetHearts()
     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.530",
+  "version": "1.0.534",
   "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",