isaacscript-common 18.1.0 → 18.2.0

package/src/classes/callbacks/PostDiceRoomActivated.ts

@@ -25,10 +25,11 @@ export class PostDiceRoomActivated extends CustomCallback<T> {
     super();
 
     this.callbacksUsed = [
+      // 55
       [
         ModCallback.POST_EFFECT_UPDATE,
         [this.postEffectUpdateDiceFloor, EffectVariant.DICE_FLOOR],
-      ], // 55
+      ],
     ];
   }
 

package/src/classes/callbacks/PostDoorRender.ts

@@ -8,7 +8,10 @@ export class PostDoorRender extends CustomCallback<ModCallbackCustom.POST_DOOR_R
   constructor() {
     super();
 
-    this.callbacksUsed = [[ModCallback.POST_RENDER, [this.postRender]]]; // 2
+    this.callbacksUsed = [
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
+    ];
   }
 
   protected override shouldFire = shouldFireDoor;

package/src/classes/callbacks/PostDoorUpdate.ts

@@ -8,7 +8,10 @@ export class PostDoorUpdate extends CustomCallback<ModCallbackCustom.POST_DOOR_U
   constructor() {
     super();
 
-    this.callbacksUsed = [[ModCallback.POST_UPDATE, [this.postUpdate]]]; // 1
+    this.callbacksUsed = [
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
+    ];
   }
 
   protected override shouldFire = shouldFireDoor;

package/src/classes/callbacks/PostEffectInitLate.ts

@@ -14,8 +14,9 @@ export class PostEffectInitLate extends CustomCallback<ModCallbackCustom.POST_EF
     super();
 
     this.callbacksUsed = [
+      // 55
       [ModCallback.POST_EFFECT_UPDATE, [this.postEffectUpdate]],
-    ]; // 55
+    ];
   }
 
   protected override shouldFire = shouldFireEffect;

package/src/classes/callbacks/PostEffectStateChanged.ts

@@ -15,8 +15,9 @@ export class PostEffectStateChanged extends CustomCallback<ModCallbackCustom.POS
     super();
 
     this.callbacksUsed = [
+      // 55
       [ModCallback.POST_EFFECT_UPDATE, [this.postEffectUpdate]],
-    ]; // 55
+    ];
   }
 
   protected override shouldFire = shouldFireEffect;

package/src/classes/callbacks/PostFamiliarInitLate.ts

@@ -14,8 +14,9 @@ export class PostFamiliarInitLate extends CustomCallback<ModCallbackCustom.POST_
     super();
 
     this.callbacksUsed = [
+      // 6
       [ModCallback.POST_FAMILIAR_UPDATE, [this.postFamiliarUpdate]],
-    ]; // 6
+    ];
   }
 
   protected override shouldFire = shouldFireFamiliar;

package/src/classes/callbacks/PostFamiliarStateChanged.ts

@@ -15,8 +15,9 @@ export class PostFamiliarStateChanged extends CustomCallback<ModCallbackCustom.P
     super();
 
     this.callbacksUsed = [
+      // 6
       [ModCallback.POST_FAMILIAR_UPDATE, [this.postFamiliarUpdate]],
-    ]; // 6
+    ];
   }
 
   protected override shouldFire = shouldFireFamiliar;

package/src/classes/callbacks/PostGreedModeWave.ts

@@ -15,7 +15,8 @@ export class PostGreedModeWave extends CustomCallback<ModCallbackCustom.POST_GRE
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostItemDischarge.ts

@@ -52,10 +52,11 @@ export class PostItemDischarge extends CustomCallback<T> {
     super();
 
     this.callbacksUsed = [
+      // 30
       [
         ModCallback.PRE_NPC_COLLISION,
         [this.preNPCCollisionSucker, EntityType.SUCKER],
-      ], // 30
+      ],
     ];
 
     this.customCallbacksUsed = [

package/src/classes/callbacks/PostKnifeInitLate.ts

@@ -14,7 +14,8 @@ export class PostKnifeInitLate extends CustomCallback<ModCallbackCustom.POST_KNI
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_KNIFE_UPDATE, [this.postKnifeUpdate]], // 51
+      // 51
+      [ModCallback.POST_KNIFE_UPDATE, [this.postKnifeUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostLaserInitLate.ts

@@ -14,7 +14,8 @@ export class PostLaserInitLate extends CustomCallback<ModCallbackCustom.POST_LAS
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_LASER_UPDATE, [this.postLaserUpdate]], // 51
+      // 48
+      [ModCallback.POST_LASER_UPDATE, [this.postLaserUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostNPCDeathFilter.ts

@@ -8,14 +8,15 @@ export class PostNPCDeathFilter extends CustomCallback<ModCallbackCustom.POST_NP
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NPC_DEATH, [this.postNPCRender]], // 29
+      // 29
+      [ModCallback.POST_NPC_DEATH, [this.postNPCDeath]],
     ];
   }
 
   protected override shouldFire = shouldFireNPC;
 
   // ModCallback.POST_NPC_DEATH (29)
-  private postNPCRender = (npc: EntityNPC) => {
+  private postNPCDeath = (npc: EntityNPC) => {
     this.fire(npc);
   };
 }

package/src/classes/callbacks/PostNPCInitFilter.ts

@@ -8,7 +8,8 @@ export class PostNPCInitFilter extends CustomCallback<ModCallbackCustom.POST_NPC
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NPC_INIT, [this.postNPCInit]], // 27
+      // 27
+      [ModCallback.POST_NPC_INIT, [this.postNPCInit]],
     ];
   }
 

package/src/classes/callbacks/PostNPCInitLate.ts

@@ -14,7 +14,8 @@ export class PostNPCInitLate extends CustomCallback<ModCallbackCustom.POST_NPC_I
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NPC_UPDATE, [this.postNPCUpdate]], // 0
+      // 0
+      [ModCallback.POST_NPC_UPDATE, [this.postNPCUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostNPCRenderFilter.ts

@@ -8,7 +8,8 @@ export class PostNPCRenderFilter extends CustomCallback<ModCallbackCustom.POST_N
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NPC_RENDER, [this.postNPCRender]], // 28
+      // 28
+      [ModCallback.POST_NPC_RENDER, [this.postNPCRender]],
     ];
   }
 

package/src/classes/callbacks/PostNPCStateChanged.ts

@@ -17,7 +17,8 @@ export class PostNPCStateChanged extends CustomCallback<ModCallbackCustom.POST_N
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NPC_UPDATE, [this.postNPCUpdate]], // 0
+      // 0
+      [ModCallback.POST_NPC_UPDATE, [this.postNPCUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostNPCUpdateFilter.ts

@@ -8,7 +8,8 @@ export class PostNPCUpdateFilter extends CustomCallback<ModCallbackCustom.POST_N
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NPC_UPDATE, [this.postNPCUpdate]], // 0
+      // 0
+      [ModCallback.POST_NPC_UPDATE, [this.postNPCUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostNewRoomEarly.ts

@@ -22,8 +22,11 @@ export class PostNewRoomEarly extends CustomCallback<ModCallbackCustom.POST_NEW_
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_NEW_ROOM, [this.postNewRoom]], // 19
-      [ModCallback.PRE_ENTITY_SPAWN, [this.preEntitySpawn]], // 24
+      // 19
+      [ModCallback.POST_NEW_ROOM, [this.postNewRoom]],
+
+      // 24
+      [ModCallback.PRE_ENTITY_SPAWN, [this.preEntitySpawn]],
     ];
   }
 

package/src/classes/callbacks/PostPickupCollect.ts

@@ -15,7 +15,8 @@ export class PostPickupCollect extends CustomCallback<ModCallbackCustom.POST_PIC
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_PICKUP_RENDER, [this.postPickupRender]], // 36
+      // 36
+      [ModCallback.POST_PICKUP_RENDER, [this.postPickupRender]],
     ];
   }
 

package/src/classes/callbacks/PostPickupInitFirst.ts

@@ -16,7 +16,8 @@ export class PostPickupInitFirst extends CustomCallback<ModCallbackCustom.POST_P
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_PICKUP_INIT, [this.postPickupInit]], // 34
+      // 34
+      [ModCallback.POST_PICKUP_INIT, [this.postPickupInit]],
     ];
   }
 

package/src/classes/callbacks/PostPickupInitLate.ts

@@ -14,7 +14,8 @@ export class PostPickupInitLate extends CustomCallback<ModCallbackCustom.POST_PI
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_PICKUP_UPDATE, [this.postPickupUpdate]], // 35
+      // 35
+      [ModCallback.POST_PICKUP_UPDATE, [this.postPickupUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostPickupStateChanged.ts

@@ -15,7 +15,8 @@ export class PostPickupStateChanged extends CustomCallback<ModCallbackCustom.POS
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_PICKUP_UPDATE, [this.postPickupUpdate]], // 35
+      // 35
+      [ModCallback.POST_PICKUP_UPDATE, [this.postPickupUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostPitRender.ts

@@ -9,7 +9,8 @@ export class PostPitRender extends CustomCallback<ModCallbackCustom.POST_PIT_REN
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
     ];
   }
 

package/src/classes/callbacks/PostPitUpdate.ts

@@ -9,7 +9,8 @@ export class PostPitUpdate extends CustomCallback<ModCallbackCustom.POST_PIT_UPD
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostPlayerFatalDamage.ts

@@ -36,11 +36,14 @@ export class PostPlayerFatalDamage extends CustomCallback<ModCallbackCustom.POST
     super();
 
     this.callbacksUsed = [
+      // 11
       [
         ModCallback.ENTITY_TAKE_DMG,
         [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ], // 11
-      [ModCallback.PRE_USE_ITEM, [this.preUseItemBible, CollectibleType.BIBLE]], // 23
+      ],
+
+      // 23
+      [ModCallback.PRE_USE_ITEM, [this.preUseItemBible, CollectibleType.BIBLE]],
     ];
   }
 

package/src/classes/callbacks/PostPoopRender.ts

@@ -9,7 +9,8 @@ export class PostPoopRender extends CustomCallback<ModCallbackCustom.POST_POOP_R
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
     ];
   }
 

package/src/classes/callbacks/PostPoopUpdate.ts

@@ -9,7 +9,8 @@ export class PostPoopUpdate extends CustomCallback<ModCallbackCustom.POST_POOP_U
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostPressurePlateRender.ts

@@ -9,7 +9,8 @@ export class PostPressurePlateRender extends CustomCallback<ModCallbackCustom.PO
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
     ];
   }
 

package/src/classes/callbacks/PostPressurePlateUpdate.ts

@@ -9,7 +9,8 @@ export class PostPressurePlateUpdate extends CustomCallback<ModCallbackCustom.PO
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostProjectileInitLate.ts

@@ -14,7 +14,8 @@ export class PostProjectileInitLate extends CustomCallback<ModCallbackCustom.POS
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_PROJECTILE_UPDATE, [this.postProjectileUpdate]], // 44
+      // 44
+      [ModCallback.POST_PROJECTILE_UPDATE, [this.postProjectileUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostRockRender.ts

@@ -9,7 +9,8 @@ export class PostRockRender extends CustomCallback<ModCallbackCustom.POST_ROCK_R
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
     ];
   }
 

package/src/classes/callbacks/PostRockUpdate.ts

@@ -9,7 +9,8 @@ export class PostRockUpdate extends CustomCallback<ModCallbackCustom.POST_ROCK_U
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostRoomClearChanged.ts

@@ -20,7 +20,8 @@ export class PostRoomClearChanged extends CustomCallback<T> {
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
 
     this.customCallbacksUsed = [

package/src/classes/callbacks/PostSacrifice.ts

@@ -21,10 +21,11 @@ export class PostSacrifice extends CustomCallback<ModCallbackCustom.POST_SACRIFI
     super();
 
     this.callbacksUsed = [
+      // 11
       [
         ModCallback.ENTITY_TAKE_DMG,
         [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ], // 11
+      ],
     ];
   }
 

package/src/classes/callbacks/PostSlotCollision.ts

@@ -9,7 +9,8 @@ export class PostSlotCollision extends CustomCallback<ModCallbackCustom.POST_SLO
     super();
 
     this.callbacksUsed = [
-      [ModCallback.PRE_PLAYER_COLLISION, [this.prePlayerCollision]], // 33
+      // 33
+      [ModCallback.PRE_PLAYER_COLLISION, [this.prePlayerCollision]],
     ];
   }
 

package/src/classes/callbacks/PostSlotDestroyed.ts

@@ -23,6 +23,7 @@ export class PostSlotDestroyed extends CustomCallback<ModCallbackCustom.POST_SLO
     super();
 
     this.callbacksUsed = [
+      // 67
       [
         ModCallback.POST_ENTITY_REMOVE,
         [this.postEntityRemoveSlot, EntityType.SLOT],

package/src/classes/callbacks/PostSpikesRender.ts

@@ -9,7 +9,8 @@ export class PostSpikesRender extends CustomCallback<ModCallbackCustom.POST_SPIK
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
     ];
   }
 

package/src/classes/callbacks/PostSpikesUpdate.ts

@@ -9,7 +9,8 @@ export class PostSpikesUpdate extends CustomCallback<ModCallbackCustom.POST_SPIK
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostTNTRender.ts

@@ -9,7 +9,8 @@ export class PostTNTRender extends CustomCallback<ModCallbackCustom.POST_TNT_REN
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, [this.postRender]],
     ];
   }
 

package/src/classes/callbacks/PostTNTUpdate.ts

@@ -9,7 +9,8 @@ export class PostTNTUpdate extends CustomCallback<ModCallbackCustom.POST_TNT_UPD
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, [this.postUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostTearInitLate.ts

@@ -14,7 +14,8 @@ export class PostTearInitLate extends CustomCallback<ModCallbackCustom.POST_TEAR
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]], // 40
+      // 40
+      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostTearInitVeryLate.ts

@@ -14,7 +14,8 @@ export class PostTearInitVeryLate extends CustomCallback<ModCallbackCustom.POST_
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]], // 40
+      // 40
+      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]],
     ];
   }
 

package/src/classes/callbacks/PostTrinketBreak.ts

@@ -31,10 +31,11 @@ export class PostTrinketBreak extends CustomCallback<ModCallbackCustom.POST_TRIN
     super();
 
     this.callbacksUsed = [
+      // 11
       [
         ModCallback.ENTITY_TAKE_DMG,
         [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ], // 11
+      ],
     ];
 
     this.customCallbacksUsed = [

package/src/classes/callbacks/PreGetPedestal.ts

@@ -12,10 +12,11 @@ export class PreGetPedestal extends CustomCallback<ModCallbackCustom.PRE_GET_PED
     super();
 
     this.callbacksUsed = [
+      // 38
       [
         ModCallback.PRE_PICKUP_COLLISION,
         [this.prePickupCollision, PickupVariant.COLLECTIBLE],
-      ], // 38
+      ],
     ];
   }
 

package/src/classes/callbacks/PreNPCCollisionFilter.ts

@@ -8,7 +8,8 @@ export class PreNPCCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_
     super();
 
     this.callbacksUsed = [
-      [ModCallback.PRE_NPC_COLLISION, [this.preNPCCollision]], // 30
+      // 30
+      [ModCallback.PRE_NPC_COLLISION, [this.preNPCCollision]],
     ];
   }
 

package/src/classes/callbacks/PreNPCUpdateFilter.ts

@@ -8,7 +8,8 @@ export class PreNPCUpdateFilter extends CustomCallback<ModCallbackCustom.PRE_NPC
     super();
 
     this.callbacksUsed = [
-      [ModCallback.PRE_NPC_UPDATE, [this.preNPCUpdate]], // 69
+      // 69
+      [ModCallback.PRE_NPC_UPDATE, [this.preNPCUpdate]],
     ];
   }
 

package/src/classes/callbacks/PreNewLevel.ts

@@ -20,7 +20,8 @@ export class PreNewLevel extends CustomCallback<ModCallbackCustom.PRE_NEW_LEVEL>
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_PLAYER_RENDER, [this.postPlayerRender]], // 32
+      // 32
+      [ModCallback.POST_PLAYER_RENDER, [this.postPlayerRender]],
     ];
   }
 

package/src/enums/ModCallbackCustom.ts

@@ -33,6 +33,18 @@ export enum ModCallbackCustom {
    */
   ENTITY_TAKE_DMG_FILTER,
 
+  /**
+   * The exact same thing as the vanilla `ENTITY_TAKE_DMG` callback, except this callback
+   * automatically filters for `EntityType.ENTITY_PLAYER` and casts the `Entity` object to a
+   * `EntityPlayer`.
+   *
+   * - You can provide an optional third argument that will make the callback only fire if it
+   *   matches the `PlayerVariant` provided.
+   * - You can provide an optional fourth argument that will make the callback only fire if it
+   *   matches the `PlayerType` provided.
+   */
+  ENTITY_TAKE_DMG_PLAYER,
+
   /**
    * Fires from the `POST_UPDATE` callback when a Challenge Room or Boss Rush is started.
    * Specifically, this happens on the first frame that `Room.IsAmbushDone` is true.

package/src/interfaces/private/AddCallbackParametersCustom.ts

@@ -51,6 +51,18 @@ export interface AddCallbackParametersCustom {
     subType?: number,
   ];
 
+  [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER]: [
+    callback: (
+      player: EntityPlayer,
+      amount: float,
+      damageFlags: BitFlags<DamageFlag>,
+      source: EntityRef,
+      countdownFrames: int,
+    ) => boolean | undefined,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType,
+  ];
+
   [ModCallbackCustom.POST_AMBUSH_FINISHED]: [
     callback: (ambushType: AmbushType) => void,
     ambushType?: AmbushType,