isaacscript-common 1.2.11 → 1.2.12

package/dist/functions/player.lua

@@ -30,6 +30,7 @@ local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
 local ____util = require("functions.util")
 local ensureAllCases = ____util.ensureAllCases
+local stringContains = ____util.stringContains
 local trimPrefix = ____util.trimPrefix
 function ____exports.getCharacterMaxHeartContainers(self, character)
     if character == PlayerType.PLAYER_KEEPER then
@@ -83,6 +84,30 @@ function getAdjustedPlayerName(self, player)
                 return "Lazarus II"
             end
         end
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond71 then
+            do
+                return "Dark Judas"
+            end
+        end
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB
+        if ____cond71 then
+            do
+                return "Jacob & Esau"
+            end
+        end
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond71 then
+            do
+                return "Dead Tainted Lazarus"
+            end
+        end
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB2_B
+        if ____cond71 then
+            do
+                return "Dead Tainted Jacob"
+            end
+        end
         do
             do
                 return player:GetName()
@@ -102,18 +127,18 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue77
+                    goto __continue81
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue77
+                    goto __continue81
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue77
+                    goto __continue81
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue77::
+            ::__continue81::
             i = i + 1
         end
     end
@@ -341,7 +366,7 @@ function ____exports.getPlayerName(self, player)
         return adjustedName
     end
     local baseName = trimPrefix(nil, adjustedName, "The ")
-    return "Tainted " .. baseName
+    return stringContains(nil, baseName, "Tainted") and baseName or "Tainted " .. baseName
 end
 function ____exports.getPlayerNumHitsRemaining(self, player)
     local hearts = player:GetHearts()
@@ -499,9 +524,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch117 = activeSlot
-        local ____cond117 = ____switch117 == ActiveSlot.SLOT_PRIMARY
-        if ____cond117 then
+        local ____switch121 = activeSlot
+        local ____cond121 = ____switch121 == ActiveSlot.SLOT_PRIMARY
+        if ____cond121 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -510,8 +535,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_SECONDARY
-        if ____cond117 then
+        ____cond121 = ____cond121 or ____switch121 == ActiveSlot.SLOT_SECONDARY
+        if ____cond121 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -526,16 +551,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_POCKET
-        if ____cond117 then
+        ____cond121 = ____cond121 or ____switch121 == ActiveSlot.SLOT_POCKET
+        if ____cond121 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond117 = ____cond117 or ____switch117 == ActiveSlot.SLOT_POCKET2
-        if ____cond117 then
+        ____cond121 = ____cond121 or ____switch121 == ActiveSlot.SLOT_POCKET2
+        if ____cond121 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/util.d.ts

@@ -80,6 +80,7 @@ export declare function onSetSeed(): boolean;
  * message (which `Isaac.ConsoleOutput()` does not do by default).
  */
 export declare function printConsole(msg: string): void;
+export declare function stringContains(string: string, searchString: string): boolean;
 /**
  * In a Map, you can use the `clear` method to delete every element. However, in a LuaTable, the
  * `clear` method does not exist. Use this helper function as a drop-in replacement for this.

package/dist/functions/util.lua

@@ -67,6 +67,9 @@ end
 function ____exports.printConsole(self, msg)
     Isaac.ConsoleOutput(msg .. "\n")
 end
+function ____exports.stringContains(self, ____string, searchString)
+    return (string.find(____string, searchString, nil, true) or 0) - 1 ~= -1
+end
 function ____exports.tableClear(self, ____table)
     for key in pairs(____table) do
         ____table[key] = nil

package/package.json

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