isaacscript-common 1.2.153 → 1.2.154

package/dist/callbacks/postCustomDoorEnter.lua

@@ -4,14 +4,17 @@ local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local Map = ____lualib.Map
 local ____exports = {}
-local hasSubscriptions, postEffectRenderCustomEntity, getPositionOffset, getAnimation, POSITION_OFFSET_MULTIPLIER
+local hasSubscriptions, postEffectRenderCustomEntity, isPlayerPastDoorThreshold, getPositionOffset, getAnimation, POSITION_OFFSET_MULTIPLIER, v
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____doors = require("functions.doors")
 local doorSlotToDirection = ____doors.doorSlotToDirection
-local getDoors = ____doors.getDoors
+local ____player = require("functions.player")
+local getClosestPlayer = ____player.getClosestPlayer
+local ____utils = require("functions.utils")
+local ensureAllCases = ____utils.ensureAllCases
 local ____vector = require("functions.vector")
 local directionToVector = ____vector.directionToVector
 local ____postCustomDoorEnter = require("callbacks.subscriptions.postCustomDoorEnter")
@@ -20,16 +23,66 @@ local postCustomDoorEnterHasSubscriptions = ____postCustomDoorEnter.postCustomDo
 function hasSubscriptions(self)
     return postCustomDoorEnterHasSubscriptions(nil)
 end
-function postEffectRenderCustomEntity(self)
+function postEffectRenderCustomEntity(self, effect)
     if not hasSubscriptions(nil) then
         return
     end
-    local doors = getDoors(nil)
-    if #doors == 0 then
+    local ptrHash = GetPtrHash(effect)
+    local doorData = v.room.doors:get(ptrHash)
+    if doorData == nil then
         return
     end
-    local door = doors[1]
-    postCustomDoorEnterFire(nil, door)
+    local direction = doorSlotToDirection(nil, doorData.slot)
+    local player = getClosestPlayer(nil, effect.Position)
+    if isPlayerPastDoorThreshold(nil, effect, player, direction) then
+        postCustomDoorEnterFire(
+            nil,
+            player,
+            effect.Variant,
+            doorData.slot,
+            direction
+        )
+    end
+end
+function isPlayerPastDoorThreshold(self, effect, player, direction)
+    repeat
+        local ____switch10 = direction
+        local ____cond10 = ____switch10 == Direction.NO_DIRECTION
+        if ____cond10 then
+            do
+                return false
+            end
+        end
+        ____cond10 = ____cond10 or ____switch10 == Direction.UP
+        if ____cond10 then
+            do
+                return player.Position.Y <= effect.Position.Y
+            end
+        end
+        ____cond10 = ____cond10 or ____switch10 == Direction.RIGHT
+        if ____cond10 then
+            do
+                return player.Position.X >= effect.Position.X
+            end
+        end
+        ____cond10 = ____cond10 or ____switch10 == Direction.DOWN
+        if ____cond10 then
+            do
+                return player.Position.Y >= effect.Position.Y
+            end
+        end
+        ____cond10 = ____cond10 or ____switch10 == Direction.LEFT
+        if ____cond10 then
+            do
+                return player.Position.X <= effect.Position.X
+            end
+        end
+        do
+            do
+                return ensureAllCases(nil, direction)
+            end
+        end
+    until true
 end
 function getPositionOffset(self, doorSlot)
     local direction = doorSlotToDirection(nil, doorSlot)
@@ -38,15 +91,15 @@ function getPositionOffset(self, doorSlot)
 end
 function getAnimation(self, effect)
     repeat
-        local ____switch15 = effect.State
-        local ____cond15 = ____switch15 == DoorState.STATE_OPEN
-        if ____cond15 then
+        local ____switch24 = effect.State
+        local ____cond24 = ____switch24 == DoorState.STATE_OPEN
+        if ____cond24 then
             do
                 return "Opened"
             end
         end
-        ____cond15 = ____cond15 or ____switch15 == DoorState.STATE_CLOSED
-        if ____cond15 then
+        ____cond24 = ____cond24 or ____switch24 == DoorState.STATE_CLOSED
+        if ____cond24 then
             do
                 return "Closed"
             end
@@ -60,7 +113,7 @@ function getAnimation(self, effect)
 end
 POSITION_OFFSET_MULTIPLIER = 23
 local initializedEffectVariants = __TS__New(Set)
-local v = {room = {doors = __TS__New(Map)}}
+v = {room = {doors = __TS__New(Map)}}
 function ____exports.postCustomDoorEnterCallbackInit(self)
     saveDataManager(nil, "postCustomDoorEnter", v, hasSubscriptions)
 end

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

@@ -1,2 +1,2 @@
 /// <reference types="isaac-typescript-definitions" />
-export declare type PostCustomDoorEnterCallbackType = (door: GridEntityDoor) => void;
+export declare type PostCustomDoorEnterCallbackType = (player: EntityPlayer, effectVariant: int, doorSlot: DoorSlot, direction: Direction) => void;

package/dist/callbacks/subscriptions/postCustomDoorEnter.lua

@@ -6,18 +6,24 @@ local subscriptions = {}
 function ____exports.postCustomDoorEnterHasSubscriptions(self)
     return #subscriptions > 0
 end
-function ____exports.postCustomDoorEnterRegister(self, callback, doorVariant)
-    __TS__ArrayPush(subscriptions, {callback, doorVariant})
+function ____exports.postCustomDoorEnterRegister(self, callback, effectVariant)
+    __TS__ArrayPush(subscriptions, {callback, effectVariant})
 end
-function ____exports.postCustomDoorEnterFire(self, door)
+function ____exports.postCustomDoorEnterFire(self, player, effectVariant, doorSlot, direction)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
-        local doorVariant = ____value[2]
+        local callbackEffectVariant = ____value[2]
         do
-            if doorVariant ~= nil and doorVariant ~= door:GetVariant() then
+            if effectVariant ~= callbackEffectVariant then
                 goto __continue5
             end
-            callback(nil, door)
+            callback(
+                nil,
+                player,
+                effectVariant,
+                doorSlot,
+                direction
+            )
         end
         ::__continue5::
     end

package/dist/objects/directionToVector.lua

@@ -3,8 +3,8 @@ local ____exports = {}
 ____exports.DIRECTION_TO_VECTOR = {
     [Direction.NO_DIRECTION] = Vector.Zero,
     [Direction.LEFT] = Vector(-1, 0),
-    [Direction.UP] = Vector(0, -1),
+    [Direction.UP] = Vector(0, 1),
     [Direction.RIGHT] = Vector(1, 0),
-    [Direction.DOWN] = Vector(0, 1)
+    [Direction.DOWN] = Vector(0, -1)
 }
 return ____exports

package/package.json

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