isaacscript-common 1.2.152 → 1.2.155

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
@@ -58,9 +111,9 @@ function getAnimation(self, effect)
         end
     until true
 end
-POSITION_OFFSET_MULTIPLIER = 23
+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
@@ -100,5 +153,8 @@ function ____exports.spawnCustomDoor(self, effectVariant, doorSlot)
             wall.CollisionClass = GridCollisionClass.COLLISION_WALL_EXCEPT_PLAYER
         end
     end
+    local ptrHash = GetPtrHash(effect)
+    local doorData = {slot = doorSlot}
+    v.room.doors:set(ptrHash, doorData)
 end
 return ____exports

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 callbackEffectVariant ~= nil and callbackEffectVariant ~= effectVariant then
                 goto __continue5
             end
-            callback(nil, door)
+            callback(
+                nil,
+                player,
+                effectVariant,
+                doorSlot,
+                direction
+            )
         end
         ::__continue5::
     end

package/dist/features/extraConsoleCommands/commands.d.ts

@@ -264,7 +264,9 @@ export declare function sacrifice(): void;
 /** Warps to the first Secret Room on the floor. */
 export declare function secret(): void;
 /** Logs all of the current run's seed effects to the "log.txt" file. */
-export declare function seeds(): void;
+export declare function seedsCommand(): void;
+/** Changes to a seeded run, using the seed of the current run. */
+export declare function seedStick(): void;
 /**
  * Sets a charge to the player's specified active item. You must provide the active slot number and
  * the number of charges to set.

package/dist/features/extraConsoleCommands/commands.lua

@@ -755,10 +755,15 @@ end
 function ____exports.secret(self)
     warpToRoomType(nil, RoomType.ROOM_SECRET)
 end
-function ____exports.seeds(self)
+function ____exports.seedsCommand(self)
     logAllSeedEffects()
     printConsole(nil, "Logged the seed effects to the \"log.txt\" file.")
 end
+function ____exports.seedStick(self)
+    local seeds = game:GetSeeds()
+    local startSeedString = seeds:GetStartSeedString()
+    Isaac.ExecuteCommand("seed " .. startSeedString)
+end
 function ____exports.setCharges(self, params)
     if params == "" then
         printConsole(nil, "You must specify a slot number and a charge amount. (Use 0 for the primary slot, 1 for the Schoolbag slot, 2 for the pocket item slot, and 3 for the Dice Bag slot.)")

package/dist/features/extraConsoleCommands/init.lua

@@ -173,7 +173,8 @@ commandFunctionsMap:set("rottenhearts", commands.rottenHearts)
 commandFunctionsMap:set("s", commands.s)
 commandFunctionsMap:set("sacrifice", commands.sacrifice)
 commandFunctionsMap:set("secret", commands.secret)
-commandFunctionsMap:set("seeds", commands.seeds)
+commandFunctionsMap:set("seeds", commands.seedsCommand)
+commandFunctionsMap:set("seedstick", commands.seedStick)
 commandFunctionsMap:set("setcharges", commands.setCharges)
 commandFunctionsMap:set("setposition", commands.setPosition)
 commandFunctionsMap:set("sh", commands.sh)

package/dist/index.d.ts

@@ -70,6 +70,10 @@ export * from "./functions/trinketSet";
 export * from "./functions/ui";
 export * from "./functions/utils";
 export * from "./functions/vector";
+export * from "./maps/cardMap";
+export * from "./maps/characterMap";
+export * from "./maps/pillEffectMap";
+export * from "./maps/roomTypeMap";
 export * from "./types/AnyEntity";
 export * from "./types/CallbackParametersCustom";
 export * from "./types/CardType";

package/dist/index.lua

@@ -568,6 +568,38 @@ do
         end
     end
 end
+do
+    local ____export = require("maps.cardMap")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
+do
+    local ____export = require("maps.characterMap")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
+do
+    local ____export = require("maps.pillEffectMap")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
+do
+    local ____export = require("maps.roomTypeMap")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("types.CardType")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/types/CallbackParametersCustom.d.ts

@@ -233,6 +233,7 @@ export interface CallbackParametersCustom {
         callback: PostBoneSwingCallbackType
     ];
     [ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER]: [
-        callback: PostCustomDoorEnterCallbackType
+        callback: PostCustomDoorEnterCallbackType,
+        effectVariant?: int
     ];
 }

package/dist/types/ModUpgraded.d.ts

@@ -8,11 +8,11 @@ export declare class ModUpgraded implements Mod {
     /** End-users can optionally enable verbose-mode, which helps troubleshoot crashes. */
     Verbose: boolean;
     constructor(mod: Mod, verbose: boolean);
-    AddCallback<T extends keyof CallbackParameters>(callbackID: T, ...args: CallbackParameters[T]): void;
+    AddCallback<T extends keyof CallbackParameters>(modCallbacks: T, ...args: CallbackParameters[T]): void;
     HasData(): boolean;
     LoadData(): string;
     RemoveCallback(callbackID: ModCallbacks, callback: () => void): void;
     RemoveData(): void;
     SaveData(data: string): void;
-    AddCallbackCustom<T extends keyof CallbackParametersCustom>(callbackID: T, ...args: CallbackParametersCustom[T]): void;
+    AddCallbackCustom<T extends keyof CallbackParametersCustom>(modCallbacksCustom: T, ...args: CallbackParametersCustom[T]): void;
 }

package/dist/types/ModUpgraded.lua

@@ -27,12 +27,12 @@ function ModUpgraded.prototype.____constructor(self, mod, verbose)
     self.Mod = mod
     self.Verbose = verbose
 end
-function ModUpgraded.prototype.AddCallback(self, callbackID, ...)
+function ModUpgraded.prototype.AddCallback(self, modCallbacks, ...)
     local args = {...}
     if self.Verbose then
         local callback = args[1]
         local optionalArg = args[2]
-        local callbackName = getCallbackName(nil, callbackID)
+        local callbackName = getCallbackName(nil, modCallbacks)
         local debugMsg = getDebugPrependString(nil, callbackName)
         local function callbackWithLogger(____, ...)
             Isaac.DebugString(debugMsg .. " - START")
@@ -40,10 +40,10 @@ function ModUpgraded.prototype.AddCallback(self, callbackID, ...)
             Isaac.DebugString((debugMsg .. " - END - ") .. tostring(value))
             return value
         end
-        self.Mod:AddCallback(callbackID, callbackWithLogger, optionalArg)
+        self.Mod:AddCallback(modCallbacks, callbackWithLogger, optionalArg)
     else
         self.Mod:AddCallback(
-            callbackID,
+            modCallbacks,
             __TS__Spread(args)
         )
     end
@@ -63,10 +63,10 @@ end
 function ModUpgraded.prototype.SaveData(self, data)
     self.Mod:SaveData(data)
 end
-function ModUpgraded.prototype.AddCallbackCustom(self, callbackID, ...)
-    local callbackRegisterFunction = CALLBACK_REGISTER_FUNCTIONS[callbackID]
+function ModUpgraded.prototype.AddCallbackCustom(self, modCallbacksCustom, ...)
+    local callbackRegisterFunction = CALLBACK_REGISTER_FUNCTIONS[modCallbacksCustom]
     if callbackRegisterFunction == nil then
-        error("Failed to find a callback registration function for custom callback: " .. tostring(callbackID))
+        error("Failed to find a callback registration function for custom callback: " .. tostring(modCallbacksCustom))
     end
     callbackRegisterFunction(nil, ...)
 end

package/package.json

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