isaacscript-common 87.5.0 → 87.6.0

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

@@ -104,7 +104,7 @@ export class SaveDataManager extends Feature {
 
       // 18
       // We want to avoid a needless dependency on the `GameReorderedCallbacks` feature.
-      // eslint-disable-next-line deprecation/deprecation
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
       [ModCallback.POST_NEW_LEVEL, this.postNewLevel],
     ];
 
@@ -393,8 +393,8 @@ export class SaveDataManager extends Feature {
   private storeClassConstructorsFromObject(luaMap: LuaMap<AnyNotNil, unknown>) {
     const tstlClassName = getTSTLClassName(luaMap);
     if (
-      tstlClassName !== undefined &&
-      !NON_USER_DEFINED_CLASS_NAMES.has(tstlClassName)
+      tstlClassName !== undefined
+      && !NON_USER_DEFINED_CLASS_NAMES.has(tstlClassName)
     ) {
       this.classConstructors.set(tstlClassName, luaMap as unknown as AnyClass);
     }

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

@@ -323,8 +323,8 @@ export class StageHistory extends Feature {
 
     return v.run.stageHistory.some(
       (stageHistoryEntry) =>
-        stageHistoryEntry.stage === stage &&
-        stageHistoryEntry.stageType === stageType,
+        stageHistoryEntry.stage === stage
+        && stageHistoryEntry.stageType === stageType,
     );
   }
 }

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

@@ -60,8 +60,8 @@ export class StartAmbush extends Feature {
       const coins = getCoins();
       const coinsFromSack = coins.filter(
         (pickup) =>
-          pickup.SpawnerEntity !== undefined &&
-          GetPtrHash(pickup.SpawnerEntity) === sackPtrHash,
+          pickup.SpawnerEntity !== undefined
+          && GetPtrHash(pickup.SpawnerEntity) === sackPtrHash,
       );
       removeEntities(coinsFromSack);
     });

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

@@ -70,8 +70,8 @@ export class TaintedLazarusPlayers extends Feature {
    */
   private checkDequeue() {
     if (
-      v.run.queuedTaintedLazarus.length === 0 ||
-      v.run.queuedDeadTaintedLazarus.length === 0
+      v.run.queuedTaintedLazarus.length === 0
+      || v.run.queuedDeadTaintedLazarus.length === 0
     ) {
       return;
     }

package/src/classes/features/other/customStages/backdrop.ts

@@ -57,7 +57,7 @@ const ROOM_SHAPE_WALL_ANM2_LAYERS = {
 } as const satisfies Record<RoomShape, int>;
 
 // We don't use `as const` since we need the object to be indexable by all `RoomShape`.
-// eslint-disable-next-line isaacscript/require-capital-const-assertions
+// eslint-disable-next-line complete/require-capital-const-assertions
 const ROOM_SHAPE_WALL_EXTRA_ANM2_LAYERS: Readonly<
   Partial<Record<RoomShape, int>>
 > = {

package/src/classes/features/other/customStages/gridEntities.ts

@@ -14,8 +14,8 @@ export function setCustomDecorationGraphics(
   // If the end-user did not specify custom decoration graphics, default to Basement graphics. (We
   // don't have to adjust anything for this case.)
   if (
-    customStage.decorationsPNGPath === undefined &&
-    customStage.decorationsANM2Path === undefined
+    customStage.decorationsPNGPath === undefined
+    && customStage.decorationsANM2Path === undefined
   ) {
     return;
   }
@@ -56,8 +56,8 @@ export function setCustomRockGraphics(
   // If the end-user did not specify custom rock graphics, default to Basement graphics. (We don't
   // have to adjust anything for this case.)
   if (
-    customStage.rocksPNGPath === undefined &&
-    customStage.rocksANM2Path === undefined
+    customStage.rocksPNGPath === undefined
+    && customStage.rocksANM2Path === undefined
   ) {
     return;
   }

package/src/classes/features/other/customStages/streakText.ts

@@ -100,8 +100,8 @@ export function streakTextPostRender(): void {
 
 function checkEndTopStreakText() {
   if (
-    v.run.topStreakTextStartedRenderFrame === null ||
-    v.run.topStreakText.animation !== UIStreakAnimation.TEXT_STAY
+    v.run.topStreakTextStartedRenderFrame === null
+    || v.run.topStreakText.animation !== UIStreakAnimation.TEXT_STAY
   ) {
     return;
   }
@@ -229,8 +229,8 @@ function renderStreakText(
   }
 
   if (
-    streakText.animation === UIStreakAnimation.TEXT &&
-    streakText.frame === TEXT_STAY_FRAME
+    streakText.animation === UIStreakAnimation.TEXT
+    && streakText.frame === TEXT_STAY_FRAME
   ) {
     streakText.animation = UIStreakAnimation.TEXT_STAY;
     streakText.frame = 0;

package/src/classes/features/other/extraConsoleCommands/commands.ts

@@ -2,22 +2,22 @@
 
 /*
 eslint "sort-exports/sort-exports": [
-  "error",
+  "warn",
   {
     sortDir: "asc",
   },
 ],
 */
 
-/* eslint "jsdoc/require-jsdoc": "error" */
+/* eslint "jsdoc/require-jsdoc": "warn" */
 
 /**
  * __DOCS_LINE_THAT_WILL_BE_AUTOMATICALLY_REMOVED__
  *
  * This is a list of custom console commands that are included with the standard library. By
  * default, they will not be enabled. You can enable them by upgrading your mod with
- * `ISCFeature.EXTRA_CONSOLE_COMMANDS`. (Also see the [Extra Console Commands](ExtraConsoleCommands)
- * feature documentation.)
+ * `ISCFeature.EXTRA_CONSOLE_COMMANDS`. (Also see the [Extra Console
+ * Commands](/isaacscript-common/features/ExtraConsoleCommands) feature documentation.)
  *
  * As a quality of life feature, you do not have to match the casing of the command. For example,
  * you can type the "addCharges" command as "addcharges", and it will still work the same.
@@ -414,7 +414,7 @@ export function cards(): void {
 
       const worldPosition = gridCoordinatesToWorldPosition(x, y);
       spawnCard(cardType, worldPosition);
-      cardType++; // eslint-disable-line isaacscript/strict-enums
+      cardType++; // eslint-disable-line complete/strict-enums
     }
   }
 }
@@ -1115,7 +1115,7 @@ export function pills(): void {
 
     const worldPosition = gridCoordinatesToWorldPosition(x, y);
     spawnPill(pillColor, worldPosition);
-    pillColor++; // eslint-disable-line isaacscript/strict-enums
+    pillColor++; // eslint-disable-line complete/strict-enums
   }
 
   y = 2;
@@ -1127,7 +1127,7 @@ export function pills(): void {
 
     const worldPosition = gridCoordinatesToWorldPosition(x, y);
     spawnPill(pillColor, worldPosition);
-    pillColor++; // eslint-disable-line isaacscript/strict-enums
+    pillColor++; // eslint-disable-line complete/strict-enums
   }
 
   y = 3;
@@ -1156,8 +1156,8 @@ export function pocket(params: string): void {
 
   const collectibleType = parseIntSafe(params);
   if (
-    collectibleType === undefined ||
-    !isValidCollectibleType(collectibleType)
+    collectibleType === undefined
+    || !isValidCollectibleType(collectibleType)
   ) {
     print(`Invalid collectible type: ${collectibleType}`);
     return;
@@ -1259,10 +1259,10 @@ export function s(params: string): void {
   let stageString: string;
   let stageTypeLetter: string;
   if (
-    finalCharacter === "a" ||
-    finalCharacter === "b" ||
-    finalCharacter === "c" ||
-    finalCharacter === "d"
+    finalCharacter === "a"
+    || finalCharacter === "b"
+    || finalCharacter === "c"
+    || finalCharacter === "d"
   ) {
     // e.g. "s 11a" for going to The Chest
     stageString = params.slice(0, -1);
@@ -1553,8 +1553,8 @@ export function spawnCollectibleAt(params: string): void {
 
   const collectibleType = parseIntSafe(collectibleTypeString);
   if (
-    collectibleType === undefined ||
-    !isValidCollectibleType(collectibleType)
+    collectibleType === undefined
+    || !isValidCollectibleType(collectibleType)
   ) {
     print(`Invalid collectible type: ${args[0]}`);
     return;

package/src/classes/features/other/saveDataManager/glowingHourGlass.ts

@@ -140,8 +140,10 @@ export function restoreGlowingHourGlassBackup(
 
 function getKeysToBackup(saveData: SaveData) {
   const shouldBackupPersistentObject =
-    saveData.persistent !== undefined &&
-    (saveData.persistent as LuaTable).has(REWIND_WITH_GLOWING_HOUR_GLASS_KEY);
+    saveData.persistent !== undefined
+    && (saveData.persistent as LuaTable).has(
+      REWIND_WITH_GLOWING_HOUR_GLASS_KEY,
+    );
 
   return shouldBackupPersistentObject
     ? ([...GLOWING_HOUR_GLASS_BACKUP_KEYS, SaveDataKey.PERSISTENT] as const)

package/src/classes/features/other/saveDataManager/loadFromDisk.ts

@@ -23,6 +23,11 @@ export function loadFromDisk(
   const jsonString = readSaveDatFile(mod);
   const newSaveData = jsonDecode(jsonString);
 
+  if (newSaveData === undefined) {
+    // Reading the save data failed.
+    return;
+  }
+
   if (SAVE_DATA_MANAGER_DEBUG) {
     log('Converted data from the "save#.dat" to a Lua table.');
   }

package/src/core/constants.ts

@@ -295,7 +295,7 @@ export const ONE_BY_ONE_ROOM_GRID_SIZE = 135;
  * An array representing every valid collectible type quality. Specifically, this is: `[0, 1, 2, 3,
  * 4]`
  */
-// eslint-disable-next-line isaacscript/require-capital-const-assertions
+// eslint-disable-next-line complete/require-capital-const-assertions
 export const QUALITIES: readonly Quality[] = [0, 1, 2, 3, 4];
 export const MAX_QUALITY: Quality = 4;
 

package/src/core/constantsVanilla.ts

@@ -53,7 +53,7 @@ export const VANILLA_COLLECTIBLE_TYPE_RANGE: readonly int[] = iRange(
  *
  * If you need to do O(1) lookups, use the `VANILLA_COLLECTIBLE_TYPES_SET` constant instead.
  */
-// eslint-disable-next-line isaacscript/strict-enums
+// eslint-disable-next-line complete/strict-enums
 export const VANILLA_COLLECTIBLE_TYPES: readonly CollectibleType[] =
   VANILLA_COLLECTIBLE_TYPE_RANGE.filter((potentialCollectibleType) => {
     const collectibleType = asCollectibleType(potentialCollectibleType);
@@ -93,7 +93,7 @@ export const VANILLA_TRINKET_TYPE_RANGE: readonly int[] = iRange(
  *
  * If you need to do O(1) lookups, use the `VANILLA_TRINKET_TYPES_SET` constant instead.
  */
-// eslint-disable-next-line isaacscript/strict-enums
+// eslint-disable-next-line complete/strict-enums
 export const VANILLA_TRINKET_TYPES: readonly TrinketType[] =
   VANILLA_TRINKET_TYPE_RANGE.filter((potentialTrinketType) => {
     const trinketType = asTrinketType(potentialTrinketType);
@@ -130,7 +130,7 @@ export const VANILLA_CARD_TYPE_RANGE: readonly int[] = iRange(
  *
  * If you need to do O(1) lookups, use the `VANILLA_CARD_TYPES_SET` constant instead.
  */
-// eslint-disable-next-line isaacscript/strict-enums
+// eslint-disable-next-line complete/strict-enums
 export const VANILLA_CARD_TYPES: readonly CardType[] =
   VANILLA_CARD_TYPE_RANGE.filter((potentialCardType) => {
     const cardType = asCardType(potentialCardType);
@@ -167,7 +167,7 @@ export const VANILLA_PILL_EFFECT_RANGE: readonly int[] = iRange(
  *
  * If you need to do O(1) lookups, use the `VANILLA_PILL_EFFECT_SET` constant instead.
  */
-// eslint-disable-next-line isaacscript/strict-enums
+// eslint-disable-next-line complete/strict-enums
 export const VANILLA_PILL_EFFECTS: readonly PillEffect[] =
   VANILLA_PILL_EFFECT_RANGE.filter((potentialPillEffect) => {
     const pillEffect = asPillEffect(potentialPillEffect);

package/src/enums/ModCallbackCustom.ts

@@ -415,6 +415,24 @@ export enum ModCallbackCustom {
    */
   POST_ENTITY_KILL_FILTER,
 
+  /**
+   * The exact same thing as the vanilla `POST_ENTITY_REMOVE` callback, except this callback allows
+   * you to specify extra arguments for additional filtration.
+   *
+   * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+   * - You can provide an optional third argument that will make the callback only fire if it
+   *   matches the `EntityType` provided.
+   * - You can provide an optional fourth argument that will make the callback only fire if it
+   *   matches the variant provided.
+   * - You can provide an optional fifth argument that will make the callback only fire if it
+   *   matches the sub-type provided.
+   *
+   * ```ts
+   * function postEntityRemoveFilter(entity: Entity): void {}
+   * ```
+   */
+  POST_ENTITY_REMOVE_FILTER,
+
   /**
    * Fires one `POST_UPDATE` frame after the player has used the Esau Jr. item. (The player is not
    * updated to the new character until a game frame has passed.)

package/src/functions/array.ts

@@ -35,7 +35,7 @@ export function arrayEquals<T>(
  * matching element. If you want to remove all of the elements, use the `arrayRemoveAll` function
  * instead.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function arrayRemove<T>(
   originalArray: readonly T[],
   ...elementsToRemove: readonly T[]
@@ -63,7 +63,7 @@ export function arrayRemove<T>(
  * element. If you want to only remove the first matching element, use the `arrayRemove` function
  * instead.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function arrayRemoveAll<T>(
   originalArray: readonly T[],
   ...elementsToRemove: readonly T[]
@@ -86,11 +86,12 @@ export function arrayRemoveAll<T>(
  * @returns True if one or more elements were removed, false otherwise.
  */
 export function arrayRemoveAllInPlace<T>(
-  // eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
   array: T[],
   ...elementsToRemove: readonly T[]
 ): boolean {
   let removedOneOrMoreElements = false;
+
   for (const element of elementsToRemove) {
     let index: number;
     do {
@@ -117,9 +118,9 @@ export function arrayRemoveAllInPlace<T>(
  *
  * @returns The removed elements. This will be an empty array if no elements were removed.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function arrayRemoveInPlace<T>(
-  // eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
   array: T[],
   ...elementsToRemove: readonly T[]
 ): T[] {
@@ -127,7 +128,7 @@ export function arrayRemoveInPlace<T>(
 
   for (const element of elementsToRemove) {
     const index = array.indexOf(element);
-    if (index > -1) {
+    if (index !== -1) {
       const removedElement = array.splice(index, 1);
       removedElements.push(...removedElement);
     }
@@ -143,7 +144,7 @@ export function arrayRemoveInPlace<T>(
  *
  * This function is variadic, meaning that you can specify N arguments to remove N elements.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function arrayRemoveIndex<T>(
   originalArray: readonly T[],
   ...indexesToRemove: readonly int[]
@@ -168,9 +169,9 @@ export function arrayRemoveIndex<T>(
  *
  * @returns The removed elements. This will be an empty array if no elements were removed.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function arrayRemoveIndexInPlace<T>(
-  // eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
   array: T[],
   ...indexesToRemove: readonly int[]
 ): T[] {
@@ -212,7 +213,7 @@ export function arrayToString(array: readonly unknown[]): string {
  * This function is variadic, meaning that you can specify N arguments to combine N arrays. Note
  * that this will only perform a shallow copy of the array elements.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function combineArrays<T>(...arrays: ReadonlyArray<readonly T[]>): T[] {
   const elements: T[] = [];
   for (const array of arrays) {
@@ -231,7 +232,7 @@ export function combineArrays<T>(...arrays: ReadonlyArray<readonly T[]>): T[] {
  * @param numElements Optional. If specified, will only copy the first N elements. By default, the
  *                    entire array will be copied.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function copyArray<T>(oldArray: readonly T[], numElements?: int): T[] {
   // Using the spread operator was benchmarked to be faster than manually creating an array using
   // the below algorithm.
@@ -249,9 +250,9 @@ export function copyArray<T>(oldArray: readonly T[], numElements?: int): T[] {
 }
 
 /** Helper function to remove all of the elements in an array in-place. */
-// eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
-export function emptyArray<T>(array: T[]): void {
-  array.splice(0, array.length);
+// eslint-disable-next-line complete/prefer-readonly-parameter-types
+export function emptyArray(array: unknown[]): void {
+  array.splice(0);
 }
 
 /**
@@ -265,7 +266,7 @@ export function emptyArray<T>(array: T[]): void {
  * This is named `filterMap` after the Rust function:
  * https://doc.rust-lang.org/std/iter/struct.FilterMap.html
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function filterMap<OldT, NewT>(
   array: readonly OldT[],
   func: (element: OldT) => NewT | undefined,
@@ -340,6 +341,7 @@ function addCombinations<T>(
   n: number,
   src: readonly T[],
   got: readonly T[],
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
   all: Array<readonly T[]>,
 ) {
   if (n === 0) {
@@ -385,7 +387,7 @@ export function getArrayDuplicateElements<T extends number | string>(
  * due to implementation details of TypeScriptToLua, this results in an array of 1 through N
  * (instead of an array of 0 through N -1).
  */
-export function getArrayIndexes<T>(array: readonly T[]): readonly int[] {
+export function getArrayIndexes(array: readonly unknown[]): readonly int[] {
   return eRange(array.length);
 }
 
@@ -482,7 +484,7 @@ export function getRandomArrayElement<T>(
  * @param exceptions Optional. An array of elements to skip over if selected.
  */
 export function getRandomArrayElementAndRemove<T>(
-  // eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
   array: T[],
   seedOrRNG: Seed | RNG | undefined,
   exceptions: readonly T[] = [],
@@ -509,8 +511,8 @@ export function getRandomArrayElementAndRemove<T>(
  * @param exceptions Optional. An array of indexes that will be skipped over when getting the random
  *                   index. Default is an empty array.
  */
-export function getRandomArrayIndex<T>(
-  array: readonly T[],
+export function getRandomArrayIndex(
+  array: readonly unknown[],
   seedOrRNG: Seed | RNG | undefined,
   exceptions: readonly int[] = [],
 ): int {
@@ -596,9 +598,7 @@ export function isArray(
 export function isArrayContiguous(array: readonly int[]): boolean {
   let lastValue: int | undefined;
   for (const element of array) {
-    if (lastValue === undefined) {
-      lastValue = element - 1;
-    }
+    lastValue ??= element - 1;
 
     if (element !== lastValue - 1) {
       return false;
@@ -627,7 +627,7 @@ export function isArrayInArray<T>(
 }
 
 /** Helper function to set every element in an array to a specific value. */
-// eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
+// eslint-disable-next-line complete/prefer-readonly-parameter-types
 export function setAllArrayElements<T>(array: T[], value: T): void {
   for (let i = 0; i < array.length; i++) {
     array[i] = value;
@@ -647,7 +647,7 @@ export function setAllArrayElements<T>(array: T[], value: T): void {
  *                  `RNG.Next` method will be called. If `undefined` is provided, it will default to
  *                  a random seed.
  */
-// eslint-disable-next-line isaacscript/no-mutable-return
+// eslint-disable-next-line complete/no-mutable-return
 export function shuffleArray<T>(
   originalArray: readonly T[],
   seedOrRNG: Seed | RNG | undefined,
@@ -671,9 +671,9 @@ export function shuffleArray<T>(
  *                  `RNG.Next` method will be called. If `undefined` is provided, it will default to
  *                  a random seed.
  */
-export function shuffleArrayInPlace<T>(
-  // eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
-  array: T[],
+export function shuffleArrayInPlace(
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
+  array: unknown[],
   seedOrRNG: Seed | RNG | undefined,
 ): void {
   let currentIndex = array.length;
@@ -696,8 +696,12 @@ export function sumArray(array: readonly number[]): number {
 /**
  * Helper function to swap two different array elements. (The elements will be swapped in-place.)
  */
-// eslint-disable-next-line isaacscript/prefer-readonly-parameter-types
-export function swapArrayElements<T>(array: T[], i: number, j: number): void {
+export function swapArrayElements(
+  // eslint-disable-next-line complete/prefer-readonly-parameter-types
+  array: unknown[],
+  i: number,
+  j: number,
+): void {
   const value1 = array[i]!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
   const value2 = array[j]!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
 

package/src/functions/arrayLua.ts

@@ -66,7 +66,7 @@ export function forEach<T>(
  *
  * Internally, this just calls `Array.join`.
  */
-export function join<T>(array: readonly T[], separator: string): string {
+export function join(array: readonly unknown[], separator: string): string {
   return array.join(separator);
 }
 

package/src/functions/bosses.ts

@@ -109,7 +109,7 @@ export function getBossID(): BossID | undefined {
 
   const room = game.GetRoom();
 
-  // eslint-disable-next-line deprecation/deprecation
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
   const bossID = room.GetBossID();
   if (bossID === 0) {
     return undefined;
@@ -117,8 +117,8 @@ export function getBossID(): BossID | undefined {
 
   // The Ultra Greed room holds both Ultra Greed and Ultra Greedier.
   if (
-    bossID === BossID.ULTRA_GREED &&
-    doesEntityExist(EntityType.ULTRA_GREED, UltraGreedVariant.ULTRA_GREEDIER)
+    bossID === BossID.ULTRA_GREED
+    && doesEntityExist(EntityType.ULTRA_GREED, UltraGreedVariant.ULTRA_GREEDIER)
   ) {
     return BossID.ULTRA_GREEDIER;
   }
@@ -235,6 +235,7 @@ function getNumBossSegments(
 
     // 69
     case EntityType.LOKI: {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
       return variant === LokiVariant.LOKII ? 2 : 1;
     }
 

package/src/functions/charge.ts

@@ -45,8 +45,7 @@ export function addCharge(
   // add too many charges, it will grant orange "battery" charges, even if the player does not have
   // The Battery.)
   const chargesAwayFromMax = getChargesAwayFromMax(player, activeSlot);
-  const chargesToAdd =
-    numCharges > chargesAwayFromMax ? chargesAwayFromMax : numCharges;
+  const chargesToAdd = Math.min(numCharges, chargesAwayFromMax);
 
   // The AAA Battery trinket might grant an additional charge.
   const modifiedChargesToAdd = getChargesToAddWithAAAModifier(
@@ -319,7 +318,7 @@ function shouldPlayFullRechargeSound(
   // If we do have The Battery, play the full recharge sound if we are exactly double charged or
   // exactly single charged.
   return (
-    batteryCharge === maxCharges ||
-    (activeCharge === maxCharges && batteryCharge === 0)
+    batteryCharge === maxCharges
+    || (activeCharge === maxCharges && batteryCharge === 0)
   );
 }

package/src/functions/collectibles.ts

@@ -509,8 +509,8 @@ export function isFamiliarCollectible(
  */
 export function isGlitchedCollectible(collectible: EntityPickup): boolean {
   return (
-    collectible.Variant === PickupVariant.COLLECTIBLE &&
-    collectible.SubType > GLITCHED_ITEM_THRESHOLD
+    collectible.Variant === PickupVariant.COLLECTIBLE
+    && collectible.SubType > GLITCHED_ITEM_THRESHOLD
   );
 }
 

package/src/functions/decorators.ts

@@ -85,13 +85,13 @@ export function PriorityCallback<T extends ModCallback>(
   priority: CallbackPriority | int,
   ...optionalArgs: AllButFirst<AddCallbackParameters[T]>
 ) {
-  return <Class extends ModFeature, Fn extends AddCallbackParameters[T][0]>(
-    target: Class,
+  return <Fn extends AddCallbackParameters[T][0]>(
+    target: ModFeature,
     propertyKey: string,
     _descriptor: TypedPropertyDescriptor<Fn>,
   ): void => {
     // First, prepare the arguments for the `Mod.AddPriorityCallback` method.
-    const methodName = propertyKey as keyof Class;
+    const methodName = propertyKey as keyof ModFeature;
     const method = target[methodName] as AddCallbackParameters[T][0];
     const callbackTuple = [modCallback, priority, method, optionalArgs];
 
@@ -133,16 +133,13 @@ export function PriorityCallbackCustom<T extends ModCallbackCustom>(
   priority: CallbackPriority | int,
   ...optionalArgs: AllButFirst<AddCallbackParametersCustom[T]>
 ) {
-  return <
-    Class extends ModFeature,
-    Fn extends AddCallbackParametersCustom[T][0],
-  >(
-    target: Class,
+  return <Fn extends AddCallbackParametersCustom[T][0]>(
+    target: ModFeature,
     propertyKey: string,
     _descriptor: TypedPropertyDescriptor<Fn>,
   ): void => {
     // First, prepare the arguments for the `Mod.AddCallbackCustom` method.
-    const methodName = propertyKey as keyof Class;
+    const methodName = propertyKey as keyof ModFeature;
     const method = target[methodName] as AddCallbackParametersCustom[T][0];
     const callbackTuple = [modCallbackCustom, priority, method, optionalArgs];
 

package/src/functions/deepCopy.ts

@@ -212,8 +212,8 @@ function deepCopyTable(
 
   // Handle the special case of serialized Isaac API classes.
   if (
-    isSerializedIsaacAPIClass(luaMap) &&
-    serializationType === SerializationType.DESERIALIZE
+    isSerializedIsaacAPIClass(luaMap)
+    && serializationType === SerializationType.DESERIALIZE
   ) {
     return deserializeIsaacAPIClass(luaMap);
   }
@@ -258,8 +258,8 @@ function deepCopyDefaultMap(
   // function. If this is the case, then we cannot serialize it (because there is no way to
   // serialize a function).
   if (
-    serializationType === SerializationType.SERIALIZE &&
-    !isPrimitive(constructorArg)
+    serializationType === SerializationType.SERIALIZE
+    && !isPrimitive(constructorArg)
   ) {
     if (insideMap) {
       // The case of a DefaultMap within another map is complicated. Unlike a DefaultMap attached to
@@ -320,8 +320,6 @@ function deepCopyDefaultMap(
     }
   }
 
-  insideMap = false;
-
   return newDefaultMap;
 }
 
@@ -421,8 +419,6 @@ function deepCopyMap(
     }
   }
 
-  insideMap = false;
-
   return newMap;
 }
 
@@ -648,8 +644,8 @@ function getCopiedEntries(
   // During serialization, we brand some Lua tables with a special identifier to signify that it has
   // keys that should be deserialized to numbers.
   const convertStringKeysToNumbers =
-    serializationType === SerializationType.DESERIALIZE &&
-    entries.some(
+    serializationType === SerializationType.DESERIALIZE
+    && entries.some(
       ([key]) => key === asString(SerializationBrand.OBJECT_WITH_NUMBER_KEYS),
     );