isaacscript-common 15.6.0 → 15.6.2

package/dist/index.d.ts

@@ -1363,7 +1363,7 @@ export declare function combineSets<T>(...sets: Array<Set<T> | ReadonlySet<T>>):
  * Helper function to get the enum name for the specified `Controller` value. Note that this will
  * trim off the "BUTTON_" prefix.
  */
-export declare function controllerToString(controller: Controller): string | undefined;
+export declare function controllerToString(controller: Controller): string;
 
 /**
  * This is the type that is fed to `registerCharacterHealthConversion` helper function to signify
@@ -3801,7 +3801,7 @@ declare class ForgottenSwitch extends Feature {
      *
      * In order to use this function, you must upgrade your mod with `ISCFeature.FORGOTTEN_SWITCH`.
      */
-    forgottenSwitch(): void;
+    forgottenSwitch(player: EntityPlayer): void;
 }
 
 declare type FunctionIsNotSerializable = "Error: Functions are not serializable. For more information, see: https://isaacscript.github.io/main/gotchas#functions-are-not-serializable";
@@ -4865,7 +4865,7 @@ export declare function getHearts(heartSubType?: HeartSubType): EntityPickupHear
 /**
  * Helper function to get the width of the first player's hearts on the UI. This is useful for
  * drawing UI elements to the right of where the player's hearts are. Make sure to use this in
- * combination with the the `getHUDOffsetVector` helper function.
+ * combination with the `getHUDOffsetVector` helper function.
  */
 export declare function getHeartsUIWidth(): int;
 
@@ -5268,9 +5268,9 @@ export declare function getPillEffectName(pillEffect: PillEffect): string;
 
 /**
  * Helper function to get a pill effect type from a PillEffect enum value. In this context, the type
- * is equal to positive, negative, or neutral. This is derived from the suffix of the the "class"
- * tag in the "pocketitems.xml" file. Use the `getPillEffectClass` helper function to determine the
- * "power" of the pill.
+ * is equal to positive, negative, or neutral. This is derived from the suffix of the "class" tag in
+ * the "pocketitems.xml" file. Use the `getPillEffectClass` helper function to determine the "power"
+ * of the pill.
  *
  * Due to limitations in the API, this function will not work properly for modded pill effects, and
  * will always return `DEFAULT_PILL_EFFECT_TYPE` in those cases.
@@ -11322,7 +11322,8 @@ export declare type PickupIndex = int & {
 declare class PickupIndexCreation extends Feature {
     private roomHistory;
     private postPickupInit;
-    private trySetPickupIndex;
+    private setPickupIndex;
+    private getPickupIndexFromPreviousData;
     private postEntityRemovePickup;
     private checkDespawningFromPlayerLeavingRoom;
     /**
@@ -11330,7 +11331,6 @@ declare class PickupIndexCreation extends Feature {
      * Keep track of the metadata for later.
      */
     private trackDespawningPickupMetadata;
-    private postNewRoomReordered;
     private getPostAscentPickupIndex;
     /**
      * Mods often have to track variables relating to a pickups. Finding an index for these kinds of
@@ -11726,7 +11726,7 @@ declare class PressInput extends Feature {
      *
      * In order to use this function, you must upgrade your mod with `ISCFeature.PRESS_INPUT`.
      */
-    pressInput(buttonAction: ButtonAction): void;
+    pressInput(player: EntityPlayer, buttonAction: ButtonAction): void;
 }
 
 declare class PreventChildEntities extends Feature {
@@ -12561,8 +12561,8 @@ declare class RoomHistory extends Feature {
     /**
      * Helper function to detect if the game is in the state where the room index has changed to a new
      * room, but the entities from the previous room are currently in the process of despawning. (At
-     * this point, the `POST_NEW_ROOM` callback will not have fired yet, and there will not be an
-     * entry in the room history array for the current room.)
+     * this point, the `POST_NEW_ROOM` callback and the `POST_NEW_ROOM_EARLY` callback will not have
+     * fired yet, and there will not be an entry in the room history array for the current room.)
      *
      * This function is intended to be used in the `POST_ENTITY_REMOVE` callback to detect when an
      * entity is despawning.
@@ -14505,6 +14505,12 @@ export declare function validateEnumContiguous<T>(transpiledEnumName: string, tr
  */
 export declare function validateInterfaceMatchesEnum<T extends Record<Enum, unknown>, Enum extends string | number>(): void;
 
+/**
+ * Helper function to compare two vectors for equality.
+ *
+ * This function is useful because vectors are not directly comparable. In other words, `Vector(1.2)
+ * === Vector(1.2)` will be equal to false.
+ */
 export declare function vectorEquals(vector1: Vector, vector2: Vector): boolean;
 
 /**

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 15.6.0
+isaacscript-common 15.6.2
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -25,7 +25,15 @@ information about using TypeScript, see the website: https://isaacscript.github.
 
 --]]
 
+---@diagnostic disable: assign-type-mismatch
 ---@diagnostic disable: deprecated
+---@diagnostic disable: lowercase-global
+---@diagnostic disable: need-check-nil
+---@diagnostic disable: redefined-local
+---@diagnostic disable: redundant-parameter
+---@diagnostic disable: unused-function
+---@diagnostic disable: unused-local
+---@diagnostic disable: unused-vararg
 
 
 local ____modules = {}
@@ -16788,6 +16796,8 @@ end
 return ____exports
  end,
 ["src.functions.flag"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectEntries = ____lualib.__TS__ObjectEntries
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
@@ -16803,7 +16813,9 @@ function ____exports.bitFlags(self, flag)
     return flag
 end
 function ____exports.getFlagName(self, flag, flagEnum)
-    for key, value in pairs(flagEnum) do
+    for ____, ____value in ipairs(__TS__ObjectEntries(flagEnum)) do
+        local key = ____value[1]
+        local value = ____value[2]
         if value == flag then
             return key
         end
@@ -23256,7 +23268,7 @@ function ____exports.restart(self, character)
     local command = "restart " .. tostring(character)
     log(
         nil,
-        (((("Restarting the run as PlayerType." .. tostring(PlayerType[character])) .. " (") .. tostring(character)) .. ") with a console command of: ") .. command
+        (((("Restarting the run as PlayerType." .. PlayerType[character]) .. " (") .. tostring(character)) .. ") with a console command of: ") .. command
     )
     Isaac.ExecuteCommand(command)
 end
@@ -27382,10 +27394,7 @@ function ____exports.logPlayerHealth(self, player)
     )
     log(nil, "  Soul heart types: [")
     for ____, soulHeartType in ipairs(playerHealth.soulHeartTypes) do
-        log(
-            nil,
-            "    HeartSubType." .. tostring(HeartSubType[soulHeartType])
-        )
+        log(nil, "    HeartSubType." .. HeartSubType[soulHeartType])
     end
     log(nil, "  ]")
 end
@@ -31340,7 +31349,7 @@ function CustomRevive.prototype.logStateChanged(self)
     if DEBUG then
         log(
             nil,
-            ((("Custom revive state changed: " .. tostring(CustomReviveState[self.v.run.state])) .. " (") .. tostring(self.v.run.state)) .. ")"
+            ((("Custom revive state changed: " .. CustomReviveState[self.v.run.state]) .. " (") .. tostring(self.v.run.state)) .. ")"
         )
     end
 end
@@ -33886,12 +33895,8 @@ local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
-local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
-local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____entities = require("src.functions.entities")
 local getEntityID = ____entities.getEntityID
-local ____entitiesSpecific = require("src.functions.entitiesSpecific")
-local getPickups = ____entitiesSpecific.getPickups
 local ____roomData = require("src.functions.roomData")
 local getRoomListIndex = ____roomData.getRoomListIndex
 local ____stage = require("src.functions.stage")
@@ -33931,53 +33936,41 @@ function PickupIndexCreation.prototype.____constructor(self, roomHistory)
         room = {pickupIndexes = __TS__New(Map)}
     }
     self.postPickupInit = function(____, pickup)
-        self:trySetPickupIndex(pickup)
+        self:setPickupIndex(pickup)
     end
     self.postEntityRemovePickup = function(____, entity)
         self:checkDespawningFromPlayerLeavingRoom(entity)
     end
-    self.postNewRoomReordered = function()
-        local room = game:GetRoom()
-        local isFirstVisit = room:IsFirstVisit()
-        if isFirstVisit then
-            return
-        end
-        local roomListIndex = getRoomListIndex(nil)
-        local pickupDescriptions = self.v.level.pickupData:getAndSetDefault(roomListIndex)
-        for ____, pickup in ipairs(getPickups(nil)) do
-            local pickupIndex = getStoredPickupIndex(nil, pickup, pickupDescriptions)
-            if pickupIndex == nil then
-                pickupIndex = self:getPostAscentPickupIndex(pickup)
-            end
-            if pickupIndex == nil then
-                local ____self_v_run_0, ____pickupCounter_1 = self.v.run, "pickupCounter"
-                ____self_v_run_0[____pickupCounter_1] = ____self_v_run_0[____pickupCounter_1] + 1
-                pickupIndex = self.v.run.pickupCounter
-            end
-            local ptrHash = GetPtrHash(pickup)
-            self.v.room.pickupIndexes:set(ptrHash, pickupIndex)
-        end
-    end
     self.featuresUsed = {ISCFeature.ROOM_HISTORY}
     self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, {self.postPickupInit}}, {ModCallback.POST_ENTITY_REMOVE, {self.postEntityRemovePickup, EntityType.PICKUP}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
     self.roomHistory = roomHistory
 end
-function PickupIndexCreation.prototype.trySetPickupIndex(self, pickup)
+function PickupIndexCreation.prototype.setPickupIndex(self, pickup)
     local ptrHash = GetPtrHash(pickup)
     if self.v.room.pickupIndexes:has(ptrHash) then
         return
     end
+    local pickupIndexFromLevelData = self:getPickupIndexFromPreviousData(pickup)
     local room = game:GetRoom()
     local isFirstVisit = room:IsFirstVisit()
     local roomFrameCount = room:GetFrameCount()
-    if not isFirstVisit and roomFrameCount <= 0 then
+    if pickupIndexFromLevelData ~= nil and not isFirstVisit and roomFrameCount <= 0 then
+        self.v.room.pickupIndexes:set(ptrHash, pickupIndexFromLevelData)
         return
     end
-    local ____self_v_run_2, ____pickupCounter_3 = self.v.run, "pickupCounter"
-    ____self_v_run_2[____pickupCounter_3] = ____self_v_run_2[____pickupCounter_3] + 1
+    local ____self_v_run_0, ____pickupCounter_1 = self.v.run, "pickupCounter"
+    ____self_v_run_0[____pickupCounter_1] = ____self_v_run_0[____pickupCounter_1] + 1
     self.v.room.pickupIndexes:set(ptrHash, self.v.run.pickupCounter)
 end
+function PickupIndexCreation.prototype.getPickupIndexFromPreviousData(self, pickup)
+    local roomListIndex = getRoomListIndex(nil)
+    local pickupDescriptions = self.v.level.pickupData:getAndSetDefault(roomListIndex)
+    local pickupIndex = getStoredPickupIndex(nil, pickup, pickupDescriptions)
+    if pickupIndex == nil then
+        pickupIndex = self:getPostAscentPickupIndex(pickup)
+    end
+    return pickupIndex
+end
 function PickupIndexCreation.prototype.checkDespawningFromPlayerLeavingRoom(self, entity)
     local ptrHash = GetPtrHash(entity)
     local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
@@ -34004,16 +33997,16 @@ function PickupIndexCreation.prototype.trackDespawningPickupMetadata(self, entit
     local room = game:GetRoom()
     local roomType = room:GetType()
     repeat
-        local ____switch21 = roomType
-        local ____cond21 = ____switch21 == RoomType.TREASURE
-        if ____cond21 then
+        local ____switch17 = roomType
+        local ____cond17 = ____switch17 == RoomType.TREASURE
+        if ____cond17 then
             do
                 self.v.run.pickupDataTreasureRooms:set(pickupIndex, pickupDescription)
                 break
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == RoomType.BOSS
-        if ____cond21 then
+        ____cond17 = ____cond17 or ____switch17 == RoomType.BOSS
+        if ____cond17 then
             do
                 self.v.run.pickupDataBossRooms:set(pickupIndex, pickupDescription)
                 break
@@ -34033,15 +34026,15 @@ function PickupIndexCreation.prototype.getPostAscentPickupIndex(self, pickup)
     local room = game:GetRoom()
     local roomType = room:GetType()
     repeat
-        local ____switch27 = roomType
-        local ____cond27 = ____switch27 == RoomType.TREASURE
-        if ____cond27 then
+        local ____switch23 = roomType
+        local ____cond23 = ____switch23 == RoomType.TREASURE
+        if ____cond23 then
             do
                 return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataTreasureRooms)
             end
         end
-        ____cond27 = ____cond27 or ____switch27 == RoomType.BOSS
-        if ____cond27 then
+        ____cond23 = ____cond23 or ____switch23 == RoomType.BOSS
+        if ____cond23 then
             do
                 return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataBossRooms)
             end
@@ -34056,15 +34049,16 @@ end
 function PickupIndexCreation.prototype.getPickupIndex(self, pickup)
     local ptrHash = GetPtrHash(pickup)
     local pickupIndexInitial = self.v.room.pickupIndexes:get(ptrHash)
-    if pickupIndexInitial == nil then
-        self:trySetPickupIndex(pickup)
+    if pickupIndexInitial ~= nil then
+        return pickupIndexInitial
     end
+    self:setPickupIndex(pickup)
     local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
-    if pickupIndex == nil then
-        local entityID = getEntityID(nil, pickup)
-        error("Failed to generate a new pickup index for pickup: " .. entityID)
+    if pickupIndex ~= nil then
+        return pickupIndex
     end
-    return pickupIndex
+    local entityID = getEntityID(nil, pickup)
+    error("Failed to generate a new pickup index for pickup: " .. entityID)
 end
 __TS__Decorate({Exported}, PickupIndexCreation.prototype, "getPickupIndex", true)
 return ____exports
@@ -34230,9 +34224,6 @@ local SHOOTING_ACTIONS = {ButtonAction.SHOOT_LEFT, ButtonAction.SHOOT_RIGHT, But
 ____exports.SHOOTING_ACTIONS_SET = __TS__New(Set, SHOOTING_ACTIONS)
 function ____exports.controllerToString(self, controller)
     local key = Controller[controller]
-    if key == nil then
-        return nil
-    end
     return trimPrefix(nil, key, "BUTTON_")
 end
 function ____exports.getMoveActions(self)
@@ -34370,7 +34361,7 @@ function CustomHotkeys.prototype.setConditionalHotkey(self, getKeyFunc, triggerF
 end
 function CustomHotkeys.prototype.setHotkey(self, keyboard, triggerFunc)
     if self.staticHotkeyFunctionMap:has(keyboard) then
-        error(((("Failed to register a hotkey due to a hotkey already being defined for: Keyboard." .. tostring(Keyboard[keyboard])) .. " (") .. tostring(keyboard)) .. ")")
+        error(((("Failed to register a hotkey due to a hotkey already being defined for: Keyboard." .. Keyboard[keyboard]) .. " (") .. tostring(keyboard)) .. ")")
     end
     self.staticHotkeyFunctionMap:set(keyboard, triggerFunc)
 end
@@ -34382,7 +34373,7 @@ function CustomHotkeys.prototype.unsetConditionalHotkey(self, getKeyFunc)
 end
 function CustomHotkeys.prototype.unsetHotkey(self, keyboard)
     if not self.staticHotkeyFunctionMap:has(keyboard) then
-        error(((("Failed to unregister a hotkey since there is no existing hotkey defined for: Keyboard." .. tostring(Keyboard[keyboard])) .. " (") .. tostring(keyboard)) .. ")")
+        error(((("Failed to unregister a hotkey since there is no existing hotkey defined for: Keyboard." .. Keyboard[keyboard]) .. " (") .. tostring(keyboard)) .. ")")
     end
     self.staticHotkeyFunctionMap:delete(keyboard)
 end
@@ -39128,7 +39119,7 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 if roomType == RoomType.DEFAULT then
                     logError(
                         nil,
-                        (((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name
+                        (((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name
                     )
                 end
                 goto __continue26
@@ -39138,7 +39129,7 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
             if roomDoorSlotFlagMap == nil then
                 logError(
                     nil,
-                    (((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name
+                    (((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name
                 )
                 goto __continue26
             end
@@ -39147,13 +39138,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
             if roomsMetadata == nil then
                 logError(
                     nil,
-                    (((((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name
+                    (((((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name
                 )
                 local header = ("For reference, a DoorSlotFlags of " .. tostring(doorSlotFlags)) .. " is equal to the following doors being enabled:\n"
                 local doorSlots = doorSlotFlagsToDoorSlots(nil, doorSlotFlags)
                 local doorSlotLines = __TS__ArrayMap(
                     doorSlots,
-                    function(____, doorSlot) return ((("- DoorSlot." .. tostring(DoorSlot[doorSlot])) .. " (") .. tostring(doorSlot)) .. ")" end
+                    function(____, doorSlot) return ((("- DoorSlot." .. DoorSlot[doorSlot]) .. " (") .. tostring(doorSlot)) .. ")" end
                 )
                 local explanation = header .. table.concat(doorSlotLines, "\n")
                 logError(nil, explanation)
@@ -40015,7 +40006,7 @@ function ____exports.getGridIndexesBetween(self, gridIndex1, gridIndex2, roomSha
     if isOnVerticalLine then
         return iRange(nil, gridIndex1, gridIndex2, gridWidth)
     end
-    error(((((((("Failed to get the grid indexes between " .. tostring(gridIndex1)) .. " and ") .. tostring(gridIndex2)) .. " for RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") since they are not on the same horizontal or vertical line.")
+    error(((((((("Failed to get the grid indexes between " .. tostring(gridIndex1)) .. " and ") .. tostring(gridIndex2)) .. " for RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") since they are not on the same horizontal or vertical line.")
 end
 return ____exports
  end,
@@ -40058,7 +40049,7 @@ function getVanillaWallGridIndexSetForRoomShape(self, roomShape)
     local corners = getRoomShapeCorners(nil, roomShape)
     local lRoom = isLRoom(nil, roomShape)
     if lRoom and #corners ~= 6 then
-        error(((("Failed to get the correct amount of corners for: RoomShape." .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ")")
+        error(((("Failed to get the correct amount of corners for: RoomShape." .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ")")
     end
     repeat
         local ____switch7 = roomShape
@@ -40280,7 +40271,7 @@ function ____exports.isVanillaWallGridIndex(self, gridIndex)
         wallGridIndexSet = ROOM_SHAPE_TO_WALL_GRID_INDEX_SET:get(roomShape)
     end
     if wallGridIndexSet == nil then
-        error(((("Failed to find the wall grid index set for: RoomShape." .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ")")
+        error(((("Failed to find the wall grid index set for: RoomShape." .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ")")
     end
     return wallGridIndexSet:has(gridIndex)
 end
@@ -44462,23 +44453,23 @@ function getEntityLogLine(self, entity, num)
     msg = msg .. getEntityID(nil, entity)
     local bomb = entity:ToBomb()
     if bomb ~= nil then
-        msg = msg .. (" (bomb - BombVariant." .. tostring(BombVariant[bomb.Variant])) .. ")"
+        msg = msg .. (" (bomb - BombVariant." .. BombVariant[bomb.Variant]) .. ")"
     end
     local effect = entity:ToEffect()
     if effect ~= nil then
-        msg = msg .. (((" (effect - EffectVariant." .. tostring(EffectVariant[effect.Variant])) .. ") (State: ") .. tostring(effect.State)) .. ")"
+        msg = msg .. (((" (effect - EffectVariant." .. EffectVariant[effect.Variant]) .. ") (State: ") .. tostring(effect.State)) .. ")"
     end
     local familiar = entity:ToFamiliar()
     if familiar ~= nil then
-        msg = msg .. (((" (familiar - FamiliarVariant." .. tostring(FamiliarVariant[familiar.Variant])) .. ") (State: ") .. tostring(familiar.State)) .. ")"
+        msg = msg .. (((" (familiar - FamiliarVariant." .. FamiliarVariant[familiar.Variant]) .. ") (State: ") .. tostring(familiar.State)) .. ")"
     end
     local knife = entity:ToKnife()
     if knife ~= nil then
-        msg = msg .. (" (knife - KnifeVariant." .. tostring(KnifeVariant[knife.Variant])) .. ")"
+        msg = msg .. (" (knife - KnifeVariant." .. KnifeVariant[knife.Variant]) .. ")"
     end
     local laser = entity:ToLaser()
     if laser ~= nil then
-        msg = msg .. (" (laser - LaserVariant." .. tostring(LaserVariant[laser.Variant])) .. ")"
+        msg = msg .. (" (laser - LaserVariant." .. LaserVariant[laser.Variant]) .. ")"
     end
     local npc = entity:ToNPC()
     if npc ~= nil then
@@ -44486,19 +44477,19 @@ function getEntityLogLine(self, entity, num)
     end
     local pickup = entity:ToPickup()
     if pickup ~= nil then
-        msg = msg .. (((" (pickup - PickupVariant." .. tostring(PickupVariant[pickup.Variant])) .. ") (State: ") .. tostring(pickup.State)) .. ")"
+        msg = msg .. (((" (pickup - PickupVariant." .. PickupVariant[pickup.Variant]) .. ") (State: ") .. tostring(pickup.State)) .. ")"
     end
     local player = entity:ToPlayer()
     if player ~= nil then
-        msg = msg .. (" (player - PlayerVariant." .. tostring(PlayerVariant[player.Variant])) .. ")"
+        msg = msg .. (" (player - PlayerVariant." .. PlayerVariant[player.Variant]) .. ")"
     end
     local projectile = entity:ToProjectile()
     if projectile ~= nil then
-        msg = msg .. (" (projectile - ProjectileVariant." .. tostring(ProjectileVariant[projectile.Variant])) .. "))"
+        msg = msg .. (" (projectile - ProjectileVariant." .. ProjectileVariant[projectile.Variant]) .. "))"
     end
     local tear = entity:ToTear()
     if tear ~= nil then
-        msg = msg .. (" (tear - TearVariant." .. tostring(TearVariant[tear.Variant])) .. "))"
+        msg = msg .. (" (tear - TearVariant." .. TearVariant[tear.Variant]) .. "))"
     end
     msg = msg .. "\n"
     msg = msg .. ("  - Index: " .. tostring(entity.Index)) .. "\n"
@@ -45410,7 +45401,7 @@ function ____exports.getCharge(self, params)
     local totalCharge = getTotalCharge(nil, player, activeSlot)
     printConsole(
         nil,
-        (((("Total charge for ActiveSlot." .. tostring(ActiveSlot[activeSlot])) .. " (") .. tostring(activeSlot)) .. ") is: ") .. tostring(totalCharge)
+        (((("Total charge for ActiveSlot." .. ActiveSlot[activeSlot]) .. " (") .. tostring(activeSlot)) .. ") is: ") .. tostring(totalCharge)
     )
 end
 function ____exports.getPosition(self)
@@ -46295,8 +46286,7 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local Set = ____lualib.Set
-local __TS__New = ____lualib.__TS__New
+local __TS__ArraySplice = ____lualib.__TS__ArraySplice
 local __TS__Decorate = ____lualib.__TS__Decorate
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
@@ -46304,6 +46294,8 @@ local InputHook = ____isaac_2Dtypescript_2Ddefinitions.InputHook
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
+local ____playerIndex = require("src.functions.playerIndex")
+local getPlayerIndex = ____playerIndex.getPlayerIndex
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
 ____exports.PressInput = __TS__Class()
@@ -46312,18 +46304,36 @@ PressInput.name = "PressInput"
 __TS__ClassExtends(PressInput, Feature)
 function PressInput.prototype.____constructor(self)
     Feature.prototype.____constructor(self)
-    self.v = {run = {pressButtonAction = __TS__New(Set)}}
-    self.isActionTriggered = function(____, _entity, _inputHook, buttonAction)
-        if not self.v.run.pressButtonAction:has(buttonAction) then
+    self.v = {run = {buttonActionTuples = {}}}
+    self.isActionTriggered = function(____, entity, _inputHook, buttonAction)
+        if entity == nil then
             return nil
         end
-        self.v.run.pressButtonAction:delete(buttonAction)
-        return true
+        local player = entity:ToPlayer()
+        if player == nil then
+            return nil
+        end
+        local playerIndex = getPlayerIndex(nil, player)
+        do
+            local i = #self.v.run.buttonActionTuples - 1
+            while i >= 0 do
+                local tuple = self.v.run.buttonActionTuples[i + 1]
+                local tuplePlayerIndex, tupleButtonAction = table.unpack(tuple)
+                if tuplePlayerIndex == playerIndex and tupleButtonAction == buttonAction then
+                    __TS__ArraySplice(self.v.run.buttonActionTuples, i)
+                    return true
+                end
+                i = i - 1
+            end
+        end
+        return nil
     end
     self.callbacksUsed = {{ModCallback.INPUT_ACTION, {self.isActionTriggered, InputHook.IS_ACTION_TRIGGERED}}}
 end
-function PressInput.prototype.pressInput(self, buttonAction)
-    self.v.run.pressButtonAction:add(buttonAction)
+function PressInput.prototype.pressInput(self, player, buttonAction)
+    local playerIndex = getPlayerIndex(nil, player)
+    local ____self_v_run_buttonActionTuples_0 = self.v.run.buttonActionTuples
+    ____self_v_run_buttonActionTuples_0[#____self_v_run_buttonActionTuples_0 + 1] = {playerIndex, buttonAction}
 end
 __TS__Decorate({Exported}, PressInput.prototype, "pressInput", true)
 return ____exports
@@ -46352,8 +46362,8 @@ function ForgottenSwitch.prototype.____constructor(self, pressInput)
     self.featuresUsed = {ISCFeature.PRESS_INPUT}
     self.pressInput = pressInput
 end
-function ForgottenSwitch.prototype.forgottenSwitch(self)
-    self.pressInput:pressInput(ButtonAction.DROP)
+function ForgottenSwitch.prototype.forgottenSwitch(self, player)
+    self.pressInput:pressInput(player, ButtonAction.DROP)
 end
 __TS__Decorate({Exported}, ForgottenSwitch.prototype, "forgottenSwitch", true)
 return ____exports
@@ -48747,7 +48757,7 @@ function ModUpgradedBase.prototype.AddCallback(self, modCallback, ...)
         local callback = args[1]
         local optionalArg = args[2]
         local parentFunctionDescription = getParentFunctionDescription(nil)
-        local callbackName = "ModCallback." .. tostring(ModCallback[modCallback])
+        local callbackName = "ModCallback." .. ModCallback[modCallback]
         local signature = parentFunctionDescription == nil and callbackName or (parentFunctionDescription .. " - ") .. callbackName
         local function callbackWithLogger(____, ...)
             local startTime = getTime(nil)

package/dist/src/callbacks.d.ts

@@ -101,7 +101,7 @@ declare const MOD_CALLBACK_CUSTOM_TO_CLASS: {
     readonly 98: typeof cc.PreNPCCollisionFilter;
     readonly 99: typeof cc.PreNPCUpdateFilter;
 };
-export declare type ModCallbackCustomToClass = {
+export type ModCallbackCustomToClass = {
     readonly [key in keyof typeof MOD_CALLBACK_CUSTOM_TO_CLASS]: InstanceType<typeof MOD_CALLBACK_CUSTOM_TO_CLASS[key]>;
 };
 export declare function getCallbacks(): ModCallbackCustomToClass;

package/dist/src/callbacks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callbacks.d.ts","sourceRoot":"","sources":["../../src/callbacks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAKxC,QAAA,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkHvB,CAAC;AAEZ,oBAAY,wBAAwB,GAAG;IACrC,QAAQ,EAAE,GAAG,IAAI,MAAM,OAAO,4BAA4B,GAAG,YAAY,CACvE,OAAO,4BAA4B,CAAC,GAAG,CAAC,CACzC;CACF,CAAC;AAEF,wBAAgB,YAAY,IAAI,wBAAwB,CASvD"}
+{"version":3,"file":"callbacks.d.ts","sourceRoot":"","sources":["../../src/callbacks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAKxC,QAAA,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkHvB,CAAC;AAEZ,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,GAAG,IAAI,MAAM,OAAO,4BAA4B,GAAG,YAAY,CACvE,OAAO,4BAA4B,CAAC,GAAG,CAAC,CACzC;CACF,CAAC;AAEF,wBAAgB,YAAY,IAAI,wBAAwB,CASvD"}

package/dist/src/classes/DefaultMap.d.ts

@@ -107,5 +107,5 @@ export declare class DefaultMap<Key, Value, Args extends unknown[] = []> extends
  * A function that creates the default value for your `DefaultMap`. For example, if it was a
  * `DefaultMap` containing maps, the factory function would be: `() => new Map()`
  */
-export declare type FactoryFunction<V, Args extends unknown[]> = (...args: Args) => V;
+export type FactoryFunction<V, Args extends unknown[]> = (...args: Args) => V;
 //# sourceMappingURL=DefaultMap.d.ts.map

package/dist/src/classes/DefaultMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultMap.d.ts","sourceRoot":"","sources":["../../../src/classes/DefaultMap.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AACH,qBAAa,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,SAAS,OAAO,EAAE,GAAG,EAAE,CAAE,SAAQ,GAAG,CAC1E,GAAG,EACH,KAAK,CACN;IACC,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,mBAAmB,CAA2C;IAEtE;;;OAGG;gBAED,6BAA6B,EAAE,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,EACnE,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAqB3C;;;OAGG;IACI,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK;IAWvD;;;OAGG;IACI,eAAe,CAAC,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK;IAY5C;;;OAGG;IACI,iBAAiB,IAAI,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC;CAWjE;AAGD;;;GAGG;AACH,oBAAY,eAAe,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,CAAC"}
+{"version":3,"file":"DefaultMap.d.ts","sourceRoot":"","sources":["../../../src/classes/DefaultMap.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AACH,qBAAa,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,SAAS,OAAO,EAAE,GAAG,EAAE,CAAE,SAAQ,GAAG,CAC1E,GAAG,EACH,KAAK,CACN;IACC,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,mBAAmB,CAA2C;IAEtE;;;OAGG;gBAED,6BAA6B,EAAE,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,EACnE,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAqB3C;;;OAGG;IACI,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK;IAWvD;;;OAGG;IACI,eAAe,CAAC,GAAG,IAAI,EAAE,IAAI,GAAG,KAAK;IAY5C;;;OAGG;IACI,iBAAiB,IAAI,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC;CAWjE;AAGD;;;GAGG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,CAAC"}

package/dist/src/classes/ModUpgradedBase.lua

@@ -72,7 +72,7 @@ function ModUpgradedBase.prototype.AddCallback(self, modCallback, ...)
         local callback = args[1]
         local optionalArg = args[2]
         local parentFunctionDescription = getParentFunctionDescription(nil)
-        local callbackName = "ModCallback." .. tostring(ModCallback[modCallback])
+        local callbackName = "ModCallback." .. ModCallback[modCallback]
         local signature = parentFunctionDescription == nil and callbackName or (parentFunctionDescription .. " - ") .. callbackName
         --- We don't use the "log" helper function here since it will always show the same "unknown"
         -- prefix.

package/dist/src/classes/callbacks/PostCollectibleEmpty.d.ts

@@ -1,7 +1,7 @@
 import { CollectibleType } from "isaac-typescript-definitions";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { CustomCallback, OptionalArgs } from "../private/CustomCallback";
-declare type T = ModCallbackCustom.POST_COLLECTIBLE_EMPTY;
+type T = ModCallbackCustom.POST_COLLECTIBLE_EMPTY;
 export declare class PostCollectibleEmpty extends CustomCallback<T> {
     v: {
         room: {

package/dist/src/classes/callbacks/PostCollectibleEmpty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostCollectibleEmpty.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCollectibleEmpty.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAGhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,aAAK,CAAC,GAAG,iBAAiB,CAAC,sBAAsB,CAAC;AAElD,qBAAa,oBAAqB,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzC,CAAC;;;;MAIf;;IAcF,UAAmB,UAAU,wGAEb,aAAa,CAAC,CAAC,KAC5B,OAAO,CAQR;IAIF,OAAO,CAAC,2BAA2B,CAajC;IAEF,OAAO,CAAC,sBAAsB;CAQ/B"}
+{"version":3,"file":"PostCollectibleEmpty.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCollectibleEmpty.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAGhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,CAAC,GAAG,iBAAiB,CAAC,sBAAsB,CAAC;AAElD,qBAAa,oBAAqB,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzC,CAAC;;;;MAIf;;IAcF,UAAmB,UAAU,wGAEb,aAAa,CAAC,CAAC,KAC5B,OAAO,CAQR;IAIF,OAAO,CAAC,2BAA2B,CAajC;IAEF,OAAO,CAAC,sBAAsB;CAQ/B"}

package/dist/src/classes/callbacks/PostCustomRevive.d.ts

@@ -1,6 +1,6 @@
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { CustomCallback, OptionalArgs } from "../private/CustomCallback";
-declare type T = ModCallbackCustom.POST_CUSTOM_REVIVE;
+type T = ModCallbackCustom.POST_CUSTOM_REVIVE;
 export declare class PostCustomRevive extends CustomCallback<ModCallbackCustom.POST_CUSTOM_REVIVE> {
     constructor();
     protected shouldFire: (fireArgs: [player: EntityPlayer, revivalType: number], optionalArgs: OptionalArgs<T>) => boolean;

package/dist/src/classes/callbacks/PostCustomRevive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostCustomRevive.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCustomRevive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,aAAK,CAAC,GAAG,iBAAiB,CAAC,kBAAkB,CAAC;AAE9C,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,kBAAkB,CAAC;;IAQxF,UAAmB,UAAU,wEAEb,aAAa,CAAC,CAAC,KAC5B,OAAO,CAOR;CACH"}
+{"version":3,"file":"PostCustomRevive.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCustomRevive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,CAAC,GAAG,iBAAiB,CAAC,kBAAkB,CAAC;AAE9C,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,iBAAiB,CAAC,kBAAkB,CAAC;;IAQxF,UAAmB,UAAU,wEAEb,aAAa,CAAC,CAAC,KAC5B,OAAO,CAOR;CACH"}

package/dist/src/classes/callbacks/PostDiceRoomActivated.d.ts

@@ -1,7 +1,7 @@
 import { DiceFloorSubType } from "isaac-typescript-definitions";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { CustomCallback, OptionalArgs } from "../private/CustomCallback";
-declare type T = ModCallbackCustom.POST_DICE_ROOM_ACTIVATED;
+type T = ModCallbackCustom.POST_DICE_ROOM_ACTIVATED;
 export declare class PostDiceRoomActivated extends CustomCallback<T> {
     v: {
         room: {

package/dist/src/classes/callbacks/PostDiceRoomActivated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostDiceRoomActivated.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostDiceRoomActivated.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAGjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,aAAK,CAAC,GAAG,iBAAiB,CAAC,wBAAwB,CAAC;AAEpD,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC1C,CAAC;;;;MAIf;;IAcF,UAAmB,UAAU,uFAEb,aAAa,CAAC,CAAC,KAC5B,OAAO,CAQR;IAIF,OAAO,CAAC,yBAAyB,CAgB/B;CACH"}
+{"version":3,"file":"PostDiceRoomActivated.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostDiceRoomActivated.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAGjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,KAAK,CAAC,GAAG,iBAAiB,CAAC,wBAAwB,CAAC;AAEpD,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC1C,CAAC;;;;MAIf;;IAcF,UAAmB,UAAU,uFAEb,aAAa,CAAC,CAAC,KAC5B,OAAO,CAQR;IAIF,OAAO,CAAC,yBAAyB,CAgB/B;CACH"}

package/dist/src/classes/callbacks/PostGridEntityCollision.d.ts

@@ -1,6 +1,6 @@
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { CustomCallback } from "../private/CustomCallback";
-declare type T = ModCallbackCustom.POST_GRID_ENTITY_COLLISION;
+type T = ModCallbackCustom.POST_GRID_ENTITY_COLLISION;
 export declare class PostGridEntityCollision extends CustomCallback<T> {
     constructor();
     protected shouldFire: (fireArgs: [gridEntity: GridEntity, entity: Entity], optionalArgs: [gridEntityType?: import("isaac-typescript-definitions").GridEntityType | undefined, gridEntityVariant?: number | undefined, entityType?: import("isaac-typescript-definitions").EntityType | undefined, entityVariant?: number | undefined, entitySubType?: number | undefined]) => boolean;