isaacscript-common 1.2.132 → 1.2.135

package/dist/callbacks/customRevive.lua

@@ -3,6 +3,8 @@ local ____exports = {}
 local hasSubscriptions, postRender, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, CustomReviveState, v
 local ____cachedClasses = require("cachedClasses")
 local sfxManager = ____cachedClasses.sfxManager
+local ____runInNFrames = require("features.runInNFrames")
+local runNextGameFrame = ____runInNFrames.runNextGameFrame
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____collectibles = require("functions.collectibles")
@@ -10,6 +12,7 @@ local removeCollectibleFromItemTracker = ____collectibles.removeCollectibleFromI
 local ____familiars = require("functions.familiars")
 local removeAllFamiliars = ____familiars.removeAllFamiliars
 local ____player = require("functions.player")
+local getPlayerFromIndex = ____player.getPlayerFromIndex
 local getPlayerIndex = ____player.getPlayerIndex
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
 local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
@@ -83,6 +86,26 @@ function playerIsAboutToDie(self, player)
     player:AddCollectible(CollectibleType.COLLECTIBLE_1UP, 0, false)
     removeAllFamiliars(nil, FamiliarVariant.ONE_UP)
     removeCollectibleFromItemTracker(nil, CollectibleType.COLLECTIBLE_1UP)
+    local character = player:GetPlayerType()
+    if character ~= PlayerType.PLAYER_SAMSON_B then
+        return
+    end
+    local playerIndex = getPlayerIndex(nil, player)
+    runNextGameFrame(
+        nil,
+        function()
+            local taintedSamson = getPlayerFromIndex(nil, playerIndex)
+            if taintedSamson == nil then
+                return
+            end
+            local effects = player:GetEffects()
+            local isBerserk = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK)
+            if not isBerserk then
+                return
+            end
+            effects:RemoveCollectibleEffect(CollectibleType.COLLECTIBLE_BERSERK, -1)
+        end
+    )
 end
 CustomReviveState = CustomReviveState or ({})
 CustomReviveState.DISABLED = 0

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

@@ -14,6 +14,16 @@ export declare function anyPlayerHasTrinket(trinketType: TrinketType | int): boo
  * for. Returns true if any of the characters supplied are present.
  */
 export declare function anyPlayerIs(...matchingCharacters: Array<PlayerType | int>): boolean;
+/**
+ * Helper function to determine if a player will destroy a rock/pot/skull/etc. if they walk over it.
+ *
+ * The following situations allow for this to be true:
+ * - the player has Leo (collectible 302)
+ * - the player has Thunder Thighs (collectible 314)
+ * - the player is under the effects of Mega Mush (collectible 625)
+ * - the player has Stompy (transformation 13)
+ */
+export declare function canPlayerCrushRocks(player: EntityPlayer): boolean;
 /**
  * Helper function to determine if the provided character can have red heart containers. Returns
  * true for characters like Isaac, Magdalene, or Cain. Returns true for Keeper and Tainted Keeper,
@@ -47,7 +57,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 +73,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 +204,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 +236,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")
@@ -99,15 +100,15 @@ end
 function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
     local character = player:GetPlayerType()
     repeat
-        local ____switch68 = character
-        local ____cond68 = ____switch68 == PlayerType.PLAYER_THESOUL
-        if ____cond68 then
+        local ____switch69 = character
+        local ____cond69 = ____switch69 == PlayerType.PLAYER_THESOUL
+        if ____cond69 then
             do
                 return differentiateForgottenAndSoul and CollectibleType.COLLECTIBLE_SPOON_BENDER or DEFAULT_COLLECTIBLE_TYPE
             end
         end
-        ____cond68 = ____cond68 or ____switch68 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond68 then
+        ____cond69 = ____cond69 or ____switch69 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond69 then
             do
                 return CollectibleType.COLLECTIBLE_INNER_EYE
             end
@@ -138,39 +139,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch81 = character
-        local ____cond81 = ____switch81 == PlayerType.PLAYER_BLUEBABY or ____switch81 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond81 then
+        local ____switch82 = character
+        local ____cond82 = ____switch82 == PlayerType.PLAYER_BLUEBABY or ____switch82 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond82 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_LAZARUS2
-        if ____cond81 then
+        ____cond82 = ____cond82 or ____switch82 == PlayerType.PLAYER_LAZARUS2
+        if ____cond82 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond81 then
+        ____cond82 = ____cond82 or ____switch82 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond82 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_JACOB
-        if ____cond81 then
+        ____cond82 = ____cond82 or ____switch82 == PlayerType.PLAYER_JACOB
+        if ____cond82 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond81 then
+        ____cond82 = ____cond82 or ____switch82 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond82 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond81 = ____cond81 or ____switch81 == PlayerType.PLAYER_JACOB2_B
-        if ____cond81 then
+        ____cond82 = ____cond82 or ____switch82 == PlayerType.PLAYER_JACOB2_B
+        if ____cond82 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -291,6 +292,10 @@ function ____exports.anyPlayerIs(self, ...)
         function(____, character) return matchingCharacterSet:has(character) end
     )
 end
+function ____exports.canPlayerCrushRocks(self, player)
+    local effects = player:GetEffects()
+    return player:HasCollectible(CollectibleType.COLLECTIBLE_LEO) or player:HasCollectible(CollectibleType.COLLECTIBLE_THUNDER_THIGHS) or effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_MEGA_MUSH) or player:HasPlayerForm(PlayerForm.PLAYERFORM_STOMPY)
+end
 function ____exports.characterCanHaveRedHearts(self, character)
     return not CHARACTERS_WITH_NO_RED_HEARTS:has(character)
 end
@@ -498,11 +503,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 +620,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 ____switch133 = activeSlot
+        local ____cond133 = ____switch133 == ActiveSlot.SLOT_PRIMARY
+        if ____cond133 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -622,8 +631,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond131 = ____cond131 or ____switch131 == ActiveSlot.SLOT_SECONDARY
-        if ____cond131 then
+        ____cond133 = ____cond133 or ____switch133 == ActiveSlot.SLOT_SECONDARY
+        if ____cond133 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -638,16 +647,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond131 = ____cond131 or ____switch131 == ActiveSlot.SLOT_POCKET
-        if ____cond131 then
+        ____cond133 = ____cond133 or ____switch133 == ActiveSlot.SLOT_POCKET
+        if ____cond133 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond131 = ____cond131 or ____switch131 == ActiveSlot.SLOT_POCKET2
-        if ____cond131 then
+        ____cond133 = ____cond133 or ____switch133 == ActiveSlot.SLOT_POCKET2
+        if ____cond133 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.135",
   "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"