isaacscript-common 80.1.0 → 80.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "80.1.0",
+  "version": "80.2.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -37,6 +37,6 @@
     "lint": "tsx --tsconfig ./scripts/tsconfig.json ./scripts/lint.mts"
   },
   "dependencies": {
-    "isaac-typescript-definitions": "^39.0.2"
+    "isaac-typescript-definitions": "^39.0.3"
   }
 }

package/src/classes/callbacks/PostItemDischarge.ts

@@ -13,7 +13,6 @@ import {
   mapGetPlayer,
   mapSetPlayer,
 } from "../../functions/playerDataStructures";
-import { asNumber } from "../../functions/types";
 import type { PlayerIndex } from "../../types/PlayerIndex";
 import { DefaultMap } from "../DefaultMap";
 import type { FireArgs, OptionalArgs } from "../private/CustomCallback";
@@ -84,7 +83,7 @@ export class PostItemDischarge extends CustomCallback<T> {
     npc: EntityNPC,
     collider: Entity,
   ): boolean | undefined => {
-    if (npc.Variant === asNumber(SuckerVariant.BULB)) {
+    if (npc.Variant === SuckerVariant.BULB) {
       return this.preNPCCollisionBulb(npc, collider);
     }
 

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

@@ -11,7 +11,6 @@ import {
   getEntityIDFromConstituents,
 } from "../../../functions/entities";
 import { spawnEffect } from "../../../functions/entitiesSpecific";
-import { asNumber } from "../../../functions/types";
 import { Feature } from "../../private/Feature";
 
 interface CustomPickupFunctions {
@@ -97,7 +96,7 @@ export class CustomPickups extends Feature {
   // ModCallback.POST_EFFECT_RENDER (56)
   // PICKUP_EFFECT_VARIANT
   private readonly postEffectRenderPickupEffect = (effect: EntityEffect) => {
-    if (effect.SubType !== asNumber(PICKUP_EFFECT_SUB_TYPE)) {
+    if (effect.SubType !== PICKUP_EFFECT_SUB_TYPE) {
       return;
     }
 

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

@@ -30,7 +30,6 @@ import {
 } from "../../../functions/rooms";
 import { getMusicForStage } from "../../../functions/sound";
 import { setStage } from "../../../functions/stage";
-import { asNumber } from "../../../functions/types";
 import { assertDefined } from "../../../functions/utils";
 import type {
   CustomStageLua,
@@ -532,9 +531,7 @@ export class CustomStages extends Feature {
         ? DEFAULT_BASE_STAGE_TYPE
         : (customStage.baseStageType as StageType);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-    const reseed = asNumber(stage) >= baseStage;
-
+    const reseed = stage >= baseStage;
     setStage(baseStage, baseStageType, reseed);
 
     // As soon as we warp to the base stage, the base stage music will begin to play. Thus, we

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

@@ -28,7 +28,7 @@ import { isRNG, newRNG } from "../../../functions/rng";
 import { gridCoordinatesToWorldPosition } from "../../../functions/roomGrid";
 import { setRoomCleared, setRoomUncleared } from "../../../functions/rooms";
 import { spawnCollectible } from "../../../functions/spawnCollectible";
-import { asCollectibleType, asNumber } from "../../../functions/types";
+import { asCollectibleType } from "../../../functions/types";
 import { assertDefined } from "../../../functions/utils";
 import type { JSONRoom } from "../../../interfaces/JSONRoomsFile";
 import { ReadonlySet } from "../../../types/ReadonlySet";
@@ -162,15 +162,11 @@ export class DeployJSONRoom extends Feature {
     let entity: Entity;
     if (
       entityType === EntityType.PICKUP &&
-      variant === asNumber(PickupVariant.COLLECTIBLE)
+      variant === PickupVariant.COLLECTIBLE
     ) {
+      const collectibleType = asCollectibleType(subType);
       const options = roomType === RoomType.ANGEL;
-      entity = spawnCollectible(
-        asCollectibleType(subType),
-        position,
-        seed,
-        options,
-      );
+      entity = spawnCollectible(collectibleType, position, seed, options);
     } else {
       entity = spawnWithSeed(entityType, variant, subType, position, seed);
     }
@@ -178,7 +174,7 @@ export class DeployJSONRoom extends Feature {
     // For some reason, Pitfalls do not spawn with the correct collision classes.
     if (
       entityType === EntityType.PITFALL &&
-      variant === asNumber(PitfallVariant.PITFALL)
+      variant === PitfallVariant.PITFALL
     ) {
       entity.EntityCollisionClass = EntityCollisionClass.ENEMIES;
       entity.GridCollisionClass = EntityGridCollisionClass.WALLS;

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

@@ -17,15 +17,23 @@ import {
   NUM_VANILLA_TRINKET_TYPES,
 } from "../../../core/constantsFirstLast";
 import { Exported } from "../../../decorators";
-import {
-  asCardType,
-  asCollectibleType,
-  asNumber,
-  asPillEffect,
-  asTrinketType,
-} from "../../../functions/types";
 import { Feature } from "../../private/Feature";
 
+// eslint-disable-next-line isaacscript/strict-enums
+export const FIRST_MODDED_COLLECTIBLE_TYPE: CollectibleType =
+  LAST_VANILLA_COLLECTIBLE_TYPE + 1;
+
+// eslint-disable-next-line isaacscript/strict-enums
+export const FIRST_MODDED_TRINKET_TYPE: TrinketType =
+  LAST_VANILLA_TRINKET_TYPE + 1;
+
+// eslint-disable-next-line isaacscript/strict-enums
+export const FIRST_MODDED_CARD_TYPE: CardType = LAST_VANILLA_CARD_TYPE + 1;
+
+// eslint-disable-next-line isaacscript/strict-enums
+export const FIRST_MODDED_PILL_EFFECT: PillEffect =
+  LAST_VANILLA_PILL_EFFECT + 1;
+
 /**
  * Mods can add extra things to the game (e.g. collectibles, trinkets, and so on). Since mods load
  * in alphabetical order, the total number of things can't be properly be known until at least one
@@ -82,16 +90,13 @@ export class ModdedElementDetection extends Feature {
   public getFirstModdedCollectibleType(): CollectibleType | undefined {
     this.errorIfNoCallbacksFired("collectible");
 
-    const firstModdedCollectibleType = asCollectibleType(
-      asNumber(LAST_VANILLA_COLLECTIBLE_TYPE) + 1,
-    );
     const itemConfigItem = itemConfig.GetCollectible(
-      firstModdedCollectibleType,
+      FIRST_MODDED_COLLECTIBLE_TYPE,
     );
 
     return itemConfigItem === undefined
       ? undefined
-      : firstModdedCollectibleType;
+      : FIRST_MODDED_COLLECTIBLE_TYPE;
   }
 
   /**
@@ -100,7 +105,7 @@ export class ModdedElementDetection extends Feature {
    * Equal to `itemConfig.GetCollectibles().Size - 1`. (`Size` includes invalid collectibles, like
    * 666. We subtract one to account for `CollectibleType.NULL`.)
    *
-   * If there are no mods present that add any custom items, this function will return
+   * If there are no mods present that add any custom collectibles, this function will return
    * `CollectibleType.MOMS_RING` (732).
    *
    * This function can only be called if at least one callback has been executed. This is because
@@ -120,7 +125,7 @@ export class ModdedElementDetection extends Feature {
 
   /**
    * Returns the total number of collectibles in the item config, including both vanilla and modded
-   * items. If you just need the number of vanilla collectible types, use the
+   * collectibles. If you just need the number of vanilla collectible types, use the
    * `NUM_VANILLA_COLLECTIBLE_TYPES` constant.
    *
    * This function can only be called if at least one callback has been executed. This is because
@@ -135,9 +140,7 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumCollectibleTypes(): int {
     this.errorIfNoCallbacksFired("collectible");
-
-    const numModdedCollectibleTypes = this.getNumModdedCollectibleTypes();
-    return NUM_VANILLA_COLLECTIBLE_TYPES + numModdedCollectibleTypes;
+    return NUM_VANILLA_COLLECTIBLE_TYPES + this.getNumModdedCollectibleTypes();
   }
 
   /**
@@ -155,9 +158,7 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumModdedCollectibleTypes(): int {
     this.errorIfNoCallbacksFired("collectible");
-
-    const lastCollectibleType = this.getLastCollectibleType();
-    return lastCollectibleType - LAST_VANILLA_COLLECTIBLE_TYPE;
+    return this.getLastCollectibleType() - LAST_VANILLA_COLLECTIBLE_TYPE;
   }
 
   // --------
@@ -179,11 +180,8 @@ export class ModdedElementDetection extends Feature {
   public getFirstModdedTrinketType(): TrinketType | undefined {
     this.errorIfNoCallbacksFired("trinket");
 
-    const firstModdedTrinketType = asTrinketType(
-      asNumber(LAST_VANILLA_TRINKET_TYPE) + 1,
-    );
-    const itemConfigItem = itemConfig.GetTrinket(firstModdedTrinketType);
-    return itemConfigItem === undefined ? undefined : firstModdedTrinketType;
+    const itemConfigItem = itemConfig.GetTrinket(FIRST_MODDED_TRINKET_TYPE);
+    return itemConfigItem === undefined ? undefined : FIRST_MODDED_TRINKET_TYPE;
   }
 
   /**
@@ -211,7 +209,7 @@ export class ModdedElementDetection extends Feature {
 
   /**
    * Returns the total number of trinkets in the item config, including both vanilla and modded
-   * items. If you just need the number of vanilla trinket types, use the
+   * trinkets. If you just need the number of vanilla trinket types, use the
    * `NUM_VANILLA_TRINKET_TYPES` constant.
    *
    * This function can only be called if at least one callback has been executed. This is because
@@ -225,9 +223,7 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumTrinketTypes(): int {
     this.errorIfNoCallbacksFired("trinket");
-
-    const numModdedTrinketTypes = this.getNumModdedTrinketTypes();
-    return NUM_VANILLA_TRINKET_TYPES + numModdedTrinketTypes;
+    return NUM_VANILLA_TRINKET_TYPES + this.getNumModdedTrinketTypes();
   }
 
   /**
@@ -244,9 +240,7 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumModdedTrinketTypes(): int {
     this.errorIfNoCallbacksFired("trinket");
-
-    const lastTrinketType = this.getLastTrinketType();
-    return lastTrinketType - LAST_VANILLA_TRINKET_TYPE;
+    return this.getLastTrinketType() - LAST_VANILLA_TRINKET_TYPE;
   }
 
   // -----
@@ -268,22 +262,21 @@ export class ModdedElementDetection extends Feature {
   public getFirstModdedCardType(): CardType | undefined {
     this.errorIfNoCallbacksFired("card");
 
-    const firstModdedCardType = asCardType(
-      asNumber(LAST_VANILLA_CARD_TYPE) + 1,
-    );
-
-    const itemConfigCard = itemConfig.GetCard(firstModdedCardType);
-    return itemConfigCard === undefined ? undefined : firstModdedCardType;
+    const itemConfigCard = itemConfig.GetCard(FIRST_MODDED_CARD_TYPE);
+    return itemConfigCard === undefined ? undefined : FIRST_MODDED_CARD_TYPE;
   }
 
   /**
    * Will change depending on how many modded cards there are.
    *
-   * This is equal to the number of cards, since all card sub-types are contiguous (unlike
-   * collectibles).
+   * Equal to `itemConfig.GetCards().Size - 1`. (`Size` includes invalid cards, but since cards are
+   * contiguous, there are no invalid cards. We subtract one to account for `CardType.NULL`.)
+   *
+   * If there are no mods present that add any custom cards, this function will return
+   * `CardType.SOUL_OF_JACOB_AND_ESAU` (97).
    *
    * This function can only be called if at least one callback has been executed. This is because
-   * not all cards will necessarily be present when a mod first loads (due to mod load order).
+   * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
    *
    * In order to use this function, you must upgrade your mod with
    * `ISCFeature.MODDED_ELEMENT_DETECTION`.
@@ -293,15 +286,12 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getLastCardType(): CardType {
     this.errorIfNoCallbacksFired("card");
-
-    const numCards = this.getNumCardTypes();
-    return asCardType(numCards);
+    return itemConfig.GetCards().Size - 1;
   }
 
   /**
-   * Will change depending on how many modded cards there are.
-   *
-   * Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
+   * Returns the total number of cards in the item config, including both vanilla and modded cards.
+   * If you just need the number of vanilla card types, use the `NUM_VANILLA_CARD_TYPES` constant.
    *
    * This function can only be called if at least one callback has been executed. This is because
    * not all cards will necessarily be present when a mod first loads (due to mod load order).
@@ -314,12 +304,14 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumCardTypes(): int {
     this.errorIfNoCallbacksFired("card");
-    return itemConfig.GetCards().Size - 1;
+    return NUM_VANILLA_CARD_TYPES + this.getNumModdedCardTypes();
   }
 
   /**
+   * Like vanilla card types, modded card types are always contiguous.
+   *
    * This function can only be called if at least one callback has been executed. This is because
-   * not all trinkets will necessarily be present when a mod first loads (due to mod load order).
+   * not all cards will necessarily be present when a mod first loads (due to mod load order).
    *
    * In order to use this function, you must upgrade your mod with
    * `ISCFeature.MODDED_ELEMENT_DETECTION`.
@@ -329,9 +321,7 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumModdedCardTypes(): int {
     this.errorIfNoCallbacksFired("card");
-
-    const numCardTypes = this.getNumCardTypes();
-    return numCardTypes - NUM_VANILLA_CARD_TYPES;
+    return this.getLastCardType() - LAST_VANILLA_CARD_TYPE;
   }
 
   // ------------
@@ -354,23 +344,24 @@ export class ModdedElementDetection extends Feature {
   public getFirstModdedPillEffect(): PillEffect | undefined {
     this.errorIfNoCallbacksFired("pill");
 
-    const firstModdedPillEffect = asPillEffect(
-      asNumber(LAST_VANILLA_PILL_EFFECT) + 1,
-    );
     const itemConfigPillEffect = itemConfig.GetPillEffect(
-      firstModdedPillEffect,
+      FIRST_MODDED_PILL_EFFECT,
     );
 
     return itemConfigPillEffect === undefined
       ? undefined
-      : firstModdedPillEffect;
+      : FIRST_MODDED_PILL_EFFECT;
   }
 
   /**
    * Will change depending on how many modded pill effects there are.
    *
-   * This is equal to the number of pill effects, since all pill effects are contiguous (unlike
-   * collectibles).
+   * Equal to `itemConfig.GetPillEffects().Size - 1`. (`Size` includes invalid pill effects, but
+   * since pill effects are contiguous, there are no invalid pill effects. We subtract one to
+   * account for the enum starting at 0 instead of 1.)
+   *
+   * If there are no mods present that add any custom pill effects, this function will return
+   * `PillEffect.EXPERIMENTAL` (49).
    *
    * This function can only be called if at least one callback has been executed. This is because
    * not all pill effects will necessarily be present when a mod first loads (due to mod load
@@ -384,22 +375,16 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getLastPillEffect(): PillEffect {
     this.errorIfNoCallbacksFired("pill");
-
-    // We need to subtract one because Bad Gas is ID 0. In other words, in vanilla Repentance, there
-    // are 50 pill effects that have IDs from 0 to 49, so the highest pill effect is 49.
-    const numPillEffects = this.getNumPillEffects() - 1;
-    return asPillEffect(numPillEffects);
+    return itemConfig.GetPillEffects().Size - 1;
   }
 
   /**
-   * Will change depending on how many modded pill effects there are.
-   *
-   * Equal to `itemConfig.GetPillEffects().Size`. (We do not have to subtract one, because the first
-   * pill effect has an ID of 0 and there is no `PillEffect.NULL`.)
+   * Returns the total number of pill effects in the item config, including both vanilla and modded
+   * pill effects. If you just need the number of vanilla pill effects, use the
+   * `NUM_VANILLA_PILL_EFFECTS` constant.
    *
    * This function can only be called if at least one callback has been executed. This is because
-   * not all pill effects will necessarily be present when a mod first loads (due to mod load
-   * order).
+   * not all cards will necessarily be present when a mod first loads (due to mod load order).
    *
    * In order to use this function, you must upgrade your mod with
    * `ISCFeature.MODDED_ELEMENT_DETECTION`.
@@ -409,13 +394,14 @@ export class ModdedElementDetection extends Feature {
   @Exported
   public getNumPillEffects(): int {
     this.errorIfNoCallbacksFired("pill");
-    return itemConfig.GetPillEffects().Size;
+    return NUM_VANILLA_PILL_EFFECTS + this.getNumModdedPillEffects();
   }
 
   /**
+   * Like vanilla pill effects, modded pill effects are always contiguous.
+   *
    * This function can only be called if at least one callback has been executed. This is because
-   * not all pill effects will necessarily be present when a mod first loads (due to mod load
-   * order).
+   * not all cards will necessarily be present when a mod first loads (due to mod load order).
    *
    * In order to use this function, you must upgrade your mod with
    * `ISCFeature.MODDED_ELEMENT_DETECTION`.
@@ -424,9 +410,7 @@ export class ModdedElementDetection extends Feature {
    */
   @Exported
   public getNumModdedPillEffects(): int {
-    this.errorIfNoCallbacksFired("pill");
-
-    const numPillEffects = this.getNumPillEffects();
-    return numPillEffects - NUM_VANILLA_PILL_EFFECTS;
+    this.errorIfNoCallbacksFired("card");
+    return this.getLastPillEffect() - LAST_VANILLA_PILL_EFFECT;
   }
 }

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

@@ -11,7 +11,6 @@ import {
   calculateStageType,
   onRepentanceStage,
 } from "../../../functions/stage";
-import { asNumber } from "../../../functions/types";
 import type { StageHistoryEntry } from "../../../interfaces/StageHistoryEntry";
 import { Feature } from "../../private/Feature";
 
@@ -289,7 +288,7 @@ export class StageHistory extends Feature {
       return LevelStage.DEPTHS_1;
     }
 
-    return asNumber(stage) - 1;
+    return stage - 1;
   }
 
   /**

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

@@ -124,11 +124,7 @@ import { spawnCollectible as spawnCollectibleFunc } from "../../../../functions/
 import { onStage, setStage } from "../../../../functions/stage";
 import { getMapPartialMatch } from "../../../../functions/string";
 import { getGoldenTrinketType } from "../../../../functions/trinkets";
-import {
-  asCardType,
-  asCollectibleType,
-  asTrinketType,
-} from "../../../../functions/types";
+import { asCollectibleType, asTrinketType } from "../../../../functions/types";
 import { iRange } from "../../../../functions/utils";
 import { CARD_NAME_TO_TYPE_MAP } from "../../../../maps/cardNameToTypeMap";
 import { CHARACTER_NAME_TO_TYPE_MAP } from "../../../../maps/characterNameToTypeMap";
@@ -423,7 +419,7 @@ export function cards(): void {
       }
 
       const worldPosition = gridCoordinatesToWorldPosition(x, y);
-      spawnCard(asCardType(cardType), worldPosition);
+      spawnCard(cardType, worldPosition);
       cardType++; // eslint-disable-line isaacscript/strict-enums
     }
   }

package/src/core/constantsFirstLast.ts

@@ -28,8 +28,8 @@ export const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
 /**
  * Calculated from the `CollectibleType` enum.
  *
- * Note that this cannot be calculated from the length of the enum, because unlike all of the other
- * enums, collectible types are not contiguous.
+ * Note that this cannot be calculated from the length of the enum, because collectible types are
+ * not contiguous.
  */
 export const LAST_VANILLA_COLLECTIBLE_TYPE =
   getHighestEnumValue(CollectibleType);
@@ -44,7 +44,12 @@ export const NUM_VANILLA_COLLECTIBLE_TYPES = getEnumLength(CollectibleType) - 1;
 /** Equal to `TrinketType.SWALLOWED_PENNY`. */
 export const FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY;
 
-/** Calculated from the `TrinketType` enum. */
+/**
+ * Calculated from the `TrinketType` enum.
+ *
+ * Note that this cannot be calculated from the length of the enum, because trinket types are not
+ * contiguous.
+ */
 export const LAST_VANILLA_TRINKET_TYPE = getHighestEnumValue(TrinketType);
 
 /** Calculated from the `TrinketType` enum. (`TrinketType.NULL` is not included.) */
@@ -57,7 +62,13 @@ export const NUM_VANILLA_TRINKET_TYPES = getEnumLength(TrinketType) - 1;
 /** Equal to `Card.FOOL`. */
 export const FIRST_CARD_TYPE = CardType.FOOL;
 
-/** Calculated from the `Card` enum. */
+/**
+ * Calculated from the `CardType` enum.
+ *
+ * Note that this could be calculated from the length of the enum, because card types are
+ * contiguous. However, we instead get the highest enum value to be safer and to make the code more
+ * consistent with collectibles and trinkets.
+ */
 export const LAST_VANILLA_CARD_TYPE = getHighestEnumValue(CardType);
 
 /** Calculated from the `Card` enum. `Card.NULL` is not included. */
@@ -70,7 +81,13 @@ export const NUM_VANILLA_CARD_TYPES = getEnumLength(CardType) - 1;
 /** Equal to `PillEffect.BAD_GAS`. */
 export const FIRST_PILL_EFFECT = PillEffect.BAD_GAS;
 
-/** Calculated from the `PillEffect` enum. */
+/**
+ * Calculated from the `PillEffect` enum.
+ *
+ * Note that this could be calculated from the length of the enum, because pill effects are
+ * contiguous. However, we instead get the highest enum value to be safer and to make the code more
+ * consistent with collectibles and trinkets.
+ */
 export const LAST_VANILLA_PILL_EFFECT = getHighestEnumValue(PillEffect);
 
 /**
@@ -119,7 +136,13 @@ export const FIRST_CHARACTER = PlayerType.ISAAC;
 
 // It is not possible to determine "LAST_PLAYER_TYPE", since there is no associated config.
 
-/** Calculated from the `PlayerType` enum. */
+/**
+ * Calculated from the `PlayerType` enum.
+ *
+ * Note that this could be calculated from the length of the enum, because characters are
+ * contiguous. However, we instead get the highest enum value to be safer and to make the code more
+ * consistent with collectibles and trinkets.
+ */
 export const LAST_VANILLA_CHARACTER = getHighestEnumValue(PlayerType);
 
 // ----------

package/src/functions/bosses.ts

@@ -24,7 +24,6 @@ import { getNPCs, spawnNPC } from "./entitiesSpecific";
 import { getAliveNPCs } from "./npcs";
 import { isRNG } from "./rng";
 import { inBeastRoom, inDogmaRoom } from "./rooms";
-import { asNumber } from "./types";
 import { repeat } from "./utils";
 
 const BOSSES_THAT_REQUIRE_MULTIPLE_SPAWNS = new ReadonlySet<EntityType>([
@@ -234,7 +233,7 @@ function getNumBossSegments(
 
     // 69
     case EntityType.LOKI: {
-      return variant === asNumber(LokiVariant.LOKII) ? 2 : 1;
+      return variant === LokiVariant.LOKII ? 2 : 1;
     }
 
     // 237

package/src/functions/doors.ts

@@ -31,7 +31,6 @@ import { arrayToBitFlags } from "./bitwise";
 import { directionToVector } from "./direction";
 import { hasFlag } from "./flag";
 import { isTSTLSet } from "./tstlClass";
-import { asNumber } from "./types";
 
 export function closeAllDoors(): void {
   for (const door of getDoors()) {
@@ -373,7 +372,7 @@ export function isAngelRoomDoor(door: GridEntityDoor): boolean {
  * Room.)
  */
 export function isBlueWombDoor(door: GridEntityDoor): boolean {
-  return door.TargetRoomIndex === asNumber(GridRoom.BLUE_WOMB);
+  return door.TargetRoomIndex === GridRoom.BLUE_WOMB;
 }
 
 /**
@@ -381,7 +380,7 @@ export function isBlueWombDoor(door: GridEntityDoor): boolean {
  * vanilla, the door will only appear in the Boss Room of the sixth floor.)
  */
 export function isBossRushDoor(door: GridEntityDoor): boolean {
-  return door.TargetRoomIndex === asNumber(GridRoom.BOSS_RUSH);
+  return door.TargetRoomIndex === GridRoom.BOSS_RUSH;
 }
 
 export function isDevilRoomDoor(door: GridEntityDoor): boolean {
@@ -489,7 +488,7 @@ export function isHiddenSecretRoomDoor(door: GridEntityDoor): boolean {
  * (In vanilla, the door will only appear in the starting room of The Chest / Dark Room.)
  */
 export function isMegaSatanDoor(door: GridEntityDoor): boolean {
-  return door.TargetRoomIndex === asNumber(GridRoom.MEGA_SATAN);
+  return door.TargetRoomIndex === GridRoom.MEGA_SATAN;
 }
 
 /**
@@ -497,7 +496,7 @@ export function isMegaSatanDoor(door: GridEntityDoor): boolean {
  * you to the Repentance floor.
  */
 export function isRepentanceDoor(door: GridEntityDoor): boolean {
-  return door.TargetRoomIndex === asNumber(GridRoom.SECRET_EXIT);
+  return door.TargetRoomIndex === GridRoom.SECRET_EXIT;
 }
 
 /**
@@ -521,7 +520,7 @@ export function isSecretRoomDoor(door: GridEntityDoor): boolean {
  * contains the portal to The Void. (In vanilla, the door will only appear in the Hush Boss Room.)
  */
 export function isVoidDoor(door: GridEntityDoor): boolean {
-  return door.TargetRoomIndex === asNumber(GridRoom.VOID);
+  return door.TargetRoomIndex === GridRoom.VOID;
 }
 
 /**

package/src/functions/gridEntities.ts

@@ -26,7 +26,7 @@ import { removeEntities } from "./entities";
 import { getEffects } from "./entitiesSpecific";
 import { isCircleIntersectingRectangle } from "./math";
 import { roomUpdateSafe } from "./rooms";
-import { asNumber, isInteger } from "./types";
+import { isInteger } from "./types";
 import { assertDefined, eRange, iRange } from "./utils";
 import { isVector, vectorEquals } from "./vector";
 
@@ -1032,7 +1032,7 @@ export function removeGridEntity(
   // corresponding effect.
   if (gridEntityType === GridEntityType.STATUE) {
     const effectVariant =
-      variant === asNumber(StatueVariant.DEVIL)
+      variant === StatueVariant.DEVIL
         ? EffectVariant.DEVIL
         : EffectVariant.ANGEL;
     const effects = getEffects(effectVariant);

package/src/functions/gridEntitiesSpecific.ts

@@ -14,7 +14,6 @@ import {
   removeGridEntities,
   spawnGridEntityWithVariant,
 } from "./gridEntities";
-import { asNumber } from "./types";
 import { assertDefined } from "./utils";
 
 /**
@@ -27,7 +26,7 @@ import { assertDefined } from "./utils";
 export function getCrawlSpaces(
   crawlSpaceVariant: CrawlSpaceVariant | -1 = -1,
 ): GridEntity[] {
-  if (asNumber(crawlSpaceVariant) === -1) {
+  if (crawlSpaceVariant === -1) {
     return getGridEntities(GridEntityType.CRAWL_SPACE);
   }
 
@@ -49,7 +48,7 @@ export function getPits(pitVariant: PitVariant | -1 = -1): GridEntityPit[] {
     const pit = gridEntity.ToPit();
     if (pit !== undefined) {
       const thisPitVariant = pit.GetVariant();
-      if (asNumber(pitVariant) === -1 || pitVariant === thisPitVariant) {
+      if (pitVariant === -1 || pitVariant === thisPitVariant) {
         pits.push(pit);
       }
     }
@@ -72,7 +71,7 @@ export function getPoops(
     const poop = gridEntity.ToPoop();
     if (poop !== undefined) {
       const thisPoopVariant = poop.GetVariant();
-      if (asNumber(poopVariant) === -1 || poopVariant === thisPoopVariant) {
+      if (poopVariant === -1 || poopVariant === thisPoopVariant) {
         poops.push(poop);
       }
     }
@@ -96,7 +95,7 @@ export function getPressurePlates(
     if (pressurePlate !== undefined) {
       const thisPressurePlateVariant = pressurePlate.GetVariant();
       if (
-        asNumber(pressurePlateVariant) === -1 ||
+        pressurePlateVariant === -1 ||
         pressurePlateVariant === thisPressurePlateVariant
       ) {
         pressurePlates.push(pressurePlate);
@@ -187,7 +186,7 @@ export function getTeleporters(variant = -1): GridEntity[] {
 export function getTrapdoors(
   trapdoorVariant: TrapdoorVariant | -1 = -1,
 ): GridEntity[] {
-  if (asNumber(trapdoorVariant) === -1) {
+  if (trapdoorVariant === -1) {
     return getGridEntities(GridEntityType.TRAPDOOR);
   }