isaacscript-common 1.2.75 → 1.2.76

package/dist/callbacks/postGridEntity.lua

@@ -4,61 +4,94 @@ local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local hasSubscriptions, postUpdate, checkNewGridEntity, checkGridEntityRemoved, postNewRoom, v
+local hasSubscriptions, postUpdate, checkGridEntitiesRemoved, checkGridEntityStateChanged, checkNewGridEntity, updateTupleInMap, postNewRoom, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____gridEntity = require("functions.gridEntity")
-local getGridEntities = ____gridEntity.getGridEntities
+local getGridEntitiesMap = ____gridEntity.getGridEntitiesMap
+local isGridEntityBroken = ____gridEntity.isGridEntityBroken
+local ____postGridEntityBroken = require("callbacks.subscriptions.postGridEntityBroken")
+local postGridEntityBrokenFire = ____postGridEntityBroken.postGridEntityBrokenFire
+local postGridEntityBrokenHasSubscriptions = ____postGridEntityBroken.postGridEntityBrokenHasSubscriptions
 local ____postGridEntityInit = require("callbacks.subscriptions.postGridEntityInit")
 local postGridEntityInitFire = ____postGridEntityInit.postGridEntityInitFire
 local postGridEntityInitHasSubscriptions = ____postGridEntityInit.postGridEntityInitHasSubscriptions
 local ____postGridEntityRemove = require("callbacks.subscriptions.postGridEntityRemove")
 local postGridEntityRemoveFire = ____postGridEntityRemove.postGridEntityRemoveFire
 local postGridEntityRemoveHasSubscriptions = ____postGridEntityRemove.postGridEntityRemoveHasSubscriptions
+local ____postGridEntityStateChange = require("callbacks.subscriptions.postGridEntityStateChange")
+local postGridEntityStateChangeFire = ____postGridEntityStateChange.postGridEntityStateChangeFire
+local postGridEntityStateChangeHasSubscriptions = ____postGridEntityStateChange.postGridEntityStateChangeHasSubscriptions
 local ____postGridEntityUpdate = require("callbacks.subscriptions.postGridEntityUpdate")
 local postGridEntityUpdateFire = ____postGridEntityUpdate.postGridEntityUpdateFire
 local postGridEntityUpdateHasSubscriptions = ____postGridEntityUpdate.postGridEntityUpdateHasSubscriptions
 function hasSubscriptions(self)
-    return postGridEntityInitHasSubscriptions(nil) or postGridEntityUpdateHasSubscriptions(nil) or postGridEntityRemoveHasSubscriptions(nil)
+    return postGridEntityInitHasSubscriptions(nil) or postGridEntityUpdateHasSubscriptions(nil) or postGridEntityRemoveHasSubscriptions(nil) or postGridEntityStateChangeHasSubscriptions(nil) or postGridEntityBrokenHasSubscriptions(nil)
 end
 function postUpdate(self)
     if not hasSubscriptions(nil) then
         return
     end
-    for ____, gridEntity in ipairs(getGridEntities(nil)) do
-        checkNewGridEntity(nil, gridEntity)
+    local gridEntitiesMap = getGridEntitiesMap(nil)
+    checkGridEntitiesRemoved(nil, gridEntitiesMap)
+    for ____, ____value in __TS__Iterator(gridEntitiesMap:entries()) do
+        local gridIndex = ____value[1]
+        local gridEntity = ____value[2]
+        checkGridEntityStateChanged(nil, gridIndex, gridEntity)
+        checkNewGridEntity(nil, gridIndex, gridEntity)
         postGridEntityUpdateFire(nil, gridEntity)
     end
-    checkGridEntityRemoved(nil)
-end
-function checkNewGridEntity(self, gridEntity)
-    local gridIndex = gridEntity:GetGridIndex()
-    local gridEntityType = gridEntity:GetType()
-    local storedGridEntityType = v.room.initializedGridEntities:get(gridIndex)
-    if storedGridEntityType ~= gridEntityType then
-        v.room.initializedGridEntities:set(gridIndex, gridEntityType)
-        postGridEntityInitFire(nil, gridEntity)
-    end
 end
-function checkGridEntityRemoved(self)
-    local game = Game()
-    local room = game:GetRoom()
+function checkGridEntitiesRemoved(self, gridEntitiesMap)
     for ____, ____value in __TS__Iterator(v.room.initializedGridEntities:entries()) do
         local gridIndex = ____value[1]
-        local gridEntityType = ____value[2]
-        local gridEntity = room:GetGridEntity(gridIndex)
-        if gridEntity == nil or gridEntity:GetType() ~= gridEntityType then
+        local gridEntityTuple = ____value[2]
+        local storedGridEntityType = table.unpack(gridEntityTuple)
+        local gridEntity = gridEntitiesMap:get(gridIndex)
+        if gridEntity == nil or gridEntity:GetType() ~= storedGridEntityType then
             v.room.initializedGridEntities:delete(gridIndex)
-            postGridEntityRemoveFire(nil, gridIndex, gridEntityType)
+            postGridEntityRemoveFire(nil, gridIndex, storedGridEntityType)
         end
     end
 end
+function checkGridEntityStateChanged(self, gridIndex, gridEntity)
+    local gridEntityTuple = v.room.initializedGridEntities:get(gridIndex)
+    if gridEntityTuple == nil then
+        return
+    end
+    local ____, oldState = table.unpack(gridEntityTuple)
+    local newState = gridEntity.State
+    if oldState ~= newState then
+        updateTupleInMap(nil, gridEntity)
+        postGridEntityStateChangeFire(nil, gridEntity, oldState, newState)
+        if isGridEntityBroken(nil, gridEntity) then
+            postGridEntityBrokenFire(nil, gridEntity)
+        end
+    end
+end
+function checkNewGridEntity(self, gridIndex, gridEntity)
+    local gridEntityType = gridEntity:GetType()
+    local gridEntityTuple = v.room.initializedGridEntities:get(gridIndex)
+    if gridEntityTuple == nil or gridEntityTuple[1] ~= gridEntityType then
+        updateTupleInMap(nil, gridEntity)
+        postGridEntityInitFire(nil, gridEntity)
+    end
+end
+function updateTupleInMap(self, gridEntity)
+    local gridEntityType = gridEntity:GetType()
+    local gridIndex = gridEntity:GetGridIndex()
+    local newTuple = {gridEntityType, gridEntity.State}
+    v.room.initializedGridEntities:set(gridIndex, newTuple)
+end
 function postNewRoom(self)
     if not hasSubscriptions(nil) then
         return
     end
-    for ____, gridEntity in ipairs(getGridEntities(nil)) do
-        checkNewGridEntity(nil, gridEntity)
+    local gridEntitiesMap = getGridEntitiesMap(nil)
+    for ____, ____value in __TS__Iterator(gridEntitiesMap:entries()) do
+        local gridIndex = ____value[1]
+        local gridEntity = ____value[2]
+        checkNewGridEntity(nil, gridIndex, gridEntity)
     end
 end
 v = {room = {initializedGridEntities = __TS__New(Map)}}

package/dist/callbacks/subscriptions/postGridEntityBroken.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare type PostGridEntityBrokenCallbackType = (gridEntity: GridEntity) => void;

package/dist/callbacks/subscriptions/postGridEntityBroken.lua

@@ -0,0 +1,25 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local ____exports = {}
+local subscriptions = {}
+function ____exports.postGridEntityBrokenHasSubscriptions(self)
+    return #subscriptions > 0
+end
+function ____exports.postGridEntityBrokenRegister(self, callback, gridEntityType)
+    __TS__ArrayPush(subscriptions, {callback, gridEntityType})
+end
+function ____exports.postGridEntityBrokenFire(self, gridEntity)
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local gridEntityType = ____value[2]
+        do
+            if gridEntityType ~= nil and gridEntityType ~= gridEntity:GetType() then
+                goto __continue5
+            end
+            callback(nil, gridEntity)
+        end
+        ::__continue5::
+    end
+end
+return ____exports

package/dist/callbacks/subscriptions/postGridEntityStateChange.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare type PostGridEntityStateChangeCallbackType = (gridEntity: GridEntity, oldState: int, newState: int) => void;

package/dist/callbacks/subscriptions/postGridEntityStateChange.lua

@@ -0,0 +1,25 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local ____exports = {}
+local subscriptions = {}
+function ____exports.postGridEntityStateChangeHasSubscriptions(self)
+    return #subscriptions > 0
+end
+function ____exports.postGridEntityStateChangeRegister(self, callback, gridEntityType)
+    __TS__ArrayPush(subscriptions, {callback, gridEntityType})
+end
+function ____exports.postGridEntityStateChangeFire(self, gridEntity, oldState, newState)
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local gridEntityType = ____value[2]
+        do
+            if gridEntityType ~= nil and gridEntityType ~= gridEntity:GetType() then
+                goto __continue5
+            end
+            callback(nil, gridEntity, oldState, newState)
+        end
+        ::__continue5::
+    end
+end
+return ____exports

package/dist/functions/gridEntity.d.ts

@@ -7,8 +7,10 @@
 export declare function convertXMLGridEntityType(gridEntityXMLType: int, gridEntityXMLVariant: int): [int, int] | undefined;
 export declare function getCollidingEntitiesWithGridEntity(gridEntity: GridEntity): Entity[];
 /**
- * Helper function to get every grid entity in the current room. Use it with no arguments to get
- * every grid entity, or specify a variadic amount of arguments to match specific grid entity types.
+ * Helper function to get every grid entity in the current room.
+ *
+ * Use this function with no arguments to get every grid entity, or specify a variadic amount of
+ * arguments to match specific grid entity types.
  *
  * Example:
  * ```
@@ -27,6 +29,14 @@ export declare function getCollidingEntitiesWithGridEntity(gridEntity: GridEntit
  * ```
  */
 export declare function getGridEntities(...gridEntityTypes: GridEntityType[]): GridEntity[];
+/**
+ * Helper function to get a map of every grid entity in the current room. The indexes of the map are
+ * equal to the grid index. The values of the map are equal to the grid entities.
+ *
+ * Use this function with no arguments to get every grid entity, or specify a variadic amount of
+ * arguments to match specific grid entity types.
+ */
+export declare function getGridEntitiesMap(...gridEntityTypes: GridEntityType[]): Map<int, GridEntity>;
 export declare function getTopLeftWall(): GridEntity | undefined;
 /**
  * Helper function to get the grid index of the top left wall.

package/dist/functions/gridEntity.lua

@@ -4,8 +4,10 @@ local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local Map = ____lualib.Map
 local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local ____exports = {}
+local getAllGridEntities
 local ____constants = require("constants")
 local DISTANCE_OF_GRID_TILE = ____constants.DISTANCE_OF_GRID_TILE
 local ____gridEntityTypeToBrokenStateMap = require("maps.gridEntityTypeToBrokenStateMap")
@@ -22,6 +24,19 @@ local ____rooms = require("functions.rooms")
 local roomUpdateSafe = ____rooms.roomUpdateSafe
 local ____sprite = require("functions.sprite")
 local clearSprite = ____sprite.clearSprite
+function getAllGridEntities(self)
+    local game = Game()
+    local room = game:GetRoom()
+    local gridSize = room:GetGridSize()
+    local gridEntities = {}
+    for ____, gridIndex in ipairs(range(nil, 0, gridSize - 1)) do
+        local gridEntity = room:GetGridEntity(gridIndex)
+        if gridEntity ~= nil then
+            __TS__ArrayPush(gridEntities, gridEntity)
+        end
+    end
+    return gridEntities
+end
 function ____exports.getTopLeftWallGridIndex(self)
     local game = Game()
     local room = game:GetRoom()
@@ -116,29 +131,27 @@ function ____exports.getCollidingEntitiesWithGridEntity(self, gridEntity)
 end
 function ____exports.getGridEntities(self, ...)
     local gridEntityTypes = {...}
-    local game = Game()
-    local room = game:GetRoom()
-    local gridSize = room:GetGridSize()
+    local gridEntities = getAllGridEntities(nil)
+    if #gridEntityTypes == 0 then
+        return gridEntities
+    end
     local gridEntityTypesSet = __TS__New(Set, gridEntityTypes)
-    local gridEntities = {}
-    for ____, gridIndex in ipairs(range(nil, 0, gridSize - 1)) do
-        do
-            local gridEntity = room:GetGridEntity(gridIndex)
-            if gridEntity == nil then
-                goto __continue10
-            end
-            if #gridEntityTypes == 0 then
-                __TS__ArrayPush(gridEntities, gridEntity)
-            else
-                local thisGridEntityType = gridEntity:GetType()
-                if gridEntityTypesSet:has(thisGridEntityType) then
-                    __TS__ArrayPush(gridEntities, gridEntity)
-                end
-            end
+    return __TS__ArrayFilter(
+        gridEntities,
+        function(____, gridEntity)
+            local gridEntityType = gridEntity:GetType()
+            return gridEntityTypesSet:has(gridEntityType)
         end
-        ::__continue10::
+    )
+end
+function ____exports.getGridEntitiesMap(self, ...)
+    local gridEntities = ____exports.getGridEntities(nil, ...)
+    local gridEntityMap = __TS__New(Map)
+    for ____, gridEntity in ipairs(gridEntities) do
+        local gridIndex = gridEntity:GetGridIndex()
+        gridEntityMap:set(gridIndex, gridEntity)
     end
-    return gridEntities
+    return gridEntityMap
 end
 function ____exports.getTopLeftWall(self)
     local game = Game()

package/dist/types/CallbackParametersCustom.d.ts

@@ -10,9 +10,11 @@ import { PostFirstEsauJrCallbackType } from "../callbacks/subscriptions/postFirs
 import { PostFirstFlipCallbackType } from "../callbacks/subscriptions/postFirstFlip";
 import { PostFlipCallbackType } from "../callbacks/subscriptions/postFlip";
 import { PostGameStartedReorderedCallbackType } from "../callbacks/subscriptions/postGameStartedReordered";
+import { PostGridEntityBrokenCallbackType } from "../callbacks/subscriptions/postGridEntityBroken";
 import { PostGridEntityCollisionCallbackType } from "../callbacks/subscriptions/postGridEntityCollision";
 import { PostGridEntityInitCallbackType } from "../callbacks/subscriptions/postGridEntityInit";
 import { PostGridEntityRemoveCallbackType } from "../callbacks/subscriptions/postGridEntityRemove";
+import { PostGridEntityStateChangeCallbackType } from "../callbacks/subscriptions/postGridEntityStateChange";
 import { PostGridEntityUpdateCallbackType } from "../callbacks/subscriptions/postGridEntityUpdate";
 import { PostItemPickupCallbackType } from "../callbacks/subscriptions/postItemPickup";
 import { PostKnifeInitLateCallbackType } from "../callbacks/subscriptions/postKnifeInitLate";
@@ -209,6 +211,14 @@ export interface CallbackParametersCustom {
         callback: PostGridEntityRemoveCallbackType,
         gridEntityType?: GridEntityType
     ];
+    [ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE]: [
+        callback: PostGridEntityStateChangeCallbackType,
+        gridEntityType?: GridEntityType
+    ];
+    [ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN]: [
+        callback: PostGridEntityBrokenCallbackType,
+        gridEntityType?: GridEntityType
+    ];
     [ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION]: [
         callback: PostGridEntityCollisionCallbackType,
         gridEntityType?: GridEntityType

package/dist/types/ModCallbacksCustom.d.ts

@@ -51,6 +51,8 @@ export declare enum ModCallbacksCustom {
     MC_POST_GRID_ENTITY_INIT = 42,
     MC_POST_GRID_ENTITY_UPDATE = 43,
     MC_POST_GRID_ENTITY_REMOVE = 44,
-    MC_POST_GRID_ENTITY_COLLISION = 45,
-    MC_POST_BONE_SWING = 46
+    MC_POST_GRID_ENTITY_STATE_CHANGE = 45,
+    MC_POST_GRID_ENTITY_BROKEN = 46,
+    MC_POST_GRID_ENTITY_COLLISION = 47,
+    MC_POST_BONE_SWING = 48
 }

package/dist/types/ModCallbacksCustom.lua

@@ -91,8 +91,12 @@ ____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 43
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE] = "MC_POST_GRID_ENTITY_UPDATE"
 ____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 44
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE] = "MC_POST_GRID_ENTITY_REMOVE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION = 45
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE = 45
+____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE] = "MC_POST_GRID_ENTITY_STATE_CHANGE"
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN = 46
+____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN] = "MC_POST_GRID_ENTITY_BROKEN"
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION = 47
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION] = "MC_POST_GRID_ENTITY_COLLISION"
-____exports.ModCallbacksCustom.MC_POST_BONE_SWING = 46
+____exports.ModCallbacksCustom.MC_POST_BONE_SWING = 48
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_BONE_SWING] = "MC_POST_BONE_SWING"
 return ____exports

package/dist/types/ModUpgraded.lua

@@ -27,12 +27,16 @@ local ____postFlip = require("callbacks.subscriptions.postFlip")
 local postFlipRegister = ____postFlip.postFlipRegister
 local ____postGameStartedReordered = require("callbacks.subscriptions.postGameStartedReordered")
 local postGameStartedReorderedRegister = ____postGameStartedReordered.postGameStartedReorderedRegister
+local ____postGridEntityBroken = require("callbacks.subscriptions.postGridEntityBroken")
+local postGridEntityBrokenRegister = ____postGridEntityBroken.postGridEntityBrokenRegister
 local ____postGridEntityCollision = require("callbacks.subscriptions.postGridEntityCollision")
 local postGridEntityCollisionRegister = ____postGridEntityCollision.postGridEntityCollisionRegister
 local ____postGridEntityInit = require("callbacks.subscriptions.postGridEntityInit")
 local postGridEntityInitRegister = ____postGridEntityInit.postGridEntityInitRegister
 local ____postGridEntityRemove = require("callbacks.subscriptions.postGridEntityRemove")
 local postGridEntityRemoveRegister = ____postGridEntityRemove.postGridEntityRemoveRegister
+local ____postGridEntityStateChange = require("callbacks.subscriptions.postGridEntityStateChange")
+local postGridEntityStateChangeRegister = ____postGridEntityStateChange.postGridEntityStateChangeRegister
 local ____postGridEntityUpdate = require("callbacks.subscriptions.postGridEntityUpdate")
 local postGridEntityUpdateRegister = ____postGridEntityUpdate.postGridEntityUpdateRegister
 local ____postItemPickup = require("callbacks.subscriptions.postItemPickup")
@@ -388,6 +392,18 @@ function getCallbackRegisterFunction(self, callbackID)
                 return postGridEntityRemoveRegister
             end
         end
+        ____cond19 = ____cond19 or ____switch19 == ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE
+        if ____cond19 then
+            do
+                return postGridEntityStateChangeRegister
+            end
+        end
+        ____cond19 = ____cond19 or ____switch19 == ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN
+        if ____cond19 then
+            do
+                return postGridEntityBrokenRegister
+            end
+        end
         ____cond19 = ____cond19 or ____switch19 == ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION
         if ____cond19 then
             do

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.75",
+  "version": "1.2.76",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
-    "isaac-typescript-definitions": "^1.0.353",
+    "isaac-typescript-definitions": "^1.0.354",
     "isaacscript-lint": "^1.0.81",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.12",