isaacscript-common 1.2.109 → 1.2.112

package/dist/callbacks/postPurchase.lua

@@ -1,132 +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__ArrayFilter = ____lualib.__TS__ArrayFilter
-local __TS__ArrayMap = ____lualib.__TS__ArrayMap
-local Set = ____lualib.Set
-local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
-local hasSubscriptions, postUpdate, checkPickupsPurchased, checkCollectiblesPurchased, getPlayerThatIsNoLongerHoldingAnItem, storePickupsInMap, storeCollectiblesInMap, storePlayersInMap, 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 ____PickupDescription = require("types.PickupDescription")
-local getPickupDescription = ____PickupDescription.getPickupDescription
 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 pickupsWithPrice = __TS__ArrayFilter(
-        pickups,
-        function(____, pickup) return pickup:Exists() and pickup.Price ~= 0 end
-    )
-    local nonCollectiblesWithPrice = __TS__ArrayFilter(
-        pickupsWithPrice,
-        function(____, pickup) return pickup.Variant ~= PickupVariant.PICKUP_COLLECTIBLE end
-    )
-    local collectiblesWithPrice = __TS__ArrayFilter(
-        pickupsWithPrice,
-        function(____, pickup) return pickup.Variant == PickupVariant.PICKUP_COLLECTIBLE end
-    )
-    local players = getPlayers(nil)
-    checkPickupsPurchased(nil, nonCollectiblesWithPrice, players)
-    checkCollectiblesPurchased(nil, collectiblesWithPrice, players)
-    storePickupsInMap(nil, nonCollectiblesWithPrice)
-    storeCollectiblesInMap(nil, collectiblesWithPrice)
-    storePlayersInMap(nil, players)
-end
-function checkPickupsPurchased(self, nonCollectiblesWithPrice, players)
-    local pickupIndexes = __TS__ArrayMap(
-        nonCollectiblesWithPrice,
-        function(____, pickup) return pickup.Index end
-    )
-    local pickupIndexSet = __TS__New(Set, pickupIndexes)
-    for ____, ____value in __TS__Iterator(v.room.pickupMap:entries()) do
-        local index = ____value[1]
-        local pickupDescription = ____value[2]
-        do
-            if pickupIndexSet:has(index) then
-                goto __continue11
-            end
-            local player = getPlayerThatIsNoLongerHoldingAnItem(nil, players)
-            if player ~= nil then
-                postPurchaseFire(nil, player, pickupDescription)
-            end
-        end
-        ::__continue11::
-    end
-end
-function checkCollectiblesPurchased(self, collectiblesWithPrice, players)
-    for ____, collectible in ipairs(collectiblesWithPrice) do
-        do
-            local pickupDescription = v.room.collectibleMap:get(collectible.Index)
-            if pickupDescription == nil then
-                goto __continue16
-            end
-            if pickupDescription.subType ~= collectible.SubType and collectible.SubType == CollectibleType.COLLECTIBLE_NULL then
-                local player = getPlayerThatIsNoLongerHoldingAnItem(nil, players)
-                if player ~= nil then
-                    postPurchaseFire(nil, player, pickupDescription)
-                end
-            end
-        end
-        ::__continue16::
+    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 playerHoldingItemNow = player:IsHoldingItem()
-            local playerIndex = getPlayerIndex(nil, player)
-            local playerHoldingItemOnLastFrame = v.room.playersHoldingItemOnLastFrameMap:getAndSetDefault(playerIndex)
-            return not playerHoldingItemOnLastFrame and playerHoldingItemNow
-        end
+function playerPickedUpNewItem(self, player)
+    local pickups = getPickups(nil)
+    local disappearingPickup = __TS__ArrayFind(
+        pickups,
+        function(____, pickup) return not pickup:Exists() and pickup.Price ~= 0 end
     )
-end
-function storePickupsInMap(self, nonCollectiblesWithPrice)
-    v.room.pickupMap:clear()
-    for ____, pickup in ipairs(nonCollectiblesWithPrice) do
-        local pickupDescription = getPickupDescription(nil, pickup)
-        v.room.pickupMap:set(pickup.Index, pickupDescription)
-    end
-end
-function storeCollectiblesInMap(self, collectiblesWithPrice)
-    v.room.collectibleMap:clear()
-    for ____, collectible in ipairs(collectiblesWithPrice) do
-        local pickupDescription = getPickupDescription(nil, collectible)
-        v.room.collectibleMap:set(collectible.Index, pickupDescription)
-    end
-end
-function storePlayersInMap(self, players)
-    for ____, player in ipairs(players) do
-        local playerIndex = getPlayerIndex(nil, player)
-        local holdingItem = player:IsHoldingItem()
-        v.room.playersHoldingItemOnLastFrameMap:set(playerIndex, holdingItem)
+    if disappearingPickup ~= nil then
+        postPurchaseFire(nil, player, disappearingPickup)
     end
 end
-v = {room = {
-    pickupMap = __TS__New(Map),
-    collectibleMap = __TS__New(Map),
-    playersHoldingItemOnLastFrameMap = __TS__New(DefaultMap, false)
-}}
+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/functions/player.d.ts

@@ -208,6 +208,17 @@ export declare function getSoulHearts(player: EntityPlayer): int;
  * return undefined.
  */
 export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPlayer | undefined;
+/**
+ * Helper function to determine how many heart containers that Tainted Magdalene has that will not
+ * be automatically depleted over time. By default, this is 2, but this function will return 4 so
+ * that it is consistent with the `player.GetHearts` and `player.GetMaxHearts` methods.
+ *
+ * If Tainted Magdalene has Birthright, she will gained an additional non-temporary heart container.
+ *
+ * This function does not validate whether or not the provided player is Tainted Magdalene; that
+ * should be accomplished before invoking this function.
+ */
+export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): 4 | 6;
 /**
  * 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

@@ -503,6 +503,10 @@ function ____exports.getSoulHearts(self, player)
     local blackHearts = ____exports.getBlackHearts(nil, player)
     return soulHearts - blackHearts
 end
+function ____exports.getTaintedMagdaleneNonTemporaryMaxHearts(self, player)
+    local hasBirthright = player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT)
+    return hasBirthright and 6 or 4
+end
 function ____exports.getTotalCharge(self, player, activeSlot)
     local activeCharge = player:GetActiveCharge(activeSlot)
     local batteryCharge = player:GetBatteryCharge(activeSlot)
@@ -597,9 +601,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch127 = activeSlot
-        local ____cond127 = ____switch127 == ActiveSlot.SLOT_PRIMARY
-        if ____cond127 then
+        local ____switch128 = activeSlot
+        local ____cond128 = ____switch128 == ActiveSlot.SLOT_PRIMARY
+        if ____cond128 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -608,8 +612,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_SECONDARY
-        if ____cond127 then
+        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_SECONDARY
+        if ____cond128 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -624,16 +628,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET
-        if ____cond127 then
+        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_POCKET
+        if ____cond128 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET2
-        if ____cond127 then
+        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_POCKET2
+        if ____cond128 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/spawnCollectible.d.ts

@@ -21,4 +21,4 @@ export declare function spawnCollectible(collectibleType: CollectibleType | int,
  * Instead, this function arbitrarily spawns a collectible with
  * `CollectibleType.COLLECTIBLE_SAD_ONION`, and then converts it to an empty pedestal afterward.
  */
-export declare function spawnEmptyCollectible(position: Vector, seed?: number): void;
+export declare function spawnEmptyCollectible(position: Vector, seed?: number): EntityPickup;

package/dist/functions/spawnCollectible.lua

@@ -60,5 +60,6 @@ function ____exports.spawnEmptyCollectible(self, position, seed)
         true
     )
     setCollectibleEmpty(nil, collectible)
+    return collectible
 end
 return ____exports

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/index.lua

@@ -674,14 +674,6 @@ do
         end
     end
 end
-do
-    local ____export = require("types.PickupDescription")
-    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/package.json

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