isaacscript-common 1.2.132 → 1.2.133

package/dist/functions/entity.d.ts

@@ -11,7 +11,7 @@ export declare function anyEntityCloserThan(entities: Entity[], position: Vector
  * @param subType Default is -1.
  * @param ignoreFriendly Default is false.
  */
-export declare function countEntities(entityType?: EntityType | int, variant?: number, subType?: number, ignoreFriendly?: boolean): number;
+export declare function countEntities(entityType?: EntityType | int, variant?: number, subType?: number, ignoreFriendly?: boolean): int;
 /**
  * Given an array of entities, this helper function returns the closest one to a provided reference
  * entity.

package/dist/functions/player.d.ts

@@ -47,7 +47,7 @@ export declare function getAllPlayers(): EntityPlayer[];
  *
  * The formula for calculating it is: 32 - 2.5 * player.TearHeight
  */
-export declare function getAzazelBrimstoneDistance(playerOrTearHeight: EntityPlayer | float): number;
+export declare function getAzazelBrimstoneDistance(playerOrTearHeight: EntityPlayer | float): float;
 /**
  * Returns the number of black hearts that the player has, excluding any soul hearts. For example,
  * if the player has one full black heart, one full soul heart, and one half black heart, this
@@ -63,7 +63,7 @@ export declare function getBlackHearts(player: EntityPlayer): int;
  */
 export declare function getCharacterMaxHeartContainers(character: PlayerType | int): int;
 /** Helper function to get an array containing the characters of all of the current players. */
-export declare function getCharacters(): number[];
+export declare function getCharacters(): PlayerType[];
 export declare function getClosestPlayer(position: Vector): EntityPlayer;
 /**
  * Most characters have a 56 frame death animation (i.e. the "Death" animation).
@@ -194,7 +194,13 @@ export declare function getPlayers(performCharacterExclusions?: boolean): Entity
  * for. Returns true if any of the characters supplied are present.
  */
 export declare function getPlayersOfType(...characters: Array<PlayerType | int>): EntityPlayer[];
-export declare function getPlayersWithCollectible(collectibleType: CollectibleType | int): EntityPlayer[];
+/**
+ * Helper function to get only the players that have a certain collectible.
+ *
+ * This function is variadic, meaning that you can supply as many collectible types as you want to
+ * check for. It only returns the players that have all of the collectibles.
+ */
+export declare function getPlayersWithCollectible(...collectibleTypes: Array<CollectibleType | int>): EntityPlayer[];
 /**
  * Returns the number of soul hearts that the player has, excluding any black hearts. For example,
  * if the player has one full black heart, one full soul heart, and one half black heart, this
@@ -220,7 +226,7 @@ export declare function getSubPlayerParent(subPlayer: EntitySubPlayer): EntityPl
  * 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): number;
+export declare function getTaintedMagdaleneNonTemporaryMaxHearts(player: EntityPlayer): int;
 /**
  * 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

@@ -9,6 +9,7 @@ local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local Map = ____lualib.Map
 local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
+local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local ____exports = {}
 local getPlayerIndexCollectibleType, getAdjustedPlayerName, isTaintedModded, DEFAULT_COLLECTIBLE_TYPE, EXCLUDED_CHARACTERS
 local ____cachedClasses = require("cachedClasses")
@@ -498,11 +499,15 @@ function ____exports.getPlayersOfType(self, ...)
         end
     )
 end
-function ____exports.getPlayersWithCollectible(self, collectibleType)
+function ____exports.getPlayersWithCollectible(self, ...)
+    local collectibleTypes = {...}
     local players = ____exports.getPlayers(nil)
     return __TS__ArrayFilter(
         players,
-        function(____, player) return player:HasCollectible(collectibleType) end
+        function(____, player) return __TS__ArrayEvery(
+            collectibleTypes,
+            function(____, collectibleType) return player:HasCollectible(collectibleType) end
+        ) end
     )
 end
 function ____exports.getSoulHearts(self, player)
@@ -611,9 +616,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch131 = activeSlot
-        local ____cond131 = ____switch131 == ActiveSlot.SLOT_PRIMARY
-        if ____cond131 then
+        local ____switch132 = activeSlot
+        local ____cond132 = ____switch132 == ActiveSlot.SLOT_PRIMARY
+        if ____cond132 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -622,8 +627,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond131 = ____cond131 or ____switch131 == ActiveSlot.SLOT_SECONDARY
-        if ____cond131 then
+        ____cond132 = ____cond132 or ____switch132 == ActiveSlot.SLOT_SECONDARY
+        if ____cond132 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -638,16 +643,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond131 = ____cond131 or ____switch131 == ActiveSlot.SLOT_POCKET
-        if ____cond131 then
+        ____cond132 = ____cond132 or ____switch132 == ActiveSlot.SLOT_POCKET
+        if ____cond132 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond131 = ____cond131 or ____switch131 == ActiveSlot.SLOT_POCKET2
-        if ____cond131 then
+        ____cond132 = ____cond132 or ____switch132 == ActiveSlot.SLOT_POCKET2
+        if ____cond132 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/rooms.d.ts

@@ -188,7 +188,7 @@ export declare function inMinibossRoomOf(minibossID: MinibossID): boolean;
 export declare function inSecretShop(): boolean;
 /**
  * Helper function to determine whether or not the current room is the starting room of a floor.
- * Only returns true for the starting room of the primary dimension (meaning that being in the
+ * It only returns true for the starting room of the primary dimension (meaning that being in the
  * starting room of the mirror world does not count).
  */
 export declare function inStartingRoom(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.132",
+  "version": "1.2.133",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.2",
     "isaac-typescript-definitions": "^1.0.364",
-    "isaacscript-lint": "^1.0.86",
+    "isaacscript-lint": "^1.0.88",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",
     "typescript": "4.5.5"