isaacscript-common 1.2.292 → 2.0.0

package/dist/functions/player.lua

@@ -10,11 +10,18 @@ local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local ____exports = {}
 local isTaintedModded
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
+local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
+local Challenge = ____isaac_2Dtypescript_2Ddefinitions.Challenge
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local NullItemID = ____isaac_2Dtypescript_2Ddefinitions.NullItemID
+local PlayerForm = ____isaac_2Dtypescript_2Ddefinitions.PlayerForm
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
+local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local itemConfig = ____cachedClasses.itemConfig
-local ____constants = require("constants")
-local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____HealthType = require("enums.HealthType")
 local HealthType = ____HealthType.HealthType
 local ____array = require("functions.array")
@@ -27,10 +34,13 @@ local getNumBitsOfN = ____bitwise.getNumBitsOfN
 local ____character = require("functions.character")
 local getCharacterMaxHeartContainers = ____character.getCharacterMaxHeartContainers
 local getCharacterName = ____character.getCharacterName
+local isVanillaCharacter = ____character.isVanillaCharacter
 local ____collectibles = require("functions.collectibles")
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
 local ____collectibleSet = require("functions.collectibleSet")
 local getCollectibleSet = ____collectibleSet.getCollectibleSet
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 local ____playerIndex = require("functions.playerIndex")
 local getPlayerIndexVanilla = ____playerIndex.getPlayerIndexVanilla
 local getPlayers = ____playerIndex.getPlayers
@@ -38,7 +48,6 @@ local ____tears = require("functions.tears")
 local addTearsStat = ____tears.addTearsStat
 local ____utils = require("functions.utils")
 local ensureAllCases = ____utils.ensureAllCases
-local getEnumValues = ____utils.getEnumValues
 local ____repeat = ____utils["repeat"]
 function ____exports.getCharacters(self)
     local players = getPlayers(nil)
@@ -50,13 +59,13 @@ end
 function ____exports.getPlayerMaxHeartContainers(self, player)
     local character = player:GetPlayerType()
     local characterMaxHeartContainers = getCharacterMaxHeartContainers(nil, character)
-    if character == PlayerType.PLAYER_MAGDALENE and player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT) then
+    if character == PlayerType.MAGDALENE and player:HasCollectible(CollectibleType.BIRTHRIGHT) then
         local extraMaxHeartContainersFromBirthright = 6
         return characterMaxHeartContainers + extraMaxHeartContainersFromBirthright
     end
     if ____exports.isKeeper(nil, player) then
-        local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
-        local hasGreedsGullet = player:HasCollectible(CollectibleType.COLLECTIBLE_GREEDS_GULLET)
+        local numMothersKisses = player:GetTrinketMultiplier(TrinketType.MOTHERS_KISS)
+        local hasGreedsGullet = player:HasCollectible(CollectibleType.GREEDS_GULLET)
         local coins = player:GetNumCoins()
         local greedsGulletCoinContainers = hasGreedsGullet and math.floor(coins / 25) or 0
         return characterMaxHeartContainers + numMothersKisses + greedsGulletCoinContainers
@@ -71,11 +80,10 @@ function ____exports.isCharacter(self, player, ...)
 end
 function ____exports.isKeeper(self, player)
     local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_KEEPER or character == PlayerType.PLAYER_KEEPER_B
+    return character == PlayerType.KEEPER or character == PlayerType.KEEPER_B
 end
-function ____exports.isModdedCharacter(self, player)
-    local character = player:GetPlayerType()
-    return character > MAX_VANILLA_CHARACTER
+function ____exports.isModdedPlayer(self, player)
+    return not ____exports.isVanillaPlayer(nil, player)
 end
 function isTaintedModded(self, player)
     local character = player:GetPlayerType()
@@ -83,16 +91,17 @@ function isTaintedModded(self, player)
     local taintedCharacter = Isaac.GetPlayerTypeByName(name, true)
     return character == taintedCharacter
 end
-function ____exports.isVanillaCharacter(self, player)
-    return not ____exports.isModdedCharacter(nil, player)
+function ____exports.isVanillaPlayer(self, player)
+    local character = player:GetPlayerType()
+    return isVanillaCharacter(nil, character)
 end
 local STAT_CACHE_FLAGS_SET = __TS__New(Set, {
-    CacheFlag.CACHE_DAMAGE,
-    CacheFlag.CACHE_FIREDELAY,
-    CacheFlag.CACHE_SHOTSPEED,
-    CacheFlag.CACHE_RANGE,
-    CacheFlag.CACHE_SPEED,
-    CacheFlag.CACHE_LUCK
+    CacheFlag.DAMAGE,
+    CacheFlag.FIRE_DELAY,
+    CacheFlag.SHOT_SPEED,
+    CacheFlag.RANGE,
+    CacheFlag.SPEED,
+    CacheFlag.LUCK
 })
 function ____exports.addCollectibleCostume(self, player, collectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
@@ -107,42 +116,42 @@ function ____exports.addStat(self, player, cacheFlag, amount)
     end
     repeat
         local ____switch6 = cacheFlag
-        local ____cond6 = ____switch6 == CacheFlag.CACHE_DAMAGE
+        local ____cond6 = ____switch6 == CacheFlag.DAMAGE
         if ____cond6 then
             do
                 player.Damage = player.Damage + amount
                 break
             end
         end
-        ____cond6 = ____cond6 or ____switch6 == CacheFlag.CACHE_FIREDELAY
+        ____cond6 = ____cond6 or ____switch6 == CacheFlag.FIRE_DELAY
         if ____cond6 then
             do
                 addTearsStat(nil, player, amount)
                 break
             end
         end
-        ____cond6 = ____cond6 or ____switch6 == CacheFlag.CACHE_SHOTSPEED
+        ____cond6 = ____cond6 or ____switch6 == CacheFlag.SHOT_SPEED
         if ____cond6 then
             do
                 player.ShotSpeed = player.ShotSpeed + amount
                 break
             end
         end
-        ____cond6 = ____cond6 or ____switch6 == CacheFlag.CACHE_RANGE
+        ____cond6 = ____cond6 or ____switch6 == CacheFlag.RANGE
         if ____cond6 then
             do
                 player.TearHeight = player.TearHeight + amount
                 break
             end
         end
-        ____cond6 = ____cond6 or ____switch6 == CacheFlag.CACHE_SPEED
+        ____cond6 = ____cond6 or ____switch6 == CacheFlag.SPEED
         if ____cond6 then
             do
                 player.MoveSpeed = player.MoveSpeed + amount
                 break
             end
         end
-        ____cond6 = ____cond6 or ____switch6 == CacheFlag.CACHE_LUCK
+        ____cond6 = ____cond6 or ____switch6 == CacheFlag.LUCK
         if ____cond6 then
             do
                 player.Luck = player.Luck + amount
@@ -188,7 +197,7 @@ function ____exports.anyPlayerIs(self, ...)
 end
 function ____exports.canPlayerCrushRocks(self, player)
     local effects = player:GetEffects()
-    return player:HasCollectible(CollectibleType.COLLECTIBLE_LEO) or player:HasCollectible(CollectibleType.COLLECTIBLE_THUNDER_THIGHS) or effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_MEGA_MUSH) or player:HasPlayerForm(PlayerForm.PLAYERFORM_STOMPY)
+    return player:HasCollectible(CollectibleType.LEO) or player:HasCollectible(CollectibleType.THUNDER_THIGHS) or effects:HasCollectibleEffect(CollectibleType.MEGA_MUSH) or player:HasPlayerForm(PlayerForm.STOMPY)
 end
 function ____exports.getActiveItemSlot(self, player, collectibleType)
     local activeSlots = getEnumValues(nil, ActiveSlot)
@@ -241,7 +250,11 @@ function ____exports.getEffectsList(self, player)
 end
 function ____exports.getFinalPlayer(self)
     local players = getPlayers(nil)
-    return getLastElement(nil, players)
+    local lastPlayer = getLastElement(nil, players)
+    if lastPlayer == nil then
+        error("Failed to get the final player since there were 0 players.")
+    end
+    return lastPlayer
 end
 function ____exports.getNewestPlayer(self)
     local newestPlayer = nil
@@ -347,7 +360,7 @@ function ____exports.getPlayerLastHeart(self, player)
 end
 function ____exports.getPlayerName(self, player)
     local character = player:GetPlayerType()
-    return character >= PlayerType.NUM_PLAYER_TYPES and player:GetName() or getCharacterName(nil, character)
+    return ____exports.isModdedPlayer(nil, player) and player:GetName() or getCharacterName(nil, character)
 end
 function ____exports.getPlayerNumHitsRemaining(self, player)
     local hearts = player:GetHearts()
@@ -387,7 +400,7 @@ function ____exports.getPlayersWithCollectible(self, ...)
 end
 function ____exports.getTaintedMagdaleneNonTemporaryMaxHearts(self, player)
     local maxHearts = player:GetMaxHearts()
-    local hasBirthright = player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT)
+    local hasBirthright = player:HasCollectible(CollectibleType.BIRTHRIGHT)
     local maxNonTemporaryMaxHearts = hasBirthright and 6 or 4
     return math.min(maxHearts, maxNonTemporaryMaxHearts)
 end
@@ -401,56 +414,56 @@ function ____exports.getTotalPlayerCollectibles(self, collectibleType)
 end
 function ____exports.hasLostCurse(self, player)
     local effects = player:GetEffects()
-    return effects:HasNullEffect(NullItemID.ID_LOST_CURSE)
+    return effects:HasNullEffect(NullItemID.LOST_CURSE)
 end
 function ____exports.hasOpenActiveItemSlot(self, player)
-    if ____exports.isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
+    if ____exports.isCharacter(nil, player, PlayerType.THE_SOUL_B) then
         return false
     end
-    local activeItemPrimary = player:GetActiveItem(ActiveSlot.SLOT_PRIMARY)
-    local activeItemSecondary = player:GetActiveItem(ActiveSlot.SLOT_SECONDARY)
-    local hasSchoolbag = player:HasCollectible(CollectibleType.COLLECTIBLE_SCHOOLBAG)
+    local activeItemPrimary = player:GetActiveItem(ActiveSlot.PRIMARY)
+    local activeItemSecondary = player:GetActiveItem(ActiveSlot.SECONDARY)
+    local hasSchoolbag = player:HasCollectible(CollectibleType.SCHOOLBAG)
     if hasSchoolbag then
-        return activeItemPrimary == CollectibleType.COLLECTIBLE_NULL or activeItemSecondary == CollectibleType.COLLECTIBLE_NULL
+        return activeItemPrimary == CollectibleType.NULL or activeItemSecondary == CollectibleType.NULL
     end
-    return activeItemPrimary == CollectibleType.COLLECTIBLE_NULL
+    return activeItemPrimary == CollectibleType.NULL
 end
 function ____exports.isActiveSlotEmpty(self, player, activeSlot)
     local activeCollectibleType = player:GetActiveItem(activeSlot)
-    return activeCollectibleType == CollectibleType.COLLECTIBLE_NULL
+    return activeCollectibleType == CollectibleType.NULL
 end
 function ____exports.isBethany(self, player)
     local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_BETHANY or character == PlayerType.PLAYER_BETHANY_B
+    return character == PlayerType.BETHANY or character == PlayerType.BETHANY_B
 end
 function ____exports.isEden(self, player)
     local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_EDEN or character == PlayerType.PLAYER_EDEN_B
+    return character == PlayerType.EDEN or character == PlayerType.EDEN_B
 end
 function ____exports.isFirstPlayer(self, player)
     return getPlayerIndexVanilla(nil, player) == 0
 end
 function ____exports.isJacobOrEsau(self, player)
     local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_JACOB or character == PlayerType.PLAYER_ESAU
+    return character == PlayerType.JACOB or character == PlayerType.ESAU
 end
 function ____exports.isLost(self, player)
     local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_THELOST or character == PlayerType.PLAYER_THELOST_B
+    return character == PlayerType.THE_LOST or character == PlayerType.THE_LOST_B
 end
 function ____exports.isTainted(self, player)
     local character = player:GetPlayerType()
-    local ____isVanillaCharacter_result_0
-    if ____exports.isVanillaCharacter(nil, player) then
-        ____isVanillaCharacter_result_0 = character >= PlayerType.PLAYER_ISAAC_B
+    local ____isVanillaPlayer_result_0
+    if ____exports.isVanillaPlayer(nil, player) then
+        ____isVanillaPlayer_result_0 = character >= PlayerType.ISAAC_B
     else
-        ____isVanillaCharacter_result_0 = isTaintedModded(nil, player)
+        ____isVanillaPlayer_result_0 = isTaintedModded(nil, player)
     end
-    return ____isVanillaCharacter_result_0
+    return ____isVanillaPlayer_result_0
 end
 function ____exports.isTaintedLazarus(self, player)
     local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_LAZARUS_B or character == PlayerType.PLAYER_LAZARUS2_B
+    return character == PlayerType.LAZARUS_B or character == PlayerType.LAZARUS_2_B
 end
 function ____exports.playerAddCollectible(self, player, ...)
     local collectibleTypes = {...}
@@ -493,9 +506,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         keepInPools = false
     end
     local itemPool = game:GetItemPool()
-    local primaryCollectibleType = player:GetActiveItem(ActiveSlot.SLOT_PRIMARY)
-    local primaryCharge = player:GetActiveCharge(ActiveSlot.SLOT_PRIMARY)
-    local secondaryCollectibleType = player:GetActiveItem(ActiveSlot.SLOT_SECONDARY)
+    local primaryCollectibleType = player:GetActiveItem(ActiveSlot.PRIMARY)
+    local primaryCharge = player:GetActiveCharge(ActiveSlot.PRIMARY)
+    local secondaryCollectibleType = player:GetActiveItem(ActiveSlot.SECONDARY)
     if charge == nil then
         charge = getCollectibleMaxCharges(nil, collectibleType)
     end
@@ -503,43 +516,43 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch109 = activeSlot
-        local ____cond109 = ____switch109 == ActiveSlot.SLOT_PRIMARY
-        if ____cond109 then
+        local ____switch110 = activeSlot
+        local ____cond110 = ____switch110 == ActiveSlot.PRIMARY
+        if ____cond110 then
             do
-                if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
+                if primaryCollectibleType ~= CollectibleType.NULL then
                     player:RemoveCollectible(primaryCollectibleType)
                 end
                 player:AddCollectible(collectibleType, charge, false)
                 break
             end
         end
-        ____cond109 = ____cond109 or ____switch109 == ActiveSlot.SLOT_SECONDARY
-        if ____cond109 then
+        ____cond110 = ____cond110 or ____switch110 == ActiveSlot.SECONDARY
+        if ____cond110 then
             do
-                if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
+                if primaryCollectibleType ~= CollectibleType.NULL then
                     player:RemoveCollectible(primaryCollectibleType)
                 end
-                if secondaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
+                if secondaryCollectibleType ~= CollectibleType.NULL then
                     player:RemoveCollectible(secondaryCollectibleType)
                 end
                 player:AddCollectible(secondaryCollectibleType, charge, false)
-                if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
+                if primaryCollectibleType ~= CollectibleType.NULL then
                     player:AddCollectible(primaryCollectibleType, primaryCharge, false)
                 end
                 break
             end
         end
-        ____cond109 = ____cond109 or ____switch109 == ActiveSlot.SLOT_POCKET
-        if ____cond109 then
+        ____cond110 = ____cond110 or ____switch110 == ActiveSlot.POCKET
+        if ____cond110 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond109 = ____cond109 or ____switch109 == ActiveSlot.SLOT_POCKET2
-        if ____cond109 then
+        ____cond110 = ____cond110 or ____switch110 == ActiveSlot.POCKET_SINGLE_USE
+        if ____cond110 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break
@@ -559,18 +572,18 @@ function ____exports.setBlindfold(self, player, enabled, modifyCostume)
     local character = player:GetPlayerType()
     local challenge = Isaac.GetChallenge()
     if enabled then
-        game.Challenge = Challenge.CHALLENGE_SOLAR_SYSTEM
+        game.Challenge = Challenge.SOLAR_SYSTEM
         player:ChangePlayerType(character)
         game.Challenge = challenge
         if not modifyCostume then
-            player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
+            player:TryRemoveNullCostume(NullItemID.BLINDFOLD)
         end
     else
-        game.Challenge = Challenge.CHALLENGE_NULL
+        game.Challenge = Challenge.NULL
         player:ChangePlayerType(character)
         game.Challenge = challenge
         if modifyCostume then
-            player:TryRemoveNullCostume(NullItemID.ID_BLINDFOLD)
+            player:TryRemoveNullCostume(NullItemID.BLINDFOLD)
         end
     end
 end

package/dist/functions/playerHealth.lua

@@ -1,6 +1,9 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayForEach = ____lualib.__TS__ArrayForEach
 local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local HeartSubType = ____isaac_2Dtypescript_2Ddefinitions.HeartSubType
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local ____constants = require("constants")
 local MAX_PLAYER_HEART_CONTAINERS = ____constants.MAX_PLAYER_HEART_CONTAINERS
 local ____HealthType = require("enums.HealthType")
@@ -100,11 +103,11 @@ function ____exports.getPlayerHealth(self, player)
     local subPlayer = player:GetSubPlayer()
     local soulCharges = player:GetEffectiveSoulCharge()
     local bloodCharges = player:GetEffectiveBloodCharge()
-    if character == PlayerType.PLAYER_THEFORGOTTEN and subPlayer ~= nil then
+    if character == PlayerType.THE_FORGOTTEN and subPlayer ~= nil then
         maxHearts = boneHearts * 2
         boneHearts = 0
         soulHearts = subPlayer:GetSoulHearts()
-    elseif character == PlayerType.PLAYER_THESOUL and subPlayer ~= nil then
+    elseif character == PlayerType.THE_SOUL and subPlayer ~= nil then
         maxHearts = subPlayer:GetBoneHearts() * 2
         hearts = subPlayer:GetHearts()
     end
@@ -114,20 +117,20 @@ function ____exports.getPlayerHealth(self, player)
         local i = 0
         while i < extraHearts do
             local isBoneHeart = player:IsBoneHeart(i)
-            if character == PlayerType.PLAYER_THEFORGOTTEN and subPlayer ~= nil then
+            if character == PlayerType.THE_FORGOTTEN and subPlayer ~= nil then
                 isBoneHeart = subPlayer:IsBoneHeart(i)
             end
             if isBoneHeart then
-                soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.HEART_BONE
+                soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.BONE
             else
                 local isBlackHeart = player:IsBlackHeart(currentSoulHeart + 1)
-                if character == PlayerType.PLAYER_THEFORGOTTEN and subPlayer ~= nil then
+                if character == PlayerType.THE_FORGOTTEN and subPlayer ~= nil then
                     isBlackHeart = subPlayer:IsBlackHeart(currentSoulHeart + 1)
                 end
                 if isBlackHeart then
-                    soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.HEART_BLACK
+                    soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.BLACK
                 else
-                    soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.HEART_SOUL
+                    soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.SOUL
                 end
                 currentSoulHeart = currentSoulHeart + 2
             end
@@ -223,7 +226,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 isCharacter(nil, player, PlayerType.PLAYER_THESOUL) then
+    if isCharacter(nil, player, PlayerType.THE_SOUL) then
         local forgotten = player:GetSubPlayer()
         if forgotten ~= nil then
             local forgottenBoneHearts = forgotten:GetBoneHearts()
@@ -235,7 +238,7 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
     local character = player:GetPlayerType()
     local subPlayer = player:GetSubPlayer()
     ____exports.removeAllPlayerHealth(nil, player)
-    if character == PlayerType.PLAYER_THESOUL and subPlayer ~= nil then
+    if character == PlayerType.THE_SOUL and subPlayer ~= nil then
         subPlayer:AddMaxHearts(playerHealth.maxHearts, false)
     else
         player:AddMaxHearts(playerHealth.maxHearts, false)
@@ -247,16 +250,16 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         function(____, heartType, i)
             local isHalf = playerHealth.soulHearts + playerHealth.boneHearts * 2 < (i + 1) * 2
             local addAmount = 2
-            if isHalf or heartType == HeartSubType.HEART_BONE or soulHeartsRemaining < 2 then
+            if isHalf or heartType == HeartSubType.BONE or soulHeartsRemaining < 2 then
                 addAmount = 1
             end
-            if heartType == HeartSubType.HEART_SOUL then
+            if heartType == HeartSubType.SOUL then
                 player:AddSoulHearts(addAmount)
                 soulHeartsRemaining = soulHeartsRemaining - addAmount
-            elseif heartType == HeartSubType.HEART_BLACK then
+            elseif heartType == HeartSubType.BLACK then
                 player:AddBlackHearts(addAmount)
                 soulHeartsRemaining = soulHeartsRemaining - addAmount
-            elseif heartType == HeartSubType.HEART_BONE then
+            elseif heartType == HeartSubType.BONE then
                 player:AddBoneHearts(addAmount)
             end
         end
@@ -267,16 +270,16 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         playerHealth.hearts,
         function()
             player:AddHearts(1)
-            if character == PlayerType.PLAYER_MAGDALENE_B then
+            if character == PlayerType.MAGDALENE_B then
                 player:AddHearts(-1)
             end
         end
     )
     player:AddGoldenHearts(playerHealth.goldenHearts)
     player:AddBrokenHearts(playerHealth.brokenHearts)
-    if character == PlayerType.PLAYER_BETHANY then
+    if character == PlayerType.BETHANY then
         player:SetSoulCharge(playerHealth.soulCharges)
-    elseif character == PlayerType.PLAYER_BETHANY_B then
+    elseif character == PlayerType.BETHANY_B then
         player:SetBloodCharge(playerHealth.bloodCharges)
     end
 end

package/dist/functions/playerIndex.d.ts

@@ -46,7 +46,7 @@ export declare function getPlayerIndex(player: EntityPlayer, differentiateForgot
 export declare function getPlayerIndexVanilla(playerToFind: EntityPlayer): int | undefined;
 /**
  * This function always excludes players with a non-undefined parent, since they are not real
- * players. (e.g. the Strawman Keeper)
+ * players (e.g. the Strawman Keeper).
  *
  * If this is not desired, use the `getAllPlayers` helper function instead.
  *
@@ -61,7 +61,7 @@ export declare function getPlayers(performCharacterExclusions?: boolean): Entity
  */
 export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPlayer | undefined;
 /**
- * Some players are "child" players, meaning that they have a non-undefined Parent property.
- * (For example, the Strawman Keeper.)
+ * Some players are "child" players, meaning that they have a non-undefined Parent property. (For
+ * example, the Strawman Keeper.)
  */
 export declare function isChildPlayer(player: EntityPlayer): boolean;

package/dist/functions/playerIndex.lua

@@ -5,6 +5,9 @@ local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
 local getPlayerIndexCollectibleType, DEFAULT_COLLECTIBLE_TYPE, EXCLUDED_CHARACTERS
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 function ____exports.getAllPlayers(self)
@@ -41,16 +44,16 @@ function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSo
     local character = player:GetPlayerType()
     repeat
         local ____switch10 = character
-        local ____cond10 = ____switch10 == PlayerType.PLAYER_THESOUL
+        local ____cond10 = ____switch10 == PlayerType.THE_SOUL
         if ____cond10 then
             do
-                return differentiateForgottenAndSoul and CollectibleType.COLLECTIBLE_SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
+                return differentiateForgottenAndSoul and CollectibleType.SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
             end
         end
-        ____cond10 = ____cond10 or ____switch10 == PlayerType.PLAYER_LAZARUS2_B
+        ____cond10 = ____cond10 or ____switch10 == PlayerType.LAZARUS_2_B
         if ____cond10 then
             do
-                return CollectibleType.COLLECTIBLE_INNER_EYE
+                return CollectibleType.INNER_EYE
             end
         end
         do
@@ -96,8 +99,8 @@ end
 function ____exports.isChildPlayer(self, player)
     return player.Parent ~= nil
 end
-DEFAULT_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_SAD_ONION
-EXCLUDED_CHARACTERS = __TS__New(Set, {PlayerType.PLAYER_ESAU, PlayerType.PLAYER_THESOUL_B})
+DEFAULT_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION
+EXCLUDED_CHARACTERS = __TS__New(Set, {PlayerType.ESAU, PlayerType.THE_SOUL_B})
 function ____exports.getPlayerFromIndex(self, playerIndex)
     local players = ____exports.getPlayers(nil)
     return __TS__ArrayFind(

package/dist/functions/pocketItems.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="isaac-typescript-definitions" />
+import { PocketItemSlot } from "isaac-typescript-definitions";
 import { PocketItemDescription } from "../types/PocketItemDescription";
 /**
  * Helper function to get the `PocketItemSlot` that the player's pocket active collectible item is

package/dist/functions/pocketItems.lua

@@ -2,29 +2,35 @@ local ____lualib = require("lualib_bundle")
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local __TS__ArraySome = ____lualib.__TS__ArraySome
 local ____exports = {}
-local ____constants = require("constants")
-local MAX_PLAYER_POCKET_ITEM_SLOTS = ____constants.MAX_PLAYER_POCKET_ITEM_SLOTS
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
+local Card = ____isaac_2Dtypescript_2Ddefinitions.Card
+local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local PillColor = ____isaac_2Dtypescript_2Ddefinitions.PillColor
+local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
+local PocketItemSlot = ____isaac_2Dtypescript_2Ddefinitions.PocketItemSlot
 local ____PocketItemType = require("enums.PocketItemType")
 local PocketItemType = ____PocketItemType.PocketItemType
-local ____math = require("functions.math")
-local range = ____math.range
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 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
-    local pocketItem2 = player:GetActiveItem(ActiveSlot.SLOT_POCKET2)
-    local hasPocketItem2 = pocketItem2 ~= CollectibleType.COLLECTIBLE_NULL
+    local pocketItem = player:GetActiveItem(ActiveSlot.POCKET)
+    local hasPocketItem = pocketItem ~= CollectibleType.NULL
+    local pocketItem2 = player:GetActiveItem(ActiveSlot.POCKET_SINGLE_USE)
+    local hasPocketItem2 = pocketItem2 ~= CollectibleType.NULL
     local maxPocketItems = player:GetMaxPocketItems()
+    local pocketItemSlots = getEnumValues(nil, PocketItemSlot)
     local pocketItems = {}
     local pocketItemIdentified = false
     local pocketItem2Identified = false
-    for ____, slot in ipairs(range(nil, MAX_PLAYER_POCKET_ITEM_SLOTS - 1)) do
+    for ____, slot in ipairs(pocketItemSlots) do
         local card = player:GetCard(slot)
         local pillColor = player:GetPill(slot)
-        if card ~= Card.CARD_NULL then
+        if card ~= Card.NULL then
             pocketItems[#pocketItems + 1] = {slot = slot, type = PocketItemType.CARD, subType = card}
-        elseif pillColor ~= PillColor.PILL_NULL then
+        elseif pillColor ~= PillColor.NULL then
             pocketItems[#pocketItems + 1] = {slot = slot, type = PocketItemType.PILL, subType = pillColor}
         elseif hasPocketItem and not hasPocketItem2 and not pocketItemIdentified then
             pocketItemIdentified = true
@@ -60,7 +66,7 @@ function ____exports.getFirstCardOrPill(self, player)
     )
 end
 function ____exports.hasOpenPocketItemSlot(self, player)
-    if isCharacter(nil, player, PlayerType.PLAYER_THESOUL_B) then
+    if isCharacter(nil, player, PlayerType.THE_SOUL_B) then
         return false
     end
     local pocketItems = ____exports.getPocketItems(nil, player)
@@ -72,6 +78,9 @@ end
 function ____exports.isFirstSlotPocketActiveItem(self, player)
     local pocketItems = ____exports.getPocketItems(nil, player)
     local firstPocketItem = pocketItems[1]
+    if firstPocketItem == nil then
+        return false
+    end
     return firstPocketItem.type == PocketItemType.ACTIVE_ITEM
 end
 return ____exports

package/dist/functions/positionVelocity.lua

@@ -3,6 +3,9 @@ local __TS__ArraySome = ____lualib.__TS__ArraySome
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
+local HeavenLightDoorSubType = ____isaac_2Dtypescript_2Ddefinitions.HeavenLightDoorSubType
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local ____constants = require("constants")
@@ -34,7 +37,7 @@ function ____exports.findFreePosition(self, startingPosition, avoidActiveEntitie
         avoidActiveEntities = false
     end
     local room = game:GetRoom()
-    local heavenDoors = getEffects(nil, EffectVariant.HEAVEN_LIGHT_DOOR, 0)
+    local heavenDoors = getEffects(nil, EffectVariant.HEAVEN_LIGHT_DOOR, HeavenLightDoorSubType.HEAVEN_DOOR)
     do
         local i = 0
         while i < MAX_FIND_FREE_POSITION_ATTEMPTS do

package/dist/functions/random.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="isaac-typescript-definitions" />
 /**
- * This returns a random float between 0 and 1. It is inclusive on the low end, but exclusive on
- * the high end. (This is because the `RNG.RandomFloat` method will never return a value of exactly
- * 1.)
+ * This returns a random float between 0 and 1. It is inclusive on the low end, but exclusive on the
+ * high end. (This is because the `RNG.RandomFloat` method will never return a value of exactly 1.)
  *
  * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
  * `RNG.Next` method will be called. Default is `getRandomSeed()`.

package/dist/functions/random.lua

@@ -1,4 +1,3 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local ____rng = require("functions.rng")
 local getRandomSeed = ____rng.getRandomSeed