isaacscript-common 1.2.114 → 1.2.117

package/dist/callbacks/customRevive.lua

@@ -1,6 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
+local hasSubscriptions, postRender, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____collectibles = require("functions.collectibles")
@@ -27,15 +27,6 @@ function postRender(self)
     local sfx = SFXManager()
     sfx:Stop(SoundEffect.SOUND_1UP)
 end
-function postNewRoom(self)
-    if v.run.state == CustomReviveState.CHANGING_ROOMS then
-        v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
-    elseif v.run.state == CustomReviveState.WAITING_FOR_ITEM_ANIMATION then
-        v.run.state = CustomReviveState.DISABLED
-        v.run.revivalType = nil
-        v.run.dyingPlayerIndex = nil
-    end
-end
 function postPEffectUpdateReordered(self, player)
     checkWaitingForItemAnimation(nil, player)
 end
@@ -85,7 +76,7 @@ function playerIsAboutToDie(self, player)
     if revivalType == nil then
         return
     end
-    v.run.state = CustomReviveState.CHANGING_ROOMS
+    v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
     v.run.revivalType = revivalType
     v.run.dyingPlayerIndex = getPlayerIndex(nil, player)
     player:AddCollectible(CollectibleType.COLLECTIBLE_1UP, 0, false)
@@ -95,15 +86,12 @@ end
 CustomReviveState = CustomReviveState or ({})
 CustomReviveState.DISABLED = 0
 CustomReviveState[CustomReviveState.DISABLED] = "DISABLED"
-CustomReviveState.CHANGING_ROOMS = 1
-CustomReviveState[CustomReviveState.CHANGING_ROOMS] = "CHANGING_ROOMS"
-CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 2
+CustomReviveState.WAITING_FOR_ITEM_ANIMATION = 1
 CustomReviveState[CustomReviveState.WAITING_FOR_ITEM_ANIMATION] = "WAITING_FOR_ITEM_ANIMATION"
 v = {run = {state = CustomReviveState.DISABLED, revivalType = nil, dyingPlayerIndex = nil}}
 function ____exports.customReviveCallbacksInit(self, mod)
     saveDataManager(nil, "customRevive", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_RENDER, postRender)
-    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)

package/dist/functions/log.lua

@@ -137,17 +137,17 @@ function ____exports.logPlayerHealth(player)
     local playerName = getPlayerName(nil, player)
     local playerHealth = getPlayerHealth(nil, player)
     ____exports.log(("Player health for " .. playerName) .. ":")
-    ____exports.log("- Max hearts: " .. tostring(playerHealth.maxHearts))
-    ____exports.log("- Hearts: " .. tostring(playerHealth.hearts))
-    ____exports.log("- Eternal hearts: " .. tostring(playerHealth.eternalHearts))
-    ____exports.log("- Soul hearts: " .. tostring(playerHealth.soulHearts))
-    ____exports.log("- Bone hearts: " .. tostring(playerHealth.boneHearts))
-    ____exports.log("- Golden hearts: " .. tostring(playerHealth.goldenHearts))
-    ____exports.log("- Rotten hearts: " .. tostring(playerHealth.rottenHearts))
-    ____exports.log("- Broken hearts: " .. tostring(playerHealth.brokenHearts))
-    ____exports.log("- Soul charges: " .. tostring(playerHealth.soulCharges))
-    ____exports.log("- Blood charges: " .. tostring(playerHealth.bloodCharges))
-    ____exports.log(("- Soul heart types: [" .. table.concat(playerHealth.soulHeartTypes, "," or ",")) .. "]")
+    ____exports.log("  Max hearts: " .. tostring(playerHealth.maxHearts))
+    ____exports.log("  Hearts: " .. tostring(playerHealth.hearts))
+    ____exports.log("  Eternal hearts: " .. tostring(playerHealth.eternalHearts))
+    ____exports.log("  Soul hearts: " .. tostring(playerHealth.soulHearts))
+    ____exports.log("  Bone hearts: " .. tostring(playerHealth.boneHearts))
+    ____exports.log("  Golden hearts: " .. tostring(playerHealth.goldenHearts))
+    ____exports.log("  Rotten hearts: " .. tostring(playerHealth.rottenHearts))
+    ____exports.log("  Broken hearts: " .. tostring(playerHealth.brokenHearts))
+    ____exports.log("  Soul charges: " .. tostring(playerHealth.soulCharges))
+    ____exports.log("  Blood charges: " .. tostring(playerHealth.bloodCharges))
+    ____exports.log(("  Soul heart types: [" .. table.concat(playerHealth.soulHeartTypes, "," or ",")) .. "]")
 end
 function ____exports.logRoom()
     local roomGridIndex = getRoomGridIndex(nil)

package/dist/functions/player.d.ts

@@ -218,7 +218,7 @@ export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPl
  * This function does not validate whether or not the provided player is Tainted Magdalene; that
  * should be accomplished before invoking this function.
  */
-export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): 4 | 6;
+export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): number;
 /**
  * Helper function to return the active charge and the battery charge combined. This is useful
  * because you are not able to set the battery charge directly.

package/dist/functions/player.lua

@@ -504,8 +504,10 @@ function ____exports.getSoulHearts(self, player)
     return soulHearts - blackHearts
 end
 function ____exports.getTaintedMagdaleneNonTemporaryMaxHearts(self, player)
+    local maxHearts = player:GetMaxHearts()
     local hasBirthright = player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT)
-    return hasBirthright and 6 or 4
+    local maxNonTemporaryMaxHearts = hasBirthright and 6 or 4
+    return math.min(maxHearts, maxNonTemporaryMaxHearts)
 end
 function ____exports.getTotalCharge(self, player, activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)

package/dist/functions/playerHealth.lua

@@ -5,6 +5,10 @@ local __TS__ArrayForEach = ____lualib.__TS__ArrayForEach
 local ____exports = {}
 local ____constants = require("constants")
 local MAX_PLAYER_HEART_CONTAINERS = ____constants.MAX_PLAYER_HEART_CONTAINERS
+local ____player = require("functions.player")
+local getHearts = ____player.getHearts
+local ____utils = require("functions.utils")
+local ____repeat = ____utils["repeat"]
 function ____exports.removeAllPlayerHealth(self, player)
     local character = player:GetPlayerType()
     local goldenHearts = player:GetGoldenHearts()
@@ -29,7 +33,7 @@ function ____exports.getPlayerHealth(self, player)
     local character = player:GetPlayerType()
     local soulHeartTypes = {}
     local maxHearts = player:GetMaxHearts()
-    local hearts = player:GetHearts()
+    local hearts = getHearts(nil, player)
     local soulHearts = player:GetSoulHearts()
     local boneHearts = player:GetBoneHearts()
     local goldenHearts = player:GetGoldenHearts()
@@ -47,7 +51,6 @@ function ____exports.getPlayerHealth(self, player)
         maxHearts = subPlayer:GetBoneHearts() * 2
         hearts = subPlayer:GetHearts()
     end
-    hearts = hearts - rottenHearts * 2
     local extraHearts = math.ceil(soulHearts / 2) + boneHearts
     local currentSoulHeart = 0
     do
@@ -91,6 +94,7 @@ end
 function ____exports.setPlayerHealth(self, player, playerHealth)
     local character = player:GetPlayerType()
     local subPlayer = player:GetSubPlayer()
+    local isTaintedMagdalene = character == PlayerType.PLAYER_MAGDALENE_B
     ____exports.removeAllPlayerHealth(nil, player)
     if character == PlayerType.PLAYER_THESOUL and subPlayer ~= nil then
         subPlayer:AddMaxHearts(playerHealth.maxHearts, false)
@@ -119,7 +123,16 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         end
     )
     player:AddRottenHearts(playerHealth.rottenHearts)
-    player:AddHearts(playerHealth.hearts)
+    ____repeat(
+        nil,
+        playerHealth.hearts,
+        function()
+            player:AddHearts(1)
+            if isTaintedMagdalene then
+                player:AddHearts(-1)
+            end
+        end
+    )
     player:AddGoldenHearts(playerHealth.goldenHearts)
     player:AddBrokenHearts(playerHealth.brokenHearts)
     if character == PlayerType.PLAYER_BETHANY then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.114",
+  "version": "1.2.117",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.2",
-    "isaac-typescript-definitions": "^1.0.358",
+    "isaac-typescript-definitions": "^1.0.359",
     "isaacscript-lint": "^1.0.84",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",