isaacscript-common 1.2.19 → 1.2.20

package/dist/callbacks/postGridEntity.lua

@@ -4,7 +4,7 @@ local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local hasSubscriptions, postUpdate, checkGridEntityRemoved, postNewRoom, checkNewGridEntity, v
+local hasSubscriptions, postUpdate, checkNewGridEntity, checkGridEntityRemoved, postNewRoom, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____gridEntity = require("functions.gridEntity")
@@ -31,6 +31,15 @@ function postUpdate(self)
     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()
@@ -52,15 +61,6 @@ function postNewRoom(self)
         checkNewGridEntity(nil, gridEntity)
     end
 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
 v = {room = {initializedGridEntities = __TS__New(Map)}}
 function ____exports.postGridEntityCallbacksInit(self, mod)
     saveDataManager(nil, "postGridEntity", v, hasSubscriptions)

package/dist/callbacks/postGridEntityCollision.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/callbacks/postGridEntityCollision.lua

@@ -0,0 +1,63 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local Set = ____lualib.Set
+local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__Iterator = ____lualib.__TS__Iterator
+local ____exports = {}
+local hasSubscriptions, postUpdate, v
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+local ____gridEntity = require("functions.gridEntity")
+local getCollidingEntitiesWithGridEntity = ____gridEntity.getCollidingEntitiesWithGridEntity
+local getGridEntities = ____gridEntity.getGridEntities
+local ____postGridEntityCollision = require("callbacks.subscriptions.postGridEntityCollision")
+local postGridEntityCollisionFire = ____postGridEntityCollision.postGridEntityCollisionFire
+local postGridEntityCollisionHasSubscriptions = ____postGridEntityCollision.postGridEntityCollisionHasSubscriptions
+function hasSubscriptions(self)
+    return postGridEntityCollisionHasSubscriptions(nil)
+end
+function postUpdate(self)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    for ____, gridEntity in ipairs(getGridEntities(nil)) do
+        do
+            if gridEntity.CollisionClass == GridCollisionClass.COLLISION_NONE then
+                goto __continue6
+            end
+            local gridEntityPtrHash = GetPtrHash(gridEntity)
+            local oldCollidingEntities = v.room.collidingEntitiesMap:get(gridEntityPtrHash)
+            if oldCollidingEntities == nil then
+                oldCollidingEntities = __TS__New(Set)
+                v.room.collidingEntitiesMap:set(gridEntityPtrHash, oldCollidingEntities)
+            end
+            local collidingEntities = getCollidingEntitiesWithGridEntity(nil, gridEntity)
+            for ____, entity in ipairs(collidingEntities) do
+                local entityPtrHash = GetPtrHash(entity)
+                if not oldCollidingEntities:has(entityPtrHash) then
+                    oldCollidingEntities:add(entityPtrHash)
+                    postGridEntityCollisionFire(nil, gridEntity, entity)
+                end
+            end
+            local collidingEntitiesPtrHashes = __TS__ArrayMap(
+                collidingEntities,
+                function(____, entity) return GetPtrHash(entity) end
+            )
+            local collidingEntitiesPtrHashSet = __TS__New(Set, collidingEntitiesPtrHashes)
+            for ____, oldCollidingEntityPtrHash in __TS__Iterator(oldCollidingEntities:values()) do
+                if not collidingEntitiesPtrHashSet:has(oldCollidingEntityPtrHash) then
+                    oldCollidingEntities:delete(oldCollidingEntityPtrHash)
+                end
+            end
+        end
+        ::__continue6::
+    end
+end
+v = {room = {collidingEntitiesMap = __TS__New(Map)}}
+function ____exports.postGridEntityCollisionInit(self, mod)
+    saveDataManager(nil, "postGridEntity", v, hasSubscriptions)
+    mod:AddCallback(ModCallbacks.MC_POST_UPDATE, postUpdate)
+end
+return ____exports

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

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

package/dist/callbacks/subscriptions/postGridEntityCollision.lua

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

package/dist/functions/gridEntity.d.ts

@@ -5,6 +5,7 @@
  * 1000.0 in a room XML file, but `GridEntityType.GRID_ROCK` is equal to 2.
  */
 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.

package/dist/functions/gridEntity.lua

@@ -1,16 +1,21 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArrayEvery = ____lualib.__TS__ArrayEvery
 local ____exports = {}
+local ____constants = require("constants")
+local DISTANCE_OF_GRID_TILE = ____constants.DISTANCE_OF_GRID_TILE
 local ____gridEntityXMLMap = require("maps.gridEntityXMLMap")
 local GRID_ENTITY_XML_MAP = ____gridEntityXMLMap.GRID_ENTITY_XML_MAP
 local ____roomShapeToTopLeftWallGridIndexMap = require("maps.roomShapeToTopLeftWallGridIndexMap")
 local DEFAULT_TOP_LEFT_WALL_GRID_INDEX = ____roomShapeToTopLeftWallGridIndexMap.DEFAULT_TOP_LEFT_WALL_GRID_INDEX
 local ROOM_SHAPE_TO_TOP_LEFT_WALL_GRID_INDEX_MAP = ____roomShapeToTopLeftWallGridIndexMap.ROOM_SHAPE_TO_TOP_LEFT_WALL_GRID_INDEX_MAP
+local ____math = require("functions.math")
+local isCircleIntersectingRectangle = ____math.isCircleIntersectingRectangle
 local ____rooms = require("functions.rooms")
 local roomUpdateSafe = ____rooms.roomUpdateSafe
 local ____sprite = require("functions.sprite")
@@ -68,6 +73,25 @@ function ____exports.convertXMLGridEntityType(self, gridEntityXMLType, gridEntit
     end
     return {gridEntityType, gridEntityVariant}
 end
+function ____exports.getCollidingEntitiesWithGridEntity(self, gridEntity)
+    local gridEntityCollisionTopLeft = Vector(gridEntity.Position.X - DISTANCE_OF_GRID_TILE / 2, gridEntity.Position.Y - DISTANCE_OF_GRID_TILE / 2)
+    local gridEntityCollisionBottomRight = Vector(gridEntity.Position.X + DISTANCE_OF_GRID_TILE / 2, gridEntity.Position.Y + DISTANCE_OF_GRID_TILE / 2)
+    local closeEntities = Isaac.FindInRadius(gridEntity.Position, DISTANCE_OF_GRID_TILE * 2)
+    local closeEntitiesThatCollideWithGrid = __TS__ArrayFilter(
+        closeEntities,
+        function(____, entity) return entity:CollidesWithGrid() end
+    )
+    return __TS__ArrayFilter(
+        closeEntitiesThatCollideWithGrid,
+        function(____, entity) return isCircleIntersectingRectangle(
+            nil,
+            entity.Position,
+            entity.Size,
+            gridEntityCollisionTopLeft,
+            gridEntityCollisionBottomRight
+        ) end
+    )
+end
 function ____exports.getGridEntities(self, ...)
     local gridEntityTypes = {...}
     local game = Game()
@@ -81,7 +105,7 @@ function ____exports.getGridEntities(self, ...)
             do
                 local gridEntity = room:GetGridEntity(gridIndex)
                 if gridEntity == nil then
-                    goto __continue7
+                    goto __continue10
                 end
                 if #gridEntityTypes == 0 then
                     __TS__ArrayPush(gridEntities, gridEntity)
@@ -92,7 +116,7 @@ function ____exports.getGridEntities(self, ...)
                     end
                 end
             end
-            ::__continue7::
+            ::__continue10::
             gridIndex = gridIndex + 1
         end
     end

package/dist/functions/math.d.ts

@@ -13,6 +13,15 @@ export declare function getAngleDifference(angle1: float, angle2: float): float;
  * this can be optionally changed by specifying this argument.
  */
 export declare function getCircleDiscretizedPoints(centerPos: Vector, radius: float, numPoints: int, xMultiplier?: number, yMultiplier?: number, initialDirection?: Direction): Vector[];
+/**
+ * Helper function to check if a given position is within a given rectangle. This is an inclusive
+ * check, meaning that it will return true if the position is on the border of the rectangle.
+ */
+export declare function inRectangle(position: Vector, topLeft: Vector, bottomRight: Vector): boolean;
+/**
+ * From: https://www.geeksforgeeks.org/check-if-any-point-overlaps-the-given-circle-and-rectangle/
+ */
+export declare function isCircleIntersectingRectangle(circleCenter: Vector, circleRadius: float, rectangleTopLeft: Vector, rectangleBottomRight: Vector): boolean;
 export declare function isEven(num: int): boolean;
 export declare function isOdd(num: int): boolean;
 export declare function lerp(a: number, b: number, pos: float): number;

package/dist/functions/math.lua

@@ -75,6 +75,22 @@ function ____exports.getCircleDiscretizedPoints(self, centerPos, radius, numPoin
     end
     return positions
 end
+function ____exports.inRectangle(self, position, topLeft, bottomRight)
+    return position.X >= topLeft.X and position.X <= bottomRight.X and position.Y <= topLeft.Y and position.Y >= bottomRight.Y
+end
+function ____exports.isCircleIntersectingRectangle(self, circleCenter, circleRadius, rectangleTopLeft, rectangleBottomRight)
+    local nearestX = math.max(
+        rectangleTopLeft.X,
+        math.min(circleCenter.X, rectangleBottomRight.X)
+    )
+    local nearestY = math.max(
+        rectangleTopLeft.Y,
+        math.min(circleCenter.Y, rectangleBottomRight.Y)
+    )
+    local nearestPointToCircleOnRectangle = Vector(nearestX, nearestY)
+    local distanceToCenterOfCircle = nearestPointToCircleOnRectangle:Distance(circleCenter)
+    return distanceToCenterOfCircle <= circleRadius
+end
 function ____exports.isEven(self, num)
     return num & 1 == 0
 end

package/dist/types/CallbackParametersCustom.d.ts

@@ -9,6 +9,7 @@ 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 { PostGridEntityCollisionCallbackType } from "../callbacks/subscriptions/postGridEntityCollision";
 import { PostGridEntityInitCallbackType } from "../callbacks/subscriptions/postGridEntityInit";
 import { PostGridEntityRemoveCallbackType } from "../callbacks/subscriptions/postGridEntityRemove";
 import { PostGridEntityUpdateCallbackType } from "../callbacks/subscriptions/postGridEntityUpdate";
@@ -207,4 +208,8 @@ export interface CallbackParametersCustom {
         callback: PostGridEntityRemoveCallbackType,
         gridEntityType?: GridEntityType
     ];
+    [ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION]: [
+        callback: PostGridEntityCollisionCallbackType,
+        gridEntityType?: GridEntityType
+    ];
 }

package/dist/types/ModCallbacksCustom.d.ts

@@ -50,5 +50,6 @@ export declare enum ModCallbacksCustom {
     MC_POST_SLOT_DESTROYED = 41,
     MC_POST_GRID_ENTITY_INIT = 42,
     MC_POST_GRID_ENTITY_UPDATE = 43,
-    MC_POST_GRID_ENTITY_REMOVE = 44
+    MC_POST_GRID_ENTITY_REMOVE = 44,
+    MC_POST_GRID_ENTITY_COLLISION = 45
 }

package/dist/types/ModCallbacksCustom.lua

@@ -91,4 +91,6 @@ ____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[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION] = "MC_POST_GRID_ENTITY_COLLISION"
 return ____exports

package/dist/types/ModUpgraded.lua

@@ -25,6 +25,8 @@ local ____postFlip = require("callbacks.subscriptions.postFlip")
 local postFlipRegister = ____postFlip.postFlipRegister
 local ____postGameStartedReordered = require("callbacks.subscriptions.postGameStartedReordered")
 local postGameStartedReorderedRegister = ____postGameStartedReordered.postGameStartedReorderedRegister
+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")
@@ -384,6 +386,12 @@ function getCallbackRegisterFunction(self, callbackID)
                 return postGridEntityRemoveRegister
             end
         end
+        ____cond19 = ____cond19 or ____switch19 == ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION
+        if ____cond19 then
+            do
+                return postGridEntityCollisionRegister
+            end
+        end
         do
             do
                 ensureAllCases(nil, callbackID)

package/dist/upgradeMod.lua

@@ -21,6 +21,8 @@ local ____postFlip = require("callbacks.postFlip")
 local postFlipCallbacksInit = ____postFlip.postFlipCallbacksInit
 local ____postGridEntity = require("callbacks.postGridEntity")
 local postGridEntityCallbacksInit = ____postGridEntity.postGridEntityCallbacksInit
+local ____postGridEntityCollision = require("callbacks.postGridEntityCollision")
+local postGridEntityCollisionInit = ____postGridEntityCollision.postGridEntityCollisionInit
 local ____postKnifeInitLate = require("callbacks.postKnifeInitLate")
 local postKnifeInitLateCallbackInit = ____postKnifeInitLate.postKnifeInitLateCallbackInit
 local ____postLaserInitLate = require("callbacks.postLaserInitLate")
@@ -122,6 +124,7 @@ function initCustomCallbacks(self, mod)
     postSlotInitUpdateCallbacksInit(nil, mod)
     postSlotRenderBrokenCallbacksInit(nil, mod)
     postGridEntityCallbacksInit(nil, mod)
+    postGridEntityCollisionInit(nil, mod)
 end
 function initFeatures(self, mod)
     deployJSONRoomInit(nil, mod)

package/package.json

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