isaacscript-common 87.9.5 → 87.9.7

package/src/functions/emptyRoom.ts

@@ -31,6 +31,34 @@ export function emptyRoom(): void {
   emptyRoomGridEntities();
 }
 
+/** Helper function to remove all grid entities from a room except for doors and walls. */
+export function emptyRoomGridEntities(): void {
+  let removedOneOrMoreGridEntities = false;
+  for (const gridEntity of getGridEntities()) {
+    const gridEntityType = gridEntity.GetType();
+    const gridIndex = gridEntity.GetGridIndex();
+
+    // We cannot simply check if the grid entity type is equal to a wall because other mods use
+    // walls as a base for custom grid entities.
+    if (
+      gridEntityType === GridEntityType.WALL
+      && isVanillaWallGridIndex(gridIndex)
+    ) {
+      continue;
+    }
+
+    if (gridEntityType === GridEntityType.DOOR) {
+      continue;
+    }
+
+    removeGridEntity(gridEntity, false);
+    removedOneOrMoreGridEntities = true;
+  }
+  if (removedOneOrMoreGridEntities) {
+    roomUpdateSafe();
+  }
+}
+
 /**
  * We remove entities in the `POST_NEW_ROOM` callback instead of in the `PRE_ROOM_ENTITY_SPAWN`
  * callback so that they will not re-appear when we re-enter the room.
@@ -63,31 +91,3 @@ function emptyRoomEntities() {
     }
   }
 }
-
-/** Helper function to remove all grid entities from a room except for doors and walls. */
-export function emptyRoomGridEntities(): void {
-  let removedOneOrMoreGridEntities = false;
-  for (const gridEntity of getGridEntities()) {
-    const gridEntityType = gridEntity.GetType();
-    const gridIndex = gridEntity.GetGridIndex();
-
-    // We cannot simply check if the grid entity type is equal to a wall because other mods use
-    // walls as a base for custom grid entities.
-    if (
-      gridEntityType === GridEntityType.WALL
-      && isVanillaWallGridIndex(gridIndex)
-    ) {
-      continue;
-    }
-
-    if (gridEntityType === GridEntityType.DOOR) {
-      continue;
-    }
-
-    removeGridEntity(gridEntity, false);
-    removedOneOrMoreGridEntities = true;
-  }
-  if (removedOneOrMoreGridEntities) {
-    roomUpdateSafe();
-  }
-}

package/src/functions/entities.ts

@@ -23,15 +23,7 @@ import { assertDefined } from "./utils";
 import { doesVectorHaveLength, isVector, vectorToString } from "./vector";
 
 /** From DeadInfinity. */
-const DAMAGE_FLASH_COLOR = newReadonlyColor(
-  0.5,
-  0.5,
-  0.5,
-  1,
-  200 / 255,
-  0 / 255,
-  0 / 255,
-);
+const DAMAGE_FLASH_COLOR = newReadonlyColor(0.5, 0.5, 0.5, 1, 200 / 255, 0, 0);
 
 /**
  * Helper function to count the number of entities in room. Use this over the vanilla
@@ -94,7 +86,7 @@ export function doesAnyEntityExist(
   const entityTypesMutable = entityTypes as EntityType[] | Set<EntityType>;
 
   const entityTypesArray: readonly EntityType[] = isTSTLSet(entityTypesMutable)
-    ? [...entityTypesMutable.values()]
+    ? [...entityTypesMutable]
     : entityTypesMutable;
 
   return entityTypesArray.some((entityType) =>
@@ -144,7 +136,7 @@ export function getClosestEntityTo<T extends AnyEntity>(
   filterFunc?: (entity: T) => boolean,
 ): T | undefined {
   let closestEntity: T | undefined;
-  let closestDistance = Number.POSITIVE_INFINITY;
+  let closestDistance = Infinity;
   for (const entity of entities) {
     const distance = referenceEntity.Position.Distance(entity.Position);
 
@@ -260,8 +252,7 @@ export function getEntityFields(
   const entityFields = new LuaMap<string, boolean | number | string>();
 
   const metatable = getmetatable(entity) as
-    | LuaMap<AnyNotNil, unknown>
-    | undefined;
+    LuaMap<AnyNotNil, unknown> | undefined;
   assertDefined(metatable, "Failed to get the metatable for an entity.");
 
   setPrimitiveEntityFields(entity, metatable, entityFields);
@@ -275,8 +266,7 @@ export function getEntityFields(
   }
 
   const parentTable = metatable.get("__parent") as
-    | LuaMap<AnyNotNil, unknown>
-    | undefined;
+    LuaMap<AnyNotNil, unknown> | undefined;
   assertDefined(
     parentTable,
     'Failed to get the "__parent" table for an entity.',
@@ -287,31 +277,6 @@ export function getEntityFields(
   return entityFields;
 }
 
-function setPrimitiveEntityFields(
-  entity: Entity,
-  metatable: LuaMap<AnyNotNil, unknown>,
-  entityFields: LuaMap<string, boolean | number | string>,
-) {
-  const propGetTable = metatable.get("__propget") as
-    | LuaMap<AnyNotNil, unknown>
-    | undefined;
-  assertDefined(
-    propGetTable,
-    'Failed to get the "__propget" table for an entity.',
-  );
-
-  for (const [key] of propGetTable) {
-    // The values of this table are functions. Thus, we use the key to index the original entity.
-    const indexKey = key as keyof typeof entity;
-    const value = entity[indexKey];
-    if (isPrimitive(value)) {
-      entityFields.set(indexKey as string, value);
-    } else if (isVector(value)) {
-      entityFields.set(indexKey as string, vectorToString(value));
-    }
-  }
-}
-
 /**
  * Helper function to get an entity from a `PtrHash`. Note that doing this is very expensive, so you
  * should only use this function when debugging. (Normally, if you need to work backwards from a
@@ -399,6 +364,7 @@ export function isActiveEnemy(entity: Entity): boolean {
       case EntityType.ULTRA_GREED: {
         const npc = entity.ToNPC();
         if (npc !== undefined) {
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
           const ultraGreedVariant = npc.Variant as UltraGreedVariant;
 
           switch (ultraGreedVariant) {
@@ -747,3 +713,27 @@ export function spawnWithSeed(
     seedOrRNG,
   );
 }
+
+function setPrimitiveEntityFields(
+  entity: Entity,
+  metatable: LuaMap<AnyNotNil, unknown>,
+  entityFields: LuaMap<string, boolean | number | string>,
+) {
+  const propGetTable = metatable.get("__propget") as
+    LuaMap<AnyNotNil, unknown> | undefined;
+  assertDefined(
+    propGetTable,
+    'Failed to get the "__propget" table for an entity.',
+  );
+
+  for (const [key] of propGetTable) {
+    // The values of this table are functions. Thus, we use the key to index the original entity.
+    const indexKey = key as keyof typeof entity;
+    const value = entity[indexKey];
+    if (isPrimitive(value)) {
+      entityFields.set(indexKey as string, value);
+    } else if (isVector(value)) {
+      entityFields.set(indexKey as string, vectorToString(value));
+    }
+  }
+}

package/src/functions/flag.ts

@@ -101,7 +101,7 @@ export function hasFlag<T extends BitFlag | BitFlag128>(
   const flagsAsInt = flags as int;
 
   for (const flagToCheck of flagsToCheck) {
-    if (!((flagsAsInt & (flagToCheck as int)) === flagToCheck)) {
+    if ((flagsAsInt & (flagToCheck as int)) !== flagToCheck) {
       return false;
     }
   }

package/src/functions/globals.ts

@@ -194,7 +194,7 @@ const RACING_PLUS_SANDBOX_ADDED_GLOBALS = new ReadonlySet<string>([
  * Returns a slightly different set depending on whether the "--luadebug" flag is enabled.
  */
 export function getDefaultGlobals(): ReadonlySet<string> {
-  const defaultGlobals = copySet(DEFAULT_GLOBALS);
+  const defaultGlobals = copySet(DEFAULT_GLOBALS) as Set<string>;
 
   if (isLuaDebugEnabled()) {
     addSetsToSet(defaultGlobals, LUA_DEBUG_ADDED_GLOBALS);
@@ -207,10 +207,6 @@ export function getDefaultGlobals(): ReadonlySet<string> {
   return defaultGlobals;
 }
 
-function isRacingPlusSandboxEnabled() {
-  return SandboxGetParentFunctionDescription !== undefined;
-}
-
 /**
  * Helper function to get an array of any added global variables in the Isaac Lua environment.
  * Returns a sorted array of key/value tuples.
@@ -219,10 +215,12 @@ export function getNewGlobals(): ReadonlyArray<[AnyNotNil, unknown]> {
   const defaultGlobals = getDefaultGlobals();
   const newGlobals: Array<[AnyNotNil, unknown]> = [];
   for (const [key, value] of pairs(_G)) {
-    if (!defaultGlobals.has(key)) {
-      const keyValueTuple: [AnyNotNil, unknown] = [key, value];
-      newGlobals.push(keyValueTuple);
+    if (defaultGlobals.has(key)) {
+      continue;
     }
+
+    const keyValueTuple: [AnyNotNil, unknown] = [key, value];
+    newGlobals.push(keyValueTuple);
   }
 
   newGlobals.sort(sortTwoDimensionalArray);
@@ -273,3 +271,7 @@ export function setTracebackFunctionsGlobal(): void {
   globals["getTraceback"] = getTraceback;
   globals["traceback"] = traceback;
 }
+
+function isRacingPlusSandboxEnabled() {
+  return SandboxGetParentFunctionDescription !== undefined;
+}