isaacscript-common 87.9.6 → 87.9.7

package/src/functions/playerHealth.ts

@@ -177,7 +177,7 @@ export function getPlayerHealth(player: EntityPlayer): Readonly<PlayerHealth> {
   const bloodCharges = player.GetEffectiveBloodCharge();
 
   // The Forgotten and The Soul has special health, so we need to account for this.
-  if (character === PlayerType.FORGOTTEN && subPlayer !== undefined) {
+  if (subPlayer !== undefined && character === PlayerType.FORGOTTEN) {
     // The Forgotten does not have red heart containers.
     maxHearts = boneHearts * 2;
     boneHearts = 0;
@@ -185,7 +185,7 @@ export function getPlayerHealth(player: EntityPlayer): Readonly<PlayerHealth> {
     // The Forgotten will always have 0 soul hearts; we need to get the soul heart amount from the
     // sub player.
     soulHearts = subPlayer.GetSoulHearts();
-  } else if (character === PlayerType.SOUL && subPlayer !== undefined) {
+  } else if (subPlayer !== undefined && character === PlayerType.SOUL) {
     // The Soul will always have 0 bone hearts; we need to get the bone heart amount from the sub
     // player. We need to store it as "maxHearts" instead of "boneHearts".
     maxHearts = subPlayer.GetBoneHearts() * 2;
@@ -202,7 +202,7 @@ export function getPlayerHealth(player: EntityPlayer): Readonly<PlayerHealth> {
   const soulHeartTypes: SoulHeartType[] = [];
   for (let i = 0; i < extraHearts; i++) {
     let isBoneHeart = player.IsBoneHeart(i);
-    if (character === PlayerType.FORGOTTEN && subPlayer !== undefined) {
+    if (subPlayer !== undefined && character === PlayerType.FORGOTTEN) {
       isBoneHeart = subPlayer.IsBoneHeart(i);
     }
     if (isBoneHeart) {
@@ -210,7 +210,7 @@ export function getPlayerHealth(player: EntityPlayer): Readonly<PlayerHealth> {
     } else {
       // We need to add 1 here because only the second half of a black heart is considered black.
       let isBlackHeart = player.IsBlackHeart(currentSoulHeart + 1);
-      if (character === PlayerType.FORGOTTEN && subPlayer !== undefined) {
+      if (subPlayer !== undefined && character === PlayerType.FORGOTTEN) {
         isBlackHeart = subPlayer.IsBlackHeart(currentSoulHeart + 1);
       }
       if (isBlackHeart) {
@@ -531,10 +531,10 @@ export function removeAllPlayerHealth(player: EntityPlayer): void {
 
   // To avoid bugs, we have to remove the exact amount of certain types of hearts. We remove Golden
   // Hearts first so that they don't break.
-  player.AddGoldenHearts(goldenHearts * -1);
-  player.AddEternalHearts(eternalHearts * -1);
-  player.AddBoneHearts(boneHearts * -1);
-  player.AddBrokenHearts(brokenHearts * -1);
+  player.AddGoldenHearts(-goldenHearts);
+  player.AddEternalHearts(-eternalHearts);
+  player.AddBoneHearts(-boneHearts);
+  player.AddBrokenHearts(-brokenHearts);
   player.AddMaxHearts(MAX_PLAYER_HEART_CONTAINERS * -2, true);
   player.AddSoulHearts(MAX_PLAYER_HEART_CONTAINERS * -2);
 
@@ -544,7 +544,7 @@ export function removeAllPlayerHealth(player: EntityPlayer): void {
     const forgotten = player.GetSubPlayer();
     if (forgotten !== undefined) {
       const forgottenBoneHearts = forgotten.GetBoneHearts();
-      forgotten.AddBoneHearts(forgottenBoneHearts * -1);
+      forgotten.AddBoneHearts(-forgottenBoneHearts);
     }
   }
 }
@@ -576,13 +576,16 @@ export function setPlayerHealth(
   for (const activeSlot of alabasterBoxActiveSlots) {
     const totalCharge = getTotalCharge(player, activeSlot);
     setActiveItem(player, CollectibleType.NULL, activeSlot);
-    alabasterBoxDescriptions.push({ activeSlot, totalCharge });
+    alabasterBoxDescriptions.push({
+      activeSlot,
+      totalCharge,
+    });
   }
 
   removeAllPlayerHealth(player);
 
   // Add the red heart containers.
-  if (character === PlayerType.SOUL && subPlayer !== undefined) {
+  if (subPlayer !== undefined && character === PlayerType.SOUL) {
     // Adding health to The Soul is a special case.
     subPlayer.AddMaxHearts(playerHealth.maxHearts, false);
   } else {
@@ -597,32 +600,31 @@ export function setPlayerHealth(
   for (const [i, soulHeartType] of playerHealth.soulHeartTypes.entries()) {
     const isHalf =
       playerHealth.soulHearts + playerHealth.boneHearts * 2 < (i + 1) * 2;
-    let addAmount = 2;
-    if (
-      isHalf
-      || soulHeartType === HeartSubType.BONE
-      || soulHeartsRemaining < 2
-    ) {
-      // Fix the bug where a half soul heart to the left of a bone heart will be treated as a full
-      // soul heart.
-      addAmount = 1;
-    }
+
+    /**
+     * Fix the bug where a half soul heart to the left of a bone heart will be treated as a full
+     * soul heart.
+     */
+    const shouldAddOneSoulHeart =
+      isHalf || soulHeartType === HeartSubType.BONE || soulHeartsRemaining < 2;
+
+    const numSoulHearts = shouldAddOneSoulHeart ? 1 : 2;
 
     switch (soulHeartType) {
       case HeartSubType.SOUL: {
-        player.AddSoulHearts(addAmount);
-        soulHeartsRemaining -= addAmount;
+        player.AddSoulHearts(numSoulHearts);
+        soulHeartsRemaining -= numSoulHearts;
         break;
       }
 
       case HeartSubType.BLACK: {
-        player.AddBlackHearts(addAmount);
-        soulHeartsRemaining -= addAmount;
+        player.AddBlackHearts(numSoulHearts);
+        soulHeartsRemaining -= numSoulHearts;
         break;
       }
 
       case HeartSubType.BONE: {
-        player.AddBoneHearts(addAmount);
+        player.AddBoneHearts(numSoulHearts);
         break;
       }
     }

package/src/functions/playerIndex.ts

@@ -122,21 +122,6 @@ export function getPlayerIndex(
   return seed as unknown as PlayerIndex;
 }
 
-function getPlayerIndexCollectibleType(
-  player: EntityPlayer,
-  differentiateForgottenAndSoul: boolean,
-) {
-  const character = player.GetPlayerType();
-
-  if (character === PlayerType.SOUL) {
-    return differentiateForgottenAndSoul
-      ? CollectibleType.INNER_EYE
-      : DEFAULT_COLLECTIBLE_TYPE;
-  }
-
-  return DEFAULT_COLLECTIBLE_TYPE;
-}
-
 /**
  * Helper function to return the index of this player with respect to the output of the
  * `Isaac.GetPlayer` method.
@@ -224,3 +209,18 @@ export function isFoundSoul(player: EntityPlayer): boolean {
     && player.SubType === (BabySubType.FOUND_SOUL as int)
   );
 }
+
+function getPlayerIndexCollectibleType(
+  player: EntityPlayer,
+  differentiateForgottenAndSoul: boolean,
+) {
+  const character = player.GetPlayerType();
+
+  if (character === PlayerType.SOUL) {
+    return differentiateForgottenAndSoul
+      ? CollectibleType.INNER_EYE
+      : DEFAULT_COLLECTIBLE_TYPE;
+  }
+
+  return DEFAULT_COLLECTIBLE_TYPE;
+}

package/src/functions/playerTrinkets.ts

@@ -55,7 +55,6 @@ export function anyPlayerHasTrinket(
 export function getOpenTrinketSlot(player: EntityPlayer): int | undefined {
   const maxTrinkets = player.GetMaxTrinkets();
   const trinketType1 = player.GetTrinket(TrinketSlot.SLOT_1);
-  const trinketType2 = player.GetTrinket(TrinketSlot.SLOT_2);
 
   if (maxTrinkets === 1) {
     return trinketType1 === TrinketType.NULL ? 0 : undefined;
@@ -66,12 +65,29 @@ export function getOpenTrinketSlot(player: EntityPlayer): int | undefined {
       return 0;
     }
 
+    const trinketType2 = player.GetTrinket(TrinketSlot.SLOT_2);
     return trinketType2 === TrinketType.NULL ? 1 : undefined;
   }
 
   error(`The player has an unknown number of trinket slots: ${maxTrinkets}`);
 }
 
+/**
+ * Helper function to get only the players that have a certain trinket.
+ *
+ * This function is variadic, meaning that you can supply as many trinket types as you want to check
+ * for. It only returns the players that have all of the trinkets.
+ */
+export function getPlayersWithTrinket(
+  ...trinketTypes: readonly TrinketType[]
+): readonly EntityPlayer[] {
+  const players = getPlayers();
+
+  return players.filter((player) =>
+    trinketTypes.every((trinketType) => player.HasTrinket(trinketType)),
+  );
+}
+
 /**
  * Helper function to get all of the trinkets that the player is currently holding. This will not
  * include any smelted trinkets.
@@ -91,22 +107,6 @@ export function getPlayerTrinkets(
   return trinketTypes;
 }
 
-/**
- * Helper function to get only the players that have a certain trinket.
- *
- * This function is variadic, meaning that you can supply as many trinket types as you want to check
- * for. It only returns the players that have all of the trinkets.
- */
-export function getPlayersWithTrinket(
-  ...trinketTypes: readonly TrinketType[]
-): readonly EntityPlayer[] {
-  const players = getPlayers();
-
-  return players.filter((player) =>
-    trinketTypes.every((trinketType) => player.HasTrinket(trinketType)),
-  );
-}
-
 /** Helper function to check to see if the player is holding one or more trinkets. */
 export function hasAnyTrinket(player: EntityPlayer): boolean {
   const playerTrinketTypes = TRINKET_SLOT_VALUES.map((trinketSlot) =>

package/src/functions/players.ts

@@ -118,7 +118,7 @@ export function getCharacters(): readonly PlayerType[] {
  */
 export function getClosestPlayer(position: Vector): EntityPlayer {
   let closestPlayer: EntityPlayer | undefined;
-  let closestDistance = Number.POSITIVE_INFINITY;
+  let closestDistance = Infinity;
   for (const player of getPlayers()) {
     const distance = position.Distance(player.Position);
 
@@ -156,12 +156,14 @@ export function getFinalPlayer(): EntityPlayer {
  */
 export function getNewestPlayer(): EntityPlayer {
   let newestPlayer: EntityPlayer | undefined;
-  let lowestFrame = Number.POSITIVE_INFINITY;
+  let lowestFrame = Infinity;
   for (const player of getPlayers()) {
-    if (player.FrameCount < lowestFrame) {
-      newestPlayer = player;
-      lowestFrame = player.FrameCount;
+    if (!(player.FrameCount < lowestFrame)) {
+      continue;
     }
+
+    newestPlayer = player;
+    lowestFrame = player.FrameCount;
   }
 
   assertDefined(newestPlayer, "Failed to find the newest player.");

package/src/functions/revive.ts

@@ -29,8 +29,6 @@ export function isDamageToPlayerFatal(
   lastDamageGameFrame: int | undefined,
 ): boolean {
   const character = player.GetPlayerType();
-  const effects = player.GetEffects();
-  const isBerserk = effects.HasCollectibleEffect(CollectibleType.BERSERK);
 
   // If we are Tainted Jacob and the damage source is Dark Esau, this will not be fatal damage
   // (because we will transform into Tainted Jacob's lost form).
@@ -41,6 +39,9 @@ export function isDamageToPlayerFatal(
     return false;
   }
 
+  const effects = player.GetEffects();
+  const isBerserk = effects.HasCollectibleEffect(CollectibleType.BERSERK);
+
   // If we are berserk, no damage is fatal. (The death is deferred until the end of the berserk
   // effect.)
   if (isBerserk) {
@@ -102,17 +103,13 @@ export function isDamageToPlayerFatal(
   const eternalHearts = player.GetEternalHearts();
   const soulHearts = player.GetSoulHearts();
   const boneHearts = player.GetBoneHearts();
-  if (
+  return !(
     (hearts > 0 && soulHearts > 0)
     || (hearts > 0 && boneHearts > 0)
     || (soulHearts > 0 && boneHearts > 0)
     || (soulHearts > 0 && eternalHearts > 0)
     || boneHearts >= 2 // Two bone hearts and nothing else should not result in a death
-  ) {
-    return false;
-  }
-
-  return true;
+  );
 }
 
 /**

package/src/functions/rng.ts

@@ -9,7 +9,7 @@ import { getNumbersFromTable, tableHasKeys } from "./table";
 import { isTable } from "./types";
 import { assertDefined } from "./utils";
 
-export type SerializedRNG = LuaMap<string, unknown> & {
+export type SerializedRNG = Readonly<LuaMap<string, unknown>> & {
   readonly __serializedRNGBrand: symbol;
   readonly __kind: CopyableIsaacAPIClassType.RNG;
 };
@@ -133,15 +133,17 @@ export function setAllRNGToSeed(
     );
   }
 
-  let setAtLeastOneSeed = false;
+  let didSomething = false;
   for (const [_key, value] of object) {
-    if (isRNG(value)) {
-      setSeed(value, seed);
-      setAtLeastOneSeed = true;
+    if (!isRNG(value)) {
+      continue;
     }
+
+    setSeed(value, seed);
+    didSomething = true;
   }
 
-  if (!setAtLeastOneSeed) {
+  if (!didSomething) {
     error(
       `Failed to set all RNG objects to seed ${seed} because the parent object did not contain any RNG objects.`,
     );

package/src/functions/roomData.ts

@@ -24,10 +24,12 @@ export function getRoomAllowedDoors(
   }
 
   for (const doorSlotFlag of DOOR_SLOT_FLAG_VALUES) {
-    if (hasFlag(roomData.Doors, doorSlotFlag)) {
-      const doorSlot = doorSlotFlagToDoorSlot(doorSlotFlag);
-      allowedDoors.add(doorSlot);
+    if (!hasFlag(roomData.Doors, doorSlotFlag)) {
+      continue;
     }
+
+    const doorSlot = doorSlotFlagToDoorSlot(doorSlotFlag);
+    allowedDoors.add(doorSlot);
   }
 
   return allowedDoors;
@@ -43,7 +45,6 @@ export function getRoomAllowedDoors(
  * room is guaranteed to have data.)
  */
 export function getRoomData(): RoomConfig;
-
 /**
  * Helper function to get the room data for the current or provided room.
  *
@@ -51,7 +52,6 @@ export function getRoomData(): RoomConfig;
  * @returns The room data for the room or undefined if the provided room does not have any data.
  */
 export function getRoomData(roomGridIndex?: int): RoomConfig | undefined;
-
 export function getRoomData(roomGridIndex?: int): RoomConfig | undefined {
   const roomDescriptor = getRoomDescriptor(roomGridIndex);
   return roomDescriptor.Data;
@@ -137,7 +137,6 @@ export function getRoomListIndex(roomGridIndex?: int): int {
  * If you want to get the room name for a specific room type, use the `getRoomTypeName` function.
  */
 export function getRoomName(): string;
-
 /**
  * Helper function to get the name of the room as it appears in the STB/XML data.
  *
@@ -147,7 +146,6 @@ export function getRoomName(): string;
  * @returns The room name. Returns undefined if the room data was not found.
  */
 export function getRoomName(roomGridIndex?: int): string | undefined;
-
 export function getRoomName(roomGridIndex?: int): string | undefined {
   const roomData = getRoomData(roomGridIndex);
   return roomData === undefined ? undefined : roomData.Name;
@@ -163,7 +161,6 @@ export function getRoomName(roomGridIndex?: int): string | undefined {
  * room is guaranteed to have data.)
  */
 export function getRoomShape(): RoomShape;
-
 /**
  * Helper function to get the shape of the room as it appears in the STB/XML data.
  *
@@ -171,7 +168,6 @@ export function getRoomShape(): RoomShape;
  * @returns The room shape. Returns undefined if the room data was not found.
  */
 export function getRoomShape(roomGridIndex?: int): RoomShape | undefined;
-
 export function getRoomShape(roomGridIndex?: int): RoomShape | undefined {
   const roomData = getRoomData(roomGridIndex);
   return roomData === undefined ? undefined : roomData.Shape;
@@ -190,7 +186,6 @@ export function getRoomShape(roomGridIndex?: int): RoomShape | undefined {
  * room is guaranteed to have data.)
  */
 export function getRoomStageID(): StageID;
-
 /**
  * Helper function to get the stage ID for a room as it appears in the STB/XML data.
  *
@@ -201,7 +196,6 @@ export function getRoomStageID(): StageID;
  * @returns The room stage ID. Returns undefined if the room data was not found.
  */
 export function getRoomStageID(roomGridIndex?: int): StageID | undefined;
-
 export function getRoomStageID(roomGridIndex?: int): StageID | undefined {
   const roomData = getRoomData(roomGridIndex);
   return roomData === undefined ? undefined : roomData.StageID;
@@ -222,7 +216,6 @@ export function getRoomStageID(roomGridIndex?: int): StageID | undefined {
  * room is guaranteed to have data.)
  */
 export function getRoomSubType(): int;
-
 /**
  * Helper function to get the sub-type for a room as it appears in the STB/XML data.
  *
@@ -235,7 +228,6 @@ export function getRoomSubType(): int;
  * @returns The room sub-type. Returns undefined if the room data was not found.
  */
 export function getRoomSubType(roomGridIndex?: int): int | undefined;
-
 export function getRoomSubType(roomGridIndex?: int): int | undefined {
   const roomData = getRoomData(roomGridIndex);
   return roomData === undefined ? undefined : roomData.Subtype;
@@ -251,7 +243,6 @@ export function getRoomSubType(roomGridIndex?: int): int | undefined {
  * room is guaranteed to have data.)
  */
 export function getRoomType(): RoomType;
-
 /**
  * Helper function to get the type for a room as it appears in the STB/XML data.
  *
@@ -259,7 +250,6 @@ export function getRoomType(): RoomType;
  * @returns The room type. Returns undefined if the room data was not found.
  */
 export function getRoomType(roomGridIndex?: int): RoomType | undefined;
-
 /**
  * Helper function for getting the type of the room with the given grid index.
  *
@@ -284,7 +274,6 @@ export function getRoomType(roomGridIndex?: int): RoomType | undefined {
  * room is guaranteed to have data.)
  */
 export function getRoomVariant(): int;
-
 /**
  * Helper function to get the variant for a room as it appears in the STB/XML data.
  *
@@ -295,7 +284,6 @@ export function getRoomVariant(): int;
  * @returns The room variant. Returns undefined if the room data was not found.
  */
 export function getRoomVariant(roomGridIndex?: int): int | undefined;
-
 export function getRoomVariant(roomGridIndex?: int): int {
   const roomData = getRoomData(roomGridIndex);
   return roomData === undefined ? -1 : roomData.Variant;

package/src/functions/roomGrid.ts

@@ -75,30 +75,6 @@ export function isValidGridPosition(
     : isValidGridPositionNormal(gridPosition, roomShape);
 }
 
-function isValidGridPositionNormal(gridPosition: Vector, roomShape: RoomShape) {
-  const topLeft = getRoomShapeTopLeftPosition(roomShape);
-  const bottomRight = getRoomShapeBottomRightPosition(roomShape);
-  return inRectangle(gridPosition, topLeft, bottomRight);
-}
-
-function isValidGridPositionLRoom(gridPosition: Vector, roomShape: RoomShape) {
-  const rectangles = L_ROOM_SHAPE_TO_RECTANGLES[roomShape];
-  if (rectangles === undefined) {
-    return false;
-  }
-
-  const {
-    verticalTopLeft,
-    verticalBottomRight,
-    horizontalTopLeft,
-    horizontalBottomRight,
-  } = rectangles;
-  return (
-    inRectangle(gridPosition, verticalTopLeft, verticalBottomRight)
-    || inRectangle(gridPosition, horizontalTopLeft, horizontalBottomRight)
-  );
-}
-
 /**
  * Helper function to convert a world position `Vector` to a grid position `Vector`.
  *
@@ -126,3 +102,27 @@ export function worldPositionToGridPositionFast(
   const y = worldPos.Y / 40 - 4;
   return Vector(x, y);
 }
+
+function isValidGridPositionLRoom(gridPosition: Vector, roomShape: RoomShape) {
+  const rectangles = L_ROOM_SHAPE_TO_RECTANGLES[roomShape];
+  if (rectangles === undefined) {
+    return false;
+  }
+
+  const {
+    verticalTopLeft,
+    verticalBottomRight,
+    horizontalTopLeft,
+    horizontalBottomRight,
+  } = rectangles;
+  return (
+    inRectangle(gridPosition, verticalTopLeft, verticalBottomRight)
+    || inRectangle(gridPosition, horizontalTopLeft, horizontalBottomRight)
+  );
+}
+
+function isValidGridPositionNormal(gridPosition: Vector, roomShape: RoomShape) {
+  const topLeft = getRoomShapeTopLeftPosition(roomShape);
+  const bottomRight = getRoomShapeBottomRightPosition(roomShape);
+  return inRectangle(gridPosition, topLeft, bottomRight);
+}

package/src/functions/roomShapeWalls.ts

@@ -270,6 +270,35 @@ export function getVanillaWallGridIndexSetForRoomShape(
   }
 }
 
+/**
+ * Helper function to determine if a given grid index should have a wall generated by the vanilla
+ * game. This is useful as a mechanism to distinguish between real walls and custom walls spawned by
+ * mods.
+ *
+ * This function properly handles the special cases of the Mother boss room and the Home closet
+ * rooms, which are both non-standard room shapes.
+ */
+export function isVanillaWallGridIndex(gridIndex: int): boolean {
+  const room = game.GetRoom();
+  const roomShape = room.GetRoomShape();
+
+  // Handle the special cases of non-standard room shapes.
+  let wallGridIndexSet: ReadonlySet<int> | undefined;
+  if (inHomeCloset()) {
+    wallGridIndexSet = HOME_CLOSET_CORNERS_SET;
+  } else if (inBossRoomOf(BossID.MOTHER)) {
+    wallGridIndexSet = MOTHER_ROOM_CORNERS_SET;
+  } else {
+    wallGridIndexSet = ROOM_SHAPE_TO_WALL_GRID_INDEX_MAP.get(roomShape);
+    assertDefined(
+      wallGridIndexSet,
+      `Failed to find the wall grid index set for: RoomShape.${RoomShape[roomShape]} (${roomShape})`,
+    );
+  }
+
+  return wallGridIndexSet.has(gridIndex);
+}
+
 /**
  * Providing the room shape is necessary so that the `getGridIndexesBetween` function can use the
  * corresponding grid width.
@@ -313,32 +342,3 @@ function getVanillaWallGridIndexSetForRectangleRoomShape(
     ),
   ]);
 }
-
-/**
- * Helper function to determine if a given grid index should have a wall generated by the vanilla
- * game. This is useful as a mechanism to distinguish between real walls and custom walls spawned by
- * mods.
- *
- * This function properly handles the special cases of the Mother boss room and the Home closet
- * rooms, which are both non-standard room shapes.
- */
-export function isVanillaWallGridIndex(gridIndex: int): boolean {
-  const room = game.GetRoom();
-  const roomShape = room.GetRoomShape();
-
-  // Handle the special cases of non-standard room shapes.
-  let wallGridIndexSet: ReadonlySet<int> | undefined;
-  if (inHomeCloset()) {
-    wallGridIndexSet = HOME_CLOSET_CORNERS_SET;
-  } else if (inBossRoomOf(BossID.MOTHER)) {
-    wallGridIndexSet = MOTHER_ROOM_CORNERS_SET;
-  } else {
-    wallGridIndexSet = ROOM_SHAPE_TO_WALL_GRID_INDEX_MAP.get(roomShape);
-    assertDefined(
-      wallGridIndexSet,
-      `Failed to find the wall grid index set for: RoomShape.${RoomShape[roomShape]} (${roomShape})`,
-    );
-  }
-
-  return wallGridIndexSet.has(gridIndex);
-}

package/src/functions/rooms.ts

@@ -187,15 +187,6 @@ export function getRoomItemPoolType(): ItemPoolType {
     : itemPoolTypeOrNegativeOne;
 }
 
-/**
- * Helper function to get the proper name of a room type.
- *
- * For example, `RoomType.TREASURE` will return "Treasure Room".
- */
-export function getRoomTypeName(roomType: RoomType): string {
-  return ROOM_TYPE_NAMES[roomType];
-}
-
 /**
  * Helper function to get the room descriptor for every room on the level. This includes off-grid
  * rooms, such as the Devil Room.
@@ -298,6 +289,15 @@ export function getRoomsOutsideGrid(): readonly RoomDescriptor[] {
   );
 }
 
+/**
+ * Helper function to get the proper name of a room type.
+ *
+ * For example, `RoomType.TREASURE` will return "Treasure Room".
+ */
+export function getRoomTypeName(roomType: RoomType): string {
+  return ROOM_TYPE_NAMES[roomType];
+}
+
 /**
  * Helper function to determine if the current room shape is equal to `RoomShape.1x2` or
  * `RoomShape.2x1`.

package/src/functions/serialization.ts

@@ -101,24 +101,6 @@ export function deserializeIsaacAPIClass<
   return functions.deserialize(serializedIsaacAPIClass);
 }
 
-/**
- * In order to find out what type of serialized Isaac API class this is, we search through the
- * serialized table for brands.
- */
-function getSerializedTableType(
-  serializedIsaacAPIClass: SerializedIsaacAPIClass,
-): CopyableIsaacAPIClassType | undefined {
-  for (const [copyableIsaacAPIClassType, serializationBrand] of Object.entries(
-    ISAAC_API_CLASS_TYPE_TO_BRAND,
-  )) {
-    if (serializedIsaacAPIClass.has(serializationBrand)) {
-      return copyableIsaacAPIClassType as CopyableIsaacAPIClassType;
-    }
-  }
-
-  return undefined;
-}
-
 /**
  * Helper function to generically check if a given object is a copyable Isaac API class. (This is
  * used by the save data manager when determining what is safe to copy.)
@@ -194,3 +176,21 @@ export function serializeIsaacAPIClass<T extends CopyableIsaacAPIClass>(
 
   return functions.serialize(isaacAPIClass);
 }
+
+/**
+ * In order to find out what type of serialized Isaac API class this is, we search through the
+ * serialized table for brands.
+ */
+function getSerializedTableType(
+  serializedIsaacAPIClass: SerializedIsaacAPIClass,
+): CopyableIsaacAPIClassType | undefined {
+  for (const [copyableIsaacAPIClassType, serializationBrand] of Object.entries(
+    ISAAC_API_CLASS_TYPE_TO_BRAND,
+  )) {
+    if (serializedIsaacAPIClass.has(serializationBrand)) {
+      return copyableIsaacAPIClassType as CopyableIsaacAPIClassType;
+    }
+  }
+
+  return undefined;
+}

package/src/functions/set.ts

@@ -40,14 +40,8 @@ export function combineSets<T>(
 }
 
 /** Helper function to copy a set. (You can also use a Set constructor to accomplish this task.) */
-// eslint-disable-next-line complete/no-mutable-return
-export function copySet<T>(oldSet: ReadonlySet<T>): Set<T> {
-  const newSet = new Set<T>();
-  for (const value of oldSet) {
-    newSet.add(value);
-  }
-
-  return newSet;
+export function copySet<T>(oldSet: ReadonlySet<T>): ReadonlySet<T> {
+  return new Set<T>(oldSet);
 }
 
 /**

package/src/functions/spawnCollectible.ts

@@ -65,9 +65,9 @@ export function spawnCollectible(
   }
 
   if (
-    anyPlayerIs(PlayerType.KEEPER_B)
+    !forceFreeItem
     && !isQuestCollectible(collectibleType)
-    && !forceFreeItem
+    && anyPlayerIs(PlayerType.KEEPER_B)
   ) {
     // When playing Tainted Keeper, collectibles are supposed to have a price, and manually spawned
     // items will not have a price, so we have to set it manually.