isaacscript-common 6.22.3 → 7.0.0

package/dist/interfaces/SaveData.lua

@@ -1,2 +1,68 @@
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local __TS__Class = ____lualib.__TS__Class
 local ____exports = {}
+local function test(self, _saveData)
+end
+do
+    local saveDataWithPrimitives = {run = {foo = 123, bar = "bar", baz = true, nested = {foo = 123, bar = "bar", baz = true}}}
+    test(nil, saveDataWithPrimitives)
+end
+do
+    local saveDataWithEntity = {run = {foo = {}}}
+    test(nil, saveDataWithEntity)
+end
+do
+    local saveDataWithMap = {run = {foo = __TS__New(Map)}}
+    test(nil, saveDataWithMap)
+end
+do
+    local saveDataWithMap = {run = {foo = __TS__New(Map)}}
+    test(nil, saveDataWithMap)
+end
+do
+    local saveDataWithMap = {run = {foo = __TS__New(Map)}}
+    test(nil, saveDataWithMap)
+end
+do
+    local Foo = __TS__Class()
+    Foo.name = "Foo"
+    function Foo.prototype.____constructor(self)
+        self.someField = 123
+    end
+    local saveDataWithClass = {run = {foo = __TS__New(Foo)}}
+    test(nil, saveDataWithClass)
+end
+do
+    local Foo = __TS__Class()
+    Foo.name = "Foo"
+    function Foo.prototype.____constructor(self)
+        self.someField = 123
+    end
+    function Foo.prototype.someMethod(self)
+    end
+    local saveDataWithClassWithMethod = {run = {foo = __TS__New(Foo)}}
+    test(nil, saveDataWithClassWithMethod)
+end
+do
+    local Foo = __TS__Class()
+    Foo.name = "Foo"
+    function Foo.prototype.____constructor(self)
+        self.someField = 123
+    end
+    local saveDataWithNestedClass = {run = {fooMap = __TS__New(Map)}}
+    test(nil, saveDataWithNestedClass)
+end
+do
+    local Foo = __TS__Class()
+    Foo.name = "Foo"
+    function Foo.prototype.____constructor(self)
+        self.someField = 123
+    end
+    function Foo.prototype.someMethod(self)
+    end
+    local saveDataWithNestedClass = {run = {fooMap = __TS__New(Map)}}
+    test(nil, saveDataWithNestedClass)
+end
 return ____exports

package/dist/types/index.d.ts

@@ -2,7 +2,6 @@ export * from "./AnyEntity";
 export * from "./AnyGridEntity";
 export * from "./CollectibleIndex";
 export * from "./Immutable";
-export * from "./IsaacAPIClass";
 export * from "./PickingUpItem";
 export * from "./PickupIndex";
 export * from "./PlayerIndex";

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "6.22.3",
+  "version": "7.0.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.1.4"
+    "isaac-typescript-definitions": "^3.2.1"
   }
 }

package/src/classes/DefaultMap.ts

@@ -5,9 +5,7 @@ import { isFunction, isPrimitive } from "../functions/types";
  * A function that creates the default value for your `DefaultMap`. For example, if it was a
  * `DefaultMap` containing maps, the factory function would be: `() => new Map()`
  */
-export type FactoryFunction<V, Args extends unknown[]> = (
-  ...extraArgs: Args
-) => V;
+export type FactoryFunction<V, Args extends unknown[]> = (...args: Args) => V;
 
 /**
  * `DefaultMap` is a data structure that makes working with default values easier.
@@ -127,13 +125,13 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
    * If the key exists, this will return the same thing as the normal `Map.get` method. Otherwise,
    * it will set a default value for the provided key, and then return the default value.
    */
-  getAndSetDefault(key: Key, ...extraArgs: Args): Value {
+  getAndSetDefault(key: Key, ...args: Args): Value {
     const value = super.get(key);
     if (value !== undefined) {
       return value;
     }
 
-    const defaultValue = this.getDefaultValue(...extraArgs);
+    const defaultValue = this.getDefaultValue(...args);
     this.set(key, defaultValue);
     return defaultValue;
   }
@@ -142,13 +140,13 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
    * Returns the default value to be used for a new key. (If a factory function was provided during
    * instantiation, this will execute the factory function.)
    */
-  getDefaultValue(...extraArgs: Args): Value {
+  getDefaultValue(...args: Args): Value {
     if (this.defaultValue !== undefined) {
       return this.defaultValue;
     }
 
     if (this.defaultValueFactory !== undefined) {
-      return this.defaultValueFactory(...extraArgs);
+      return this.defaultValueFactory(...args);
     }
 
     error("A DefaultMap was incorrectly instantiated.");
@@ -170,3 +168,34 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
     error("A DefaultMap was incorrectly instantiated.");
   }
 }
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
+function test() {
+  // Boolean
+  const myDefaultMapBoolean = new DefaultMap<string, boolean>(false);
+  const myDefaultMapBooleanFactory = new DefaultMap<string, boolean>(
+    () => false,
+  );
+  const myDefaultMapBooleanWithoutParams = new DefaultMap(false);
+
+  // Number
+  const myDefaultMapNumber = new DefaultMap<string, number>(123);
+  const myDefaultMapNumberFactory = new DefaultMap<string, number>(() => 123);
+  const myDefaultMapNumberWithoutParams = new DefaultMap(123);
+
+  // String
+  const myDefaultMapString = new DefaultMap<string, string>("foo");
+  const myDefaultMapStringFactory = new DefaultMap<string, string>(() => "foo");
+  const myDefaultMapStringWithoutParams = new DefaultMap("foo");
+
+  // Array
+  const myDefaultMapArray = new DefaultMap<string, string[]>(() => []);
+  const myDefaultMapArrayWithoutParams = new DefaultMap(() => []);
+
+  // Map
+  const myDefaultMapMap = new DefaultMap<string, Map<string, string>>(
+    () => new Map(),
+  );
+  const myDefaultMapMapWithoutParams = new DefaultMap(() => new Map());
+}
+/* eslint-enable @typescript-eslint/no-unused-vars */

package/src/features/customStage/exports.ts

@@ -21,7 +21,7 @@ import { logError } from "../../functions/log";
 import { newRNG } from "../../functions/rng";
 import {
   getRoomDataForTypeVariant,
-  getRoomsInGrid,
+  getRoomsInsideGrid,
 } from "../../functions/rooms";
 import { setStage } from "../../functions/stage";
 import { CustomStage } from "../../interfaces/private/CustomStage";
@@ -121,7 +121,7 @@ function setStageRoomsData(
   const level = game.GetLevel();
   const startingRoomGridIndex = level.GetStartingRoomIndex();
 
-  for (const room of getRoomsInGrid()) {
+  for (const room of getRoomsInsideGrid()) {
     // The starting floor of each room should stay empty.
     if (room.SafeGridIndex === startingRoomGridIndex) {
       continue;

package/src/features/disableInputs.ts

@@ -12,16 +12,10 @@ const FEATURE_NAME = "disableInputs";
 const v = {
   run: {
     /** Indexed by the requesting feature key. */
-    disableInputsWithWhitelistMap: new Map<
-      string,
-      Set<ButtonAction> | ReadonlySet<ButtonAction>
-    >(),
+    disableInputsWithWhitelistMap: new Map<string, ReadonlySet<ButtonAction>>(),
 
     /** Indexed by the requesting feature key. */
-    enableInputsWithBlacklistMap: new Map<
-      string,
-      Set<ButtonAction> | ReadonlySet<ButtonAction>
-    >(),
+    enableInputsWithBlacklistMap: new Map<string, ReadonlySet<ButtonAction>>(),
   },
 };
 
@@ -154,7 +148,7 @@ export function enableAllInputsExceptFor(
  */
 export function disableAllInputsExceptFor(
   key: string,
-  whitelist: Set<ButtonAction>,
+  whitelist: Set<ButtonAction> | ReadonlySet<ButtonAction>,
 ): void {
   errorIfFeaturesNotInitialized(FEATURE_NAME);
 

package/src/features/runInNFrames.ts

@@ -31,7 +31,7 @@ const v = {
 };
 
 export function runInNFramesInit(mod: Mod): void {
-  saveDataManager(FEATURE_NAME, v, () => false); // Functions are not serializable.
+  saveDataManager(FEATURE_NAME, v, false); // Functions are not serializable.
 
   mod.AddCallback(ModCallback.POST_UPDATE, postUpdate); // 1
   mod.AddCallback(ModCallback.POST_RENDER, postRender); // 2

package/src/features/runNextRoom.ts

@@ -13,7 +13,7 @@ const v = {
 };
 
 export function runNextRoomInit(mod: ModUpgraded): void {
-  saveDataManager(FEATURE_NAME, v, () => false); // Functions are not serializable.
+  saveDataManager(FEATURE_NAME, v, false); // Functions are not serializable.
 
   mod.AddCallbackCustom(
     ModCallbackCustom.POST_NEW_ROOM_REORDERED,

package/src/features/saveDataManager/exports.ts

@@ -96,18 +96,30 @@ import { SAVE_DATA_MANAGER_FEATURE_NAME } from "./saveDataManagerConstants";
  *            manager. The save data manager will throw an error if the key is already registered.
  * @param v An object that corresponds to the `SaveData` interface. The object is conventionally
  *          called "v" for brevity. ("v" is short for "local variables").
- * @param conditionalFunc An optional function to run upon saving this key to disk. For example,
- *                        this allows features to only save data to disk if the feature is enabled.
- *                        Specify a value of `() => false` to completely disable saving this feature
- *                        to disk. Disabling saving to disk is useful if you are using data that is
- *                        not serializable. Alternatively, it could be useful if you want to use the
- *                        save data manager to automatically reset variables on run/level/room, but
- *                        not clutter the the "save#.dat" file with unnecessary keys.
+ * @param conditionalFunc Optional. A function to run to check if this save data should be written
+ *                        to disk. Default is `() => true`, meaning that this save data will always
+ *                        be written to disk. Use a conditional function for the situations when the
+ *                        local variables are for a feature that the end-user can disable. (If the
+ *                        feature is disabled, then there would be no point in writing any of the
+ *                        variables to the "save#.dat" file.) You can also specify `false` to this
+ *                        argument in order to completely disable saving data. (Specifying `false`
+ *                        will allow you to use non-serializable objects in your save data, such as
+ *                        `EntityPtr`.
  */
+export function saveDataManager<Persistent, Run, Level>(
+  key: string, // This is the overload for the standard case with serializable data.
+  v: SaveData<Persistent, Run, Level>,
+  conditionalFunc?: () => boolean,
+): void;
 export function saveDataManager(
-  key: string,
+  key: string, // This is the overload for the case when saving data is disabled.
   v: SaveData,
-  conditionalFunc?: () => boolean,
+  conditionalFunc: false,
+): void;
+export function saveDataManager<Persistent, Run, Level>(
+  key: string,
+  v: SaveData<Persistent, Run, Level>,
+  conditionalFunc?: (() => boolean) | false,
 ): void {
   errorIfFeaturesNotInitialized(SAVE_DATA_MANAGER_FEATURE_NAME);
 
@@ -126,6 +138,12 @@ export function saveDataManager(
   // Add the new save data to the map.
   saveDataMap.set(key, v);
 
+  // Convert the boolean to a function, if necessary. (Having the argument be a boolean is necessary
+  // in order for the overloads to work properly.)
+  if (conditionalFunc === false) {
+    conditionalFunc = () => false;
+  }
+
   // If the only key in the save data is "room", then we don't have to worry about saving this data
   // to disk (because the room would be reloaded upon resuming a continued run).
   const saveDataKeys = Object.keys(v);
@@ -135,7 +153,7 @@ export function saveDataManager(
 
   // Make a copy of the initial save data so that we can use it to restore the default values later
   // on.
-  const saveDataCopy = deepCopy(v, SerializationType.NONE, key) as SaveData;
+  const saveDataCopy = deepCopy(v, SerializationType.NONE, key) as typeof v;
   saveDataDefaultsMap.set(key, saveDataCopy);
 
   // Store the conditional function for later, if present.

package/src/features/saveDataManager/save.ts

@@ -44,7 +44,8 @@ function getAllSaveDataToWriteToDisk(
         }
       }
 
-      // Strip out the room part of the save data.
+      // Strip out the room part of the save data (and any other arbitrary fields that they might
+      // have added).
       const saveDataWithoutRoom: SaveData = {
         persistent: saveData.persistent,
         run: saveData.run,

package/src/features/taintedLazarusPlayers.ts

@@ -31,10 +31,10 @@ const v = {
 };
 
 export function taintedLazarusPlayersInit(mod: ModUpgraded): void {
-  // `EntityPtr` is not serializable, so we cannot save data. However, this is inconsequential,
+  // `EntityPtr` is not serializable, so we cannot save the data. However, this is inconsequential,
   // since the `POST_PLAYER_INIT` callback will fire when a run is continued, which will repopulate
   // the `subPlayerMap`.
-  saveDataManager(FEATURE_NAME, v, () => false);
+  saveDataManager(FEATURE_NAME, v, false);
 
   mod.AddCallback(ModCallback.POST_PLAYER_INIT, postPlayerInit);
 }

package/src/functions/deepCopy.ts

@@ -233,7 +233,7 @@ function deepCopyDefaultMap(
       // throw a run-time error to immediately alert the end-user that their data structure is
       // invalid.
       error(
-        'Failed to deep copy a DefaultMap because it was instantiated with a factory function and was also inside of another map. You cannot use a nested DefaultMap in this way because factory functions are not serializable. (In other words, there is no way to copy the function that you are using for the DefaultMap into the "save#.dat" file.) Instead, refactor your data structure so that the DefaultMap is not nested.',
+        "Failed to deep copy a DefaultMap because it was instantiated with a factory function and was also inside of an array, map, or set. For more information, see: https://isaacscript.github.io/main/gotchas#failed-to-deep-copy-a-defaultmap",
       );
     } else {
       // In most cases, the DefaultMap will be attached to a normal table element. In this case, if

package/src/functions/entities.ts

@@ -187,9 +187,9 @@ function setPrimitiveEntityFields(
     const indexKey = key as keyof typeof entity;
     const value = entity[indexKey];
     if (isPrimitive(value)) {
-      entityFields.set(indexKey, value);
+      entityFields.set(indexKey as string, value);
     } else if (isVector(value)) {
-      entityFields.set(indexKey, vectorToString(value));
+      entityFields.set(indexKey as string, vectorToString(value));
     }
   }
 }

package/src/functions/isaacAPIClass.ts

@@ -1,4 +1,3 @@
-import { IsaacAPIClass } from "../types/IsaacAPIClass";
 import { trimPrefix } from "./string";
 import { isString, isUserdata } from "./types";
 

package/src/functions/level.ts

@@ -2,14 +2,14 @@ import { DoorSlot } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { getEnumValues } from "./enums";
 import { isDoorSlotValidAtGridIndexForRedRoom } from "./levelGrid";
-import { getNumRooms, getRoomsInGrid } from "./rooms";
+import { getNumRooms, getRoomsInsideGrid } from "./rooms";
 
 export function fillLevelWithRedRooms(): void {
   const level = game.GetLevel();
 
   let numRoomsInGrid: int;
   do {
-    const roomsInGrid = getRoomsInGrid();
+    const roomsInGrid = getRoomsInsideGrid();
     numRoomsInGrid = roomsInGrid.length;
 
     for (const roomDescriptor of roomsInGrid) {

package/src/functions/levelGrid.ts

@@ -35,7 +35,7 @@ import {
   getRoomGridIndex,
   getRoomShape,
 } from "./roomData";
-import { getRooms, getRoomsInGrid } from "./rooms";
+import { getRooms, getRoomsInsideGrid } from "./rooms";
 import { getGridIndexDelta } from "./roomShape";
 
 const LEFT = -1;
@@ -63,7 +63,7 @@ export function getAdjacentRoomGridIndexes(roomGridIndex?: int): int[] {
   const roomGridIndexToUse =
     roomGridIndex === undefined ? getRoomGridIndex() : roomGridIndex;
 
-  if (!isRoomGridIndexInBounds(roomGridIndexToUse)) {
+  if (!isRoomInsideGrid(roomGridIndexToUse)) {
     return [];
   }
 
@@ -72,7 +72,7 @@ export function getAdjacentRoomGridIndexes(roomGridIndex?: int): int[] {
   );
 
   return adjacentRoomGridIndexes.filter((adjacentRoomGridIndex) =>
-    isRoomGridIndexInBounds(adjacentRoomGridIndex),
+    isRoomInsideGrid(adjacentRoomGridIndex),
   );
 }
 
@@ -117,7 +117,7 @@ export function getNewRoomCandidatesBesideRoom(
 ): Array<[doorSlot: DoorSlot, roomGridIndex: int]> {
   const roomDescriptor = getRoomDescriptor(roomGridIndex);
 
-  if (!isRoomGridIndexInBounds(roomDescriptor.SafeGridIndex)) {
+  if (!isRoomInsideGrid(roomDescriptor.SafeGridIndex)) {
     return [];
   }
 
@@ -172,7 +172,7 @@ export function getNewRoomCandidatesBesideRoom(
 export function getNewRoomCandidatesForLevel(): Array<
   [adjacentRoomGridIndex: int, doorSlot: DoorSlot, newRoomGridIndex: int]
 > {
-  const rooms = getRoomsInGrid();
+  const rooms = getRoomsInsideGrid();
   const normalRooms = rooms.filter(
     (room) =>
       room.Data !== undefined &&
@@ -207,7 +207,7 @@ export function getNewRoomCandidatesForLevel(): Array<
 export function getRoomGridIndexesForType(...roomTypes: RoomType[]): int[] {
   const roomTypesSet = new Set<RoomType>([...roomTypes]);
 
-  const rooms = getRoomsInGrid();
+  const rooms = getRoomsInsideGrid();
   const matchingRooms = rooms.filter(
     (roomDescriptor) =>
       roomDescriptor.Data !== undefined &&
@@ -230,7 +230,7 @@ export function getRoomGridIndexesForType(...roomTypes: RoomType[]): int[] {
 export function getRoomNeighbors(roomGridIndex?: int): Map<DoorSlot, int> {
   const roomDescriptor = getRoomDescriptor(roomGridIndex);
 
-  if (!isRoomGridIndexInBounds(roomDescriptor.SafeGridIndex)) {
+  if (!isRoomInsideGrid(roomDescriptor.SafeGridIndex)) {
     return new Map();
   }
 
@@ -293,7 +293,7 @@ export function getRoomShapeNeighborGridIndexes(
   const neighborGridIndexes = new Map<DoorSlot, int>();
   for (const [doorSlot, delta] of roomShapeNeighborGridIndexDeltas.entries()) {
     const roomGridIndex = safeRoomGridIndex + delta;
-    if (isRoomGridIndexInBounds(roomGridIndex)) {
+    if (isRoomInsideGrid(roomGridIndex)) {
       neighborGridIndexes.set(doorSlot, roomGridIndex);
     }
   }
@@ -356,9 +356,7 @@ export function isDoorSlotValidAtGridIndexForRedRoom(
   }
 
   const redRoomGridIndex = roomGridIndex + delta;
-  return (
-    !roomExists(redRoomGridIndex) && isRoomGridIndexInBounds(redRoomGridIndex)
-  );
+  return !roomExists(redRoomGridIndex) && isRoomInsideGrid(redRoomGridIndex);
 }
 
 /**
@@ -376,8 +374,14 @@ export function isRedKeyRoom(roomGridIndex?: int): boolean {
  * Helper function to determine if a given room grid index is inside of the normal 13x13 level grid.
  *
  * For example, Devil Rooms and the Mega Satan room are not considered to be inside the grid.
+ *
+ * @param roomGridIndex Optional. Default is the current room index.
  */
-export function isRoomGridIndexInBounds(roomGridIndex: int): boolean {
+export function isRoomInsideGrid(roomGridIndex?: int): boolean {
+  if (roomGridIndex === undefined) {
+    roomGridIndex = getRoomGridIndex();
+  }
+
   return roomGridIndex >= 0 && roomGridIndex <= MAX_LEVEL_GRID_INDEX;
 }
 

package/src/functions/minimap.ts

@@ -1,7 +1,7 @@
 import { DisplayFlag, DisplayFlagZero } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { getRoomDescriptor } from "./roomData";
-import { getRoomsInGrid } from "./rooms";
+import { getRoomsInsideGrid } from "./rooms";
 
 /**
  * Helper function to set the value of `DisplayFlag` for every room on the floor to 0.
@@ -12,7 +12,7 @@ import { getRoomsInGrid } from "./rooms";
 export function clearFloorDisplayFlags(): void {
   const level = game.GetLevel();
 
-  for (const room of getRoomsInGrid()) {
+  for (const room of getRoomsInsideGrid()) {
     room.DisplayFlags = DisplayFlagZero;
   }
 
@@ -27,7 +27,7 @@ export function clearFloorDisplayFlags(): void {
 export function getFloorDisplayFlags(): Map<int, BitFlags<DisplayFlag>> {
   const displayFlagsMap = new Map<int, BitFlags<DisplayFlag>>();
 
-  const roomsInGrid = getRoomsInGrid();
+  const roomsInGrid = getRoomsInsideGrid();
   for (const roomDescriptor of roomsInGrid) {
     displayFlagsMap.set(
       roomDescriptor.SafeGridIndex,

package/src/functions/rooms.ts

@@ -74,7 +74,7 @@ export function changeRoom(roomGridIndex: int): void {
  * include off-grid rooms, like the Devil Room.
  */
 export function getNumRooms(): int {
-  const rooms = getRoomsInGrid();
+  const rooms = getRoomsInsideGrid();
   return rooms.length;
 }
 
@@ -186,7 +186,7 @@ export function getRooms(
   // The obvious way to get all of the rooms would be to iterate over the `RoomList` from the
   // `Level.GetRooms` method. However, this results in read-only data, and we want to return a
   // writable object. Instead, we let the heavy lifting be handled by other functions.
-  const roomsInGrid = getRoomsInGrid(includeExtraDimensionalRooms);
+  const roomsInGrid = getRoomsInsideGrid(includeExtraDimensionalRooms);
   const roomsOutsideGrid = getRoomsOutsideGrid();
   return [...roomsInGrid, ...roomsOutsideGrid];
 }
@@ -201,7 +201,7 @@ export function getRooms(
  *                                 extra-dimensional rooms are automatically be generated. Default
  *                                 is false.
  */
-export function getRoomsInGrid(
+export function getRoomsInsideGrid(
   includeExtraDimensionalRooms = false,
 ): RoomDescriptor[] {
   const level = game.GetLevel();
@@ -463,7 +463,7 @@ export function inStartingRoom(): boolean {
 export function isAllRoomsClear(onlyCheckRoomTypes?: RoomType[]): boolean {
   const roomTypeWhitelist =
     onlyCheckRoomTypes === undefined ? null : new Set(onlyCheckRoomTypes);
-  const rooms = getRoomsInGrid();
+  const rooms = getRoomsInsideGrid();
   const matchingRooms =
     roomTypeWhitelist === null
       ? rooms