isaacscript-common 2.0.14 → 2.0.17

package/dist/callbacks/itemPickup.lua

@@ -3,7 +3,7 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, queueEmpty, queueNotEmpty, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____ModCallbackCustom = require("enums.ModCallbackCustom")
@@ -36,7 +36,7 @@ function postPEffectUpdateReordered(self, player)
     end
 end
 function queueEmpty(self, player, pickingUpItem)
-    if pickingUpItem.subType == CollectibleType.NULL then
+    if pickingUpItem.itemType == ItemType.NULL or pickingUpItem.subType == 0 then
         return
     end
     postItemPickupFire(nil, player, pickingUpItem)
@@ -44,7 +44,7 @@ function queueEmpty(self, player, pickingUpItem)
 end
 function queueNotEmpty(self, player, pickingUpItem)
     local queuedItem = player.QueuedItem.Item
-    if queuedItem == nil then
+    if queuedItem == nil or queuedItem.Type == ItemType.NULL then
         return
     end
     if queuedItem.Type ~= pickingUpItem.itemType or queuedItem.ID ~= pickingUpItem.subType then

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

@@ -1,7 +1,11 @@
 import { CollectibleType, ItemType, TrinketType } from "isaac-typescript-definitions";
-import { PickingUpItem } from "../../types/PickingUpItem";
-export declare type PostItemPickupRegisterParameters = [
-    callback: (player: EntityPlayer, pickingUpItem: PickingUpItem) => void,
-    itemType?: ItemType,
-    itemID?: CollectibleType | TrinketType
+import { PickingUpItem, PickingUpItemCollectible, PickingUpItemTrinket } from "../../types/PickingUpItem";
+export declare type PostItemPickupRegisterParameters = [callback: (player: EntityPlayer, pickingUpItem: PickingUpItem) => void] | [
+    callback: (player: EntityPlayer, pickingUpItem: PickingUpItemCollectible) => void,
+    itemType: ItemType.PASSIVE | ItemType.ACTIVE | ItemType.FAMILIAR,
+    collectibleType?: CollectibleType
+] | [
+    callback: (player: EntityPlayer, pickingUpItem: PickingUpItemTrinket) => void,
+    itemType: ItemType.TRINKET,
+    trinketType?: TrinketType
 ];

package/dist/callbacks/subscriptions/postItemPickup.lua

@@ -11,12 +11,12 @@ function ____exports.postItemPickupFire(self, player, pickingUpItem)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
         local itemType = ____value[2]
-        local itemID = ____value[3]
+        local subType = ____value[3]
         do
             if itemType ~= nil and itemType ~= pickingUpItem.itemType then
                 goto __continue5
             end
-            if itemID ~= nil and itemID ~= pickingUpItem.subType then
+            if subType ~= nil and subType ~= pickingUpItem.subType then
                 goto __continue5
             end
             callback(nil, player, pickingUpItem)

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

@@ -1,7 +1,11 @@
 import { CollectibleType, ItemType, TrinketType } from "isaac-typescript-definitions";
-import { PickingUpItem } from "../../types/PickingUpItem";
-export declare type PreItemPickupRegisterParameters = [
-    callback: (player: EntityPlayer, pickingUpItem: PickingUpItem) => void,
-    itemType?: ItemType,
-    itemID?: CollectibleType | TrinketType
+import { PickingUpItem, PickingUpItemCollectible, PickingUpItemTrinket } from "../../types/PickingUpItem";
+export declare type PreItemPickupRegisterParameters = [callback: (player: EntityPlayer, pickingUpItem: PickingUpItem) => void] | [
+    callback: (player: EntityPlayer, pickingUpItem: PickingUpItemCollectible) => void,
+    itemType: ItemType.PASSIVE | ItemType.ACTIVE | ItemType.FAMILIAR,
+    collectibleType?: CollectibleType
+] | [
+    callback: (player: EntityPlayer, pickingUpItem: PickingUpItemTrinket) => void,
+    itemType: ItemType.TRINKET,
+    trinketType?: TrinketType
 ];

package/dist/callbacks/subscriptions/preItemPickup.lua

@@ -11,12 +11,12 @@ function ____exports.preItemPickupFire(self, player, pickingUpItem)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
         local itemType = ____value[2]
-        local itemID = ____value[3]
+        local subType = ____value[3]
         do
             if itemType ~= nil and itemType ~= pickingUpItem.itemType then
                 goto __continue5
             end
-            if itemID ~= nil and itemID ~= pickingUpItem.subType then
+            if subType ~= nil and subType ~= pickingUpItem.subType then
                 goto __continue5
             end
             callback(nil, player, pickingUpItem)

package/dist/features/playerInventory.lua

@@ -1,13 +1,12 @@
 local ____lualib = require("lualib_bundle")
-local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
+local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local newPlayerInventory, useItemD4, postGameStarted, postItemPickup, addCollectibleToInventory, COLLECTIBLE_ITEM_TYPES, v
+local newPlayerInventory, useItemD4, postGameStarted, postItemPickup, addCollectibleToInventory, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
@@ -27,6 +26,8 @@ local getAllPlayers = ____playerIndex.getAllPlayers
 local getPlayerIndex = ____playerIndex.getPlayerIndex
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
+local ____PickingUpItem = require("types.PickingUpItem")
+local pickingUpItemIsCollectible = ____PickingUpItem.pickingUpItemIsCollectible
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function newPlayerInventory(self, player)
@@ -59,7 +60,7 @@ function postGameStarted(self)
     end
 end
 function postItemPickup(self, player, pickingUpItem)
-    if not COLLECTIBLE_ITEM_TYPES:has(pickingUpItem.itemType) then
+    if not pickingUpItemIsCollectible(nil, pickingUpItem) then
         return
     end
     addCollectibleToInventory(nil, player, pickingUpItem.subType)
@@ -83,7 +84,6 @@ function addCollectibleToInventory(self, player, collectibleType)
     end
 end
 local FEATURE_NAME = "player inventory tracker"
-COLLECTIBLE_ITEM_TYPES = __TS__New(Set, {ItemType.PASSIVE, ItemType.ACTIVE, ItemType.FAMILIAR})
 v = {run = {
     playersInventory = __TS__New(
         DefaultMap,

package/dist/functions/player.d.ts

@@ -160,6 +160,13 @@ export declare function getPlayersOfType(...characters: PlayerType[]): EntityPla
  * check for. It only returns the players that have all of the collectibles.
  */
 export declare function getPlayersWithCollectible(...collectibleTypes: CollectibleType[]): EntityPlayer[];
+/**
+ * Helper function to get only the players that have a certain trinket.
+ *
+ * This function is variadic, meaning that you can supply as many trinket types as you want to check
+ * for. It only returns the players that have all of the trinkets.
+ */
+export declare function getPlayersWithTrinket(...trinketTypes: TrinketType[]): EntityPlayer[];
 /**
  * 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

package/dist/functions/player.lua

@@ -398,6 +398,17 @@ function ____exports.getPlayersWithCollectible(self, ...)
         ) end
     )
 end
+function ____exports.getPlayersWithTrinket(self, ...)
+    local trinketTypes = {...}
+    local players = getPlayers(nil)
+    return __TS__ArrayFilter(
+        players,
+        function(____, player) return __TS__ArrayEvery(
+            trinketTypes,
+            function(____, trinketType) return player:HasTrinket(trinketType) end
+        ) end
+    )
+end
 function ____exports.getTaintedMagdaleneNonTemporaryMaxHearts(self, player)
     local maxHearts = player:GetMaxHearts()
     local hasBirthright = player:HasCollectible(CollectibleType.BIRTHRIGHT)
@@ -516,9 +527,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch110 = activeSlot
-        local ____cond110 = ____switch110 == ActiveSlot.PRIMARY
-        if ____cond110 then
+        local ____switch113 = activeSlot
+        local ____cond113 = ____switch113 == ActiveSlot.PRIMARY
+        if ____cond113 then
             do
                 if primaryCollectibleType ~= CollectibleType.NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -527,8 +538,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond110 = ____cond110 or ____switch110 == ActiveSlot.SECONDARY
-        if ____cond110 then
+        ____cond113 = ____cond113 or ____switch113 == ActiveSlot.SECONDARY
+        if ____cond113 then
             do
                 if primaryCollectibleType ~= CollectibleType.NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -543,16 +554,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond110 = ____cond110 or ____switch110 == ActiveSlot.POCKET
-        if ____cond110 then
+        ____cond113 = ____cond113 or ____switch113 == ActiveSlot.POCKET
+        if ____cond113 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond110 = ____cond110 or ____switch110 == ActiveSlot.POCKET_SINGLE_USE
-        if ____cond110 then
+        ____cond113 = ____cond113 or ____switch113 == ActiveSlot.POCKET_SINGLE_USE
+        if ____cond113 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/types/PickingUpItem.d.ts

@@ -1,9 +1,24 @@
 import { CollectibleType, ItemType, TrinketType } from "isaac-typescript-definitions";
-export interface PickingUpItem {
+export declare type PickingUpItem = PickingUpItemNull | PickingUpItemCollectible | PickingUpItemTrinket;
+export interface PickingUpItemNull {
     /** Needed so that we can distinguish between picking up a collectible and a trinket. */
-    itemType: ItemType;
-    /** Equal to either the collectible type or the trinket type. */
-    subType: CollectibleType | TrinketType;
+    itemType: ItemType.NULL;
+    /** Equal to either the collectible type, the trinket type, or 0. */
+    subType: 0;
+}
+export interface PickingUpItemCollectible {
+    /** Needed so that we can distinguish between picking up a collectible and a trinket. */
+    itemType: ItemType.PASSIVE | ItemType.ACTIVE | ItemType.FAMILIAR;
+    /** Equal to either the collectible type, the trinket type, or 0. */
+    subType: CollectibleType;
+}
+export interface PickingUpItemTrinket {
+    /** Needed so that we can distinguish between picking up a collectible and a trinket. */
+    itemType: ItemType.TRINKET;
+    /** Equal to either the collectible type, the trinket type, or 0. */
+    subType: TrinketType;
 }
 export declare function newPickingUpItem(): PickingUpItem;
 export declare function resetPickingUpItem(pickingUpItem: PickingUpItem): void;
+export declare function pickingUpItemIsCollectible(pickingUpItem: PickingUpItem): pickingUpItem is PickingUpItemCollectible;
+export declare function pickingUpItemIsTrinket(pickingUpItem: PickingUpItem): pickingUpItem is PickingUpItemTrinket;

package/dist/types/PickingUpItem.lua

@@ -1,3 +1,6 @@
+local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
@@ -11,4 +14,11 @@ function ____exports.resetPickingUpItem(self, pickingUpItem)
     pickingUpItem.itemType = DEFAULT_ITEM_TYPE
     pickingUpItem.subType = DEFAULT_SUB_TYPE
 end
+local COLLECTIBLE_ITEM_TYPES = __TS__New(Set, {ItemType.PASSIVE, ItemType.ACTIVE, ItemType.FAMILIAR})
+function ____exports.pickingUpItemIsCollectible(self, pickingUpItem)
+    return COLLECTIBLE_ITEM_TYPES:has(pickingUpItem.itemType)
+end
+function ____exports.pickingUpItemIsTrinket(self, pickingUpItem)
+    return pickingUpItem.itemType == ItemType.TRINKET
+end
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "2.0.14",
+  "version": "2.0.17",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "dependencies": {
-    "isaac-typescript-definitions": "^2.0.19"
+    "isaac-typescript-definitions": "^2.0.20"
   },
   "devDependencies": {
     "isaacscript-lint": "^1.0.150",