isaacscript-common 1.2.105 → 1.2.108

package/dist/callbacks/postPurchase.lua

@@ -41,13 +41,7 @@ function checkPickupsPurchased(self, pickups, players)
             v.room.pickupMap:delete(index)
             local player = getPlayerThatIsNoLongerHoldingAnItem(nil, players)
             if player ~= nil then
-                postPurchaseFire(
-                    nil,
-                    player,
-                    pickupDescription.variant,
-                    pickupDescription.subType,
-                    pickupDescription.price
-                )
+                postPurchaseFire(nil, player, pickupDescription)
             end
         end
         ::__continue7::
@@ -70,7 +64,14 @@ function storePickupsInMap(self, pickups)
         function(____, pickup) return pickup.Price ~= 0 end
     )
     for ____, pickup in ipairs(pickupsWithPrice) do
-        v.room.pickupMap:set(pickup.Index, {variant = pickup.Variant, subType = pickup.SubType, price = pickup.Price})
+        v.room.pickupMap:set(pickup.Index, {
+            variant = pickup.Variant,
+            subType = pickup.SubType,
+            position = pickup.Position,
+            velocity = pickup.Velocity,
+            price = pickup.Price,
+            initSeed = pickup.InitSeed
+        })
     end
 end
 function storePlayersInMap(self, players)

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

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

package/dist/callbacks/subscriptions/postPurchase.lua

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

package/dist/functions/collectibles.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="isaac-typescript-definitions" />
 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;
 /**
  * Helper function to get the in-game description for a collectible. Returns "Unknown" if the
@@ -98,24 +99,24 @@ export declare function setCollectiblesRerolledForItemTracker(): void;
 export declare function setCollectibleBlind(collectible: EntityPickup): void;
 /**
  * Helper function to remove the collectible from a collectible pedestal and make it appear as if a
- * player has already taken the item. This is accomplished by setting its sprite to an empty/missing
- * PNG file.
+ * player has already taken the item. This is accomplished by changing the sub-type to
+ * `CollectibleType.COLLECTIBLE_NULL` and then setting the sprite to an empty/missing PNG file.
  *
- * For more information, see the documentation for the "emptySprite" helper function.
+ * For more information, see the documentation for the "clearSprite" helper function.
  */
 export declare function setCollectibleEmpty(collectible: EntityPickup): void;
 /**
  * Helper function to change the sprite of a collectible pedestal entity.
  *
  * For more information about removing the collectible sprite, see the documentation for the
- * "emptySprite" helper function.
+ * "clearSprite" helper function.
  *
  * @param collectible The collectible whose sprite you want to modify.
- * @param pngPath Optional. Equal to the spritesheet path to load (e.g.
- * "gfx/items/collectibles/collectibles_001_thesadonion.png"). If not specified, will remove the
- * sprite, making it appear like the collectible has already been taken by the player.
+ * @param pngPath Equal to either the spritesheet path to load (e.g.
+ * "gfx/items/collectibles/collectibles_001_thesadonion.png") or undefined. If undefined, the sprite
+ * will be removed, making it appear like the collectible has already been taken by the player.
  */
-export declare function setCollectibleSprite(collectible: EntityPickup, pngPath?: string): void;
+export declare function setCollectibleSprite(collectible: EntityPickup, pngPath: string | undefined): void;
 /**
  * Helper function to change the collectible on a pedestal. Simply updating the SubType property is
  * not sufficient because the sprite will not change.

package/dist/functions/collectibles.lua

@@ -38,6 +38,9 @@ function ____exports.collectibleHasTag(self, collectibleType, tag)
     end
     return itemConfigItem:HasTags(tag)
 end
+function ____exports.clearCollectibleSprite(self, collectible)
+    ____exports.setCollectibleSprite(nil, collectible, nil)
+end
 function ____exports.collectibleHasCacheFlag(self, collectibleType, cacheFlag)
     local itemConfig = Isaac.GetItemConfig()
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
@@ -185,7 +188,7 @@ function ____exports.setCollectibleEmpty(self, collectible)
         error("You cannot set a collectible to be empty for pickups of variant: " .. tostring(collectible.Variant))
     end
     collectible.SubType = CollectibleType.COLLECTIBLE_NULL
-    ____exports.setCollectibleSprite(nil, collectible)
+    ____exports.clearCollectibleSprite(nil, collectible)
 end
 function ____exports.setCollectibleSubType(self, collectible, newCollectibleType)
     if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then

package/dist/functions/player.lua

@@ -17,7 +17,6 @@ local CHARACTERS_WITH_FREE_DEVIL_DEALS = ____constants.CHARACTERS_WITH_FREE_DEVI
 local CHARACTERS_WITH_NO_RED_HEARTS = ____constants.CHARACTERS_WITH_NO_RED_HEARTS
 local CHARACTERS_WITH_NO_SOUL_HEARTS = ____constants.CHARACTERS_WITH_NO_SOUL_HEARTS
 local LOST_STYLE_PLAYER_TYPES = ____constants.LOST_STYLE_PLAYER_TYPES
-local MAX_PLAYER_HEART_CONTAINERS = ____constants.MAX_PLAYER_HEART_CONTAINERS
 local MAX_VANILLA_CHARACTER = ____constants.MAX_VANILLA_CHARACTER
 local ____HealthType = require("types.HealthType")
 local HealthType = ____HealthType.HealthType
@@ -56,6 +55,12 @@ function ____exports.getCharacterMaxHeartContainers(self, character)
     if character == PlayerType.PLAYER_KEEPER then
         return 3
     end
+    if character == PlayerType.PLAYER_THEFORGOTTEN then
+        return 6
+    end
+    if character == PlayerType.PLAYER_THESOUL then
+        return 6
+    end
     if character == PlayerType.PLAYER_KEEPER_B then
         return 2
     end
@@ -91,15 +96,15 @@ end
 function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
     local character = player:GetPlayerType()
     repeat
-        local ____switch66 = character
-        local ____cond66 = ____switch66 == PlayerType.PLAYER_THESOUL
-        if ____cond66 then
+        local ____switch68 = character
+        local ____cond68 = ____switch68 == PlayerType.PLAYER_THESOUL
+        if ____cond68 then
             do
                 return differentiateForgottenAndSoul and CollectibleType.COLLECTIBLE_SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
             end
         end
-        ____cond66 = ____cond66 or ____switch66 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond66 then
+        ____cond68 = ____cond68 or ____switch68 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond68 then
             do
                 return CollectibleType.COLLECTIBLE_INNER_EYE
             end
@@ -113,53 +118,56 @@ function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSo
 end
 function ____exports.getPlayerMaxHeartContainers(self, player)
     local character = player:GetPlayerType()
-    local maxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
+    local characterMaxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
     if character == PlayerType.PLAYER_MAGDALENE and player:HasCollectible(CollectibleType.COLLECTIBLE_BIRTHRIGHT) then
-        maxHeartContainers = maxHeartContainers + 6
+        local extraMaxHeartContainersFromBirthright = 6
+        return characterMaxHeartContainers + extraMaxHeartContainersFromBirthright
     end
-    local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
-    maxHeartContainers = maxHeartContainers + numMothersKisses
-    if maxHeartContainers > MAX_PLAYER_HEART_CONTAINERS then
-        maxHeartContainers = MAX_PLAYER_HEART_CONTAINERS
+    if ____exports.isKeeper(nil, player) then
+        local numMothersKisses = player:GetTrinketMultiplier(TrinketType.TRINKET_MOTHERS_KISS)
+        local hasGreedsGullet = player:HasCollectible(CollectibleType.COLLECTIBLE_GREEDS_GULLET)
+        local coins = player:GetNumCoins()
+        local greedsGulletCoinContainers = hasGreedsGullet and math.floor(coins / 25) or 0
+        return characterMaxHeartContainers + numMothersKisses + greedsGulletCoinContainers
     end
-    return maxHeartContainers
+    return characterMaxHeartContainers
 end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch79 = character
-        local ____cond79 = ____switch79 == PlayerType.PLAYER_BLUEBABY or ____switch79 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond79 then
+        local ____switch81 = character
+        local ____cond81 = ____switch81 == PlayerType.PLAYER_BLUEBABY or ____switch81 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond81 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_LAZARUS2
+        if ____cond81 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond81 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_JACOB
+        if ____cond81 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond81 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond79 = ____cond79 or ____switch79 == PlayerType.PLAYER_JACOB2_B
-        if ____cond79 then
+        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_JACOB2_B
+        if ____cond81 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -207,6 +215,10 @@ end
 function ____exports.isChildPlayer(self, player)
     return player.Parent ~= nil
 end
+function ____exports.isKeeper(self, player)
+    local character = player:GetPlayerType()
+    return character == PlayerType.PLAYER_KEEPER or character == PlayerType.PLAYER_KEEPER_B
+end
 function ____exports.isTainted(self, player)
     local character = player:GetPlayerType()
     local ____isVanillaCharacter_result_1
@@ -532,10 +544,6 @@ function ____exports.isJacobOrEsau(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_JACOB or character == PlayerType.PLAYER_ESAU
 end
-function ____exports.isKeeper(self, player)
-    local character = player:GetPlayerType()
-    return character == PlayerType.PLAYER_KEEPER or character == PlayerType.PLAYER_KEEPER_B
-end
 function ____exports.isLost(self, player)
     local character = player:GetPlayerType()
     return character == PlayerType.PLAYER_THELOST or character == PlayerType.PLAYER_THELOST_B
@@ -589,9 +597,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch125 = activeSlot
-        local ____cond125 = ____switch125 == ActiveSlot.SLOT_PRIMARY
-        if ____cond125 then
+        local ____switch127 = activeSlot
+        local ____cond127 = ____switch127 == ActiveSlot.SLOT_PRIMARY
+        if ____cond127 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -600,8 +608,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_SECONDARY
-        if ____cond125 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_SECONDARY
+        if ____cond127 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -616,16 +624,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET
-        if ____cond125 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET
+        if ____cond127 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond125 = ____cond125 or ____switch125 == ActiveSlot.SLOT_POCKET2
-        if ____cond125 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET2
+        if ____cond127 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/rooms.d.ts

@@ -178,9 +178,9 @@ export declare function inMegaSatanRoom(): boolean;
  */
 export declare function inMinibossRoomOf(minibossID: MinibossID): boolean;
 /**
- * Helper function for checking if the room room is a secret shop from the Member Card collectible.
+ * Helper function for checking if the room is a secret shop (from the Member Card collectible).
  *
- * Secret shops are simply copies of normal shops but with the backdrop of a secret room. In other
+ * Secret shops are simply copies of normal shops, but with the backdrop of a secret room. In other
  * words, they will have the same room type, room variant, and room sub-type of a normal shop. Thus,
  * the only way to detect them is by using the grid index.
  */

package/dist/functions/spawnCollectible.d.ts

@@ -13,3 +13,12 @@
  * Tainted Keeper. False by default.
  */
 export declare function spawnCollectible(collectibleType: CollectibleType | int, position: Vector, seed?: number, options?: boolean, forceFreeItem?: boolean): EntityPickup;
+/**
+ * Helper function to spawn an empty collectible. Doing this is tricky since spawning a collectible
+ * with `CollectibleType.COLLECTIBLE_NULL` will result in spawning a collectible with a random type
+ * from the current room's item pool.
+ *
+ * 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;

package/dist/functions/spawnCollectible.lua

@@ -6,6 +6,7 @@ local ____featuresInitialized = require("featuresInitialized")
 local areFeaturesInitialized = ____featuresInitialized.areFeaturesInitialized
 local ____collectibles = require("functions.collectibles")
 local isQuestCollectible = ____collectibles.isQuestCollectible
+local setCollectibleEmpty = ____collectibles.setCollectibleEmpty
 local ____player = require("functions.player")
 local anyPlayerIs = ____player.anyPlayerIs
 function ____exports.spawnCollectible(self, collectibleType, position, seed, options, forceFreeItem)
@@ -46,4 +47,18 @@ function ____exports.spawnCollectible(self, collectibleType, position, seed, opt
     end
     return collectible
 end
+function ____exports.spawnEmptyCollectible(self, position, seed)
+    if seed == nil then
+        seed = Random()
+    end
+    local collectible = ____exports.spawnCollectible(
+        nil,
+        CollectibleType.COLLECTIBLE_SAD_ONION,
+        position,
+        seed,
+        false,
+        true
+    )
+    setCollectibleEmpty(nil, collectible)
+end
 return ____exports

package/dist/index.d.ts

@@ -90,6 +90,7 @@ 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/PickupDescription.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="isaac-typescript-definitions" />
+export interface PickupDescription {
+    variant: PickupVariant | int;
+    subType: int;
+    position: Vector;
+    velocity: Vector;
+    price: int;
+    initSeed: int;
+}

package/dist/types/PickupDescription.lua

@@ -0,0 +1,3 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+return ____exports

package/package.json

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