isaacscript-common 1.2.52 → 1.2.55

package/dist/callbacks/itemPickup.lua

@@ -10,6 +10,9 @@ local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
 local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
+local ____PickingUpItem = require("types.PickingUpItem")
+local newPickingUpItem = ____PickingUpItem.newPickingUpItem
+local resetPickingUpItem = ____PickingUpItem.resetPickingUpItem
 local ____postItemPickup = require("callbacks.subscriptions.postItemPickup")
 local postItemPickupFire = ____postItemPickup.postItemPickupFire
 local postItemPickupHasSubscriptions = ____postItemPickup.postItemPickupHasSubscriptions
@@ -25,35 +28,52 @@ function postPEffectUpdateReordered(self, player)
     end
     local pickingUpItem = getPickingUpItemForPlayer(nil, player)
     if player:IsItemQueueEmpty() then
+        if player:GetPlayerType() == PlayerType.PLAYER_THESOUL then
+            Isaac.DebugString((("GETTING HERE - EMPTY - " .. tostring(pickingUpItem.itemType)) .. ", ") .. tostring(pickingUpItem.subType))
+        end
         queueEmpty(nil, player, pickingUpItem)
     else
+        if player:GetPlayerType() == PlayerType.PLAYER_THESOUL then
+            Isaac.DebugString((("GETTING HERE - NOT EMPTY - " .. tostring(pickingUpItem.itemType)) .. ", ") .. tostring(pickingUpItem.subType))
+        end
         queueNotEmpty(nil, player, pickingUpItem)
     end
 end
 function queueEmpty(self, player, pickingUpItem)
-    if pickingUpItem.id ~= CollectibleType.COLLECTIBLE_NULL then
-        postItemPickupFire(nil, player, pickingUpItem)
-        pickingUpItem.id = CollectibleType.COLLECTIBLE_NULL
-        pickingUpItem.type = ItemType.ITEM_NULL
+    if pickingUpItem.subType == CollectibleType.COLLECTIBLE_NULL then
+        return
     end
+    postItemPickupFire(nil, player, pickingUpItem)
+    resetPickingUpItem(nil, pickingUpItem)
 end
 function queueNotEmpty(self, player, pickingUpItem)
     local queuedItem = player.QueuedItem.Item
     if queuedItem == nil then
         return
     end
-    if queuedItem.Type ~= pickingUpItem.type or queuedItem.ID ~= pickingUpItem.id then
-        pickingUpItem.type = queuedItem.Type
-        pickingUpItem.id = queuedItem.ID
+    if queuedItem.Type ~= pickingUpItem.itemType or queuedItem.ID ~= pickingUpItem.subType then
+        pickingUpItem.itemType = queuedItem.Type
+        pickingUpItem.subType = queuedItem.ID
+        Isaac.DebugString((("GETTING HERE - SET: " .. tostring(pickingUpItem.itemType)) .. ", ") .. tostring(pickingUpItem.subType))
         preItemPickupFire(nil, player, pickingUpItem)
     end
 end
 function getPickingUpItemForPlayer(self, player)
-    local index = getPlayerIndex(nil, player)
-    local pickingUpItem = v.run.pickingUpItem:get(index)
+    local character = player:GetPlayerType()
+    local playerIndex
+    if character == PlayerType.PLAYER_THESOUL then
+        local forgotten = player:GetSubPlayer()
+        if forgotten == nil then
+            error("Failed")
+        end
+        playerIndex = getPlayerIndex(nil, forgotten)
+    else
+        playerIndex = getPlayerIndex(nil, player)
+    end
+    local pickingUpItem = v.run.pickingUpItem:get(playerIndex)
     if pickingUpItem == nil then
-        pickingUpItem = {id = CollectibleType.COLLECTIBLE_NULL, type = ItemType.ITEM_NULL}
-        v.run.pickingUpItem:set(index, pickingUpItem)
+        pickingUpItem = newPickingUpItem(nil)
+        v.run.pickingUpItem:set(playerIndex, pickingUpItem)
     end
     return pickingUpItem
 end

package/dist/callbacks/postEsauJr.lua

@@ -1,4 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
 local hasSubscriptions, postUpdate, getPlayerWithControllerIndex, useItemEsauJr, v
 local ____exports = require("features.saveDataManager.exports")
@@ -39,12 +41,11 @@ function postUpdate(self)
     postEsauJrFire(nil, player)
 end
 function getPlayerWithControllerIndex(self, controllerIndex)
-    for ____, player in ipairs(getPlayers(nil)) do
-        if player.ControllerIndex == controllerIndex then
-            return player
-        end
-    end
-    return nil
+    local players = getPlayers(nil)
+    return __TS__ArrayFind(
+        players,
+        function(____, player) return player.ControllerIndex == controllerIndex end
+    )
 end
 function useItemEsauJr(self, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
     if not hasSubscriptions(nil) then

package/dist/callbacks/postTransformation.lua

@@ -5,7 +5,7 @@ local __TS__New = ____lualib.__TS__New
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local Map = ____lualib.Map
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdateReordered, playerTransformationChanged, updateForgottenOrSoulTransformation, TRANSFORMATIONS, v
+local hasSubscriptions, postPEffectUpdateReordered, TRANSFORMATIONS, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____array = require("functions.array")
@@ -40,27 +40,10 @@ function postPEffectUpdateReordered(self, player)
         end
         if hasForm ~= storedForm then
             transformations:set(playerForm, hasForm)
-            playerTransformationChanged(nil, player, playerForm, hasForm)
+            postTransformationFire(nil, player, playerForm, hasForm)
         end
     end
 end
-function playerTransformationChanged(self, player, playerForm, hasForm)
-    postTransformationFire(nil, player, playerForm, hasForm)
-    updateForgottenOrSoulTransformation(nil, player, playerForm, hasForm)
-end
-function updateForgottenOrSoulTransformation(self, player, playerForm, hasForm)
-    local subPlayer = player:GetSubPlayer()
-    if subPlayer == nil then
-        return
-    end
-    local subPlayerIndex = getPlayerIndex(nil, subPlayer)
-    local transformations = v.run.transformations:get(subPlayerIndex)
-    if transformations == nil then
-        transformations = __TS__New(Map)
-        v.run.transformations:set(subPlayerIndex, transformations)
-    end
-    transformations:set(playerForm, hasForm)
-end
 local UNUSED_TRANSFORMATIONS = __TS__New(Set, {PlayerForm.PLAYERFORM_FLIGHT})
 local tempTransformations = {}
 do

package/dist/callbacks/subscriptions/postItemPickup.lua

@@ -15,10 +15,10 @@ function ____exports.postItemPickupFire(self, player, pickingUpItem)
         local itemType = ____value[2]
         local itemID = ____value[3]
         do
-            if itemType ~= nil and itemType ~= pickingUpItem.type then
+            if itemType ~= nil and itemType ~= pickingUpItem.itemType then
                 goto __continue5
             end
-            if itemID ~= nil and itemID ~= pickingUpItem.id then
+            if itemID ~= nil and itemID ~= pickingUpItem.subType then
                 goto __continue5
             end
             callback(nil, player, pickingUpItem)

package/dist/callbacks/subscriptions/preItemPickup.lua

@@ -15,10 +15,10 @@ function ____exports.preItemPickupFire(self, player, pickingUpItem)
         local itemType = ____value[2]
         local itemID = ____value[3]
         do
-            if itemType ~= nil and itemType ~= pickingUpItem.type then
+            if itemType ~= nil and itemType ~= pickingUpItem.itemType then
                 goto __continue5
             end
-            if itemID ~= nil and itemID ~= pickingUpItem.id then
+            if itemID ~= nil and itemID ~= pickingUpItem.subType then
                 goto __continue5
             end
             callback(nil, player, pickingUpItem)

package/dist/features/sirenHelpers.lua

@@ -1,6 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
 local postNPCInitSirenHelper, checkReturnFamiliarToPlayer, blacklistEntryExists, getSirenHelper, v
 local ____errors = require("errors")
@@ -39,14 +40,12 @@ function blacklistEntryExists(self, incomingFamiliarVariant, incomingFamiliarSub
     return false
 end
 function getSirenHelper(self, familiar)
-    local familiarHash = GetPtrHash(familiar)
+    local familiarPtrHash = GetPtrHash(familiar)
     local sirenHelpers = getEntities(nil, EntityType.ENTITY_SIREN_HELPER)
-    for ____, sirenHelper in ipairs(sirenHelpers) do
-        if sirenHelper.Target ~= nil and GetPtrHash(sirenHelper.Target) == familiarHash then
-            return sirenHelper
-        end
-    end
-    return nil
+    return __TS__ArrayFind(
+        sirenHelpers,
+        function(____, sirenHelper) return sirenHelper.Target ~= nil and GetPtrHash(sirenHelper.Target) == familiarPtrHash end
+    )
 end
 local FEATURE_NAME = "siren helpers"
 local initialized = false

package/dist/functions/doors.lua

@@ -3,6 +3,7 @@ local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
 local ____constants = require("constants")
 local MAX_NUM_DOORS = ____constants.MAX_NUM_DOORS
@@ -32,12 +33,6 @@ function ____exports.getDoors(self, ...)
     end
     return doors
 end
-function ____exports.isAngelRoomDoor(self, door)
-    return door.TargetRoomType == RoomType.ROOM_ANGEL
-end
-function ____exports.isDevilRoomDoor(self, door)
-    return door.TargetRoomType == RoomType.ROOM_DEVIL
-end
 function ____exports.isRepentanceDoor(self, door)
     return door.TargetRoomIndex == GridRooms.ROOM_SECRET_EXIT_IDX
 end
@@ -57,36 +52,47 @@ function ____exports.closeDoorFast(self, door)
     sprite:Play("Closed", true)
 end
 function ____exports.getAngelRoomDoor(self)
-    for ____, door in ipairs(____exports.getDoors(nil)) do
-        if ____exports.isAngelRoomDoor(nil, door) then
-            return door
-        end
+    local angelRoomDoors = ____exports.getDoors(nil, RoomType.ROOM_ANGEL)
+    local ____temp_0
+    if #angelRoomDoors == 0 then
+        ____temp_0 = nil
+    else
+        ____temp_0 = angelRoomDoors[1]
     end
-    return nil
+    return ____temp_0
 end
 function ____exports.getDevilRoomDoor(self)
-    for ____, door in ipairs(____exports.getDoors(nil)) do
-        if ____exports.isDevilRoomDoor(nil, door) then
-            return door
-        end
+    local devilRoomDoors = ____exports.getDoors(nil, RoomType.ROOM_DEVIL)
+    local ____temp_1
+    if #devilRoomDoors == 0 then
+        ____temp_1 = nil
+    else
+        ____temp_1 = devilRoomDoors[1]
     end
-    return nil
+    return ____temp_1
 end
 function ____exports.getDevilRoomOrAngelRoomDoor(self)
-    for ____, door in ipairs(____exports.getDoors(nil)) do
-        if ____exports.isDevilRoomDoor(nil, door) or ____exports.isAngelRoomDoor(nil, door) then
-            return door
-        end
+    local devilRoomOrAngelRoomDoors = ____exports.getDoors(nil, RoomType.ROOM_DEVIL, RoomType.ROOM_ANGEL)
+    local ____temp_2
+    if #devilRoomOrAngelRoomDoors == 0 then
+        ____temp_2 = nil
+    else
+        ____temp_2 = devilRoomOrAngelRoomDoors[1]
     end
-    return nil
+    return ____temp_2
 end
 function ____exports.getRepentanceDoor(self)
-    for ____, door in ipairs(____exports.getDoors(nil)) do
-        if ____exports.isRepentanceDoor(nil, door) then
-            return door
-        end
-    end
-    return nil
+    local doors = ____exports.getDoors(nil)
+    return __TS__ArrayFind(
+        doors,
+        function(____, door) return ____exports.isRepentanceDoor(nil, door) end
+    )
+end
+function ____exports.isAngelRoomDoor(self, door)
+    return door.TargetRoomType == RoomType.ROOM_ANGEL
+end
+function ____exports.isDevilRoomDoor(self, door)
+    return door.TargetRoomType == RoomType.ROOM_DEVIL
 end
 function ____exports.isHiddenSecretRoomDoor(self, door)
     local sprite = door:GetSprite()

package/dist/functions/player.d.ts

@@ -52,6 +52,14 @@ export declare function characterGetsBlackHeartFromEternalHeart(character: Playe
  * The formula for calculating it is: 32 - 2.5 * player.TearHeight
  */
 export declare function getAzazelBrimstoneDistance(playerOrTearHeight: EntityPlayer | float): number;
+/**
+ * Returns the maximum heart containers that the provided character can have. Normally, this is 12,
+ * but with Keeper it is 3, with Tainted Keeper it is 2. Does not account for Birthright or Mother's
+ * Kiss; use the `getPlayerMaxHeartContainers()` function for that.
+ */
+export declare function getCharacterMaxHeartContainers(character: PlayerType | int): int;
+/** Helper function to get an array containing the characters of all of the current players. */
+export declare function getCharacters(): number[];
 export declare function getClosestPlayer(position: Vector): EntityPlayer;
 /**
  * Most characters have a 56 frame death animation (i.e. the "Death" animation).
@@ -81,14 +89,6 @@ export declare function getNewestPlayer(): EntityPlayer;
  * hearts and 3 broken hearts, then this function would return 6 (i.e. 12 - 1 - 2 - 3).
  */
 export declare function getPlayerAvailableHeartSlots(player: EntityPlayer): int;
-/**
- * Returns the maximum heart containers that the provided character can have. Normally, this is 12,
- * but with Keeper it is 3, with Tainted Keeper it is 2. Does not account for Birthright or Mother's
- * Kiss; use the `getPlayerMaxHeartContainers()` function for that.
- */
-export declare function getCharacterMaxHeartContainers(character: PlayerType | int): int;
-/** Helper function to get an array containing the characters of all of the current players. */
-export declare function getCharacters(): number[];
 /**
  * Iterates over all players and checks if any are close enough to the specified position.
  *
@@ -122,13 +122,15 @@ export declare function getPlayerFromIndex(playerIndex: PlayerIndex): EntityPlay
  * Instead, we use `EntityPlayer.GetCollectibleRNG()` with an arbitrary value of Sad Onion (1). This
  * works even if the player does not have any Sad Onions.
  *
- * Since the RNG value is the same for both The Forgotten and The Soul, we revert to using the RNG
- * of Inner Eye (2) for The Soul.
- *
  * Since the RNG value is the same for both Tainted Lazarus and Dead Tainted Lazarus, we revert to
- * using the RNG of Spoon Bender (3) for Dead Tainted Lazarus.
+ * using the RNG of The Inner Eye (2) for Dead Tainted Lazarus.
+ *
+ * Note that by default, this returns the same index for both The Forgotten and The Soul. (Even
+ * though they are technically different characters, they share the same inventory and InitSeed.) If
+ * this is not desired, pass true for the `differentiateForgottenAndSoul` argument, and the RNG of
+ * Spoon Bender (3) will be used for The Soul.
  */
-export declare function getPlayerIndex(player: EntityPlayer): PlayerIndex;
+export declare function getPlayerIndex(player: EntityPlayer, differentiateForgottenAndSoul?: boolean): PlayerIndex;
 /**
  * Helper function to return the index of this player with respect to the output of the
  * `Isaac.GetPlayer()` function.
@@ -171,6 +173,12 @@ export declare function getPlayers(performExclusions?: boolean): EntityPlayer[];
  * for. Returns true if any of the characters supplied are present.
  */
 export declare function getPlayersOfType(...characters: Array<PlayerType | int>): EntityPlayer[];
+/**
+ * Helper function to get a parent `EntityPlayer` object for a given `EntitySubPlayer` object. This
+ * is useful because calling the `EntityPlayer.GetSubPlayer` method on a sub-player object will
+ * return undefined.
+ */
+export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPlayer | undefined;
 /**
  * Helper function to return the active charge and the battery charge combined. This is useful
  * because you are not able to set the battery charge directly.

package/dist/functions/player.lua

@@ -4,12 +4,13 @@ local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArraySome = ____lualib.__TS__ArraySome
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local Map = ____lualib.Map
 local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local getPlayerIndexCollectibleType, getAdjustedPlayerName, isTaintedModded, EXCLUDED_CHARACTERS
+local getPlayerIndexCollectibleType, getAdjustedPlayerName, isTaintedModded, DEFAULT_COLLECTIBLE_TYPE, 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
@@ -50,31 +51,45 @@ function ____exports.getCharacters(self)
         function(____, player) return player:GetPlayerType() end
     )
 end
-function ____exports.getPlayerIndex(self, player)
-    local character = player:GetPlayerType()
-    local collectibleType = getPlayerIndexCollectibleType(nil, character)
-    local collectibleRNG = player:GetCollectibleRNG(collectibleType)
+function ____exports.getPlayerIndex(self, player, differentiateForgottenAndSoul)
+    if differentiateForgottenAndSoul == nil then
+        differentiateForgottenAndSoul = false
+    end
+    local isSubPlayer = player:IsSubPlayer()
+    local ____isSubPlayer_0
+    if isSubPlayer then
+        ____isSubPlayer_0 = ____exports.getSubPlayerParent(nil, player)
+    else
+        ____isSubPlayer_0 = player
+    end
+    local playerToUse = ____isSubPlayer_0
+    if playerToUse == nil then
+        error("Failed to get the sub-player parent when determining the index for the player with InitSeed: " .. tostring(player.InitSeed))
+    end
+    local collectibleType = getPlayerIndexCollectibleType(nil, player, differentiateForgottenAndSoul)
+    local collectibleRNG = playerToUse:GetCollectibleRNG(collectibleType)
     local seed = collectibleRNG:GetSeed()
     return seed
 end
-function getPlayerIndexCollectibleType(self, character)
+function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
+    local character = player:GetPlayerType()
     repeat
-        local ____switch62 = character
-        local ____cond62 = ____switch62 == PlayerType.PLAYER_THESOUL
-        if ____cond62 then
+        local ____switch59 = character
+        local ____cond59 = ____switch59 == PlayerType.PLAYER_THESOUL
+        if ____cond59 then
             do
-                return CollectibleType.COLLECTIBLE_INNER_EYE
+                return differentiateForgottenAndSoul and CollectibleType.COLLECTIBLE_SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
             end
         end
-        ____cond62 = ____cond62 or ____switch62 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond62 then
+        ____cond59 = ____cond59 or ____switch59 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond59 then
             do
-                return CollectibleType.COLLECTIBLE_SPOON_BENDER
+                return CollectibleType.COLLECTIBLE_INNER_EYE
             end
         end
         do
             do
-                return CollectibleType.COLLECTIBLE_SAD_ONION
+                return DEFAULT_COLLECTIBLE_TYPE
             end
         end
     until true
@@ -95,39 +110,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch75 = character
-        local ____cond75 = ____switch75 == PlayerType.PLAYER_BLUEBABY or ____switch75 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond75 then
+        local ____switch72 = character
+        local ____cond72 = ____switch72 == PlayerType.PLAYER_BLUEBABY or ____switch72 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond72 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2
-        if ____cond75 then
+        ____cond72 = ____cond72 or ____switch72 == PlayerType.PLAYER_LAZARUS2
+        if ____cond72 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond75 then
+        ____cond72 = ____cond72 or ____switch72 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond72 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB
-        if ____cond75 then
+        ____cond72 = ____cond72 or ____switch72 == PlayerType.PLAYER_JACOB
+        if ____cond72 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond75 then
+        ____cond72 = ____cond72 or ____switch72 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond72 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB2_B
-        if ____cond75 then
+        ____cond72 = ____cond72 or ____switch72 == PlayerType.PLAYER_JACOB2_B
+        if ____cond72 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -151,32 +166,47 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue85
+                    goto __continue82
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue85
+                    goto __continue82
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue85::
+            ::__continue82::
             i = i + 1
         end
     end
     return players
 end
+function ____exports.getSubPlayerParent(self, subPlayer)
+    local subPlayerPtrHash = GetPtrHash(subPlayer)
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArrayFind(
+        players,
+        function(____, player)
+            local thisPlayerSubPlayer = player:GetSubPlayer()
+            if thisPlayerSubPlayer == nil then
+                return false
+            end
+            local thisPlayerSubPlayerPtrHash = GetPtrHash(thisPlayerSubPlayer)
+            return thisPlayerSubPlayerPtrHash == subPlayerPtrHash
+        end
+    )
+end
 function ____exports.isChildPlayer(self, player)
     return player.Parent ~= nil
 end
 function ____exports.isTainted(self, player)
     local character = player:GetPlayerType()
-    local ____isVanillaCharacter_result_0
+    local ____isVanillaCharacter_result_1
     if ____exports.isVanillaCharacter(nil, player) then
-        ____isVanillaCharacter_result_0 = character >= PlayerType.PLAYER_ISAAC_B
+        ____isVanillaCharacter_result_1 = character >= PlayerType.PLAYER_ISAAC_B
     else
-        ____isVanillaCharacter_result_0 = isTaintedModded(nil, player)
+        ____isVanillaCharacter_result_1 = isTaintedModded(nil, player)
     end
-    return ____isVanillaCharacter_result_0
+    return ____isVanillaCharacter_result_1
 end
 function isTaintedModded(self, player)
     local character = player:GetPlayerType()
@@ -191,6 +221,7 @@ end
 function ____exports.isVanillaCharacter(self, player)
     return not ____exports.isModdedCharacter(nil, player)
 end
+DEFAULT_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_SAD_ONION
 EXCLUDED_CHARACTERS = __TS__New(Set, {PlayerType.PLAYER_ESAU, PlayerType.PLAYER_THESOUL_B})
 function ____exports.addCollectibleCostume(self, player, collectibleType)
     local itemConfig = Isaac.GetItemConfig()
@@ -351,12 +382,11 @@ function ____exports.getPlayerAvailableHeartSlots(self, player)
     return maxHeartContainers - totalOccupiedHeartSlots
 end
 function ____exports.getPlayerCloserThan(self, position, distance)
-    for ____, player in ipairs(____exports.getPlayers(nil)) do
-        if player.Position:Distance(position) <= distance then
-            return player
-        end
-    end
-    return nil
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArrayFind(
+        players,
+        function(____, player) return player.Position:Distance(position) <= distance end
+    )
 end
 function ____exports.getPlayerCollectibleMap(self, player)
     local collectibleSet = getCollectibleSet(nil)
@@ -370,13 +400,11 @@ function ____exports.getPlayerCollectibleMap(self, player)
     return collectibleMap
 end
 function ____exports.getPlayerFromIndex(self, playerIndex)
-    for ____, player in ipairs(____exports.getPlayers(nil)) do
-        local existingPlayerIndex = ____exports.getPlayerIndex(nil, player)
-        if existingPlayerIndex == playerIndex then
-            return player
-        end
-    end
-    return nil
+    local players = ____exports.getPlayers(nil)
+    return __TS__ArrayFind(
+        players,
+        function(____, player) return ____exports.getPlayerIndex(nil, player) == playerIndex end
+    )
 end
 function ____exports.getPlayerIndexVanilla(self, playerToFind)
     local game = Game()

package/dist/functions/pocketItems.lua

@@ -1,5 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArraySome = ____lualib.__TS__ArraySome
 local ____exports = {}
@@ -46,12 +47,10 @@ function ____exports.getPocketItems(self, player)
 end
 function ____exports.getFirstCardOrPill(self, player)
     local pocketItems = ____exports.getPocketItems(nil, player)
-    for ____, pocketItem in ipairs(pocketItems) do
-        if pocketItem.type == PocketItemType.CARD or pocketItem.type == PocketItemType.PILL then
-            return pocketItem
-        end
-    end
-    return nil
+    return __TS__ArrayFind(
+        pocketItems,
+        function(____, pocketItem) return pocketItem.type == PocketItemType.CARD or pocketItem.type == PocketItemType.PILL end
+    )
 end
 function ____exports.hasOpenPocketItemSlot(self, player)
     local character = player:GetPlayerType()

package/dist/index.d.ts

@@ -73,6 +73,7 @@ export * from "./maps/trinketNameMap";
 export * from "./sets/cards";
 export * from "./types/AnyEntity";
 export * from "./types/CallbackParametersCustom";
+export * from "./types/DefaultMap";
 export * from "./types/HealthType";
 export * from "./types/JSONDoor";
 export * from "./types/JSONEntity";

package/dist/index.lua

@@ -578,6 +578,14 @@ do
         end
     end
 end
+do
+    local ____export = require("types.DefaultMap")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("types.HealthType")
     for ____exportKey, ____exportValue in pairs(____export) do
@@ -602,6 +610,14 @@ do
         end
     end
 end
+do
+    local ____export = require("types.PickingUpItem")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("types.PillEffectClass")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/types/PickingUpItem.d.ts

@@ -1,6 +1,9 @@
 /// <reference types="isaac-typescript-definitions" />
 export interface PickingUpItem {
     /** Needed so that we can distinguish between picking up a collectible and a trinket. */
-    type: ItemType;
-    id: int;
+    itemType: ItemType;
+    /** Equal to either the collectible type or the trinket type. */
+    subType: CollectibleType | TrinketType | int;
 }
+export declare function newPickingUpItem(): PickingUpItem;
+export declare function resetPickingUpItem(pickingUpItem: PickingUpItem): void;

package/dist/types/PickingUpItem.lua

@@ -1,3 +1,12 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
+local DEFAULT_ITEM_TYPE = ItemType.ITEM_NULL
+local DEFAULT_SUB_TYPE = CollectibleType.COLLECTIBLE_NULL
+function ____exports.newPickingUpItem(self)
+    return {itemType = DEFAULT_ITEM_TYPE, subType = DEFAULT_SUB_TYPE}
+end
+function ____exports.resetPickingUpItem(self, pickingUpItem)
+    pickingUpItem.itemType = DEFAULT_ITEM_TYPE
+    pickingUpItem.subType = DEFAULT_SUB_TYPE
+end
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.52",
+  "version": "1.2.55",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
-    "isaac-typescript-definitions": "^1.0.348",
+    "isaac-typescript-definitions": "^1.0.349",
     "isaacscript-lint": "^1.0.79",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.12",