isaacscript-common 1.2.218 → 1.2.219

package/dist/callbacks/customRevive.lua

@@ -16,6 +16,8 @@ local removeAllFamiliars = ____familiars.removeAllFamiliars
 local ____log = require("functions.log")
 local log = ____log.log
 local logError = ____log.logError
+local ____player = require("functions.player")
+local isCharacter = ____player.isCharacter
 local ____playerIndex = require("functions.playerIndex")
 local getPlayerFromIndex = ____playerIndex.getPlayerFromIndex
 local getPlayerIndex = ____playerIndex.getPlayerIndex
@@ -51,13 +53,12 @@ function checkWaitingForItemAnimation(self, player)
     if v.run.dyingPlayerIndex == nil then
         return
     end
-    local character = player:GetPlayerType()
     local playerIndex = getPlayerIndex(nil, player)
     if playerIndex ~= v.run.dyingPlayerIndex then
         return
     end
     local playerToCheckHoldingItem = player
-    if character == PlayerType.PLAYER_THESOUL_B then
+    if isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
         local forgottenBody = player:GetOtherTwin()
         if forgottenBody ~= nil then
             playerToCheckHoldingItem = forgottenBody

package/dist/features/extraConsoleCommands/commands.lua

@@ -32,6 +32,7 @@ local getNPCs = ____npc.getNPCs
 local ____pills = require("functions.pills")
 local getPillEffectName = ____pills.getPillEffectName
 local ____player = require("functions.player")
+local getPlayerName = ____player.getPlayerName
 local useActiveItemTemp = ____player.useActiveItemTemp
 local ____playerHealth = require("functions.playerHealth")
 local addPlayerHealthType = ____playerHealth.addPlayerHealthType
@@ -501,10 +502,10 @@ function ____exports.fool(self)
 end
 function ____exports.getPosition(self)
     for ____, player in ipairs(getPlayers(nil)) do
-        local character = player:GetPlayerType()
+        local playerName = getPlayerName(nil, player)
         printConsole(
             nil,
-            ((((("Player position for character " .. tostring(character)) .. ": (") .. tostring(player.Position.X)) .. ", ") .. tostring(player.Position.Y)) .. ")"
+            ((((("Player position for " .. playerName) .. ": (") .. tostring(player.Position.X)) .. ", ") .. tostring(player.Position.Y)) .. ")"
         )
     end
 end

package/dist/functions/log.lua

@@ -124,17 +124,19 @@ function ____exports.logEffects(player)
     __TS__ArrayForEach(
         effects,
         function(____, effect, i)
+            local effectDescription
             if effect.Item:IsCollectible() then
                 local collectibleName = getCollectibleName(nil, effect.Item.ID)
-                ____exports.log((("  " .. tostring(i + 1)) .. ") Collectible: ") .. collectibleName)
+                effectDescription = "Collectible: " .. collectibleName
             elseif effect.Item:IsTrinket() then
                 local trinketName = getTrinketName(nil, effect.Item.ID)
-                ____exports.log((("  " .. tostring(i + 1)) .. ") Trinket: ") .. trinketName)
+                effectDescription = "Trinket: " .. trinketName
             elseif effect.Item:IsNull() then
-                ____exports.log((("  " .. tostring(i + 1)) .. ") Null item: ") .. tostring(effect.Item.ID))
+                effectDescription = "Null item: " .. tostring(effect.Item.ID)
             else
-                ____exports.log((("  " .. tostring(i + 1)) .. ") Unknown type of effect: ") .. tostring(effect.Item.ID))
+                effectDescription = "Unknown type of effect: " .. tostring(effect.Item.ID)
             end
+            ____exports.log(((((("  " .. tostring(i + 1)) .. ") ") .. effectDescription) .. " (x") .. tostring(effect.Count)) .. ")")
         end
     )
 end

package/dist/functions/player.lua

@@ -64,6 +64,12 @@ function ____exports.getPlayerMaxHeartContainers(self, player)
     end
     return characterMaxHeartContainers
 end
+function ____exports.isCharacter(self, player, ...)
+    local characters = {...}
+    local characterSet = __TS__New(Set, characters)
+    local character = player:GetPlayerType()
+    return characterSet:has(character)
+end
 function ____exports.isKeeper(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_KEEPER or character == PlayerType.PLAYER_KEEPER_B
@@ -391,8 +397,7 @@ function ____exports.hasLostCurse(self, player)
     return effects:HasNullEffect(112)
 end
 function ____exports.hasOpenActiveItemSlot(self, player)
-    local character = player:GetPlayerType()
-    if character == PlayerType.PLAYER_THESOUL_B then
+    if ____exports.isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
         return false
     end
     local activeItemPrimary = player:GetActiveItem(ActiveSlot.SLOT_PRIMARY)
@@ -411,12 +416,6 @@ function ____exports.isBethany(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_BETHANY or character == PlayerType.PLAYER_BETHANY_B
 end
-function ____exports.isCharacter(self, player, ...)
-    local characters = {...}
-    local characterSet = __TS__New(Set, characters)
-    local character = player:GetPlayerType()
-    return characterSet:has(character)
-end
 function ____exports.isEden(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_EDEN or character == PlayerType.PLAYER_EDEN_B

package/dist/functions/playerHealth.lua

@@ -10,6 +10,7 @@ local ____player = require("functions.player")
 local getPlayerBlackHearts = ____player.getPlayerBlackHearts
 local getPlayerHearts = ____player.getPlayerHearts
 local getPlayerSoulHearts = ____player.getPlayerSoulHearts
+local isCharacter = ____player.isCharacter
 local ____utils = require("functions.utils")
 local ensureAllCases = ____utils.ensureAllCases
 local ____repeat = ____utils["repeat"]
@@ -213,7 +214,6 @@ function ____exports.getPlayerHealthType(self, player, healthType)
     until true
 end
 function ____exports.removeAllPlayerHealth(self, player)
-    local character = player:GetPlayerType()
     local goldenHearts = player:GetGoldenHearts()
     local eternalHearts = player:GetEternalHearts()
     local boneHearts = player:GetBoneHearts()
@@ -224,7 +224,7 @@ function ____exports.removeAllPlayerHealth(self, player)
     player:AddBrokenHearts(brokenHearts * -1)
     player:AddMaxHearts(MAX_PLAYER_HEART_CONTAINERS * -2, true)
     player:AddSoulHearts(MAX_PLAYER_HEART_CONTAINERS * -2)
-    if character == PlayerType.PLAYER_THESOUL then
+    if isCharacter(nil, player, PlayerType.PLAYER_THESOUL) then
         local forgotten = player:GetSubPlayer()
         if forgotten ~= nil then
             local forgottenBoneHearts = forgotten:GetBoneHearts()
@@ -235,7 +235,6 @@ 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)
@@ -269,7 +268,7 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         playerHealth.hearts,
         function()
             player:AddHearts(1)
-            if isTaintedMagdalene then
+            if character == PlayerType.PLAYER_MAGDALENE_B then
                 player:AddHearts(-1)
             end
         end

package/dist/functions/pocketItems.lua

@@ -9,6 +9,8 @@ local ____PocketItemType = require("enums.PocketItemType")
 local PocketItemType = ____PocketItemType.PocketItemType
 local ____math = require("functions.math")
 local range = ____math.range
+local ____player = require("functions.player")
+local isCharacter = ____player.isCharacter
 function ____exports.getPocketItems(self, player)
     local pocketItem = player:GetActiveItem(ActiveSlot.SLOT_POCKET)
     local hasPocketItem = pocketItem ~= CollectibleType.COLLECTIBLE_NULL
@@ -50,8 +52,7 @@ function ____exports.getFirstCardOrPill(self, player)
     )
 end
 function ____exports.hasOpenPocketItemSlot(self, player)
-    local character = player:GetPlayerType()
-    if character == PlayerType.PLAYER_THESOUL_B then
+    if isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
         return false
     end
     local pocketItems = ____exports.getPocketItems(nil, player)

package/dist/functions/trinkets.lua

@@ -15,6 +15,7 @@ local hasFlag = ____flag.hasFlag
 local ____pickups = require("functions.pickups")
 local getPickups = ____pickups.getPickups
 local ____player = require("functions.player")
+local isCharacter = ____player.isCharacter
 local useActiveItemTemp = ____player.useActiveItemTemp
 local ____sprite = require("functions.sprite")
 local clearSprite = ____sprite.clearSprite
@@ -71,8 +72,7 @@ function ____exports.getTrinkets(self, matchingSubType)
     return getPickups(nil, 350, matchingSubType)
 end
 function ____exports.hasOpenTrinketSlot(self, player)
-    local character = player:GetPlayerType()
-    if character == PlayerType.PLAYER_THESOUL_B then
+    if isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
         return false
     end
     local openTrinketSlot = ____exports.getOpenTrinketSlot(nil, player)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.218",
+  "version": "1.2.219",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",