isaacscript-common 1.2.18 → 1.2.19

package/dist/functions/player.d.ts

@@ -81,6 +81,22 @@ export declare function getNewestPlayer(): EntityPlayer;
  * hearts and 3 broken hearts, then this function would return 6 (i.e. 12 - 1 - 2 - 3).
  */
 export declare function getPlayerAvailableHeartSlots(player: EntityPlayer): int;
+/**
+ * Returns an array containing every collectible type that the player has that matches the provided
+ * CacheFlag.
+ *
+ * For example, if a player has one Lord of the Pit and two Transcendences, then this function would
+ * return:
+ *
+ * ```ts
+ * [
+ *   CollectibleType.COLLECTIBLE_LORD_OF_THE_PIT,
+ *   CollectibleType.COLLECTIBLE_TRANSCENDENCE,
+ *   CollectibleType.COLLECTIBLE_TRANSCENDENCE,
+ * ]
+ * ```
+ */
+export declare function getPlayerCollectiblesForCacheFlag(player: EntityPlayer, cacheFlag: CacheFlag): Array<CollectibleType | int>;
 /**
  * Returns the maximum heart containers that the provided character can have. Normally, this is 12,
  * but with Keeper it is 3, with Tainted Keeper it is 2. Does not account for Birthright or Mother's

package/dist/functions/player.lua

@@ -3,10 +3,10 @@ local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArraySome = ____lualib.__TS__ArraySome
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local Map = ____lualib.Map
-local __TS__Iterator = ____lualib.__TS__Iterator
-local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
 local getAdjustedPlayerName, isTaintedModded, EXCLUDED_CHARACTERS
@@ -25,6 +25,8 @@ local arraySum = ____array.arraySum
 local ____bitwise = require("functions.bitwise")
 local getKBitOfN = ____bitwise.getKBitOfN
 local getNumBitsOfN = ____bitwise.getNumBitsOfN
+local ____collectibleCacheFlag = require("functions.collectibleCacheFlag")
+local getCollectiblesForCacheFlag = ____collectibleCacheFlag.getCollectiblesForCacheFlag
 local ____collectibles = require("functions.collectibles")
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
 local ____collectibleSet = require("functions.collectibleSet")
@@ -72,39 +74,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch71 = character
-        local ____cond71 = ____switch71 == PlayerType.PLAYER_BLUEBABY or ____switch71 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond71 then
+        local ____switch75 = character
+        local ____cond75 = ____switch75 == PlayerType.PLAYER_BLUEBABY or ____switch75 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond75 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2
+        if ____cond75 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond75 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB
+        if ____cond75 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond75 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB2_B
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB2_B
+        if ____cond75 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -128,18 +130,18 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue81
+                    goto __continue85
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue81
+                    goto __continue85
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue81
+                    goto __continue85
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue81::
+            ::__continue85::
             i = i + 1
         end
     end
@@ -330,6 +332,21 @@ function ____exports.getPlayerAvailableHeartSlots(self, player)
     local totalOccupiedHeartSlots = totalHeartContainers + brokenHearts
     return maxHeartContainers - totalOccupiedHeartSlots
 end
+function ____exports.getPlayerCollectiblesForCacheFlag(self, player, cacheFlag)
+    local collectiblesForCacheFlag = getCollectiblesForCacheFlag(nil, cacheFlag)
+    local playerCollectibles = {}
+    for ____, collectibleType in __TS__Iterator(collectiblesForCacheFlag:values()) do
+        local numCollectibles = player:GetCollectibleNum(collectibleType)
+        do
+            local i = 0
+            while i < numCollectibles do
+                __TS__ArrayPush(playerCollectibles, collectibleType)
+                i = i + 1
+            end
+        end
+    end
+    return playerCollectibles
+end
 function ____exports.getPlayerCloserThan(self, position, distance)
     for ____, player in ipairs(____exports.getPlayers(nil)) do
         if player.Position:Distance(position) <= distance then
@@ -367,14 +384,14 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue62
+                    goto __continue66
                 end
                 local playerHash = GetPtrHash(player)
                 if playerHash == playerToFindHash then
                     return i
                 end
             end
-            ::__continue62::
+            ::__continue66::
             i = i + 1
         end
     end
@@ -544,9 +561,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch124 = activeSlot
-        local ____cond124 = ____switch124 == ActiveSlot.SLOT_PRIMARY
-        if ____cond124 then
+        local ____switch128 = activeSlot
+        local ____cond128 = ____switch128 == ActiveSlot.SLOT_PRIMARY
+        if ____cond128 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -555,8 +572,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_SECONDARY
-        if ____cond124 then
+        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_SECONDARY
+        if ____cond128 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -571,16 +588,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET
-        if ____cond124 then
+        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_POCKET
+        if ____cond128 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET2
-        if ____cond124 then
+        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_POCKET2
+        if ____cond128 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/package.json

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