isaacscript-common 3.15.3 → 3.15.6

package/callbacks/postSlotDestroyed.lua

@@ -3,14 +3,17 @@ local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local Map = ____lualib.Map
 local ____exports = {}
-local hasSubscriptions, postEntityRemove, postSlotAnimationChanged, BROKEN_ANIMATIONS, PRIZE_GAME_FRAME_DELAY_UNTIL_REMOVAL, v
+local hasSubscriptions, postEntityRemove, postSlotAnimationChanged, PRIZE_GAME_FRAME_DELAY_UNTIL_REMOVAL, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local EntityGridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityGridCollisionClass
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____SlotDestructionType = require("enums.SlotDestructionType")
+local SlotDestructionType = ____SlotDestructionType.SlotDestructionType
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____postSlotDestroyed = require("callbacks.subscriptions.postSlotDestroyed")
@@ -28,7 +31,7 @@ function postEntityRemove(self, entity)
         return
     end
     if prizeFrame + PRIZE_GAME_FRAME_DELAY_UNTIL_REMOVAL == gameFrameCount then
-        postSlotDestroyedFire(nil, slot)
+        postSlotDestroyedFire(nil, slot, SlotDestructionType.COLLECTIBLE_PAYOUT)
     end
 end
 function postSlotAnimationChanged(self, slot)
@@ -38,19 +41,18 @@ function postSlotAnimationChanged(self, slot)
     if alreadyBroken then
         return
     end
-    local sprite = slot:GetSprite()
-    local animation = sprite:GetAnimation()
-    if BROKEN_ANIMATIONS:has(animation) then
+    if slot.GridCollisionClass == EntityGridCollisionClass.GROUND then
         v.room.brokenSlots:add(ptrHash)
-        postSlotDestroyedFire(nil, slot)
+        postSlotDestroyedFire(nil, slot, SlotDestructionType.NORMAL)
     end
+    local sprite = slot:GetSprite()
+    local animation = sprite:GetAnimation()
     if animation == "Prize" then
         v.room.slotPrizeAnimationGameFrame:set(ptrHash, gameFrameCount)
     else
         v.room.slotPrizeAnimationGameFrame:delete(ptrHash)
     end
 end
-BROKEN_ANIMATIONS = __TS__New(Set, {"Broken", "Death"})
 PRIZE_GAME_FRAME_DELAY_UNTIL_REMOVAL = 3
 v = {room = {
     brokenSlots = __TS__New(Set),

package/callbacks/subscriptions/postSlotDestroyed.d.ts

@@ -1,5 +1,7 @@
 import { SlotVariant } from "isaac-typescript-definitions";
+import { SlotDestructionType } from "../../enums/SlotDestructionType";
 export declare type PostSlotDestroyedRegisterParameters = [
-    callback: (slot: EntitySlot) => void,
-    slotVariant?: SlotVariant
+    callback: (slot: EntitySlot, slotDestructionType: SlotDestructionType) => void,
+    slotVariant?: SlotVariant,
+    slotDestructionType?: SlotDestructionType
 ];

package/callbacks/subscriptions/postSlotDestroyed.lua

@@ -13,15 +13,19 @@ function ____exports.postSlotDestroyedRegister(self, ...)
 end
 ---
 -- @internal
-function ____exports.postSlotDestroyedFire(self, slot)
+function ____exports.postSlotDestroyedFire(self, slot, slotDestructionType)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
-        local slotVariant = ____value[2]
+        local callbackSlotVariant = ____value[2]
+        local callbackSlotDestructionType = ____value[3]
         do
-            if slotVariant ~= nil and slotVariant ~= slot.Variant then
+            if callbackSlotVariant ~= nil and callbackSlotVariant ~= slot.Variant then
                 goto __continue5
             end
-            callback(nil, slot)
+            if callbackSlotDestructionType ~= nil and callbackSlotDestructionType ~= slotDestructionType then
+                goto __continue5
+            end
+            callback(nil, slot, slotDestructionType)
         end
         ::__continue5::
     end

package/enums/ModCallbackCustom.d.ts

@@ -421,7 +421,7 @@ export declare enum ModCallbackCustom {
      * ```ts
      * function postItemDischarge(
      *   player: EntityPlayer,
-     *   collectibleType: CollectibleType | int,
+     *   collectibleType: CollectibleType,
      *   activeSlot: ActiveSlot,
      * ): void {}
      * ```
@@ -692,8 +692,8 @@ export declare enum ModCallbackCustom {
      * ```ts
      * function postPlayerChangeType(
      *   player: EntityPlayer,
-     *   oldCharacter: PlayerType | int,
-     *   newCharacter: PlayerType | int,
+     *   oldCharacter: PlayerType,
+     *   newCharacter: PlayerType,
      * ) {}
      * ```
      */
@@ -964,11 +964,13 @@ export declare enum ModCallbackCustom {
      * Fires from the `POST_RENDER` callback when a slot plays the animation that indicates that it
      * has broken.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `SlotVariant` provided.
+     * - When registering the callback, takes an optional second argument that will make the callback
+     *   only fire if it matches the `SlotVariant` provided.
+     * - When registering the callback, takes an optional third argument that will make the callback
+     *   only fire if the destruction type matches the `SlotDestructionType` provided.
      *
      * ```ts
-     * function postSlotDestroyed(slot: Entity): void {}
+     * function postSlotDestroyed(slot: Entity, slotDestructionType: SlotDestructionType): void {}
      * ```
      */
     POST_SLOT_DESTROYED = 66,
@@ -1110,7 +1112,7 @@ export declare enum ModCallbackCustom {
      * ```ts
      * function postTrinketBreak(
      *   player: EntityPlayer,
-     *   trinketType: TrinketType | int,
+     *   trinketType: TrinketType,
      * ): void {}
      * ```
      */

package/enums/SlotDestructionType.d.ts

@@ -0,0 +1,4 @@
+export declare enum SlotDestructionType {
+    NORMAL = 0,
+    COLLECTIBLE_PAYOUT = 1
+}

package/enums/SlotDestructionType.lua

@@ -0,0 +1,7 @@
+local ____exports = {}
+____exports.SlotDestructionType = {}
+____exports.SlotDestructionType.NORMAL = 0
+____exports.SlotDestructionType[____exports.SlotDestructionType.NORMAL] = "NORMAL"
+____exports.SlotDestructionType.COLLECTIBLE_PAYOUT = 1
+____exports.SlotDestructionType[____exports.SlotDestructionType.COLLECTIBLE_PAYOUT] = "COLLECTIBLE_PAYOUT"
+return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "3.15.3",
+  "version": "3.15.6",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "index",
   "types": "index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^2.2.2"
+    "isaac-typescript-definitions": "^2.2.3"
   }
 }