isaacscript-common 1.2.23 → 1.2.24

package/dist/functions/collectibleCacheFlag.d.ts

@@ -4,3 +4,19 @@
  * collectibles.
  */
 export declare function getCollectiblesForCacheFlag(cacheFlag: CacheFlag): Set<CollectibleType | 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>;

package/dist/functions/collectibleCacheFlag.lua

@@ -3,6 +3,8 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
 local ____collectibles = require("functions.collectibles")
 local collectibleHasCacheFlag = ____collectibles.collectibleHasCacheFlag
@@ -38,4 +40,19 @@ function ____exports.getCollectiblesForCacheFlag(self, cacheFlag)
     end
     return copySet(nil, collectiblesSet)
 end
+function ____exports.getPlayerCollectiblesForCacheFlag(self, player, cacheFlag)
+    local collectiblesForCacheFlag = ____exports.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
 return ____exports

package/dist/functions/player.d.ts

@@ -81,22 +81,6 @@ 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,8 +25,6 @@ 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")
@@ -74,39 +72,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch75 = character
-        local ____cond75 = ____switch75 == PlayerType.PLAYER_BLUEBABY or ____switch75 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond75 then
+        local ____switch71 = character
+        local ____cond71 = ____switch71 == PlayerType.PLAYER_BLUEBABY or ____switch71 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond71 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2
-        if ____cond75 then
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2
+        if ____cond71 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond75 then
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond71 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB
-        if ____cond75 then
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB
+        if ____cond71 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond75 then
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond71 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB2_B
-        if ____cond75 then
+        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB2_B
+        if ____cond71 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -130,18 +128,18 @@ function ____exports.getPlayers(self, performExclusions)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue85
+                    goto __continue81
                 end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue85
+                    goto __continue81
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue85
+                    goto __continue81
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue85::
+            ::__continue81::
             i = i + 1
         end
     end
@@ -332,21 +330,6 @@ 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
@@ -384,14 +367,14 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
             do
                 local player = Isaac.GetPlayer(i)
                 if player == nil then
-                    goto __continue66
+                    goto __continue62
                 end
                 local playerHash = GetPtrHash(player)
                 if playerHash == playerToFindHash then
                     return i
                 end
             end
-            ::__continue66::
+            ::__continue62::
             i = i + 1
         end
     end
@@ -561,9 +544,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch128 = activeSlot
-        local ____cond128 = ____switch128 == ActiveSlot.SLOT_PRIMARY
-        if ____cond128 then
+        local ____switch124 = activeSlot
+        local ____cond124 = ____switch124 == ActiveSlot.SLOT_PRIMARY
+        if ____cond124 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -572,8 +555,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_SECONDARY
-        if ____cond128 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_SECONDARY
+        if ____cond124 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -588,16 +571,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_POCKET
-        if ____cond128 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET
+        if ____cond124 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond128 = ____cond128 or ____switch128 == ActiveSlot.SLOT_POCKET2
-        if ____cond128 then
+        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET2
+        if ____cond124 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/dist/functions/transformations.d.ts

@@ -13,5 +13,5 @@ export declare function getPlayerNumTransformationCollectibles(player: EntityPla
  */
 export declare function getTransformationName(playerForm: PlayerForm): string;
 export declare function getTransformationsForCollectibleType(collectibleType: CollectibleType | int): Set<PlayerForm>;
+export declare function hasFlyingTransformation(player: EntityPlayer): boolean;
 export declare function isTransformationFlying(playerForm: PlayerForm): boolean;
-export declare function playerHasFlyingTransformation(player: EntityPlayer): boolean;

package/dist/functions/transformations.lua

@@ -102,10 +102,7 @@ function ____exports.getTransformationsForCollectibleType(self, collectibleType)
     local transformations = COLLECTIBLE_TYPE_TO_TRANSFORMATION_MAP:get(collectibleType)
     return transformations == nil and __TS__New(Set) or copySet(nil, transformations)
 end
-function ____exports.isTransformationFlying(self, playerForm)
-    return TRANSFORMATIONS_THAT_GRANT_FLYING:has(playerForm)
-end
-function ____exports.playerHasFlyingTransformation(self, player)
+function ____exports.hasFlyingTransformation(self, player)
     for ____, playerForm in __TS__Iterator(TRANSFORMATIONS_THAT_GRANT_FLYING:values()) do
         if player:HasPlayerForm(playerForm) then
             return true
@@ -113,4 +110,7 @@ function ____exports.playerHasFlyingTransformation(self, player)
     end
     return false
 end
+function ____exports.isTransformationFlying(self, playerForm)
+    return TRANSFORMATIONS_THAT_GRANT_FLYING:has(playerForm)
+end
 return ____exports

package/dist/functions/trinketCacheFlag.d.ts

@@ -3,3 +3,8 @@
  * Returns a set containing every trinket type with the given cache flag, including modded trinkets.
  */
 export declare function getTrinketsForCacheFlag(cacheFlag: CacheFlag): Set<TrinketType | int>;
+/**
+ * Returns a map containing every trinket type that the player has that matches the provided
+ * CacheFlag. The values of the map correspond to the multiplier for that trinket.
+ */
+export declare function getPlayerTrinketsForCacheFlag(player: EntityPlayer, cacheFlag: CacheFlag): Map<TrinketType | int, int>;

package/dist/functions/trinketCacheFlag.lua

@@ -3,6 +3,7 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
+local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
 local ____set = require("functions.set")
 local copySet = ____set.copySet
@@ -38,4 +39,15 @@ function ____exports.getTrinketsForCacheFlag(self, cacheFlag)
     end
     return copySet(nil, trinketsSet)
 end
+function ____exports.getPlayerTrinketsForCacheFlag(self, player, cacheFlag)
+    local trinketsForCacheFlag = ____exports.getTrinketsForCacheFlag(nil, cacheFlag)
+    local playerTrinkets = __TS__New(Map)
+    for ____, trinketType in __TS__Iterator(trinketsForCacheFlag:values()) do
+        local trinketMultiplier = player:GetTrinketMultiplier(trinketType)
+        if trinketMultiplier > 0 then
+            playerTrinkets:set(trinketType, trinketMultiplier)
+        end
+    end
+    return playerTrinkets
+end
 return ____exports

package/package.json

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