isaacscript-common 8.4.2 → 8.4.3

package/dist/functions/playerHealth.d.ts

@@ -12,7 +12,7 @@ export declare function addPlayerHealthType(player: EntityPlayer, healthType: He
  */
 export declare function getPlayerHealth(player: EntityPlayer): PlayerHealth;
 export declare function getPlayerHealthType(player: EntityPlayer, healthType: HealthType): int;
-/** Returns a `PlayerHealth` object with all 0s. */
+/** Returns a `PlayerHealth` object with all zeros. */
 export declare function newPlayerHealth(): PlayerHealth;
 export declare function playerConvertBlackHeartsToSoulHearts(player: EntityPlayer): void;
 export declare function playerConvertSoulHeartsToBlackHearts(player: EntityPlayer): void;

package/dist/functions/playerHealth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playerHealth.d.ts","sourceRoot":"","sources":["../../src/functions/playerHealth.ts"],"names":[],"mappings":";;AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAWzE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,GACb,IAAI,CA+CN;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA2ElE;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAmDL;AAED,mDAAmD;AACnD,wBAAgB,eAAe,IAAI,YAAY,CAc9C;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAwBhE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GACzB,IAAI,CAyGN"}
+{"version":3,"file":"playerHealth.d.ts","sourceRoot":"","sources":["../../src/functions/playerHealth.ts"],"names":[],"mappings":";;AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAYzE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,GACb,IAAI,CA+CN;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA2ElE;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAmDL;AAED,sDAAsD;AACtD,wBAAgB,eAAe,IAAI,YAAY,CAc9C;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAwBhE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GACzB,IAAI,CAsHN"}

package/dist/functions/playerHealth.lua

@@ -21,6 +21,8 @@ local getPlayerHearts = ____players.getPlayerHearts
 local getPlayerSoulHearts = ____players.getPlayerSoulHearts
 local isCharacter = ____players.isCharacter
 local setActiveItem = ____players.setActiveItem
+local ____utils = require("functions.utils")
+local ____repeat = ____utils["repeat"]
 function ____exports.removeAllPlayerHealth(self, player)
     local goldenHearts = player:GetGoldenHearts()
     local eternalHearts = player:GetEternalHearts()
@@ -105,8 +107,23 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
     )
     player:AddRottenHearts(playerHealth.rottenHearts)
     if character == PlayerType.MAGDALENE_B then
-        local effectiveHearts = playerHealth.hearts / 2
-        player:AddHearts(effectiveHearts)
+        ____repeat(
+            nil,
+            playerHealth.hearts,
+            function()
+                if player:HasFullHearts() then
+                    return
+                end
+                local hearts = player:GetHearts()
+                local maxHearts = player:GetMaxHearts()
+                if hearts == maxHearts - 1 then
+                    player:AddHearts(1)
+                    return
+                end
+                player:AddHearts(1)
+                player:AddHearts(-1)
+            end
+        )
     else
         player:AddHearts(playerHealth.hearts)
     end
@@ -323,7 +340,7 @@ function ____exports.getPlayerHealthType(self, player, healthType)
         end
     until true
 end
---- Returns a `PlayerHealth` object with all 0s.
+--- Returns a `PlayerHealth` object with all zeros.
 function ____exports.newPlayerHealth(self)
     return {
         maxHearts = 0,

package/dist/index.d.ts

@@ -8143,7 +8143,7 @@ export declare function newChargeBarSprites(maxCharges: int): ChargeBarSprites;
 
 export declare function newPickingUpItem(): PickingUpItem;
 
-/** Returns a `PlayerHealth` object with all 0s. */
+/** Returns a `PlayerHealth` object with all zeros. */
 export declare function newPlayerHealth(): PlayerHealth;
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "8.4.2",
+  "version": "8.4.3",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/functions/playerHealth.ts

@@ -16,6 +16,7 @@ import {
   isCharacter,
   setActiveItem,
 } from "./players";
+import { repeat } from "./utils";
 
 export function addPlayerHealthType(
   player: EntityPlayer,
@@ -210,7 +211,7 @@ export function getPlayerHealthType(
   }
 }
 
-/** Returns a `PlayerHealth` object with all 0s. */
+/** Returns a `PlayerHealth` object with all zeros. */
 export function newPlayerHealth(): PlayerHealth {
   return {
     maxHearts: 0,
@@ -381,8 +382,21 @@ export function setPlayerHealth(
 
   if (character === PlayerType.MAGDALENE_B) {
     // Adding 1 heart to Tainted Magdalene will actually add two hearts.
-    const effectiveHearts = playerHealth.hearts / 2;
-    player.AddHearts(effectiveHearts);
+    repeat(playerHealth.hearts, () => {
+      if (player.HasFullHearts()) {
+        return;
+      }
+
+      const hearts = player.GetHearts();
+      const maxHearts = player.GetMaxHearts();
+      if (hearts === maxHearts - 1) {
+        player.AddHearts(1);
+        return;
+      }
+
+      player.AddHearts(1);
+      player.AddHearts(-1);
+    });
   } else {
     player.AddHearts(playerHealth.hearts);
   }