isaacscript-common 1.2.108 → 1.2.111

package/dist/callbacks/postPurchase.lua

@@ -1,99 +1,48 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
-local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
-local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local hasSubscriptions, postUpdate, checkPickupsPurchased, getPlayerThatIsNoLongerHoldingAnItem, storePickupsInMap, storePlayersInMap, pickupAtIndexStillExists, v
+local hasSubscriptions, postPEffectUpdate, playerPickedUpNewItem, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____pickups = require("functions.pickups")
 local getPickups = ____pickups.getPickups
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
-local getPlayers = ____player.getPlayers
+local ____DefaultMap = require("types.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
 local ____postPurchase = require("callbacks.subscriptions.postPurchase")
 local postPurchaseFire = ____postPurchase.postPurchaseFire
 local postPurchaseHasSubscriptions = ____postPurchase.postPurchaseHasSubscriptions
 function hasSubscriptions(self)
     return postPurchaseHasSubscriptions(nil)
 end
-function postUpdate(self)
+function postPEffectUpdate(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local pickups = getPickups(nil)
-    local players = getPlayers(nil)
-    checkPickupsPurchased(nil, pickups, players)
-    storePickupsInMap(nil, pickups)
-    storePlayersInMap(nil, players)
-end
-function checkPickupsPurchased(self, pickups, players)
-    for ____, ____value in __TS__Iterator(v.room.pickupMap:entries()) do
-        local index = ____value[1]
-        local pickupDescription = ____value[2]
-        do
-            if pickupAtIndexStillExists(nil, index, pickups) then
-                goto __continue7
-            end
-            v.room.pickupMap:delete(index)
-            local player = getPlayerThatIsNoLongerHoldingAnItem(nil, players)
-            if player ~= nil then
-                postPurchaseFire(nil, player, pickupDescription)
-            end
-        end
-        ::__continue7::
+    local isHoldingItem = player:IsHoldingItem()
+    local playerIndex = getPlayerIndex(nil, player)
+    local wasHoldingItemOnLastFrame = v.room.playersHoldingItemOnLastFrameMap:getAndSetDefault(playerIndex)
+    v.room.playersHoldingItemOnLastFrameMap:set(playerIndex, isHoldingItem)
+    if not wasHoldingItemOnLastFrame and isHoldingItem then
+        playerPickedUpNewItem(nil, player)
     end
 end
-function getPlayerThatIsNoLongerHoldingAnItem(self, players)
-    return __TS__ArrayFind(
-        players,
-        function(____, player)
-            local playerHoldingItem = player:IsHoldingItem()
-            local playerIndex = getPlayerIndex(nil, player)
-            local playerHoldingItemLastFrame = v.room.playerHoldingItemLastFrameMap:get(playerIndex)
-            return playerHoldingItemLastFrame == false and playerHoldingItem
-        end
-    )
-end
-function storePickupsInMap(self, pickups)
-    local pickupsWithPrice = __TS__ArrayFilter(
+function playerPickedUpNewItem(self, player)
+    local pickups = getPickups(nil)
+    local disappearingPickup = __TS__ArrayFind(
         pickups,
-        function(____, pickup) return pickup.Price ~= 0 end
+        function(____, pickup) return not pickup:Exists() and pickup.Price ~= 0 end
     )
-    for ____, pickup in ipairs(pickupsWithPrice) do
-        v.room.pickupMap:set(pickup.Index, {
-            variant = pickup.Variant,
-            subType = pickup.SubType,
-            position = pickup.Position,
-            velocity = pickup.Velocity,
-            price = pickup.Price,
-            initSeed = pickup.InitSeed
-        })
+    if disappearingPickup ~= nil then
+        postPurchaseFire(nil, player, disappearingPickup)
     end
 end
-function storePlayersInMap(self, players)
-    for ____, player in ipairs(players) do
-        local playerIndex = getPlayerIndex(nil, player)
-        local holdingItem = player:IsHoldingItem()
-        v.room.playerHoldingItemLastFrameMap:set(playerIndex, holdingItem)
-    end
-end
-function pickupAtIndexStillExists(self, index, pickups)
-    local pickupAtIndex = __TS__ArrayFind(
-        pickups,
-        function(____, pickup) return pickup.Index end
-    )
-    return pickupAtIndex ~= nil and pickupAtIndex:Exists()
-end
-v = {room = {
-    pickupMap = __TS__New(Map),
-    playerHoldingItemLastFrameMap = __TS__New(Map)
-}}
+v = {room = {playersHoldingItemOnLastFrameMap = __TS__New(DefaultMap, false)}}
 function ____exports.postPurchaseCallbackInit(self, mod)
     saveDataManager(nil, "postPurchase", v, hasSubscriptions)
-    mod:AddCallback(ModCallbacks.MC_POST_UPDATE, postUpdate)
+    mod:AddCallback(ModCallbacks.MC_POST_PEFFECT_UPDATE, postPEffectUpdate)
 end
 return ____exports

package/dist/callbacks/subscriptions/postPurchase.d.ts

@@ -1,3 +1,2 @@
 /// <reference types="isaac-typescript-definitions" />
-import { PickupDescription } from "../../types/PickupDescription";
-export declare type PostPurchaseCallbackType = (player: EntityPlayer, pickupDescription: PickupDescription) => void;
+export declare type PostPurchaseCallbackType = (player: EntityPlayer, pickup: EntityPickup) => void;

package/dist/callbacks/subscriptions/postPurchase.lua

@@ -9,10 +9,10 @@ end
 function ____exports.postPurchaseRegister(self, callback, pickupVariant, pickupSubType)
     __TS__ArrayPush(subscriptions, {callback, pickupVariant, pickupSubType})
 end
-function ____exports.postPurchaseFire(self, player, pickupDescription)
+function ____exports.postPurchaseFire(self, player, pickup)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
-        callback(nil, player, pickupDescription)
+        callback(nil, player, pickup)
     end
 end
 return ____exports

package/dist/features/getCollectibleItemPoolType.lua

@@ -6,6 +6,8 @@ local ____exports = {}
 local postPickupInitCollectible, v
 local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
+local ____entity = require("functions.entity")
+local getEntityID = ____entity.getEntityID
 local ____rooms = require("functions.rooms")
 local getRoomItemPoolType = ____rooms.getRoomItemPoolType
 local ____exports = require("features.saveDataManager.exports")
@@ -31,7 +33,8 @@ function ____exports.getCollectibleItemPoolType(self, collectible)
         error(msg)
     end
     if collectible.Type ~= EntityType.ENTITY_PICKUP or collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
-        error((((("The \"getCollectibleItemPoolType()\" function was given a non-collectible: " .. tostring(collectible.Type)) .. ".") .. tostring(collectible.Variant)) .. ".") .. tostring(collectible.SubType))
+        local entityID = getEntityID(nil, collectible)
+        error("The \"getCollectibleItemPoolType()\" function was given a non-collectible: " .. entityID)
     end
     local ptrHash = GetPtrHash(collectible)
     local itemPoolType = v.run.collectibleItemPoolTypeMap:get(ptrHash)

package/dist/functions/collectibles.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
+import { CollectiblePedestalType } from "../types/CollectiblePedestalType";
 export declare function collectibleHasTag(collectibleType: CollectibleType | int, tag: ItemConfigTag): boolean;
 export declare function clearCollectibleSprite(collectible: EntityPickup): void;
 export declare function collectibleHasCacheFlag(collectibleType: CollectibleType | int, cacheFlag: CacheFlag): boolean;
@@ -48,6 +49,7 @@ export declare function getCollectibleMaxCharges(collectibleType: CollectibleTyp
  * ```
  */
 export declare function getCollectibleName(collectibleType: CollectibleType | int): string;
+export declare function getCollectiblePedestalType(collectible: EntityPickup): CollectiblePedestalType;
 /** Helper function to get all of the collectible entities in the room. */
 export declare function getCollectibles(matchingSubType?: number): EntityPickup[];
 export declare function getMaxCollectibleType(): int;
@@ -56,7 +58,7 @@ export declare function getMaxCollectibleType(): int;
  * glitched items once a player has TMTRAINER. However, glitched items can also "naturally" appear
  * in secret rooms and I AM ERROR rooms if the "Corrupted Data" achievement is unlocked.
  */
-export declare function isGlitchedCollectible(entity: Entity): boolean;
+export declare function isGlitchedCollectible(pickup: EntityPickup): boolean;
 /**
  * Returns true if the item type in the item config is equal to `ItemType.ITEM_PASSIVE` or
  * `ItemType.ITEM_FAMILIAR`.

package/dist/functions/collectibles.lua

@@ -138,6 +138,13 @@ function ____exports.getCollectibleName(self, collectibleType)
     end
     return itemConfigItem.Name
 end
+function ____exports.getCollectiblePedestalType(self, collectible)
+    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+        error("You cannot get the pedestal type for pickups of variant: " .. tostring(collectible.Variant))
+    end
+    local sprite = collectible:GetSprite()
+    return sprite:GetOverlayFrame()
+end
 function ____exports.getCollectibles(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
@@ -148,8 +155,8 @@ function ____exports.getMaxCollectibleType(self)
     local itemConfig = Isaac.GetItemConfig()
     return itemConfig:GetCollectibles().Size - 1
 end
-function ____exports.isGlitchedCollectible(self, entity)
-    return entity.Type == EntityType.ENTITY_PICKUP and entity.Variant == PickupVariant.PICKUP_COLLECTIBLE and entity.SubType > GLITCHED_ITEM_THRESHOLD
+function ____exports.isGlitchedCollectible(self, pickup)
+    return pickup.Variant == PickupVariant.PICKUP_COLLECTIBLE and pickup.SubType > GLITCHED_ITEM_THRESHOLD
 end
 function ____exports.isPassiveCollectible(self, collectibleType)
     local itemType = ____exports.getCollectibleItemType(nil, collectibleType)

package/dist/functions/entity.d.ts

@@ -53,6 +53,8 @@ export declare function getFilteredNewEntities<T extends AnyEntity>(oldEntities:
  * returned. False by default. Will only be taken into account if `matchingEntityType` is specified.
  */
 export declare function getEntities(matchingEntityType?: EntityType | int, matchingVariant?: number, matchingSubType?: number, ignoreFriendly?: boolean): Entity[];
+/** Helper function to return a string containing an entity's type, variant, and sub-type. */
+export declare function getEntityID(entity: Entity): string;
 /**
  * Helper function to measure an entity's velocity to see if it is moving.
  *

package/dist/functions/entity.lua

@@ -88,6 +88,9 @@ function ____exports.getEntities(self, matchingEntityType, matchingVariant, matc
     end
     return Isaac.FindByType(matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
 end
+function ____exports.getEntityID(self, entity)
+    return (((tostring(entity.Type) .. ".") .. tostring(entity.Variant)) .. ".") .. tostring(entity.SubType)
+end
 function ____exports.isEntityMoving(self, entity, threshold)
     if threshold == nil then
         threshold = 0.01

package/dist/index.d.ts

@@ -90,7 +90,6 @@ export * from "./types/JSONSpawn";
 export * from "./types/ModCallbacksCustom";
 export * from "./types/ModUpgraded";
 export * from "./types/PickingUpItem";
-export * from "./types/PickupDescription";
 export * from "./types/PillEffectClass";
 export * from "./types/PillEffectType";
 export * from "./types/PlayerHealth";

package/dist/types/CollectiblePedestalType.d.ts

@@ -0,0 +1,38 @@
+/** Corresponds to the overlay frame number in "005.100_collectible.anm2". */
+export declare enum CollectiblePedestalType {
+    /**
+     * Used for e.g. shop collectibles. In the "005.100_collectible.anm2" file, this is represented by
+     * the final frame.
+     */
+    NONE = -1,
+    /** The normal grey pedestal. */
+    NORMAL = 0,
+    /** From SlotVariant.FORTUNE_TELLING_MACHINE (3) */
+    FORTUNE_TELLING_MACHINE = 1,
+    /** From SlotVariant.BLOOD_DONATION_MACHINE (2) */
+    BLOOD_DONATION_MACHINE = 2,
+    /** From SlotVariant.SLOT_MACHINE (1) */
+    SLOT_MACHINE = 3,
+    /** From PickupVariant.LOCKEDCHEST (60) */
+    LOCKEDCHEST = 4,
+    /** From PickupVariant.PICKUP_REDCHEST (360) */
+    REDCHEST = 5,
+    /** From PickupVariant.PICKUP_BOMBCHEST (51) */
+    BOMBCHEST = 6,
+    /** From PickupVariant.PICKUP_SPIKEDCHEST (52) */
+    SPIKEDCHEST = 7,
+    /** From PickupVariant.PICKUP_ETERNALCHEST (53) */
+    ETERNALCHEST = 8,
+    /** From SlotVariant.MOMS_DRESSING_TABLE (12) */
+    MOMS_DRESSING_TABLE = 9,
+    /** From PickupVariant.PICKUP_CHEST (50) */
+    CHEST = 10,
+    /** From PickupVariant.PICKUP_MOMSCHEST (390) */
+    MOMSCHEST = 11,
+    /** From PickupVariant.PICKUP_OLDCHEST (55) */
+    OLDCHEST = 12,
+    /** From PickupVariant.PICKUP_WOODENCHEST (56) */
+    WOODENCHEST = 13,
+    /** From PickupVariant.PICKUP_MEGACHEST (57) */
+    MEGACHEST = 14
+}

package/dist/types/CollectiblePedestalType.lua

@@ -0,0 +1,36 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+____exports.CollectiblePedestalType = CollectiblePedestalType or ({})
+____exports.CollectiblePedestalType.NONE = -1
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.NONE] = "NONE"
+____exports.CollectiblePedestalType.NORMAL = 0
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.NORMAL] = "NORMAL"
+____exports.CollectiblePedestalType.FORTUNE_TELLING_MACHINE = 1
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.FORTUNE_TELLING_MACHINE] = "FORTUNE_TELLING_MACHINE"
+____exports.CollectiblePedestalType.BLOOD_DONATION_MACHINE = 2
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.BLOOD_DONATION_MACHINE] = "BLOOD_DONATION_MACHINE"
+____exports.CollectiblePedestalType.SLOT_MACHINE = 3
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.SLOT_MACHINE] = "SLOT_MACHINE"
+____exports.CollectiblePedestalType.LOCKEDCHEST = 4
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.LOCKEDCHEST] = "LOCKEDCHEST"
+____exports.CollectiblePedestalType.REDCHEST = 5
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.REDCHEST] = "REDCHEST"
+____exports.CollectiblePedestalType.BOMBCHEST = 6
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.BOMBCHEST] = "BOMBCHEST"
+____exports.CollectiblePedestalType.SPIKEDCHEST = 7
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.SPIKEDCHEST] = "SPIKEDCHEST"
+____exports.CollectiblePedestalType.ETERNALCHEST = 8
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.ETERNALCHEST] = "ETERNALCHEST"
+____exports.CollectiblePedestalType.MOMS_DRESSING_TABLE = 9
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.MOMS_DRESSING_TABLE] = "MOMS_DRESSING_TABLE"
+____exports.CollectiblePedestalType.CHEST = 10
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.CHEST] = "CHEST"
+____exports.CollectiblePedestalType.MOMSCHEST = 11
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.MOMSCHEST] = "MOMSCHEST"
+____exports.CollectiblePedestalType.OLDCHEST = 12
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.OLDCHEST] = "OLDCHEST"
+____exports.CollectiblePedestalType.WOODENCHEST = 13
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.WOODENCHEST] = "WOODENCHEST"
+____exports.CollectiblePedestalType.MEGACHEST = 14
+____exports.CollectiblePedestalType[____exports.CollectiblePedestalType.MEGACHEST] = "MEGACHEST"
+return ____exports

package/dist/types/PickupDescription.d.ts

@@ -7,3 +7,4 @@ export interface PickupDescription {
     price: int;
     initSeed: int;
 }
+export declare function getPickupDescription(pickup: EntityPickup): PickupDescription;

package/dist/types/PickupDescription.lua

@@ -1,3 +1,13 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
+function ____exports.getPickupDescription(self, pickup)
+    return {
+        variant = pickup.Variant,
+        subType = pickup.SubType,
+        position = pickup.Position,
+        velocity = pickup.Velocity,
+        price = pickup.Price,
+        initSeed = pickup.InitSeed
+    }
+end
 return ____exports

package/package.json

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