isaacscript-common 8.4.5 → 8.6.0

package/dist/functions/trinketSet.lua

@@ -8,42 +8,42 @@ local ____firstLast = require("features.firstLast")
 local getModdedTrinketTypes = ____firstLast.getModdedTrinketTypes
 local ____trinkets = require("functions.trinkets")
 local getVanillaTrinketTypes = ____trinkets.getVanillaTrinketTypes
-local ALL_TRINKETS_ARRAY = {}
-local ALL_TRINKETS_SET = __TS__New(Set)
-local VANILLA_TRINKETS_ARRAY = {}
-local VANILLA_TRINKETS_SET = __TS__New(Set)
-local MODDED_TRINKETS_ARRAY = {}
-local MODDED_TRINKETS_SET = __TS__New(Set)
-local function lazyInitVanillaTrinkets(self)
-    if #VANILLA_TRINKETS_ARRAY > 0 then
+local ALL_TRINKET_TYPES_ARRAY = {}
+local ALL_TRINKET_TYPES_SET = __TS__New(Set)
+local VANILLA_TRINKET_TYPES_ARRAY = {}
+local VANILLA_TRINKET_TYPES_SET = __TS__New(Set)
+local MODDED_TRINKET_TYPES_ARRAY = {}
+local MODDED_TRINKET_TYPES_SET = __TS__New(Set)
+local function lazyInitVanillaTrinketTypes(self)
+    if #VANILLA_TRINKET_TYPES_ARRAY > 0 then
         return
     end
     local vanillaTrinketTypes = getVanillaTrinketTypes(nil)
     for ____, trinketType in ipairs(vanillaTrinketTypes) do
         local itemConfigItem = itemConfig:GetTrinket(trinketType)
         if itemConfigItem ~= nil then
-            VANILLA_TRINKETS_ARRAY[#VANILLA_TRINKETS_ARRAY + 1] = trinketType
-            VANILLA_TRINKETS_SET:add(trinketType)
+            VANILLA_TRINKET_TYPES_ARRAY[#VANILLA_TRINKET_TYPES_ARRAY + 1] = trinketType
+            VANILLA_TRINKET_TYPES_SET:add(trinketType)
         end
     end
 end
-local function lazyInitModdedTrinkets(self)
-    if #MODDED_TRINKETS_ARRAY > 0 then
+local function lazyInitModdedTrinketTypes(self)
+    if #MODDED_TRINKET_TYPES_ARRAY > 0 then
         return
     end
-    lazyInitVanillaTrinkets(nil)
-    for ____, trinketType in ipairs(VANILLA_TRINKETS_ARRAY) do
-        ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
-        ALL_TRINKETS_SET:add(trinketType)
+    lazyInitVanillaTrinketTypes(nil)
+    for ____, trinketType in ipairs(VANILLA_TRINKET_TYPES_ARRAY) do
+        ALL_TRINKET_TYPES_ARRAY[#ALL_TRINKET_TYPES_ARRAY + 1] = trinketType
+        ALL_TRINKET_TYPES_SET:add(trinketType)
     end
     local moddedTrinketTypes = getModdedTrinketTypes(nil)
     for ____, trinketType in ipairs(moddedTrinketTypes) do
         local itemConfigItem = itemConfig:GetTrinket(trinketType)
         if itemConfigItem ~= nil then
-            MODDED_TRINKETS_ARRAY[#MODDED_TRINKETS_ARRAY + 1] = trinketType
-            MODDED_TRINKETS_SET:add(trinketType)
-            ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
-            ALL_TRINKETS_SET:add(trinketType)
+            MODDED_TRINKET_TYPES_ARRAY[#MODDED_TRINKET_TYPES_ARRAY + 1] = trinketType
+            MODDED_TRINKET_TYPES_SET:add(trinketType)
+            ALL_TRINKET_TYPES_ARRAY[#ALL_TRINKET_TYPES_ARRAY + 1] = trinketType
+            ALL_TRINKET_TYPES_SET:add(trinketType)
         end
     end
 end
@@ -55,8 +55,8 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getModdedTrinketArray(self)
-    lazyInitModdedTrinkets(nil)
-    return MODDED_TRINKETS_ARRAY
+    lazyInitModdedTrinketTypes(nil)
+    return MODDED_TRINKET_TYPES_ARRAY
 end
 --- Returns a set containing every valid trinket type in the game, including modded trinkets.
 -- 
@@ -66,8 +66,8 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getModdedTrinketSet(self)
-    lazyInitModdedTrinkets(nil)
-    return MODDED_TRINKETS_SET
+    lazyInitModdedTrinketTypes(nil)
+    return MODDED_TRINKET_TYPES_SET
 end
 --- Returns an array containing every modded trinket type in the game.
 -- 
@@ -77,8 +77,8 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getTrinketArray(self)
-    lazyInitModdedTrinkets(nil)
-    return ALL_TRINKETS_ARRAY
+    lazyInitModdedTrinketTypes(nil)
+    return ALL_TRINKET_TYPES_ARRAY
 end
 --- Returns a set containing every modded trinket type in the game.
 -- 
@@ -88,23 +88,23 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getTrinketSet(self)
-    lazyInitModdedTrinkets(nil)
-    return ALL_TRINKETS_SET
+    lazyInitModdedTrinketTypes(nil)
+    return ALL_TRINKET_TYPES_SET
 end
 --- Returns an array containing every valid vanilla trinket type in the game.
 -- 
 -- Use this if you need to iterate over the trinkets in order. If you need to do O(1) lookups, then
 -- use the `getVanillaTrinketSet` helper function instead.
 function ____exports.getVanillaTrinketArray(self)
-    lazyInitVanillaTrinkets(nil)
-    return VANILLA_TRINKETS_ARRAY
+    lazyInitVanillaTrinketTypes(nil)
+    return VANILLA_TRINKET_TYPES_ARRAY
 end
 --- Returns a set containing every valid vanilla trinket type in the game.
 -- 
 -- Use this if you need to do O(1) lookups. If you need to iterate over the trinkets in order, then
 -- use the `getVanillaTrinketArray` helper function instead.
 function ____exports.getVanillaTrinketSet(self)
-    lazyInitVanillaTrinkets(nil)
-    return VANILLA_TRINKETS_SET
+    lazyInitVanillaTrinketTypes(nil)
+    return VANILLA_TRINKET_TYPES_SET
 end
 return ____exports

package/dist/index.d.ts

@@ -294,23 +294,6 @@ export declare function addRoomClearChargeToSlot(player: EntityPlayer, activeSlo
  */
 export declare function addSetsToSet<T>(mainSet: Set<T>, ...setsToAdd: Array<Set<T> | ReadonlySet<T>>): void;
 
-/**
- * Helper function to add a stat to a player based on the `CacheFlag` provided. Call this function
- * from the `EVALUATE_CACHE` callback.
- *
- * Note that for `CacheFlag.FIRE_DELAY`, the "amount" argument will be interpreted as the tear stat
- * to add (and not the amount to mutate `EntityPlayer.MaxFireDelay` by).
- *
- * This function supports the following cache flags:
- * - CacheFlag.DAMAGE (1 << 0)
- * - CacheFlag.FIRE_DELAY (1 << 1)
- * - CacheFlag.SHOT_SPEED (1 << 2)
- * - CacheFlag.RANGE (1 << 3)
- * - CacheFlag.SPEED (1 << 4)
- * - CacheFlag.LUCK (1 << 10)
- */
-export declare function addStat(player: EntityPlayer, cacheFlag: CacheFlag, amount: number): void;
-
 /**
  * - Converts the specified amount of tears stat into the format of `EntityPlayer.MaxFireDelay` and
  *   adds it to the player.
@@ -2297,9 +2280,15 @@ export declare function getAliveNPCs(entityType?: EntityType, variant?: number,
  *
  * The set contains strings with the entity type and variant, separated by a period.
  *
+ * Note that this set does not include bosses that do not appear in Boss Rooms (e.g. Krampus, Uriel,
+ * and Gabriel.).
+ *
  * Also see the `getBossSet` and `getCombinedBossSet` functions.
+ *
+ * @param includeStoryBosses Optional. Whether to include "story" bosses like Mom and It Lives!
+ *                           Default is true.
  */
-export declare function getAllBossesSet(): Set<string>;
+export declare function getAllBossesSet(includeStoryBosses?: boolean): ReadonlySet<string>;
 
 /**
  * Helper function to get an array with every valid card sub-type. This includes modded cards.
@@ -2739,7 +2728,7 @@ export declare function getCollectibleSet(): ReadonlySet<CollectibleType>;
  * This function can only be called if at least one callback has been executed. This is because not
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getCollectiblesForCacheFlag(cacheFlag: CacheFlag): Set<CollectibleType>;
+export declare function getCollectiblesForCacheFlag(cacheFlag: CacheFlag): ReadonlySet<CollectibleType>;
 
 /**
  * Helper function to get the remaining collectibles in a given item pool. This function is
@@ -2770,7 +2759,7 @@ export declare function getCollectibleTags(collectibleType: CollectibleType): Bi
  * const guppyCollectibleTypes = getCollectibleTypesForTransformation(PlayerForm.GUPPY);
  * ```
  */
-export declare function getCollectibleTypesForTransformation(playerForm: PlayerForm): Set<CollectibleType>;
+export declare function getCollectibleTypesForTransformation(playerForm: PlayerForm): ReadonlySet<CollectibleType>;
 
 /**
  * Helper function to get all of the collectible types in the game that have a certain tag.
@@ -2782,7 +2771,7 @@ export declare function getCollectibleTypesForTransformation(playerForm: PlayerF
  * const offensiveCollectibleTypes = getCollectibleTypesWithTag(ItemConfigTag.OFFENSIVE);
  * ```
  */
-export declare function getCollectibleTypesWithTag(itemConfigTag: ItemConfigTag): Set<CollectibleType>;
+export declare function getCollectibleTypesWithTag(itemConfigTag: ItemConfigTag): ReadonlySet<CollectibleType>;
 
 /**
  * Gets the entities that have a hitbox that overlaps with any part of the square that the grid
@@ -2802,7 +2791,7 @@ export declare function getCollidingEntitiesWithGridEntity(gridEntity: GridEntit
  *
  * Also see the `getAllBossesSet` and `getBossSet` functions.
  */
-export declare function getCombinedBossSet(stage: int): Set<string> | undefined;
+export declare function getCombinedBossSet(stage: int): ReadonlySet<string> | undefined;
 
 /**
  * Helper function to get all of the crawl spaces in the room.
@@ -2903,7 +2892,7 @@ export declare function getDoorSlotsForRoomShape(roomShape: RoomShape): Readonly
  */
 export declare function getDoorsToRoomIndex(...roomGridIndex: int[]): GridEntityDoor[];
 
-export declare function getEdenPassives(): Set<CollectibleType>;
+export declare function getEdenPassives(): ReadonlySet<CollectibleType>;
 
 /**
  * Helper function to account for Repentance floors being offset by 1. For example, Downpour 2 is
@@ -3169,7 +3158,7 @@ export declare function getFloorDisplayFlags(): Map<int, BitFlags<DisplayFlag>>;
  * @param pruneConditionalItems Whether or not collectibles that only grant flight conditionally
  *                              should be included in the set (like Empty Vessel).
  */
-export declare function getFlyingCollectibles(pruneConditionalItems: boolean): Set<CollectibleType>;
+export declare function getFlyingCollectibles(pruneConditionalItems: boolean): ReadonlySet<CollectibleType>;
 
 /**
  * Returns a set of all of the trinkets that grant flight. (All trinkets that grant flight do so
@@ -3535,11 +3524,11 @@ export declare function getModdedCollectibleSet(): ReadonlySet<CollectibleType>;
 /**
  * Helper function to get an array that represents the all modded collectible types.
  *
- * This function is only useful when building collectible type objects. For most purposes, you
- * should use the `getModdedCollectibleSet` helper function instead.
- *
  * Returns an empty array if there are no modded collectible types.
  *
+ * This function is only useful when building collectible type objects. For most purposes, you
+ * should use the `getModdedCollectibleArray` or `getModdedCollectibleSet` helper function instead.
+ *
  * (This function is named differently from the `getVanillaCollectibleTypeRange` function because
  * all modded collectible types are contiguous. Thus, each value represents a real
  * `CollectibleType`.)
@@ -3586,12 +3575,15 @@ export declare function getModdedTrinketSet(): ReadonlySet<TrinketType>;
  *
  * Returns an empty array if there are no modded trinket types.
  *
+ * This function is only useful when building collectible type objects. For most purposes, you
+ * should use the `getModdedCollectibleArray` or `getModdedCollectibleSet` helper function instead.
+ *
  * This function can only be called if at least one callback has been executed. This is because not
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getModdedTrinketTypes(): TrinketType[];
 
-export declare function getMoveActions(): Set<ButtonAction>;
+export declare function getMoveActions(): ReadonlySet<ButtonAction>;
 
 /**
  * Helper function to get the first player with the lowest frame count. Useful to find a freshly
@@ -4033,9 +4025,6 @@ export declare function getPlayerIndexVanilla(playerToFind: EntityPlayer): int |
  * Helper function to get all of the collectibles that the player has gotten so far on this run, in
  * order.
  *
- * Note that this does not include active collectibles that have since been dropped for other
- * collectibles.
- *
  * In the case of inventory initialization or the case where the player rerolls their build in the
  * middle of the run (e.g. with D4), the order of the inventory will not correspond to the order
  * that the items were actually given to the player. In this case, the inventory will be in the
@@ -4047,6 +4036,10 @@ export declare function getPlayerIndexVanilla(playerToFind: EntityPlayer): int |
  * would not be updated. In vanilla, this situation would never happen, but another mod might do
  * this for some reason. (With that said, the next time that a collectible is normally added or
  * removed, it would trigger a re-scan, and the previous changes would be picked up.)
+ *
+ * @param player The player to get the inventory for.
+ * @param includeActiveCollectibles Optional. If true, will include all active collectibles. Default
+ *                                 is true.
  */
 export declare function getPlayerInventory(player: EntityPlayer, includeActiveCollectibles?: boolean): CollectibleType[];
 
@@ -4056,6 +4049,14 @@ export declare function getPlayerInventory(player: EntityPlayer, includeActiveCo
  */
 export declare function getPlayerLastHeart(player: EntityPlayer): HealthType;
 
+/**
+ * Helper function to get the last passive collectible that the player picked up. In most cases,
+ * this will be the passive that is removed when the player would use Clicker.
+ *
+ * Returns undefined if the player does not have any passive collectibles.
+ */
+export declare function getPlayerLastPassiveCollectible(player: EntityPlayer): CollectibleType | undefined;
+
 /**
  * Returns the maximum heart containers that the provided player can have. Normally, this is 12, but
  * it can change depending on the character (e.g. Keeper) and other things (e.g. Mother's Kiss).
@@ -4836,7 +4837,7 @@ export declare function getScreenTopRightPos(): Vector;
  */
 export declare function getSetCombinations<T>(set: Set<T> | ReadonlySet<T>, includeEmptyArray: boolean): ReadonlyArray<ReadonlySet<T>>;
 
-export declare function getShootActions(): Set<ButtonAction>;
+export declare function getShootActions(): ReadonlySet<ButtonAction>;
 
 /**
  * Helper function to get all of the slots in the room.
@@ -5065,7 +5066,7 @@ export declare function getTrinketSet(): ReadonlySet<TrinketType>;
  * This function can only be called if at least one callback has been executed. This is because not
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
-export declare function getTrinketsForCacheFlag(cacheFlag: CacheFlag): Set<TrinketType>;
+export declare function getTrinketsForCacheFlag(cacheFlag: CacheFlag): ReadonlySet<TrinketType>;
 
 /**
  * Helper function to get an array that contains every trinket type.
@@ -5662,7 +5663,7 @@ export declare function isDamageFromPlayer(damageSource: Entity): boolean;
  * Uses the player's current health and other miscellaneous things to determine if incoming damage
  * will be fatal.
  */
-export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int | undefined): boolean;
+export declare function isDamageToPlayerFatal(player: EntityPlayer, amount: int, source: EntityRef, lastDamageGameFrame: int | undefined): boolean;
 
 /**
  * Helper function to check if the given room grid index is a dead end. Specifically, this is
@@ -6069,7 +6070,7 @@ export declare function isSack(pickup: EntityPickup): pickup is EntityPickupSack
 export declare function isSecretRoomDoor(door: GridEntityDoor): boolean;
 
 /**
- * Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+ * Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
  * self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
  * would count as self-inflicted damage.
  */
@@ -8705,7 +8706,7 @@ collectibleType?: CollectibleType
 ];
 
 declare type PostPlayerFatalDamageRegisterParameters = [
-callback: (player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int) => boolean | undefined,
+callback: (player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined,
 playerVariant?: PlayerVariant,
 character?: PlayerType
 ];

package/dist/sets/bossSets.d.ts

@@ -2,4 +2,5 @@
 export declare const STAGE_TO_STAGE_TYPE_TO_BOSS_SET_MAP: ReadonlyMap<int, ReadonlyMap<int, ReadonlySet<string>>>;
 export declare const STAGE_TO_COMBINED_BOSS_SET_MAP: ReadonlyMap<int, ReadonlySet<string>>;
 export declare const ALL_BOSSES_SET: ReadonlySet<string>;
+export declare const ALL_BOSSES_EXCLUDING_STORY_BOSSES_SET: ReadonlySet<string>;
 //# sourceMappingURL=bossSets.d.ts.map

package/dist/sets/bossSets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bossSets.d.ts","sourceRoot":"","sources":["../../src/sets/bossSets.ts"],"names":[],"mappings":";AA2aA,eAAO,MAAM,mCAAmC,EAAE,WAAW,CAC3D,GAAG,EACH,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAarC,CAAC;AAEH,eAAO,MAAM,8BAA8B,EAAE,WAAW,CACtD,GAAG,EACH,WAAW,CAAC,MAAM,CAAC,CAanB,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,MAAM,CAQ7C,CAAC"}
+{"version":3,"file":"bossSets.d.ts","sourceRoot":"","sources":["../../src/sets/bossSets.ts"],"names":[],"mappings":";AAibA,eAAO,MAAM,mCAAmC,EAAE,WAAW,CAC3D,GAAG,EACH,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAarC,CAAC;AAEH,eAAO,MAAM,8BAA8B,EAAE,WAAW,CACtD,GAAG,EACH,WAAW,CAAC,MAAM,CAAC,CAanB,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,MAAM,CAQ7C,CAAC;AAEH,eAAO,MAAM,qCAAqC,qBACX,CAAC"}

package/dist/sets/bossSets.lua

@@ -7,6 +7,7 @@ local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local Map = ____lualib.Map
 local ____exports = {}
+local getAllBossesExcludingStoryBossesSet
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local BigHornVariant = ____isaac_2Dtypescript_2Ddefinitions.BigHornVariant
 local ChubVariant = ____isaac_2Dtypescript_2Ddefinitions.ChubVariant
@@ -37,6 +38,27 @@ local SatanVariant = ____isaac_2Dtypescript_2Ddefinitions.SatanVariant
 local StageType = ____isaac_2Dtypescript_2Ddefinitions.StageType
 local WarVariant = ____isaac_2Dtypescript_2Ddefinitions.WarVariant
 local WidowVariant = ____isaac_2Dtypescript_2Ddefinitions.WidowVariant
+local ____entities = require("functions.entities")
+local parseEntityTypeVariantString = ____entities.parseEntityTypeVariantString
+local ____set = require("functions.set")
+local copySet = ____set.copySet
+local ____storyBossesSet = require("sets.storyBossesSet")
+local STORY_BOSSES_SET = ____storyBossesSet.STORY_BOSSES_SET
+function getAllBossesExcludingStoryBossesSet(self)
+    local allBossesExcludingStoryBossesSet = copySet(nil, ____exports.ALL_BOSSES_SET)
+    local allBosses = {__TS__Spread(____exports.ALL_BOSSES_SET:values())}
+    for ____, entityTypeVariantString in ipairs(allBosses) do
+        local tuple = parseEntityTypeVariantString(nil, entityTypeVariantString)
+        if tuple == nil then
+            error("Failed to parse a boss tuple when constructing the story boss set.")
+        end
+        local entityType, _variant = table.unpack(tuple)
+        if STORY_BOSSES_SET:has(entityType) then
+            allBossesExcludingStoryBossesSet:delete(entityTypeVariantString)
+        end
+    end
+    return allBossesExcludingStoryBossesSet
+end
 --- Contains just the bosses in Basement (not e.g. Burning Basement).
 local BASEMENT_BOSSES_SET = __TS__New(
     Set,
@@ -551,4 +573,5 @@ ____exports.ALL_BOSSES_SET = __TS__New(
     ____Set_13,
     {__TS__SparseArraySpread(____array_12)}
 )
+____exports.ALL_BOSSES_EXCLUDING_STORY_BOSSES_SET = getAllBossesExcludingStoryBossesSet(nil)
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "8.4.5",
+  "version": "8.6.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.5.1"
+    "isaac-typescript-definitions": "^3.5.2"
   }
 }

package/src/callbacks/postCursedTeleport.ts

@@ -54,26 +54,26 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
   incrementNumSacrifices(damageFlags); // Has to be before setting the damage frame
-  setDamageFrame(tookDamage, damageFlags);
+  setDamageFrame(entity, damageFlags);
 
   return undefined;
 }
 
-function setDamageFrame(tookDamage: Entity, damageFlags: BitFlags<DamageFlag>) {
+function setDamageFrame(entity: Entity, damageFlags: BitFlags<DamageFlag>) {
   const gameFrameCount = game.GetFrameCount();
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return;
   }

package/src/callbacks/postPlayerFatalDamage.ts

@@ -50,17 +50,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  damageAmount: float,
+  entity: Entity,
+  amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  damageSource: EntityRef,
-  damageCountdownFrames: int,
+  source: EntityRef,
+  countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }
@@ -83,23 +83,16 @@ function entityTakeDmgPlayer(
     return undefined;
   }
 
-  if (
-    !isDamageToPlayerFatal(
-      player,
-      damageAmount,
-      damageSource,
-      lastDamageGameFrame,
-    )
-  ) {
+  if (!isDamageToPlayerFatal(player, amount, source, lastDamageGameFrame)) {
     return undefined;
   }
 
   const shouldSustainDeath = postPlayerFatalDamageFire(
     player,
-    damageAmount,
+    amount,
     damageFlags,
-    damageSource,
-    damageCountdownFrames,
+    source,
+    countdownFrames,
   );
   if (shouldSustainDeath !== undefined) {
     return shouldSustainDeath;

package/src/callbacks/postSacrifice.ts

@@ -35,17 +35,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }

package/src/callbacks/postTrinketBreak.ts

@@ -52,17 +52,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   _damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }

package/src/callbacks/subscriptions/postPlayerFatalDamage.ts

@@ -7,10 +7,10 @@ import {
 export type PostPlayerFatalDamageRegisterParameters = [
   callback: (
     player: EntityPlayer,
-    damageAmount: float,
+    amount: float,
     damageFlags: BitFlags<DamageFlag>,
-    damageSource: EntityRef,
-    damageCountdownFrames: int,
+    source: EntityRef,
+    countdownFrames: int,
   ) => boolean | undefined,
   playerVariant?: PlayerVariant,
   character?: PlayerType,
@@ -30,10 +30,10 @@ export function postPlayerFatalDamageRegister(
 
 export function postPlayerFatalDamageFire(
   player: EntityPlayer,
-  damageAmount: float,
+  amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  damageSource: EntityRef,
-  damageCountdownFrames: int,
+  source: EntityRef,
+  countdownFrames: int,
 ): boolean | undefined {
   const character = player.GetPlayerType();
 
@@ -50,10 +50,10 @@ export function postPlayerFatalDamageFire(
 
     const shouldSustainDeath = callback(
       player,
-      damageAmount,
+      amount,
       damageFlags,
-      damageSource,
-      damageCountdownFrames,
+      source,
+      countdownFrames,
     );
 
     if (shouldSustainDeath !== undefined) {

package/src/features/characterStats.ts

@@ -10,8 +10,7 @@ import {
   PlayerType,
 } from "isaac-typescript-definitions";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
-import { addStat } from "../functions/players";
-import { getDefaultPlayerStat } from "../functions/stats";
+import { addStat, getDefaultPlayerStat } from "../functions/stats";
 
 const FEATURE_NAME = "characterStats";