isaacscript-common 30.4.5 → 30.5.0

package/dist/index.rollup.d.ts

@@ -1002,9 +1002,24 @@ export declare type AnyGridEntity = GridEntity | GridEntityDoor | GridEntityPit
  */
 export declare function anyPlayerCloserThan(position: Vector, distance: float): boolean;
 
-export declare function anyPlayerHasCollectible(collectibleType: CollectibleType): boolean;
+/**
+ * Helper function to check to see if any player has a particular collectible.
+ *
+ * @param collectibleType The collectible type to check for.
+ * @param ignoreModifiers If set to true, only counts collectibles the player actually owns and
+ *                        ignores effects granted by items like Zodiac, 3 Dollar Bill and Lemegeton.
+ *                        Default is false.
+ */
+export declare function anyPlayerHasCollectible(collectibleType: CollectibleType, ignoreModifiers?: boolean): boolean;
 
-export declare function anyPlayerHasTrinket(trinketType: TrinketType): boolean;
+/**
+ * Helper function to check to see if any player has a particular trinket.
+ *
+ * @param trinketType The trinket type to check for.
+ * @param ignoreModifiers If set to true, only counts trinkets the player actually holds and ignores
+ *                        effects granted by other items. Default is false.
+ */
+export declare function anyPlayerHasTrinket(trinketType: TrinketType, ignoreModifiers?: boolean): boolean;
 
 /**
  * Helper function to determine if the given character is present.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 30.4.5
+isaacscript-common 30.5.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -21644,18 +21644,18 @@ function ____exports.addTrinketCostume(self, player, trinketType)
     end
     player:AddCostume(itemConfigTrinket, false)
 end
-function ____exports.anyPlayerHasCollectible(self, collectibleType)
+function ____exports.anyPlayerHasCollectible(self, collectibleType, ignoreModifiers)
     local players = getAllPlayers(nil)
     return __TS__ArraySome(
         players,
-        function(____, player) return player:HasCollectible(collectibleType) end
+        function(____, player) return player:HasCollectible(collectibleType, ignoreModifiers) end
     )
 end
-function ____exports.anyPlayerHasTrinket(self, trinketType)
+function ____exports.anyPlayerHasTrinket(self, trinketType, ignoreModifiers)
     local players = getAllPlayers(nil)
     return __TS__ArraySome(
         players,
-        function(____, player) return player:HasTrinket(trinketType) end
+        function(____, player) return player:HasTrinket(trinketType, ignoreModifiers) end
     )
 end
 function ____exports.anyPlayerIs(self, ...)
@@ -31450,6 +31450,11 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
+local markUsedItemOnThisFrame, v
+local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
 local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____entitiesSpecific = require("src.functions.entitiesSpecific")
@@ -31461,7 +31466,14 @@ local ____DefaultMap = require("src.classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____CustomCallback = require("src.classes.private.CustomCallback")
 local CustomCallback = ____CustomCallback.CustomCallback
-local v = {room = {playersHoldingItemOnLastFrameMap = __TS__New(DefaultMap, false)}}
+function markUsedItemOnThisFrame(self, player)
+    local gameFrameCount = game:GetFrameCount()
+    mapSetPlayer(nil, v.room.playersUsedItemOnFrame, player, gameFrameCount)
+end
+v = {room = {
+    playersHoldingItemOnLastFrameMap = __TS__New(DefaultMap, false),
+    playersUsedItemOnFrame = __TS__New(DefaultMap, 0)
+}}
 ____exports.PostPurchase = __TS__Class()
 local PostPurchase = ____exports.PostPurchase
 PostPurchase.name = "PostPurchase"
@@ -31474,16 +31486,34 @@ function PostPurchase.prototype.____constructor(self)
         local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
         return (callbackPickupVariant == nil or callbackPickupVariant == pickup.Variant) and (callbackPickupSubType == nil or callbackPickupSubType == pickup.SubType)
     end
+    self.postUseItem = function(____, _collectibleType, _rng, player)
+        markUsedItemOnThisFrame(nil, player)
+        return nil
+    end
+    self.postUseCard = function(____, _cardType, player)
+        markUsedItemOnThisFrame(nil, player)
+        return nil
+    end
+    self.postUsePill = function(____, _pillEffect, player)
+        markUsedItemOnThisFrame(nil, player)
+        return nil
+    end
     self.postPEffectUpdateReordered = function(____, player)
         local isHoldingItem = player:IsHoldingItem()
         local wasHoldingItemOnLastFrame = defaultMapGetPlayer(nil, v.room.playersHoldingItemOnLastFrameMap, player)
         mapSetPlayer(nil, v.room.playersHoldingItemOnLastFrameMap, player, isHoldingItem)
-        if not wasHoldingItemOnLastFrame and isHoldingItem then
+        if not wasHoldingItemOnLastFrame and isHoldingItem and not self:playerUsedItemRecently(player) then
             self:playerPickedUpNewItem(player)
         end
     end
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItem}, {ModCallback.POST_USE_CARD, self.postUseCard}, {ModCallback.POST_USE_PILL, self.postUsePill}}
     self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
+function PostPurchase.prototype.playerUsedItemRecently(self, player)
+    local gameFrameCount = game:GetFrameCount()
+    local usedCollectibleOnFrame = defaultMapGetPlayer(nil, v.room.playersUsedItemOnFrame, player)
+    return gameFrameCount == usedCollectibleOnFrame or gameFrameCount == usedCollectibleOnFrame + 1
+end
 function PostPurchase.prototype.playerPickedUpNewItem(self, player)
     local pickups = getPickups(nil)
     local disappearingPickup = __TS__ArrayFind(

package/dist/src/classes/callbacks/PostPurchase.d.ts

@@ -7,11 +7,16 @@ export declare class PostPurchase extends CustomCallback<T> {
     v: {
         room: {
             playersHoldingItemOnLastFrameMap: DefaultMap<PlayerIndex, boolean, []>;
+            playersUsedItemOnFrame: DefaultMap<PlayerIndex, number, []>;
         };
     };
     constructor();
     protected shouldFire: (fireArgs: [player: EntityPlayer, pickup: EntityPickup], optionalArgs: [pickupVariant?: import("isaac-typescript-definitions").PickupVariant | undefined, subType?: number | undefined]) => boolean;
+    private postUseItem;
+    private postUseCard;
+    private postUsePill;
     private postPEffectUpdateReordered;
+    private playerUsedItemRecently;
     private playerPickedUpNewItem;
 }
 export {};

package/dist/src/classes/callbacks/PostPurchase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostPurchase.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostPurchase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMlE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,cAAc,EAGf,MAAM,2BAA2B,CAAC;AAEnC,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,CAAC;AAUzC,qBAAa,YAAa,SAAQ,cAAc,CAAC,CAAC,CAAC;IACjC,CAAC;;;;MAAK;;IAatB,UAAmB,UAAU,8LAG1B,OAAO,CAUR;IAGF,OAAO,CAAC,0BAA0B,CAehC;IAEF,OAAO,CAAC,qBAAqB;CAS9B"}
+{"version":3,"file":"PostPurchase.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostPurchase.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAMlE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,cAAc,EAGf,MAAM,2BAA2B,CAAC;AAEnC,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,CAAC;AAWzC,qBAAa,YAAa,SAAQ,cAAc,CAAC,CAAC,CAAC;IACjC,CAAC;;;;;MAAK;;IAwBtB,UAAmB,UAAU,8LAG1B,OAAO,CAUR;IAGF,OAAO,CAAC,WAAW,CAOjB;IAGF,OAAO,CAAC,WAAW,CAGjB;IAGF,OAAO,CAAC,WAAW,CAGjB;IAGF,OAAO,CAAC,0BAA0B,CAqBhC;IAEF,OAAO,CAAC,sBAAsB;IAY9B,OAAO,CAAC,qBAAqB;CAS9B"}

package/dist/src/classes/callbacks/PostPurchase.lua

@@ -4,6 +4,11 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
+local markUsedItemOnThisFrame, v
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
 local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____entitiesSpecific = require("src.functions.entitiesSpecific")
@@ -15,7 +20,14 @@ local ____DefaultMap = require("src.classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____CustomCallback = require("src.classes.private.CustomCallback")
 local CustomCallback = ____CustomCallback.CustomCallback
-local v = {room = {playersHoldingItemOnLastFrameMap = __TS__New(DefaultMap, false)}}
+function markUsedItemOnThisFrame(self, player)
+    local gameFrameCount = game:GetFrameCount()
+    mapSetPlayer(nil, v.room.playersUsedItemOnFrame, player, gameFrameCount)
+end
+v = {room = {
+    playersHoldingItemOnLastFrameMap = __TS__New(DefaultMap, false),
+    playersUsedItemOnFrame = __TS__New(DefaultMap, 0)
+}}
 ____exports.PostPurchase = __TS__Class()
 local PostPurchase = ____exports.PostPurchase
 PostPurchase.name = "PostPurchase"
@@ -28,16 +40,34 @@ function PostPurchase.prototype.____constructor(self)
         local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
         return (callbackPickupVariant == nil or callbackPickupVariant == pickup.Variant) and (callbackPickupSubType == nil or callbackPickupSubType == pickup.SubType)
     end
+    self.postUseItem = function(____, _collectibleType, _rng, player)
+        markUsedItemOnThisFrame(nil, player)
+        return nil
+    end
+    self.postUseCard = function(____, _cardType, player)
+        markUsedItemOnThisFrame(nil, player)
+        return nil
+    end
+    self.postUsePill = function(____, _pillEffect, player)
+        markUsedItemOnThisFrame(nil, player)
+        return nil
+    end
     self.postPEffectUpdateReordered = function(____, player)
         local isHoldingItem = player:IsHoldingItem()
         local wasHoldingItemOnLastFrame = defaultMapGetPlayer(nil, v.room.playersHoldingItemOnLastFrameMap, player)
         mapSetPlayer(nil, v.room.playersHoldingItemOnLastFrameMap, player, isHoldingItem)
-        if not wasHoldingItemOnLastFrame and isHoldingItem then
+        if not wasHoldingItemOnLastFrame and isHoldingItem and not self:playerUsedItemRecently(player) then
             self:playerPickedUpNewItem(player)
         end
     end
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItem}, {ModCallback.POST_USE_CARD, self.postUseCard}, {ModCallback.POST_USE_PILL, self.postUsePill}}
     self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
+function PostPurchase.prototype.playerUsedItemRecently(self, player)
+    local gameFrameCount = game:GetFrameCount()
+    local usedCollectibleOnFrame = defaultMapGetPlayer(nil, v.room.playersUsedItemOnFrame, player)
+    return gameFrameCount == usedCollectibleOnFrame or gameFrameCount == usedCollectibleOnFrame + 1
+end
 function PostPurchase.prototype.playerPickedUpNewItem(self, player)
     local pickups = getPickups(nil)
     local disappearingPickup = __TS__ArrayFind(

package/dist/src/functions/players.d.ts

@@ -8,8 +8,23 @@ import { ActiveSlot, CollectibleType, ControllerIndex, PlayerForm, PlayerType, T
 export declare function addCollectible(player: EntityPlayer, ...collectibleTypes: CollectibleType[]): void;
 export declare function addCollectibleCostume(player: EntityPlayer, collectibleType: CollectibleType): void;
 export declare function addTrinketCostume(player: EntityPlayer, trinketType: TrinketType): void;
-export declare function anyPlayerHasCollectible(collectibleType: CollectibleType): boolean;
-export declare function anyPlayerHasTrinket(trinketType: TrinketType): boolean;
+/**
+ * Helper function to check to see if any player has a particular collectible.
+ *
+ * @param collectibleType The collectible type to check for.
+ * @param ignoreModifiers If set to true, only counts collectibles the player actually owns and
+ *                        ignores effects granted by items like Zodiac, 3 Dollar Bill and Lemegeton.
+ *                        Default is false.
+ */
+export declare function anyPlayerHasCollectible(collectibleType: CollectibleType, ignoreModifiers?: boolean): boolean;
+/**
+ * Helper function to check to see if any player has a particular trinket.
+ *
+ * @param trinketType The trinket type to check for.
+ * @param ignoreModifiers If set to true, only counts trinkets the player actually holds and ignores
+ *                        effects granted by other items. Default is false.
+ */
+export declare function anyPlayerHasTrinket(trinketType: TrinketType, ignoreModifiers?: boolean): boolean;
 /**
  * Helper function to determine if the given character is present.
  *

package/dist/src/functions/players.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"players.d.ts","sourceRoot":"","sources":["../../../src/functions/players.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"players.d.ts","sourceRoot":"","sources":["../../../src/functions/players.ts"],"names":[],"mappings":"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"}

package/dist/src/functions/players.lua

@@ -88,18 +88,29 @@ function ____exports.addTrinketCostume(self, player, trinketType)
     end
     player:AddCostume(itemConfigTrinket, false)
 end
-function ____exports.anyPlayerHasCollectible(self, collectibleType)
+--- Helper function to check to see if any player has a particular collectible.
+-- 
+-- @param collectibleType The collectible type to check for.
+-- @param ignoreModifiers If set to true, only counts collectibles the player actually owns and
+-- ignores effects granted by items like Zodiac, 3 Dollar Bill and Lemegeton.
+-- Default is false.
+function ____exports.anyPlayerHasCollectible(self, collectibleType, ignoreModifiers)
     local players = getAllPlayers(nil)
     return __TS__ArraySome(
         players,
-        function(____, player) return player:HasCollectible(collectibleType) end
+        function(____, player) return player:HasCollectible(collectibleType, ignoreModifiers) end
     )
 end
-function ____exports.anyPlayerHasTrinket(self, trinketType)
+--- Helper function to check to see if any player has a particular trinket.
+-- 
+-- @param trinketType The trinket type to check for.
+-- @param ignoreModifiers If set to true, only counts trinkets the player actually holds and ignores
+-- effects granted by other items. Default is false.
+function ____exports.anyPlayerHasTrinket(self, trinketType, ignoreModifiers)
     local players = getAllPlayers(nil)
     return __TS__ArraySome(
         players,
-        function(____, player) return player:HasTrinket(trinketType) end
+        function(____, player) return player:HasTrinket(trinketType, ignoreModifiers) end
     )
 end
 --- Helper function to determine if the given character is present.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "30.4.5",
+  "version": "30.5.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/callbacks/PostPurchase.ts

@@ -1,3 +1,10 @@
+import {
+  CardType,
+  CollectibleType,
+  ModCallback,
+  PillEffect,
+} from "isaac-typescript-definitions";
+import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { getPickups } from "../../functions/entitiesSpecific";
 import {
@@ -19,6 +26,7 @@ const v = {
     playersHoldingItemOnLastFrameMap: new DefaultMap<PlayerIndex, boolean>(
       false,
     ),
+    playersUsedItemOnFrame: new DefaultMap<PlayerIndex, int>(0),
   },
 };
 
@@ -28,6 +36,17 @@ export class PostPurchase extends CustomCallback<T> {
   constructor() {
     super();
 
+    this.callbacksUsed = [
+      // 3
+      [ModCallback.POST_USE_ITEM, this.postUseItem],
+
+      // 5
+      [ModCallback.POST_USE_CARD, this.postUseCard],
+
+      // 10
+      [ModCallback.POST_USE_PILL, this.postUsePill],
+    ];
+
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
@@ -51,6 +70,28 @@ export class PostPurchase extends CustomCallback<T> {
     );
   };
 
+  // ModCallback.POST_USE_ITEM (3)
+  private postUseItem = (
+    _collectibleType: CollectibleType,
+    _rng: RNG,
+    player: EntityPlayer,
+  ): boolean | undefined => {
+    markUsedItemOnThisFrame(player);
+    return undefined;
+  };
+
+  // ModCallback.POST_USE_CARD (5)
+  private postUseCard = (_cardType: CardType, player: EntityPlayer) => {
+    markUsedItemOnThisFrame(player);
+    return undefined;
+  };
+
+  // ModCallback.POST_USE_PILL (10)
+  private postUsePill = (_pillEffect: PillEffect, player: EntityPlayer) => {
+    markUsedItemOnThisFrame(player);
+    return undefined;
+  };
+
   // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
   private postPEffectUpdateReordered = (player: EntityPlayer) => {
     const isHoldingItem = player.IsHoldingItem();
@@ -64,11 +105,29 @@ export class PostPurchase extends CustomCallback<T> {
       isHoldingItem,
     );
 
-    if (!wasHoldingItemOnLastFrame && isHoldingItem) {
+    // Assume that if the player did not use an active item, card, or pill recently, then they
+    // purchased an item.
+    if (
+      !wasHoldingItemOnLastFrame &&
+      isHoldingItem &&
+      !this.playerUsedItemRecently(player)
+    ) {
       this.playerPickedUpNewItem(player);
     }
   };
 
+  private playerUsedItemRecently(player: EntityPlayer): boolean {
+    const gameFrameCount = game.GetFrameCount();
+    const usedCollectibleOnFrame = defaultMapGetPlayer(
+      v.room.playersUsedItemOnFrame,
+      player,
+    );
+    return (
+      gameFrameCount === usedCollectibleOnFrame ||
+      gameFrameCount === usedCollectibleOnFrame + 1
+    );
+  }
+
   private playerPickedUpNewItem(player: EntityPlayer) {
     const pickups = getPickups();
     const disappearingPickup = pickups.find(
@@ -79,3 +138,8 @@ export class PostPurchase extends CustomCallback<T> {
     }
   }
 }
+
+function markUsedItemOnThisFrame(player: EntityPlayer) {
+  const gameFrameCount = game.GetFrameCount();
+  mapSetPlayer(v.room.playersUsedItemOnFrame, player, gameFrameCount);
+}

package/src/functions/players.ts

@@ -64,16 +64,39 @@ export function addTrinketCostume(
   player.AddCostume(itemConfigTrinket, false);
 }
 
+/**
+ * Helper function to check to see if any player has a particular collectible.
+ *
+ * @param collectibleType The collectible type to check for.
+ * @param ignoreModifiers If set to true, only counts collectibles the player actually owns and
+ *                        ignores effects granted by items like Zodiac, 3 Dollar Bill and Lemegeton.
+ *                        Default is false.
+ */
 export function anyPlayerHasCollectible(
   collectibleType: CollectibleType,
+  ignoreModifiers?: boolean,
 ): boolean {
   const players = getAllPlayers();
-  return players.some((player) => player.HasCollectible(collectibleType));
+  return players.some((player) =>
+    player.HasCollectible(collectibleType, ignoreModifiers),
+  );
 }
 
-export function anyPlayerHasTrinket(trinketType: TrinketType): boolean {
+/**
+ * Helper function to check to see if any player has a particular trinket.
+ *
+ * @param trinketType The trinket type to check for.
+ * @param ignoreModifiers If set to true, only counts trinkets the player actually holds and ignores
+ *                        effects granted by other items. Default is false.
+ */
+export function anyPlayerHasTrinket(
+  trinketType: TrinketType,
+  ignoreModifiers?: boolean,
+): boolean {
   const players = getAllPlayers();
-  return players.some((player) => player.HasTrinket(trinketType));
+  return players.some((player) =>
+    player.HasTrinket(trinketType, ignoreModifiers),
+  );
 }
 
 /**