isaacscript-common 87.9.6 → 87.9.7

package/src/classes/callbacks/PostNewRoomEarly.ts

@@ -16,21 +16,6 @@ export class PostNewRoomEarly extends CustomCallback<ModCallbackCustom.POST_NEW_
   /** The wall entity directly to the right of the top-left wall. */
   private currentRoomTopLeftWallPtrHash2: PtrHash | null = null;
 
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 19
-      // eslint-disable-next-line @typescript-eslint/no-deprecated
-      [ModCallback.POST_NEW_ROOM, this.postNewRoom],
-
-      // 24
-      [ModCallback.PRE_ENTITY_SPAWN, this.preEntitySpawn],
-    ];
-  }
-
-  protected override shouldFire = shouldFireRoom;
-
   // ModCallback.POST_NEW_ROOM (19)
   private readonly postNewRoom = (): void => {
     this.checkRoomChanged();
@@ -44,13 +29,30 @@ export class PostNewRoomEarly extends CustomCallback<ModCallbackCustom.POST_NEW_
     return undefined;
   };
 
-  private checkRoomChanged(): void {
-    if (this.isNewRoom()) {
-      const room = game.GetRoom();
-      const roomType = room.GetType();
+  protected override shouldFire = shouldFireRoom;
 
-      this.fire(roomType);
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 19
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
+      [ModCallback.POST_NEW_ROOM, this.postNewRoom],
+
+      // 24
+      [ModCallback.PRE_ENTITY_SPAWN, this.preEntitySpawn],
+    ];
+  }
+
+  private checkRoomChanged(): void {
+    if (!this.isNewRoom()) {
+      return;
     }
+
+    const room = game.GetRoom();
+    const roomType = room.GetType();
+
+    this.fire(roomType);
   }
 
   private isNewRoom(): boolean {

package/src/classes/callbacks/PostNewRoomReordered.ts

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

package/src/classes/callbacks/PostPEffectUpdateReordered.ts

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

package/src/classes/callbacks/PostPickupChanged.ts

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

package/src/classes/callbacks/PostPickupCollect.ts

@@ -11,19 +11,6 @@ const v = {
 };
 
 export class PostPickupCollect extends CustomCallback<ModCallbackCustom.POST_PICKUP_COLLECT> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 36
-      [ModCallback.POST_PICKUP_RENDER, this.postPickupRender],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePickup;
-
   // ModCallback.POST_PICKUP_RENDER (36)
   private readonly postPickupRender = (pickup: EntityPickup) => {
     const sprite = pickup.GetSprite();
@@ -40,4 +27,17 @@ export class PostPickupCollect extends CustomCallback<ModCallbackCustom.POST_PIC
       this.fire(pickup, player);
     }
   };
+
+  public override v = v;
+
+  protected override shouldFire = shouldFirePickup;
+
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 36
+      [ModCallback.POST_PICKUP_RENDER, this.postPickupRender],
+    ];
+  }
 }

package/src/classes/callbacks/PostPickupInitFilter.ts

@@ -4,6 +4,13 @@ import { shouldFirePickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPickupInitFilter extends CustomCallback<ModCallbackCustom.POST_PICKUP_INIT_FILTER> {
+  // ModCallback.POST_PICKUP_INIT (34)
+  private readonly postPickupInit = (pickup: EntityPickup) => {
+    this.fire(pickup);
+  };
+
+  protected override shouldFire = shouldFirePickup;
+
   constructor() {
     super();
 
@@ -12,11 +19,4 @@ export class PostPickupInitFilter extends CustomCallback<ModCallbackCustom.POST_
       [ModCallback.POST_PICKUP_INIT, this.postPickupInit],
     ];
   }
-
-  protected override shouldFire = shouldFirePickup;
-
-  // ModCallback.POST_PICKUP_INIT (34)
-  private readonly postPickupInit = (pickup: EntityPickup) => {
-    this.fire(pickup);
-  };
 }

package/src/classes/callbacks/PostPickupInitFirst.ts

@@ -6,12 +6,25 @@ import { shouldFirePickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPickupInitFirst extends CustomCallback<ModCallbackCustom.POST_PICKUP_INIT_FIRST> {
+  // ModCallback.POST_PICKUP_INIT (34)
+  private readonly postPickupInit = (pickup: EntityPickup) => {
+    const roomVisitedCount = getRoomVisitedCount();
+
+    // The room visited count is not reset when re-entering a Treasure Room or Boss room in the
+    // Ascent.
+    if (roomVisitedCount === 0 || isAfterRoomFrame(0)) {
+      this.fire(pickup);
+    }
+  };
+
   public override v = {
     room: {
       firedSet: new Set<PtrHash>(),
     },
   };
 
+  protected override shouldFire = shouldFirePickup;
+
   constructor() {
     super();
 
@@ -20,17 +33,4 @@ export class PostPickupInitFirst extends CustomCallback<ModCallbackCustom.POST_P
       [ModCallback.POST_PICKUP_INIT, this.postPickupInit],
     ];
   }
-
-  protected override shouldFire = shouldFirePickup;
-
-  // ModCallback.POST_PICKUP_INIT (34)
-  private readonly postPickupInit = (pickup: EntityPickup) => {
-    const roomVisitedCount = getRoomVisitedCount();
-
-    // The room visited count is not reset when re-entering a Treasure Room or Boss room in the
-    // Ascent.
-    if (isAfterRoomFrame(0) || roomVisitedCount === 0) {
-      this.fire(pickup);
-    }
-  };
 }

package/src/classes/callbacks/PostPickupInitLate.ts

@@ -10,8 +10,19 @@ const v = {
 };
 
 export class PostPickupInitLate extends CustomCallback<ModCallbackCustom.POST_PICKUP_INIT_LATE> {
+  // ModCallback.POST_PICKUP_UPDATE (35)
+  private readonly postPickupUpdate = (pickup: EntityPickup) => {
+    const index = GetPtrHash(pickup);
+    if (!v.room.firedSet.has(index)) {
+      v.room.firedSet.add(index);
+      this.fire(pickup);
+    }
+  };
+
   public override v = v;
 
+  protected override shouldFire = shouldFirePickup;
+
   constructor() {
     super();
 
@@ -20,15 +31,4 @@ export class PostPickupInitLate extends CustomCallback<ModCallbackCustom.POST_PI
       [ModCallback.POST_PICKUP_UPDATE, this.postPickupUpdate],
     ];
   }
-
-  protected override shouldFire = shouldFirePickup;
-
-  // ModCallback.POST_PICKUP_UPDATE (35)
-  private readonly postPickupUpdate = (pickup: EntityPickup) => {
-    const index = GetPtrHash(pickup);
-    if (!v.room.firedSet.has(index)) {
-      v.room.firedSet.add(index);
-      this.fire(pickup);
-    }
-  };
 }

package/src/classes/callbacks/PostPickupRenderFilter.ts

@@ -4,6 +4,16 @@ import { shouldFirePickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPickupRenderFilter extends CustomCallback<ModCallbackCustom.POST_PICKUP_RENDER_FILTER> {
+  // ModCallback.POST_PICKUP_RENDER (36)
+  private readonly postPickupRender = (
+    pickup: EntityPickup,
+    renderOffset: Vector,
+  ) => {
+    this.fire(pickup, renderOffset);
+  };
+
+  protected override shouldFire = shouldFirePickup;
+
   constructor() {
     super();
 
@@ -12,14 +22,4 @@ export class PostPickupRenderFilter extends CustomCallback<ModCallbackCustom.POS
       [ModCallback.POST_PICKUP_RENDER, this.postPickupRender],
     ];
   }
-
-  protected override shouldFire = shouldFirePickup;
-
-  // ModCallback.POST_PICKUP_RENDER (36)
-  private readonly postPickupRender = (
-    pickup: EntityPickup,
-    renderOffset: Vector,
-  ) => {
-    this.fire(pickup, renderOffset);
-  };
 }

package/src/classes/callbacks/PostPickupSelectionFilter.ts

@@ -7,14 +7,12 @@ import { CustomCallback } from "../private/CustomCallback";
 type T = ModCallbackCustom.POST_PICKUP_SELECTION_FILTER;
 
 export class PostPickupSelectionFilter extends CustomCallback<T> {
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 37
-      [ModCallback.POST_PICKUP_SELECTION, this.postPickupSelection],
-    ];
-  }
+  // ModCallback.POST_PICKUP_SELECTION (37)
+  private readonly postPickupSelection = (
+    pickup: EntityPickup,
+    variant: PickupVariant,
+    subType: int,
+  ): [PickupVariant, int] | undefined => this.fire(pickup, variant, subType);
 
   /**
    * We cannot use the `shouldFirePickup` helper function because in the case of non-collectibles,
@@ -36,10 +34,12 @@ export class PostPickupSelectionFilter extends CustomCallback<T> {
     );
   };
 
-  // ModCallback.POST_PICKUP_SELECTION (37)
-  private readonly postPickupSelection = (
-    pickup: EntityPickup,
-    variant: PickupVariant,
-    subType: int,
-  ): [PickupVariant, int] | undefined => this.fire(pickup, variant, subType);
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 37
+      [ModCallback.POST_PICKUP_SELECTION, this.postPickupSelection],
+    ];
+  }
 }

package/src/classes/callbacks/PostPickupStateChanged.ts

@@ -11,19 +11,6 @@ const v = {
 };
 
 export class PostPickupStateChanged extends CustomCallback<ModCallbackCustom.POST_PICKUP_STATE_CHANGED> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 35
-      [ModCallback.POST_PICKUP_UPDATE, this.postPickupUpdate],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePickup;
-
   // ModCallback.POST_PICKUP_UPDATE (35)
   private readonly postPickupUpdate = (pickup: EntityPickup) => {
     const ptrHash = GetPtrHash(pickup);
@@ -38,4 +25,17 @@ export class PostPickupStateChanged extends CustomCallback<ModCallbackCustom.POS
       this.fire(pickup, previousState, currentState);
     }
   };
+
+  public override v = v;
+
+  protected override shouldFire = shouldFirePickup;
+
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 35
+      [ModCallback.POST_PICKUP_UPDATE, this.postPickupUpdate],
+    ];
+  }
 }

package/src/classes/callbacks/PostPickupUpdateFilter.ts

@@ -4,6 +4,13 @@ import { shouldFirePickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPickupUpdateFilter extends CustomCallback<ModCallbackCustom.POST_PICKUP_UPDATE_FILTER> {
+  // ModCallback.POST_PICKUP_UPDATE (35)
+  private readonly postPickupUpdate = (pickup: EntityPickup) => {
+    this.fire(pickup);
+  };
+
+  protected override shouldFire = shouldFirePickup;
+
   constructor() {
     super();
 
@@ -12,11 +19,4 @@ export class PostPickupUpdateFilter extends CustomCallback<ModCallbackCustom.POS
       [ModCallback.POST_PICKUP_UPDATE, this.postPickupUpdate],
     ];
   }
-
-  protected override shouldFire = shouldFirePickup;
-
-  // ModCallback.POST_PICKUP_UPDATE (35)
-  private readonly postPickupUpdate = (pickup: EntityPickup) => {
-    this.fire(pickup);
-  };
 }

package/src/classes/callbacks/PostPitRender.ts

@@ -5,6 +5,15 @@ import { shouldFirePit } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPitRender extends CustomCallback<ModCallbackCustom.POST_PIT_RENDER> {
+  // ModCallback.POST_RENDER (2)
+  private readonly postRender = (): void => {
+    for (const pit of getPits()) {
+      this.fire(pit);
+    }
+  };
+
+  protected override shouldFire = shouldFirePit;
+
   constructor() {
     super();
 
@@ -13,13 +22,4 @@ export class PostPitRender extends CustomCallback<ModCallbackCustom.POST_PIT_REN
       [ModCallback.POST_RENDER, this.postRender],
     ];
   }
-
-  protected override shouldFire = shouldFirePit;
-
-  // ModCallback.POST_RENDER (2)
-  private readonly postRender = (): void => {
-    for (const pit of getPits()) {
-      this.fire(pit);
-    }
-  };
 }

package/src/classes/callbacks/PostPitUpdate.ts

@@ -5,6 +5,15 @@ import { shouldFirePit } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPitUpdate extends CustomCallback<ModCallbackCustom.POST_PIT_UPDATE> {
+  // ModCallback.POST_UPDATE (1)
+  private readonly postUpdate = (): void => {
+    for (const pit of getPits()) {
+      this.fire(pit);
+    }
+  };
+
+  protected override shouldFire = shouldFirePit;
+
   constructor() {
     super();
 
@@ -13,13 +22,4 @@ export class PostPitUpdate extends CustomCallback<ModCallbackCustom.POST_PIT_UPD
       [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
-
-  protected override shouldFire = shouldFirePit;
-
-  // ModCallback.POST_UPDATE (1)
-  private readonly postUpdate = (): void => {
-    for (const pit of getPits()) {
-      this.fire(pit);
-    }
-  };
 }

package/src/classes/callbacks/PostPlayerChangeHealth.ts

@@ -17,21 +17,6 @@ const v = {
 };
 
 export class PostPlayerChangeHealth extends CustomCallback<ModCallbackCustom.POST_PLAYER_CHANGE_HEALTH> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.customCallbacksUsed = [
-      [
-        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        this.postPEffectReordered,
-      ],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePlayer;
-
   // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
   private readonly postPEffectReordered = (player: EntityPlayer) => {
     // We call the "getPlayerIndex" function with the "differentiateForgottenAndSoul" argument. If
@@ -61,4 +46,19 @@ export class PostPlayerChangeHealth extends CustomCallback<ModCallbackCustom.POS
       }
     }
   };
+
+  public override v = v;
+
+  protected override shouldFire = shouldFirePlayer;
+
+  constructor() {
+    super();
+
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectReordered,
+      ],
+    ];
+  }
 }

package/src/classes/callbacks/PostPlayerChangeStat.ts

@@ -23,21 +23,6 @@ const v = {
 };
 
 export class PostPlayerChangeStat extends CustomCallback<ModCallbackCustom.POST_PLAYER_CHANGE_STAT> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.customCallbacksUsed = [
-      [
-        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        this.postPEffectReordered,
-      ],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePlayer;
-
   // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
   private readonly postPEffectReordered = (player: EntityPlayer) => {
     // We call the "getPlayerIndex" function with the "differentiateForgottenAndSoul" argument. If
@@ -71,6 +56,21 @@ export class PostPlayerChangeStat extends CustomCallback<ModCallbackCustom.POST_
       }
     }
   };
+
+  public override v = v;
+
+  protected override shouldFire = shouldFirePlayer;
+
+  constructor() {
+    super();
+
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectReordered,
+      ],
+    ];
+  }
 }
 
 function statEquals(

package/src/classes/callbacks/PostPlayerChangeType.ts

@@ -20,21 +20,6 @@ const v = {
 };
 
 export class PostPlayerChangeType extends CustomCallback<ModCallbackCustom.POST_PLAYER_CHANGE_TYPE> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.customCallbacksUsed = [
-      [
-        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        this.postPEffectReordered,
-      ],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePlayer;
-
   // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
   private readonly postPEffectReordered = (player: EntityPlayer) => {
     const character = player.GetPlayerType();
@@ -48,4 +33,19 @@ export class PostPlayerChangeType extends CustomCallback<ModCallbackCustom.POST_
       this.fire(player, storedCharacter, character);
     }
   };
+
+  public override v = v;
+
+  protected override shouldFire = shouldFirePlayer;
+
+  constructor() {
+    super();
+
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectReordered,
+      ],
+    ];
+  }
 }

package/src/classes/callbacks/PostPlayerCollectibleAdded.ts

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

package/src/classes/callbacks/PostPlayerCollectibleRemoved.ts

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

package/src/classes/callbacks/PostPlayerFatalDamage.ts

@@ -31,23 +31,6 @@ const v = {
 };
 
 export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE> {
-  public override v = v;
-
-  constructor() {
-    super();
-
-    this.callbacksUsed = [
-      // 23
-      [ModCallback.PRE_USE_ITEM, this.preUseItemBible, [CollectibleType.BIBLE]],
-    ];
-
-    this.customCallbacksUsed = [
-      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePlayer;
-
   /**
    * Using The Bible on Satan is one of the few ways to die without taking damage, so we need to
    * handle this case.
@@ -135,4 +118,21 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
 
     return undefined;
   };
+
+  public override v = v;
+
+  protected override shouldFire = shouldFirePlayer;
+
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 23
+      [ModCallback.PRE_USE_ITEM, this.preUseItemBible, [CollectibleType.BIBLE]],
+    ];
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
+    ];
+  }
 }

package/src/classes/callbacks/PostPlayerInitFirst.ts

@@ -5,17 +5,6 @@ import { shouldFirePlayer } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
 
 export class PostPlayerInitFirst extends CustomCallback<ModCallbackCustom.POST_PLAYER_INIT_FIRST> {
-  constructor() {
-    super();
-
-    this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
-      [ModCallbackCustom.POST_PLAYER_INIT_LATE, this.postPlayerInitLate],
-    ];
-  }
-
-  protected override shouldFire = shouldFirePlayer;
-
   // ModCallbackCustom.POST_NEW_ROOM_REORDERED
   private readonly postNewRoomReordered = () => {
     // When a player uses the Genesis collectible, they will lose all of their collectibles,
@@ -40,4 +29,15 @@ export class PostPlayerInitFirst extends CustomCallback<ModCallbackCustom.POST_P
 
     this.fire(player);
   };
+
+  protected override shouldFire = shouldFirePlayer;
+
+  constructor() {
+    super();
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
+      [ModCallbackCustom.POST_PLAYER_INIT_LATE, this.postPlayerInitLate],
+    ];
+  }
 }