isaacscript-common 4.2.3 → 4.2.4

package/features/extraConsoleCommands/init.lua

@@ -196,6 +196,7 @@ commandFunctionsMap:set("listGrid", commands.listGrid)
 commandFunctionsMap:set("listGridAll", commands.listGridAll)
 commandFunctionsMap:set("lowHP", commands.lowHP)
 commandFunctionsMap:set("luck", commands.luck)
+commandFunctionsMap:set("mana", commands.mana)
 commandFunctionsMap:set("map", commands.map)
 commandFunctionsMap:set("maxHearts", commands.maxHearts)
 commandFunctionsMap:set("mh", commands.mh)

package/features/extraConsoleCommands/listCommands.d.ts

@@ -209,6 +209,8 @@ export declare function listGridAll(params: string): void;
 export declare function lowHP(): void;
 /** Alias for "debug 9". */
 export declare function luck(): void;
+/** Alias for the "poopMana" command. */
+export declare function mana(params: string): void;
 /** Completely reveals the entire map, including the Ultra Secret Room. */
 export declare function map(): void;
 /**

package/features/extraConsoleCommands/listCommands.lua

@@ -148,6 +148,21 @@ function ____exports.oneHP(self)
     end
     printConsole(nil, "Set every NPC to 1 HP.")
 end
+--- Gives a poop mana charge. This only affects Tainted Blue Baby. Provide a number to give a custom
+-- amount of charges. (You can use negative numbers to remove charges.)
+function ____exports.poopMana(self, params)
+    local charges = 1
+    if params ~= "" then
+        local num = tonumber(params)
+        if num == nil then
+            printConsole(nil, "That is an invalid amount of mana to add.")
+            return
+        end
+        charges = num
+    end
+    local player = Isaac.GetPlayer()
+    player:AddPoopMana(charges)
+end
 --- Gives a half soul heart. Provide a number to give a custom amount of hearts. (You can use
 -- negative numbers to remove hearts.)
 function ____exports.soulHearts(self, params)
@@ -658,6 +673,10 @@ end
 function ____exports.luck(self)
     Isaac.ExecuteCommand("debug 9")
 end
+--- Alias for the "poopMana" command.
+function ____exports.mana(self, params)
+    ____exports.poopMana(nil, params)
+end
 --- Completely reveals the entire map, including the Ultra Secret Room.
 function ____exports.map(self)
     local level = game:GetLevel()
@@ -776,21 +795,6 @@ function ____exports.pocket(self, params)
     local player = Isaac.GetPlayer()
     player:SetPocketActiveItem(collectibleType, ActiveSlot.POCKET)
 end
---- Gives a poop mana charge. This only affects Tainted Blue Baby. Provide a number to give a custom
--- amount of charges. (You can use negative numbers to remove charges.)
-function ____exports.poopMana(self, params)
-    local charges = 1
-    if params ~= "" then
-        local num = tonumber(params)
-        if num == nil then
-            printConsole(nil, "That is an invalid amount of mana to add.")
-            return
-        end
-        charges = num
-    end
-    local player = Isaac.GetPlayer()
-    player:AddPoopMana(charges)
-end
 --- Alias for the "getPosition" command.
 function ____exports.positionCommand(self)
     ____exports.getPosition(nil)

package/functions/playerHealth.lua

@@ -20,6 +20,7 @@ local getPlayerBlackHearts = ____player.getPlayerBlackHearts
 local getPlayerHearts = ____player.getPlayerHearts
 local getPlayerSoulHearts = ____player.getPlayerSoulHearts
 local isCharacter = ____player.isCharacter
+local isKeeper = ____player.isKeeper
 local setActiveItem = ____player.setActiveItem
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
@@ -88,19 +89,24 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
             end
         end
     )
-    player:AddRottenHearts(playerHealth.rottenHearts)
-    ____repeat(
-        nil,
-        playerHealth.hearts,
-        function()
-            player:AddHearts(1)
-            if character == PlayerType.MAGDALENE_B then
-                player:AddHearts(-1)
+    if isKeeper(nil, player) then
+        local numCoinsToHeal = playerHealth.hearts / 2
+        player:AddCoins(numCoinsToHeal)
+    else
+        player:AddRottenHearts(playerHealth.rottenHearts)
+        ____repeat(
+            nil,
+            playerHealth.hearts,
+            function()
+                player:AddHearts(1)
+                if character == PlayerType.MAGDALENE_B then
+                    player:AddHearts(-1)
+                end
             end
-        end
-    )
-    player:AddGoldenHearts(playerHealth.goldenHearts)
-    player:AddBrokenHearts(playerHealth.brokenHearts)
+        )
+        player:AddGoldenHearts(playerHealth.goldenHearts)
+        player:AddBrokenHearts(playerHealth.brokenHearts)
+    end
     if character == PlayerType.BETHANY then
         player:SetSoulCharge(playerHealth.soulCharges)
     elseif character == PlayerType.BETHANY_B then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "index",
   "types": "index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.0.10"
+    "isaac-typescript-definitions": "^3.0.11"
   }
 }