isaacscript-common 1.2.12 → 1.2.13

package/dist/functions/player.d.ts

@@ -217,6 +217,8 @@ export declare function canTakeFreeDevilDeals(player: EntityPlayer): boolean;
 export declare function isTainted(player: EntityPlayer): boolean;
 /** Helper function for detecting when a player is Tainted Lazarus or Dead Tainted Lazarus. */
 export declare function isTaintedLazarus(player: EntityPlayer): boolean;
+export declare function isModdedCharacter(player: EntityPlayer): boolean;
+export declare function isVanillaCharacter(player: EntityPlayer): boolean;
 export declare function removeCollectibleCostume(player: EntityPlayer, collectibleType: CollectibleType | int): void;
 /**
  * Helper function to remove the Dead Eye multiplier from a player.

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 getAdjustedPlayerName, EXCLUDED_CHARACTERS
+local getAdjustedPlayerName, isTaintedModded, 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
@@ -17,6 +17,7 @@ local CHARACTERS_WITH_NO_RED_HEARTS = ____constants.CHARACTERS_WITH_NO_RED_HEART
 local CHARACTERS_WITH_NO_SOUL_HEARTS = ____constants.CHARACTERS_WITH_NO_SOUL_HEARTS
 local LOST_STYLE_PLAYER_TYPES = ____constants.LOST_STYLE_PLAYER_TYPES
 local MAX_PLAYER_HEART_CONTAINERS = ____constants.MAX_PLAYER_HEART_CONTAINERS
+local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____HealthType = require("types.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____array = require("functions.array")
@@ -149,7 +150,26 @@ function ____exports.isChildPlayer(self, player)
 end
 function ____exports.isTainted(self, player)
     local character = player:GetPlayerType()
-    return character >= PlayerType.PLAYER_ISAAC_B
+    local ____isVanillaCharacter_result_0
+    if ____exports.isVanillaCharacter(nil, player) then
+        ____isVanillaCharacter_result_0 = character >= PlayerType.PLAYER_ISAAC_B
+    else
+        ____isVanillaCharacter_result_0 = isTaintedModded(nil, player)
+    end
+    return ____isVanillaCharacter_result_0
+end
+function isTaintedModded(self, player)
+    local character = player:GetPlayerType()
+    local name = player:GetName()
+    local taintedCharacter = Isaac.GetPlayerTypeByName(name, true)
+    return character == taintedCharacter
+end
+function ____exports.isModdedCharacter(self, player)
+    local character = player:GetPlayerType()
+    return character > MAX_VANILLA_CHARACTER
+end
+function ____exports.isVanillaCharacter(self, player)
+    return not ____exports.isModdedCharacter(nil, player)
 end
 EXCLUDED_CHARACTERS = __TS__New(Set, {PlayerType.PLAYER_ESAU, PlayerType.PLAYER_THESOUL_B})
 function ____exports.addCollectibleCostume(self, player, collectibleType)
@@ -524,9 +544,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch121 = activeSlot
-        local ____cond121 = ____switch121 == ActiveSlot.SLOT_PRIMARY
-        if ____cond121 then
+        local ____switch124 = activeSlot
+        local ____cond124 = ____switch124 == ActiveSlot.SLOT_PRIMARY
+        if ____cond124 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -535,8 +555,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond121 = ____cond121 or ____switch121 == ActiveSlot.SLOT_SECONDARY
-        if ____cond121 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_SECONDARY
+        if ____cond124 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -551,16 +571,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond121 = ____cond121 or ____switch121 == ActiveSlot.SLOT_POCKET
-        if ____cond121 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET
+        if ____cond124 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond121 = ____cond121 or ____switch121 == ActiveSlot.SLOT_POCKET2
-        if ____cond121 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET2
+        if ____cond124 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/package.json

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