isaacscript-common 87.9.6 → 87.9.7

package/src/classes/callbacks/PreGetPedestal.ts

@@ -8,21 +8,6 @@ import { shouldFirePlayer } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreGetPedestal extends CustomCallback<ModCallbackCustom.PRE_GET_PEDESTAL> {
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 38
-      [
-        ModCallback.PRE_PICKUP_COLLISION,
-        this.prePickupCollision,
-        [PickupVariant.COLLECTIBLE],
-      ],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePlayer;
-
   // ModCallback.PRE_PICKUP_COLLISION (35)
   private readonly prePickupCollision = (
     pickup: EntityPickup,
@@ -58,4 +43,19 @@ export class PreGetPedestal extends CustomCallback<ModCallbackCustom.PRE_GET_PED
 
     return this.fire(player, collectible);
   };
+
+  protected override shouldFire = shouldFirePlayer;
+
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 38
+      [
+        ModCallback.PRE_PICKUP_COLLISION,
+        this.prePickupCollision,
+        [PickupVariant.COLLECTIBLE],
+      ],
+    ];
+  }
 }

package/src/classes/callbacks/PreItemPickup.ts

@@ -4,11 +4,10 @@ import { shouldFireItemPickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreItemPickup extends CustomCallback<ModCallbackCustom.PRE_ITEM_PICKUP> {
+  protected override shouldFire = shouldFireItemPickup;
   constructor() {
     super();
 
     this.featuresUsed = [ISCFeature.ITEM_PICKUP_DETECTION];
   }
-
-  protected override shouldFire = shouldFireItemPickup;
 }

package/src/classes/callbacks/PreKnifeCollisionFilter.ts

@@ -4,6 +4,15 @@ import { shouldFireKnife } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreKnifeCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_KNIFE_COLLISION_FILTER> {
+  // ModCallback.PRE_KNIFE_COLLISION (53)
+  private readonly preKnifeCollision = (
+    knife: EntityKnife,
+    collider: Entity,
+    low: boolean,
+  ): boolean | undefined => this.fire(knife, collider, low);
+
+  protected override shouldFire = shouldFireKnife;
+
   constructor() {
     super();
 
@@ -12,13 +21,4 @@ export class PreKnifeCollisionFilter extends CustomCallback<ModCallbackCustom.PR
       [ModCallback.PRE_KNIFE_COLLISION, this.preKnifeCollision],
     ];
   }
-
-  protected override shouldFire = shouldFireKnife;
-
-  // ModCallback.PRE_KNIFE_COLLISION (53)
-  private readonly preKnifeCollision = (
-    knife: EntityKnife,
-    collider: Entity,
-    low: boolean,
-  ): boolean | undefined => this.fire(knife, collider, low);
 }

package/src/classes/callbacks/PreNPCCollisionFilter.ts

@@ -4,6 +4,15 @@ import { shouldFireNPC } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreNPCCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_NPC_COLLISION_FILTER> {
+  // ModCallback.PRE_NPC_COLLISION (30)
+  private readonly preNPCCollision = (
+    npc: EntityNPC,
+    collider: Entity,
+    low: boolean,
+  ) => this.fire(npc, collider, low);
+
+  protected override shouldFire = shouldFireNPC;
+
   constructor() {
     super();
 
@@ -12,13 +21,4 @@ export class PreNPCCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_
       [ModCallback.PRE_NPC_COLLISION, this.preNPCCollision],
     ];
   }
-
-  protected override shouldFire = shouldFireNPC;
-
-  // ModCallback.PRE_NPC_COLLISION (30)
-  private readonly preNPCCollision = (
-    npc: EntityNPC,
-    collider: Entity,
-    low: boolean,
-  ) => this.fire(npc, collider, low);
 }

package/src/classes/callbacks/PreNPCUpdateFilter.ts

@@ -4,6 +4,10 @@ import { shouldFireNPC } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreNPCUpdateFilter extends CustomCallback<ModCallbackCustom.PRE_NPC_UPDATE_FILTER> {
+  // ModCallback.PRE_NPC_UPDATE (69)
+  private readonly preNPCUpdate = (npc: EntityNPC) => this.fire(npc);
+  protected override shouldFire = shouldFireNPC;
+
   constructor() {
     super();
 
@@ -12,9 +16,4 @@ export class PreNPCUpdateFilter extends CustomCallback<ModCallbackCustom.PRE_NPC
       [ModCallback.PRE_NPC_UPDATE, this.preNPCUpdate],
     ];
   }
-
-  protected override shouldFire = shouldFireNPC;
-
-  // ModCallback.PRE_NPC_UPDATE (69)
-  private readonly preNPCUpdate = (npc: EntityNPC) => this.fire(npc);
 }

package/src/classes/callbacks/PreNewLevel.ts

@@ -16,19 +16,6 @@ const v = {
 };
 
 export class PreNewLevel extends CustomCallback<ModCallbackCustom.PRE_NEW_LEVEL> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.customCallbacksUsed = [
-      [
-        ModCallbackCustom.POST_PLAYER_RENDER_REORDERED,
-        this.postPlayerRenderReordered,
-      ],
-    ];
-  }
-
   // ModCallbackCustom.POST_PLAYER_RENDER_REORDERED
   private readonly postPlayerRenderReordered = (player: EntityPlayer) => {
     const effectiveStage = getEffectiveStage();
@@ -52,4 +39,17 @@ export class PreNewLevel extends CustomCallback<ModCallbackCustom.PRE_NEW_LEVEL>
       this.fire(player);
     }
   };
+
+  public override v = v;
+
+  constructor() {
+    super();
+
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PLAYER_RENDER_REORDERED,
+        this.postPlayerRenderReordered,
+      ],
+    ];
+  }
 }

package/src/classes/callbacks/PreProjectileCollisionFilter.ts

@@ -4,6 +4,15 @@ import { shouldFireProjectile } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreProjectileCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_PROJECTILE_COLLISION_FILTER> {
+  // ModCallback.PRE_PROJECTILE_COLLISION (46)
+  private readonly preProjectileCollision = (
+    projectile: EntityProjectile,
+    collider: Entity,
+    low: boolean,
+  ): boolean | undefined => this.fire(projectile, collider, low);
+
+  protected override shouldFire = shouldFireProjectile;
+
   constructor() {
     super();
 
@@ -12,13 +21,4 @@ export class PreProjectileCollisionFilter extends CustomCallback<ModCallbackCust
       [ModCallback.PRE_PROJECTILE_COLLISION, this.preProjectileCollision],
     ];
   }
-
-  protected override shouldFire = shouldFireProjectile;
-
-  // ModCallback.PRE_PROJECTILE_COLLISION (46)
-  private readonly preProjectileCollision = (
-    projectile: EntityProjectile,
-    collider: Entity,
-    low: boolean,
-  ): boolean | undefined => this.fire(projectile, collider, low);
 }

package/src/classes/callbacks/PreRoomEntitySpawnFilter.ts

@@ -10,14 +10,21 @@ import { CustomCallback } from "../private/CustomCallback";
 type T = ModCallbackCustom.PRE_ROOM_ENTITY_SPAWN_FILTER;
 
 export class PreRoomEntitySpawnFilter extends CustomCallback<T> {
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 71
-      [ModCallback.PRE_ROOM_ENTITY_SPAWN, this.preRoomEntitySpawn],
-    ];
-  }
+  // ModCallback.PRE_ROOM_ENTITY_SPAWN (71)
+  private readonly preRoomEntitySpawn = (
+    entityTypeOrGridEntityXMLType: EntityType | GridEntityXMLType,
+    variant: int,
+    subType: int,
+    gridIndex: int,
+    initSeed: Seed,
+  ) =>
+    this.fire(
+      entityTypeOrGridEntityXMLType,
+      variant,
+      subType,
+      gridIndex,
+      initSeed,
+    );
 
   protected override shouldFire = (
     fireArgs: FireArgs<T>,
@@ -39,19 +46,12 @@ export class PreRoomEntitySpawnFilter extends CustomCallback<T> {
     );
   };
 
-  // ModCallback.PRE_ROOM_ENTITY_SPAWN (71)
-  private readonly preRoomEntitySpawn = (
-    entityTypeOrGridEntityXMLType: EntityType | GridEntityXMLType,
-    variant: int,
-    subType: int,
-    gridIndex: int,
-    initSeed: Seed,
-  ) =>
-    this.fire(
-      entityTypeOrGridEntityXMLType,
-      variant,
-      subType,
-      gridIndex,
-      initSeed,
-    );
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 71
+      [ModCallback.PRE_ROOM_ENTITY_SPAWN, this.preRoomEntitySpawn],
+    ];
+  }
 }

package/src/classes/callbacks/PreTearCollisionFilter.ts

@@ -4,6 +4,15 @@ import { shouldFireTear } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PreTearCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_TEAR_COLLISION_FILTER> {
+  // ModCallback.PRE_TEAR_COLLISION (42)
+  private readonly preTearCollision = (
+    tear: EntityTear,
+    collider: Entity,
+    low: boolean,
+  ): boolean | undefined => this.fire(tear, collider, low);
+
+  protected override shouldFire = shouldFireTear;
+
   constructor() {
     super();
 
@@ -12,13 +21,4 @@ export class PreTearCollisionFilter extends CustomCallback<ModCallbackCustom.PRE
       [ModCallback.PRE_TEAR_COLLISION, this.preTearCollision],
     ];
   }
-
-  protected override shouldFire = shouldFireTear;
-
-  // ModCallback.PRE_TEAR_COLLISION (42)
-  private readonly preTearCollision = (
-    tear: EntityTear,
-    collider: Entity,
-    low: boolean,
-  ): boolean | undefined => this.fire(tear, collider, low);
 }

package/src/classes/features/callbackLogic/CustomGridEntities.ts

@@ -38,33 +38,8 @@ const v = {
 };
 
 export class CustomGridEntities extends Feature {
-  /** @internal */
-  public override v = v;
-
   private readonly runInNFrames: RunInNFrames;
 
-  /** @internal */
-  constructor(runInNFrames: RunInNFrames) {
-    super();
-
-    this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
-
-    this.callbacksUsed = [
-      // 23
-      [
-        ModCallback.PRE_USE_ITEM,
-        this.preUseItemWeNeedToGoDeeper,
-        [CollectibleType.WE_NEED_TO_GO_DEEPER],
-      ],
-    ];
-
-    this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
-    ];
-
-    this.runInNFrames = runInNFrames;
-  }
-
   // ModCallback.PRE_USE_ITEM (23)
   // CollectibleType.WE_NEED_TO_GO_DEEPER (84)
   private readonly preUseItemWeNeedToGoDeeper = (
@@ -145,6 +120,31 @@ export class CustomGridEntities extends Feature {
     }
   };
 
+  /** @internal */
+  public override v = v;
+
+  /** @internal */
+  constructor(runInNFrames: RunInNFrames) {
+    super();
+
+    this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
+
+    this.callbacksUsed = [
+      // 23
+      [
+        ModCallback.PRE_USE_ITEM,
+        this.preUseItemWeNeedToGoDeeper,
+        [CollectibleType.WE_NEED_TO_GO_DEEPER],
+      ],
+    ];
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
+    ];
+
+    this.runInNFrames = runInNFrames;
+  }
+
   /**
    * Helper function to spawn a custom grid entity. Custom grid entities are persistent in that they
    * will reappear if the player leaves and re-enters the room. (It will be manually respawned in
@@ -367,7 +367,10 @@ export class CustomGridEntities extends Feature {
     for (const [gridIndex, data] of roomCustomGridEntities) {
       const gridEntity = room.GetGridEntity(gridIndex);
       if (gridEntity !== undefined) {
-        customGridEntities.push({ gridEntity, data });
+        customGridEntities.push({
+          gridEntity,
+          data,
+        });
       }
     }
 

package/src/classes/features/callbackLogic/CustomRevive.ts

@@ -44,48 +44,10 @@ const v = {
 };
 
 export class CustomRevive extends Feature {
-  public override v = v;
-
   private readonly preCustomRevive: PreCustomRevive;
   private readonly postCustomRevive: PostCustomRevive;
   private readonly runInNFrames: RunInNFrames;
 
-  constructor(
-    preCustomRevive: PreCustomRevive,
-    postCustomRevive: PostCustomRevive,
-    runInNFrames: RunInNFrames,
-  ) {
-    super();
-
-    this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
-
-    this.callbacksUsed = [
-      // 2
-      [ModCallback.POST_RENDER, this.postRender],
-
-      // 7
-      [
-        ModCallback.POST_FAMILIAR_INIT,
-        this.postFamiliarInitOneUp,
-        [FamiliarVariant.ONE_UP],
-      ],
-    ];
-
-    this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
-      [
-        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        this.postPEffectUpdateReordered,
-      ],
-      [ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, this.postPlayerFatalDamage],
-      [ModCallbackCustom.PRE_BERSERK_DEATH, this.preBerserkDeath],
-    ];
-
-    this.preCustomRevive = preCustomRevive;
-    this.postCustomRevive = postCustomRevive;
-    this.runInNFrames = runInNFrames;
-  }
-
   // ModCallback.POST_RENDER (2)
   private readonly postRender = (): void => {
     if (v.run.state !== CustomReviveState.WAITING_FOR_ITEM_ANIMATION) {
@@ -124,6 +86,57 @@ export class CustomRevive extends Feature {
     this.checkWaitingForItemAnimation(player);
   };
 
+  // ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE
+  private readonly postPlayerFatalDamage = (
+    player: EntityPlayer,
+  ): boolean | undefined => {
+    this.playerIsAboutToDie(player);
+    return undefined;
+  };
+
+  // ModCallbackCustom.PRE_BERSERK_DEATH
+  private readonly preBerserkDeath = (player: EntityPlayer): void => {
+    this.playerIsAboutToDie(player);
+  };
+
+  public override v = v;
+
+  constructor(
+    preCustomRevive: PreCustomRevive,
+    postCustomRevive: PostCustomRevive,
+    runInNFrames: RunInNFrames,
+  ) {
+    super();
+
+    this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
+
+    this.callbacksUsed = [
+      // 2
+      [ModCallback.POST_RENDER, this.postRender],
+
+      // 7
+      [
+        ModCallback.POST_FAMILIAR_INIT,
+        this.postFamiliarInitOneUp,
+        [FamiliarVariant.ONE_UP],
+      ],
+    ];
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
+      [
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectUpdateReordered,
+      ],
+      [ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, this.postPlayerFatalDamage],
+      [ModCallbackCustom.PRE_BERSERK_DEATH, this.preBerserkDeath],
+    ];
+
+    this.preCustomRevive = preCustomRevive;
+    this.postCustomRevive = postCustomRevive;
+    this.runInNFrames = runInNFrames;
+  }
+
   private checkWaitingForItemAnimation(player: EntityPlayer): void {
     if (v.run.state !== CustomReviveState.WAITING_FOR_ITEM_ANIMATION) {
       return;
@@ -165,19 +178,6 @@ export class CustomRevive extends Feature {
     this.logStateChanged();
   }
 
-  // ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE
-  private readonly postPlayerFatalDamage = (
-    player: EntityPlayer,
-  ): boolean | undefined => {
-    this.playerIsAboutToDie(player);
-    return undefined;
-  };
-
-  // ModCallbackCustom.PRE_BERSERK_DEATH
-  private readonly preBerserkDeath = (player: EntityPlayer): void => {
-    this.playerIsAboutToDie(player);
-  };
-
   /**
    * The player is about to die, which will immediately delete the save data for the run. To prevent
    * this from happening, we grant the 1-Up item.

package/src/classes/features/callbackLogic/EsauJrDetection.ts

@@ -15,30 +15,9 @@ const v = {
 };
 
 export class EsauJrDetection extends Feature {
-  public override v = v;
-
   private readonly postEsauJr: PostEsauJr;
   private readonly postFirstEsauJr: PostFirstEsauJr;
 
-  constructor(postEsauJr: PostEsauJr, postFirstEsauJr: PostFirstEsauJr) {
-    super();
-
-    this.callbacksUsed = [
-      // 1
-      [ModCallback.POST_UPDATE, this.postUpdate],
-
-      // 3
-      [
-        ModCallback.POST_USE_ITEM,
-        this.postUseItemEsauJr,
-        [CollectibleType.ESAU_JR],
-      ],
-    ];
-
-    this.postEsauJr = postEsauJr;
-    this.postFirstEsauJr = postFirstEsauJr;
-  }
-
   // ModCallback.POST_UPDATE (1)
   private readonly postUpdate = (): void => {
     const gameFrameCount = game.GetFrameCount();
@@ -93,4 +72,25 @@ export class EsauJrDetection extends Feature {
 
     return undefined;
   };
+
+  public override v = v;
+
+  constructor(postEsauJr: PostEsauJr, postFirstEsauJr: PostFirstEsauJr) {
+    super();
+
+    this.callbacksUsed = [
+      // 1
+      [ModCallback.POST_UPDATE, this.postUpdate],
+
+      // 3
+      [
+        ModCallback.POST_USE_ITEM,
+        this.postUseItemEsauJr,
+        [CollectibleType.ESAU_JR],
+      ],
+    ];
+
+    this.postEsauJr = postEsauJr;
+    this.postFirstEsauJr = postFirstEsauJr;
+  }
 }

package/src/classes/features/callbackLogic/FlipDetection.ts

@@ -17,23 +17,9 @@ const v = {
 };
 
 export class FlipDetection extends Feature {
-  public override v = v;
-
   private readonly postFlip: PostFlip;
   private readonly postFirstFlip: PostFirstFlip;
 
-  constructor(postFlip: PostFlip, postFirstFlip: PostFirstFlip) {
-    super();
-
-    this.callbacksUsed = [
-      // 3
-      [ModCallback.POST_USE_ITEM, this.postUseItemFlip, [CollectibleType.FLIP]],
-    ];
-
-    this.postFlip = postFlip;
-    this.postFirstFlip = postFirstFlip;
-  }
-
   // ModCallback.POST_USE_ITEM (3)
   // CollectibleType.FLIP (711)
   private readonly postUseItemFlip = (
@@ -64,6 +50,20 @@ export class FlipDetection extends Feature {
 
     return undefined;
   };
+
+  public override v = v;
+
+  constructor(postFlip: PostFlip, postFirstFlip: PostFirstFlip) {
+    super();
+
+    this.callbacksUsed = [
+      // 3
+      [ModCallback.POST_USE_ITEM, this.postUseItemFlip, [CollectibleType.FLIP]],
+    ];
+
+    this.postFlip = postFlip;
+    this.postFirstFlip = postFirstFlip;
+  }
 }
 
 function getNewLazarus(oldLazarus: EntityPlayer): EntityPlayer | undefined {