isaacscript-common 1.2.10 → 1.2.11

package/dist/functions/player.d.ts

@@ -132,8 +132,9 @@ export declare function getPlayerIndexVanilla(playerToFind: EntityPlayer): int |
  */
 export declare function getPlayerMaxHeartContainers(player: EntityPlayer): int;
 /**
- * Helper function to get the name of the player. Use this instead of the `EntityPlayer.GetName`
- * method if you want the name to fill in "???" and include the "Tainted" prefix.
+ * Helper function to get the proper name of the player. Use this instead of the
+ * `EntityPlayer.GetName` method because it accounts for Blue Baby, Lazarus II, and Tainted
+ * characters.
  */
 export declare function getPlayerName(player: EntityPlayer): string;
 /**

package/dist/functions/player.lua

@@ -9,7 +9,7 @@ local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local EXCLUDED_CHARACTERS
+local getAdjustedPlayerName, EXCLUDED_CHARACTERS
 local ____constants = require("constants")
 local CHARACTERS_WITH_BLACK_HEART_FROM_ETERNAL_HEART = ____constants.CHARACTERS_WITH_BLACK_HEART_FROM_ETERNAL_HEART
 local CHARACTERS_WITH_FREE_DEVIL_DEALS = ____constants.CHARACTERS_WITH_FREE_DEVIL_DEALS
@@ -67,6 +67,29 @@ function ____exports.getPlayerMaxHeartContainers(self, player)
     end
     return maxHeartContainers
 end
+function getAdjustedPlayerName(self, player)
+    local character = player:GetPlayerType()
+    repeat
+        local ____switch71 = character
+        local ____cond71 = ____switch71 == PlayerType.PLAYER_BLUEBABY or ____switch71 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond71 then
+            do
+                return "Blue Baby"
+            end
+        end
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2
+        if ____cond71 then
+            do
+                return "Lazarus II"
+            end
+        end
+        do
+            do
+                return player:GetName()
+            end
+        end
+    until true
+end
 function ____exports.getPlayers(self, performExclusions)
     if performExclusions == nil then
         performExclusions = false
@@ -79,18 +102,18 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue72
+                    goto __continue77
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue72
+                    goto __continue77
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue72
+                    goto __continue77
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue72::
+            ::__continue77::
             i = i + 1
         end
     end
@@ -313,12 +336,11 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
     return nil
 end
 function ____exports.getPlayerName(self, player)
-    local name = player:GetName()
-    local filledInName = name == "???" and "Blue Baby" or name
+    local adjustedName = getAdjustedPlayerName(nil, player)
     if not ____exports.isTainted(nil, player) then
-        return filledInName
+        return adjustedName
     end
-    local baseName = trimPrefix(nil, filledInName, "The ")
+    local baseName = trimPrefix(nil, adjustedName, "The ")
     return "Tainted " .. baseName
 end
 function ____exports.getPlayerNumHitsRemaining(self, player)
@@ -477,9 +499,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch112 = activeSlot
-        local ____cond112 = ____switch112 == ActiveSlot.SLOT_PRIMARY
-        if ____cond112 then
+        local ____switch117 = activeSlot
+        local ____cond117 = ____switch117 == ActiveSlot.SLOT_PRIMARY
+        if ____cond117 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -488,8 +510,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond112 = ____cond112 or ____switch112 == ActiveSlot.SLOT_SECONDARY
-        if ____cond112 then
+        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_SECONDARY
+        if ____cond117 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -504,16 +526,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond112 = ____cond112 or ____switch112 == ActiveSlot.SLOT_POCKET
-        if ____cond112 then
+        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_POCKET
+        if ____cond117 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond112 = ____cond112 or ____switch112 == ActiveSlot.SLOT_POCKET2
-        if ____cond112 then
+        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_POCKET2
+        if ____cond117 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/package.json

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