isaacscript-common 30.12.3 → 30.12.4

package/src/functions/levelGrid.ts

@@ -7,14 +7,13 @@
  * @module
  */
 
+import type { DoorSlot, RoomShape } from "isaac-typescript-definitions";
 import {
   DisplayFlag,
-  DoorSlot,
   DownpourRoomSubType,
   LevelStateFlag,
   MinesRoomSubType,
   RoomDescriptorFlag,
-  RoomShape,
   RoomType,
 } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
@@ -96,8 +95,7 @@ export function getAdjacentNonExistingRoomGridIndexes(
 export function getAdjacentRoomGridIndexes(
   roomGridIndex?: int,
 ): readonly int[] {
-  const roomGridIndexToUse =
-    roomGridIndex === undefined ? getRoomGridIndex() : roomGridIndex;
+  const roomGridIndexToUse = roomGridIndex ?? getRoomGridIndex();
 
   if (!isRoomInsideGrid(roomGridIndexToUse)) {
     return [];
@@ -294,7 +292,7 @@ export function getRoomAdjacentGridIndexes(
 export function getRoomDescriptorsForType(
   ...roomTypes: RoomType[]
 ): RoomDescriptor[] {
-  const roomTypesSet = new Set<RoomType>([...roomTypes]);
+  const roomTypesSet = new Set<RoomType>(roomTypes);
 
   const rooms = getRoomsInsideGrid();
   return rooms.filter(
@@ -365,7 +363,7 @@ export function getRoomShapeAdjacentGridIndexDeltas(
  *
  * @param safeRoomGridIndex This must be the room safe grid index (i.e. the top-left room grid index
  *                          for the respective room).
- * @param roomShape The shape of the room.
+ * @param roomShape The shape of the hypothetical room.
  * @returns A map of `DoorSlot` to the corresponding room grid index.
  */
 export function getRoomShapeAdjacentGridIndexes(

package/src/functions/logEntities.ts

@@ -1,7 +1,7 @@
+import type { EntityType } from "isaac-typescript-definitions";
 import {
   BombVariant,
   EffectVariant,
-  EntityType,
   FamiliarVariant,
   GridEntityType,
   KnifeVariant,
@@ -44,10 +44,11 @@ export function logAllEntities(
 
   const entities = getEntities();
   let numMatchedEntities = 0;
-  entities.forEach((entity, i) => {
+
+  for (const [i, entity] of entities.entries()) {
     // If a filter was specified, exclude all entities outside of the filter.
     if (entityTypeFilter !== undefined && entity.Type !== entityTypeFilter) {
-      return;
+      continue;
     }
 
     const effect = entity.ToEffect();
@@ -56,21 +57,21 @@ export function logAllEntities(
       effect !== undefined &&
       IGNORE_EFFECT_VARIANTS.has(effect.Variant)
     ) {
-      return;
+      continue;
     }
 
     msg += getEntityLogLine(entity, i + 1);
     numMatchedEntities++;
-  });
-
-  if (numMatchedEntities === 0) {
-    msg += "(no entities matched)\n";
-  } else {
-    msg += `(${numMatchedEntities} total ${
-      numMatchedEntities === 1 ? "entity" : "entities"
-    })\n`;
   }
 
+  const zeroText = "(no entities matched)";
+  const oneOrMoreText = `(${numMatchedEntities} total ${
+    numMatchedEntities === 1 ? "entity" : "entities"
+  })`;
+  const text = numMatchedEntities === 0 ? zeroText : oneOrMoreText;
+
+  msg += `${text}\n`;
+
   // We must log each line because otherwise the message can get truncated.
   for (const line of msg.trim().split("\n")) {
     log(line);
@@ -124,13 +125,12 @@ export function logAllGridEntities(
     numMatchedEntities++;
   }
 
-  if (numMatchedEntities === 0) {
-    msg += "(no grid entities matched)\n";
-  } else {
-    msg += `(${numMatchedEntities} total grid ${
-      numMatchedEntities === 1 ? "entity" : "entities"
-    })\n`;
-  }
+  msg +=
+    numMatchedEntities === 0
+      ? "(no grid entities matched)\n"
+      : `(${numMatchedEntities} total grid ${
+          numMatchedEntities === 1 ? "entity" : "entities"
+        })\n`;
 
   // We must log each line because otherwise the message can get truncated.
   for (const line of msg.trim().split("\n")) {

package/src/functions/logMisc.ts

@@ -1,5 +1,5 @@
+import type { CollectibleType } from "isaac-typescript-definitions";
 import {
-  CollectibleType,
   DamageFlag,
   DisplayFlag,
   EntityFlag,
@@ -271,7 +271,7 @@ export function logPlayerEffects(this: void, player: EntityPlayer): void {
     return;
   }
 
-  effects.forEach((effect, i) => {
+  for (const [i, effect] of effects.entries()) {
     let effectDescription: string;
     if (effect.Item.IsCollectible()) {
       const collectibleName = getCollectibleName(effect.Item.ID);
@@ -286,7 +286,7 @@ export function logPlayerEffects(this: void, player: EntityPlayer): void {
     }
 
     log(`  ${i + 1}) ${effectDescription} (x${effect.Count})`);
-  });
+  }
 }
 
 export function logPlayerHealth(this: void, player: EntityPlayer): void {
@@ -488,20 +488,22 @@ export function logTableDifferences<K extends AnyNotNil, V>(
   keys.sort();
 
   for (const key of keys) {
-    if (!table1KeysSet.has(key)) {
+    const value1 = table1.get(key);
+    const value2 = table2.get(key);
+
+    if (value1 === undefined) {
       // eslint-disable-next-line @typescript-eslint/no-base-to-string
       log(`  Table 1 is missing key: ${key}`);
-    } else if (!table2KeysSet.has(key)) {
+    }
+
+    if (value2 === undefined) {
       // eslint-disable-next-line @typescript-eslint/no-base-to-string
       log(`  Table 2 is missing key: ${key}`);
-    } else {
-      const value1 = table1.get(key);
+    }
 
-      const value2 = table2.get(key);
-      if (value1 !== value2) {
-        // eslint-disable-next-line @typescript-eslint/no-base-to-string
-        log(`  ${key} --> "${value1}" versus "${value2}"`);
-      }
+    if (value1 !== value2) {
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
+      log(`  ${key} --> "${value1}" versus "${value2}"`);
     }
   }
 }

package/src/functions/map.ts

@@ -1,4 +1,4 @@
-import { DefaultMap } from "../classes/DefaultMap";
+import type { DefaultMap } from "../classes/DefaultMap";
 import { sumArray } from "./array";
 import { getPartialMatch } from "./string";
 

package/src/functions/math.ts

@@ -126,7 +126,7 @@ export function lerpAngleDegrees(
  */
 export function round(num: float, numDecimalPlaces = 0): float {
   const roundedNum = tonumber(string.format(`%.${numDecimalPlaces}f`, num));
-  return roundedNum === undefined ? 0 : roundedNum;
+  return roundedNum ?? 0;
 }
 
 /** @returns 1 if n is positive, -1 if n is negative, or 0 if n is 0. */

package/src/functions/merge.ts

@@ -2,7 +2,7 @@ import { SAVE_DATA_MANAGER_DEBUG } from "../classes/features/other/saveDataManag
 import { SerializationBrand } from "../enums/private/SerializationBrand";
 import { SerializationType } from "../enums/SerializationType";
 import { isSerializationBrand } from "../serialization";
-import { AnyClass } from "../types/AnyClass";
+import type { AnyClass } from "../types/AnyClass";
 import { isArray } from "./array";
 import { deepCopy } from "./deepCopy";
 import { log } from "./log";

package/src/functions/minimap.ts

@@ -1,4 +1,5 @@
-import { DisplayFlag, DisplayFlagZero } from "isaac-typescript-definitions";
+import type { DisplayFlag } from "isaac-typescript-definitions";
+import { DisplayFlagZero } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { addFlag } from "./flag";
 import { getRoomDescriptor, getRoomGridIndex } from "./roomData";

package/src/functions/modFeatures.ts

@@ -1,5 +1,5 @@
-import { ModFeature } from "../classes/ModFeature";
-import { ModUpgraded } from "../classes/ModUpgraded";
+import type { ModFeature } from "../classes/ModFeature";
+import type { ModUpgraded } from "../classes/ModUpgraded";
 
 /**
  * Helper function to instantiate an array of mod features all at once. Use this function if your

package/src/functions/npcDataStructures.ts

@@ -1,4 +1,4 @@
-import { DefaultMap } from "../classes/DefaultMap";
+import type { DefaultMap } from "../classes/DefaultMap";
 
 /**
  * Helper function to make using default maps with an index of `PtrHash` easier. Use this instead of

package/src/functions/pickups.ts

@@ -1,4 +1,4 @@
-import { CoinSubType } from "isaac-typescript-definitions";
+import type { CoinSubType } from "isaac-typescript-definitions";
 import {
   COIN_SUB_TYPE_TO_VALUE,
   DEFAULT_COIN_VALUE,
@@ -17,7 +17,7 @@ export function getCoinValue(coinSubType: CoinSubType): int {
   const value = COIN_SUB_TYPE_TO_VALUE[coinSubType];
   // Handle modded coin sub-types.
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  return value === undefined ? DEFAULT_COIN_VALUE : value;
+  return value ?? DEFAULT_COIN_VALUE;
 }
 
 /** Helper function to get all of the red heart pickup entities in the room. */

package/src/functions/pickupsSpecific.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   BatterySubType,
   BombSubType,
   CardType,
@@ -6,11 +6,11 @@ import {
   CollectibleType,
   HeartSubType,
   KeySubType,
-  PickupVariant,
   PillColor,
   SackSubType,
   TrinketType,
 } from "isaac-typescript-definitions";
+import { PickupVariant } from "isaac-typescript-definitions";
 import { VectorZero } from "../core/constants";
 import { getPickups, removeAllPickups, spawnPickup } from "./entitiesSpecific";
 

package/src/functions/pills.ts

@@ -1,9 +1,9 @@
-import {
+import type {
   ItemConfigPillEffectClass,
   ItemConfigPillEffectType,
-  PillColor,
   PillEffect,
 } from "isaac-typescript-definitions";
+import { PillColor } from "isaac-typescript-definitions";
 import { PILL_COLOR_VALUES } from "../arrays/cachedEnumValues";
 import { game, itemConfig } from "../core/cachedClasses";
 import {
@@ -54,7 +54,7 @@ export function getAllPillColors(): PillColor[] {
  */
 export function getFalsePHDPillEffect(pillEffect: PillEffect): PillEffect {
   const convertedPillEffect = FALSE_PHD_PILL_CONVERSIONS.get(pillEffect);
-  return convertedPillEffect === undefined ? pillEffect : convertedPillEffect;
+  return convertedPillEffect ?? pillEffect;
 }
 
 /**
@@ -98,7 +98,7 @@ export function getNormalPillColors(): PillColor[] {
  */
 export function getPHDPillEffect(pillEffect: PillEffect): PillEffect {
   const convertedPillEffect = PHD_PILL_CONVERSIONS.get(pillEffect);
-  return convertedPillEffect === undefined ? pillEffect : convertedPillEffect;
+  return convertedPillEffect ?? pillEffect;
 }
 
 /**
@@ -143,11 +143,10 @@ export function getPillEffectClass(
   // `ItemConfigPillEffect` does not contain the "class" tag, so we must manually compile a map of
   // pill effect classes. Modded pill effects are not included in the map.
   const pillEffectClass = PILL_EFFECT_CLASSES[pillEffect];
+
   // Handle modded pill effects.
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  return pillEffectClass === undefined
-    ? DEFAULT_PILL_EFFECT_CLASS
-    : pillEffectClass;
+  return pillEffectClass ?? DEFAULT_PILL_EFFECT_CLASS;
 }
 
 /**
@@ -188,11 +187,10 @@ export function getPillEffectType(
   // `ItemConfigPillEffect` does not contain the "class" tag, so we must manually compile a map of
   // pill effect classes. Modded pill effects are not included in the map.
   const pillEffectClass = PILL_EFFECT_TYPES[pillEffect];
+
   // Handle modded pill effects.
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  return pillEffectClass === undefined
-    ? DEFAULT_PILL_EFFECT_TYPE
-    : pillEffectClass;
+  return pillEffectClass ?? DEFAULT_PILL_EFFECT_TYPE;
 }
 
 /** Helper function to get an array with every vanilla pill effect. */

package/src/functions/playerCenter.ts

@@ -48,11 +48,9 @@ export function movePlayersToCenter(radius: float = 10): void {
     Direction.LEFT,
   );
 
-  for (let i = 0; i < players.length; i++) {
-    const player = players[i];
+  for (const [i, player] of players.entries()) {
     const circlePosition = circlePoints[i];
-
-    if (player !== undefined && circlePosition !== undefined) {
+    if (circlePosition !== undefined) {
       player.Position = circlePosition;
     }
   }

package/src/functions/playerDataStructures.ts

@@ -1,5 +1,5 @@
-import { DefaultMap } from "../classes/DefaultMap";
-import { PlayerIndex } from "../types/PlayerIndex";
+import type { DefaultMap } from "../classes/DefaultMap";
+import type { PlayerIndex } from "../types/PlayerIndex";
 import { getPlayerIndex } from "./playerIndex";
 
 /**

package/src/functions/playerHealth.ts

@@ -1,5 +1,5 @@
+import type { ActiveSlot } from "isaac-typescript-definitions";
 import {
-  ActiveSlot,
   CollectibleType,
   HeartSubType,
   PlayerType,
@@ -7,7 +7,7 @@ import {
 } from "isaac-typescript-definitions";
 import { MAX_PLAYER_HEART_CONTAINERS } from "../core/constants";
 import { HealthType } from "../enums/HealthType";
-import { PlayerHealth, SoulHeartType } from "../interfaces/PlayerHealth";
+import type { PlayerHealth, SoulHeartType } from "../interfaces/PlayerHealth";
 import { countSetBits, getKBitOfN, getNumBitsOfN } from "./bitwise";
 import { getCharacterMaxHeartContainers } from "./characters";
 import { getTotalCharge } from "./charge";
@@ -578,7 +578,7 @@ export function setPlayerHealth(
 
   // Add the soul / black / bone hearts.
   let soulHeartsRemaining = playerHealth.soulHearts;
-  playerHealth.soulHeartTypes.forEach((soulHeartType, i) => {
+  for (const [i, soulHeartType] of playerHealth.soulHeartTypes.entries()) {
     const isHalf =
       playerHealth.soulHearts + playerHealth.boneHearts * 2 < (i + 1) * 2;
     let addAmount = 2;
@@ -610,7 +610,7 @@ export function setPlayerHealth(
         break;
       }
     }
-  });
+  }
 
   /**
    * Fill in the red heart containers.

package/src/functions/playerIndex.ts

@@ -5,7 +5,7 @@ import {
   PlayerVariant,
 } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
-import { PlayerIndex } from "../types/PlayerIndex";
+import type { PlayerIndex } from "../types/PlayerIndex";
 import { ReadonlySet } from "../types/ReadonlySet";
 
 const DEFAULT_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;

package/src/functions/playerStats.ts

@@ -1,5 +1,5 @@
 import { PlayerStat } from "../enums/PlayerStat";
-import { PlayerStats } from "../interfaces/PlayerStats";
+import type { PlayerStats } from "../interfaces/PlayerStats";
 
 /** Helper function to get the stat for a player corresponding to the `StatType`. */
 export function getPlayerStat<T extends PlayerStat>(

package/src/functions/players.ts

@@ -77,6 +77,7 @@ export function anyPlayerHasCollectible(
   ignoreModifiers?: boolean,
 ): boolean {
   const players = getAllPlayers();
+
   return players.some((player) =>
     player.HasCollectible(collectibleType, ignoreModifiers),
   );
@@ -94,6 +95,7 @@ export function anyPlayerHasTrinket(
   ignoreModifiers?: boolean,
 ): boolean {
   const players = getAllPlayers();
+
   return players.some((player) =>
     player.HasTrinket(trinketType, ignoreModifiers),
   );
@@ -117,6 +119,7 @@ export function anyPlayerHoldingItem(): boolean {
 export function anyPlayerIs(...matchingCharacters: PlayerType[]): boolean {
   const matchingCharacterSet = new ReadonlySet(matchingCharacters);
   const characters = getCharacters();
+
   return characters.some((character) => matchingCharacterSet.has(character));
 }
 
@@ -261,7 +264,7 @@ export function getFinalPlayer(): EntityPlayer {
  * will be spawned on the same frame.
  */
 export function getNewestPlayer(): EntityPlayer {
-  let newestPlayer: EntityPlayer | null = null;
+  let newestPlayer: EntityPlayer | undefined;
   let lowestFrame = math.huge;
   for (const player of getPlayers()) {
     if (player.FrameCount < lowestFrame) {
@@ -270,7 +273,7 @@ export function getNewestPlayer(): EntityPlayer {
     }
   }
 
-  if (newestPlayer === null) {
+  if (newestPlayer === undefined) {
     error("Failed to find the newest player.");
   }
 
@@ -287,6 +290,7 @@ export function getPlayerCloserThan(
   distance: float,
 ): EntityPlayer | undefined {
   const players = getPlayers();
+
   return players.find(
     (player) => player.Position.Distance(position) <= distance,
   );
@@ -405,6 +409,7 @@ export function getPlayerNumHitsRemaining(player: EntityPlayer): int {
 export function getPlayersOfType(...characters: PlayerType[]): EntityPlayer[] {
   const charactersSet = new ReadonlySet(characters);
   const players = getPlayers();
+
   return players.filter((player) => {
     const character = player.GetPlayerType();
     return charactersSet.has(character);
@@ -421,6 +426,7 @@ export function getPlayersOfType(...characters: PlayerType[]): EntityPlayer[] {
  */
 export function getPlayersOnKeyboard(): EntityPlayer[] {
   const players = getAllPlayers();
+
   return players.filter(
     (player) => player.ControllerIndex === ControllerIndex.KEYBOARD,
   );
@@ -436,6 +442,7 @@ export function getPlayersWithCollectible(
   ...collectibleTypes: CollectibleType[]
 ): EntityPlayer[] {
   const players = getPlayers();
+
   return players.filter((player) =>
     collectibleTypes.every((collectibleType) =>
       player.HasCollectible(collectibleType),
@@ -468,6 +475,7 @@ export function getPlayersWithTrinket(
   ...trinketTypes: TrinketType[]
 ): EntityPlayer[] {
   const players = getPlayers();
+
   return players.filter((player) =>
     trinketTypes.every((trinketType) => player.HasTrinket(trinketType)),
   );
@@ -523,6 +531,7 @@ export function hasCollectibleInActiveSlot(
 ): boolean {
   const matchingActiveSlotsSet = new ReadonlySet(activeSlots);
   const activeItemSlots = getActiveItemSlots(player, collectibleType);
+
   return activeItemSlots.some((activeSlot) =>
     matchingActiveSlotsSet.has(activeSlot),
   );
@@ -594,7 +603,6 @@ export function isActiveSlotEmpty(
  */
 export function isBethany(player: EntityPlayer): boolean {
   const character = player.GetPlayerType();
-
   return character === PlayerType.BETHANY || character === PlayerType.BETHANY_B;
 }
 
@@ -610,6 +618,7 @@ export function isCharacter(
 ): boolean {
   const characterSet = new ReadonlySet(characters);
   const character = player.GetPlayerType();
+
   return characterSet.has(character);
 }
 
@@ -633,7 +642,6 @@ export function isDamageFromPlayer(damageSource: Entity): boolean {
  */
 export function isEden(player: EntityPlayer): boolean {
   const character = player.GetPlayerType();
-
   return character === PlayerType.EDEN || character === PlayerType.EDEN_B;
 }
 
@@ -647,7 +655,6 @@ export function isFirstPlayer(player: EntityPlayer): boolean {
  */
 export function isJacobOrEsau(player: EntityPlayer): boolean {
   const character = player.GetPlayerType();
-
   return character === PlayerType.JACOB || character === PlayerType.ESAU;
 }
 
@@ -657,14 +664,12 @@ export function isJacobOrEsau(player: EntityPlayer): boolean {
  */
 export function isKeeper(player: EntityPlayer): boolean {
   const character = player.GetPlayerType();
-
   return character === PlayerType.KEEPER || character === PlayerType.KEEPER_B;
 }
 
 /** Helper function for detecting when a player is The Lost or Tainted Lost. */
 export function isLost(player: EntityPlayer): boolean {
   const character = player.GetPlayerType();
-
   return character === PlayerType.LOST || character === PlayerType.LOST_B;
 }
 

package/src/functions/pocketItems.ts

@@ -1,14 +1,14 @@
+import type { PocketItemSlot } from "isaac-typescript-definitions";
 import {
   ActiveSlot,
   CardType,
   CollectibleType,
   PillColor,
   PlayerType,
-  PocketItemSlot,
 } from "isaac-typescript-definitions";
 import { POCKET_ITEM_SLOT_VALUES } from "../arrays/cachedEnumValues";
 import { PocketItemType } from "../enums/PocketItemType";
-import { PocketItemDescription } from "../interfaces/PocketItemDescription";
+import type { PocketItemDescription } from "../interfaces/PocketItemDescription";
 import { isCharacter } from "./players";
 import { asNumber } from "./types";
 
@@ -179,6 +179,7 @@ export function pocketItemsEquals(
     return false;
   }
 
+  // eslint-disable-next-line unicorn/no-for-loop
   for (let i = 0; i < pocketItems1.length; i++) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const pocketItem1 = pocketItems1[i]!;

package/src/functions/rng.ts

@@ -1,4 +1,4 @@
-import { CopyableIsaacAPIClassType } from "isaac-typescript-definitions";
+import type { CopyableIsaacAPIClassType } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { SerializationBrand } from "../enums/private/SerializationBrand";
 import { isaacAPIClassEquals, isIsaacAPIClassOfType } from "./isaacAPIClass";

package/src/functions/rockAlt.ts

@@ -4,7 +4,7 @@ import {
   TrinketType,
 } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
-import { RockAltType } from "../enums/RockAltType";
+import type { RockAltType } from "../enums/RockAltType";
 import { BACKDROP_TYPE_TO_ROCK_ALT_TYPE } from "../objects/backdropTypeToRockAltType";
 import { getNPCs } from "./entitiesSpecific";
 import { removeEntitiesSpawnedFromGridEntity } from "./gridEntities";

package/src/functions/roomData.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   DoorSlot,
   RoomShape,
   RoomType,

package/src/functions/roomGrid.ts

@@ -7,7 +7,7 @@
  * @module
  */
 
-import { RoomShape } from "isaac-typescript-definitions";
+import type { RoomShape } from "isaac-typescript-definitions";
 import { L_ROOM_SHAPE_TO_RECTANGLES } from "../objects/LRoomShapeToRectangles";
 import { inRectangle } from "./math";
 import {

package/src/functions/roomShape.ts

@@ -1,5 +1,6 @@
-import { DoorSlot, RoomShape } from "isaac-typescript-definitions";
-import { Corner } from "../interfaces/Corner";
+import type { DoorSlot } from "isaac-typescript-definitions";
+import { RoomShape } from "isaac-typescript-definitions";
+import type { Corner } from "../interfaces/Corner";
 import { ROOM_SHAPE_BOUNDS } from "../objects/roomShapeBounds";
 import { ROOM_SHAPE_CORNERS } from "../objects/roomShapeCorners";
 import { ROOM_SHAPE_LAYOUT_SIZES } from "../objects/roomShapeLayoutSizes";

package/src/functions/roomShapeWalls.ts

@@ -2,7 +2,7 @@ import { BossID, RoomShape } from "isaac-typescript-definitions";
 import { ROOM_SHAPE_VALUES } from "../arrays/cachedEnumValues";
 import { game } from "../core/cachedClasses";
 import { CornerType } from "../enums/CornerType";
-import { Corner } from "../interfaces/Corner";
+import type { Corner } from "../interfaces/Corner";
 import { ReadonlySet } from "../types/ReadonlySet";
 import { getGridIndexesBetween } from "./gridIndex";
 import { getRoomShapeCorners, isLRoom } from "./roomShape";

package/src/functions/rooms.ts

@@ -1,16 +1,18 @@
-import {
-  AngelRoomSubType,
+import type {
   BackdropType,
   BossID,
+  ItemPoolType,
+  MinibossID,
+} from "isaac-typescript-definitions";
+import {
+  AngelRoomSubType,
   Dimension,
   DoorSlot,
   DownpourRoomSubType,
   DungeonSubType,
   GridRoom,
   HomeRoomSubType,
-  ItemPoolType,
   LevelStage,
-  MinibossID,
   RoomDescriptorFlag,
   RoomShape,
   RoomType,
@@ -493,7 +495,7 @@ export function inMirrorRoom(): boolean {
 export function inRoomType(...roomTypes: RoomType[]): boolean {
   const room = game.GetRoom();
   const thisRoomType = room.GetType();
-  return roomTypes.some((roomType) => roomType === thisRoomType);
+  return roomTypes.includes(thisRoomType);
 }
 
 /**

package/src/functions/serialization.ts

@@ -1,13 +1,13 @@
-import { CopyableIsaacAPIClassType } from "isaac-typescript-definitions";
+import type { CopyableIsaacAPIClassType } from "isaac-typescript-definitions";
 import { ISAAC_API_CLASS_TYPE_TO_BRAND } from "../objects/isaacAPIClassTypeToBrand";
-import {
+import type {
   CopyableIsaacAPIClass,
-  ISAAC_API_CLASS_TYPE_TO_FUNCTIONS,
   IsaacAPIClassTypeFunctions,
   IsaacAPIClassTypeToSerializedType,
   IsaacAPIClassTypeToType,
   SerializedIsaacAPIClass,
 } from "../objects/isaacAPIClassTypeToFunctions";
+import { ISAAC_API_CLASS_TYPE_TO_FUNCTIONS } from "../objects/isaacAPIClassTypeToFunctions";
 import { getIsaacAPIClassName } from "./isaacAPIClass";
 import { isTable, isUserdata } from "./types";
 

package/src/functions/sound.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   LevelStage,
   Music,
   SoundEffect,