isaacscript-common 3.12.0 → 3.13.0

package/callbacks/postDiceRoomActivated.lua

@@ -3,10 +3,10 @@ local hasSubscriptions, postEffectUpdateDiceFloor, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____constants = require("constants")
-local DICE_FLOOR_TRIGGER_DISTANCE = ____constants.DICE_FLOOR_TRIGGER_DISTANCE
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
+local ____effects = require("functions.effects")
+local isCloseEnoughToTriggerDiceFloor = ____effects.isCloseEnoughToTriggerDiceFloor
 local ____player = require("functions.player")
 local getClosestPlayer = ____player.getClosestPlayer
 local ____postDiceRoomActivated = require("callbacks.subscriptions.postDiceRoomActivated")
@@ -22,9 +22,11 @@ function postEffectUpdateDiceFloor(self, effect)
     if v.room.diceRoomActivated then
         return
     end
+    if effect.FrameCount == 0 then
+        return
+    end
     local closestPlayer = getClosestPlayer(nil, effect.Position)
-    local distance = effect.Position:Distance(closestPlayer.Position)
-    if distance <= DICE_FLOOR_TRIGGER_DISTANCE then
+    if isCloseEnoughToTriggerDiceFloor(nil, closestPlayer, effect) then
         v.room.diceRoomActivated = true
         postDiceRoomActivatedFire(nil, closestPlayer, effect.SubType)
     end

package/constants.d.ts

@@ -15,8 +15,6 @@ export declare const BLIND_ITEM_PNG_PATH = "gfx/items/collectibles/questionmark.
 /** Bombs explode when their frame count is equal to this value. */
 export declare const BOMB_EXPLODE_FRAME = 45;
 export declare const DEFAULT_ITEM_POOL_TYPE = ItemPoolType.TREASURE;
-/** For `EntityType.EFFECT` (1000), `EffectVariant.DICE_FLOOR` (76) */
-export declare const DICE_FLOOR_TRIGGER_DISTANCE = 75;
 /** This is also the distance that a player spawns from the door that they enter a room from. */
 export declare const DISTANCE_OF_GRID_TILE = 40;
 export declare const DOOR_HITBOX_RADIUS = 11;

package/constants.lua

@@ -19,8 +19,6 @@ ____exports.BLIND_ITEM_PNG_PATH = "gfx/items/collectibles/questionmark.png"
 --- Bombs explode when their frame count is equal to this value.
 ____exports.BOMB_EXPLODE_FRAME = 45
 ____exports.DEFAULT_ITEM_POOL_TYPE = ItemPoolType.TREASURE
---- For `EntityType.EFFECT` (1000), `EffectVariant.DICE_FLOOR` (76)
-____exports.DICE_FLOOR_TRIGGER_DISTANCE = 75
 --- This is also the distance that a player spawns from the door that they enter a room from.
 ____exports.DISTANCE_OF_GRID_TILE = 40
 ____exports.DOOR_HITBOX_RADIUS = 11

package/functions/effects.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="isaac-typescript-definitions" />
+/// <reference types="isaac-typescript-definitions" />
+/** For `EntityType.EFFECT` (1000), `EffectVariant.DICE_FLOOR` (76) */
+export declare const DICE_FLOOR_TRIGGER_SQUARE_SIZE = 75;
+/** Helper function to see if a player is close enough to activate a Dice Room floor. */
+export declare function isCloseEnoughToTriggerDiceFloor(player: EntityPlayer, diceFloor: EntityEffect): boolean;

package/functions/effects.lua

@@ -0,0 +1,12 @@
+local ____exports = {}
+local ____math = require("functions.math")
+local inRectangle = ____math.inRectangle
+--- For `EntityType.EFFECT` (1000), `EffectVariant.DICE_FLOOR` (76)
+____exports.DICE_FLOOR_TRIGGER_SQUARE_SIZE = 75
+--- Helper function to see if a player is close enough to activate a Dice Room floor.
+function ____exports.isCloseEnoughToTriggerDiceFloor(self, player, diceFloor)
+    local topLeft = diceFloor.Position + Vector(-____exports.DICE_FLOOR_TRIGGER_SQUARE_SIZE, -____exports.DICE_FLOOR_TRIGGER_SQUARE_SIZE)
+    local bottomRight = diceFloor.Position + Vector(____exports.DICE_FLOOR_TRIGGER_SQUARE_SIZE, ____exports.DICE_FLOOR_TRIGGER_SQUARE_SIZE)
+    return inRectangle(nil, player.Position, topLeft, bottomRight)
+end
+return ____exports

package/index.d.ts

@@ -51,6 +51,7 @@ export * from "./functions/direction";
 export * from "./functions/doors";
 export * from "./functions/easing";
 export * from "./functions/eden";
+export * from "./functions/effects";
 export * from "./functions/entity";
 export * from "./functions/entitySpecific";
 export * from "./functions/entityTypes";

package/index.lua

@@ -401,6 +401,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.effects")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.entity")
     for ____exportKey, ____exportValue in pairs(____export) do

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",