isaacscript-common 1.0.533 → 1.0.537

package/dist/callbacks/itemPickup.lua

@@ -37,9 +37,12 @@ function queueEmpty(self, player, pickingUpItem)
 end
 function queueNotEmpty(self, player, pickingUpItem)
     local queuedItem = player.QueuedItem.Item
-    if (queuedItem ~= nil) and (queuedItem.ID ~= pickingUpItem.id) then
-        pickingUpItem.id = queuedItem.ID
+    if queuedItem == nil then
+        return
+    end
+    if (queuedItem.Type ~= pickingUpItem.type) or (queuedItem.ID ~= pickingUpItem.id) then
         pickingUpItem.type = queuedItem.Type
+        pickingUpItem.id = queuedItem.ID
         preItemPickupFire(nil, player, pickingUpItem)
     end
 end

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -1,10 +1,15 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
 local ____exports = {}
-local hasSubscriptions, entityTakeDmgPlayer, damageIsFatal
+local hasSubscriptions, entityTakeDmgPlayer, damageIsFatal, v
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
 local getPlayerAvailableHeartSlots = ____player.getPlayerAvailableHeartSlots
+local getPlayerIndex = ____player.getPlayerIndex
 local getPlayerNumAllHearts = ____player.getPlayerNumAllHearts
 local hasLostCurse = ____player.hasLostCurse
+local isChildPlayer = ____player.isChildPlayer
 local ____revive = require("functions.revive")
 local willPlayerRevive = ____revive.willPlayerRevive
 local ____postPlayerFatalDamage = require("callbacks.subscriptions.postPlayerFatalDamage")
@@ -21,10 +26,21 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     if player == nil then
         return nil
     end
+    if player.Variant ~= 0 then
+        return nil
+    end
+    if isChildPlayer(nil, player) then
+        return nil
+    end
+    local game = Game()
+    local gameFrameCount = game:GetFrameCount()
+    local playerIndex = getPlayerIndex(nil, player)
+    local lastDamageFrame = v.run.playerLastDamageFrame:get(playerIndex)
+    v.run.playerLastDamageFrame:set(playerIndex, gameFrameCount)
     if willPlayerRevive(nil, player) then
         return nil
     end
-    if (not damageIsFatal(nil, player, damageAmount)) and (not hasLostCurse(nil, player)) then
+    if (not damageIsFatal(nil, player, damageAmount, lastDamageFrame)) and (not hasLostCurse(nil, player)) then
         return nil
     end
     local shouldSustainDeath = postPlayerFatalDamageFire(nil, player)
@@ -33,7 +49,9 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, _damageFlags, _dama
     end
     return nil
 end
-function damageIsFatal(self, player, damageAmount)
+function damageIsFatal(self, player, damageAmount, lastDamageFrame)
+    local game = Game()
+    local gameFrameCount = game:GetFrameCount()
     local character = player:GetPlayerType()
     if character == PlayerType.PLAYER_JACOB2_B then
         return true
@@ -46,6 +64,9 @@ function damageIsFatal(self, player, damageAmount)
     if player:HasCollectible(CollectibleType.COLLECTIBLE_HEARTBREAK) and (playerAvailableHeartSlots >= 2) then
         return false
     end
+    if player:HasCollectible(CollectibleType.COLLECTIBLE_BROKEN_GLASS_CANNON) and (gameFrameCount == lastDamageFrame) then
+        return false
+    end
     local hearts = player:GetHearts()
     local eternalHearts = player:GetEternalHearts()
     local soulHearts = player:GetSoulHearts()
@@ -55,7 +76,13 @@ function damageIsFatal(self, player, damageAmount)
     end
     return true
 end
+v = {
+    run = {
+        playerLastDamageFrame = __TS__New(Map)
+    }
+}
 function ____exports.postPlayerFatalDamageCallbackInit(self, mod)
+    saveDataManager(nil, "postPlayerFatalDamage", v)
     mod:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, entityTakeDmgPlayer, EntityType.ENTITY_PLAYER)
 end
 return ____exports

package/dist/functions/player.d.ts

@@ -19,7 +19,13 @@ export declare function addTrinketCostume(player: EntityPlayer, trinketType: Tri
 export declare function anyPlayerCloserThan(position: Vector, distance: float): boolean;
 export declare function anyPlayerHasCollectible(collectibleType: CollectibleType | int): boolean;
 export declare function anyPlayerHasTrinket(trinketType: TrinketType | int): boolean;
-export declare function anyPlayerIs(matchingCharacter: PlayerType): boolean;
+/**
+ * Helper function to determine if the given character is present.
+ *
+ * This function is variadic, meaning that you can supply as many characters as you want to check
+ * for. Returns true if any of the characters supplied are present.
+ */
+export declare function anyPlayerIs(...characters: PlayerType[]): 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,

package/dist/functions/player.lua

@@ -126,12 +126,14 @@ function ____exports.anyPlayerHasTrinket(self, trinketType)
     end
     return false
 end
-function ____exports.anyPlayerIs(self, matchingCharacter)
+function ____exports.anyPlayerIs(self, ...)
+    local characters = {...}
+    local characterSet = __TS__New(Set, characters)
     for ____, player in ipairs(
         ____exports.getPlayers(nil)
     ) do
         local character = player:GetPlayerType()
-        if character == matchingCharacter then
+        if characterSet:has(character) then
             return true
         end
     end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.533",
+  "version": "1.0.537",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.298",
+    "isaac-typescript-definitions": "^1.0.302",
     "isaacscript-lint": "^1.0.72",
     "typedoc": "^0.22.10",
     "typescript": "4.4.4",