isaacscript-common 15.6.0 → 15.6.1

package/dist/index.d.ts

@@ -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";
@@ -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 {

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 15.6.0
+isaacscript-common 15.6.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -46295,8 +46295,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 +46303,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 +46313,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 +46371,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

package/dist/src/classes/features/other/ForgottenSwitch.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="isaac-typescript-definitions" />
 import { Feature } from "../../private/Feature";
 export declare class ForgottenSwitch extends Feature {
     private pressInput;
@@ -7,6 +8,6 @@ export 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;
 }
 //# sourceMappingURL=ForgottenSwitch.d.ts.map

package/dist/src/classes/features/other/ForgottenSwitch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ForgottenSwitch.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/ForgottenSwitch.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,qBAAa,eAAgB,SAAQ,OAAO;IAQ1C,OAAO,CAAC,UAAU,CAAa;IAW/B;;;;;OAKG;IAEI,eAAe,IAAI,IAAI;CAG/B"}
+{"version":3,"file":"ForgottenSwitch.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/ForgottenSwitch.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,qBAAa,eAAgB,SAAQ,OAAO;IAQ1C,OAAO,CAAC,UAAU,CAAa;IAW/B;;;;;OAKG;IAEI,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAGnD"}

package/dist/src/classes/features/other/ForgottenSwitch.lua

@@ -21,8 +21,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

package/dist/src/classes/features/other/PressInput.d.ts

@@ -9,6 +9,6 @@ export 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;
 }
 //# sourceMappingURL=PressInput.d.ts.map

package/dist/src/classes/features/other/PressInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PressInput.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PressInput.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,qBAAa,UAAW,SAAQ,OAAO;IAsBrC,OAAO,CAAC,iBAAiB,CAWvB;IAEF;;;;;;OAMG;IAEI,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;CAGpD"}
+{"version":3,"file":"PressInput.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PressInput.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,qBAAa,UAAW,SAAQ,OAAO;IAsBrC,OAAO,CAAC,iBAAiB,CA8BvB;IAEF;;;;;;OAMG;IAEI,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI;CAI1E"}

package/dist/src/classes/features/other/PressInput.lua

@@ -1,8 +1,7 @@
 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("isaac-typescript-definitions")
@@ -10,6 +9,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()
@@ -18,18 +19,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

package/package.json

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

package/src/classes/features/other/ForgottenSwitch.ts

@@ -30,7 +30,7 @@ export class ForgottenSwitch extends Feature {
    * In order to use this function, you must upgrade your mod with `ISCFeature.FORGOTTEN_SWITCH`.
    */
   @Exported
-  public forgottenSwitch(): void {
-    this.pressInput.pressInput(ButtonAction.DROP);
+  public forgottenSwitch(player: EntityPlayer): void {
+    this.pressInput.pressInput(player, ButtonAction.DROP);
   }
 }

package/src/classes/features/other/PressInput.ts

@@ -4,13 +4,15 @@ import {
   ModCallback,
 } from "isaac-typescript-definitions";
 import { Exported } from "../../../decorators";
+import { getPlayerIndex } from "../../../functions/playerIndex";
+import { PlayerIndex } from "../../../types/PlayerIndex";
 import { Feature } from "../../private/Feature";
 
 export class PressInput extends Feature {
   /** @internal */
   public override v = {
     run: {
-      pressButtonAction: new Set(),
+      buttonActionTuples: [] as Array<[PlayerIndex, ButtonAction]>,
     },
   };
 
@@ -29,16 +31,35 @@ export class PressInput extends Feature {
   // ModCallback.INPUT_ACTION (13)
   // InputHook.IS_ACTION_TRIGGERED (1)
   private isActionTriggered = (
-    _entity: Entity | undefined,
+    entity: Entity | undefined,
     _inputHook: InputHook,
     buttonAction: ButtonAction,
   ) => {
-    if (!this.v.run.pressButtonAction.has(buttonAction)) {
+    if (entity === undefined) {
       return undefined;
     }
 
-    this.v.run.pressButtonAction.delete(buttonAction);
-    return true;
+    const player = entity.ToPlayer();
+    if (player === undefined) {
+      return undefined;
+    }
+
+    const playerIndex = getPlayerIndex(player);
+
+    for (let i = this.v.run.buttonActionTuples.length - 1; i >= 0; i--) {
+      const tuple = this.v.run.buttonActionTuples[i]!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
+      const [tuplePlayerIndex, tupleButtonAction] = tuple;
+
+      if (
+        tuplePlayerIndex === playerIndex &&
+        tupleButtonAction === buttonAction
+      ) {
+        this.v.run.buttonActionTuples.splice(i);
+        return true;
+      }
+    }
+
+    return undefined;
   };
 
   /**
@@ -49,7 +70,8 @@ export class PressInput extends Feature {
    * In order to use this function, you must upgrade your mod with `ISCFeature.PRESS_INPUT`.
    */
   @Exported
-  public pressInput(buttonAction: ButtonAction): void {
-    this.v.run.pressButtonAction.add(buttonAction);
+  public pressInput(player: EntityPlayer, buttonAction: ButtonAction): void {
+    const playerIndex = getPlayerIndex(player);
+    this.v.run.buttonActionTuples.push([playerIndex, buttonAction]);
   }
 }