isaacscript-common 7.2.0 → 7.3.0

package/src/functions/entities.ts

@@ -6,7 +6,7 @@ import { AnyEntity } from "../types/AnyEntity";
 import { getIsaacAPIClassName } from "./isaacAPIClass";
 import { getRandom } from "./random";
 import { isRNG, newRNG } from "./rng";
-import { isPrimitive } from "./types";
+import { asNumber, isPrimitive } from "./types";
 import { isVector, vectorToString } from "./vector";
 
 /**
@@ -122,7 +122,7 @@ export function getEntities(
   subType = -1,
   ignoreFriendly = false,
 ): Entity[] {
-  if ((entityType as int) === -1) {
+  if (asNumber(entityType) === -1) {
     return Isaac.GetRoomEntities();
   }
 

package/src/functions/gridEntities.ts

@@ -19,7 +19,7 @@ import { AnyGridEntity } from "../types/AnyGridEntity";
 import { isCircleIntersectingRectangle } from "./math";
 import { roomUpdateSafe } from "./rooms";
 import { clearSprite } from "./sprites";
-import { isNumber } from "./types";
+import { asNumber, isNumber } from "./types";
 import { erange } from "./utils";
 import { isVector } from "./vector";
 
@@ -136,7 +136,7 @@ export function getCollidingEntitiesWithGridEntity(
 export function getCrawlSpaces(
   crawlSpaceVariant: CrawlSpaceVariant = -1,
 ): GridEntity[] {
-  if ((crawlSpaceVariant as int) === -1) {
+  if (asNumber(crawlSpaceVariant) === -1) {
     return getGridEntities(GridEntityType.CRAWL_SPACE);
   }
 

package/src/functions/gridEntitiesSpecific.ts

@@ -11,6 +11,7 @@ import {
   removeGridEntities,
   spawnGridEntityWithVariant,
 } from "./gridEntities";
+import { asNumber } from "./types";
 
 // The `getDoors` function is not located here because doors are collected via the `Room.GetDoor`
 // method instead, which is faster.
@@ -29,7 +30,7 @@ export function getPits(pitVariant: PitVariant = -1): GridEntityPit[] {
     const pit = gridEntity.ToPit();
     if (pit !== undefined) {
       const gridEntityVariant = pit.GetVariant();
-      if ((pitVariant as int) === -1 || pitVariant === gridEntityVariant) {
+      if (asNumber(pitVariant) === -1 || pitVariant === gridEntityVariant) {
         pits.push(pit);
       }
     }
@@ -54,7 +55,7 @@ export function getPoops(
     const poop = gridEntity.ToPoop();
     if (poop !== undefined) {
       const gridEntityVariant = poop.GetVariant();
-      if ((poopVariant as int) === -1 || poopVariant === gridEntityVariant) {
+      if (asNumber(poopVariant) === -1 || poopVariant === gridEntityVariant) {
         poops.push(poop);
       }
     }
@@ -80,7 +81,7 @@ export function getPressurePlates(
     if (pressurePlate !== undefined) {
       const gridEntityVariant = pressurePlate.GetVariant();
       if (
-        (pressurePlateVariant as int) === -1 ||
+        asNumber(pressurePlateVariant) === -1 ||
         pressurePlateVariant === gridEntityVariant
       ) {
         pressurePlates.push(pressurePlate);

package/src/functions/input.ts

@@ -43,10 +43,10 @@ const SHOOTING_ACTIONS_SET: ReadonlySet<ButtonAction> = new Set(
 );
 
 /** Helper function to get the enum name for the specified `Controller` value. */
-export function controllerToString(controller: Controller): string {
+export function controllerToString(controller: Controller): string | undefined {
   const key = Controller[controller];
   if (key === undefined) {
-    return "unknown";
+    return undefined;
   }
 
   return trimPrefix(key, "BUTTON_");

package/src/functions/jsonHelpers.ts

@@ -2,7 +2,7 @@ import * as jsonLua from "../lib/jsonLua";
 import { logError } from "./log";
 
 function tryDecode(this: void, jsonString: string) {
-  return jsonLua.decode(jsonString) as LuaMap;
+  return jsonLua.decode(jsonString) as LuaMap<AnyNotNil, unknown>;
 }
 
 function tryEncode(this: void, luaTable: unknown) {

package/src/functions/kColor.ts

@@ -34,11 +34,7 @@ export function deserializeKColor(kColor: SerializedKColor): KColor {
     );
   }
 
-  const [r, g, b, a] = getNumbersFromTable(
-    kColor as LuaMap<string, unknown>,
-    OBJECT_NAME,
-    ...KEYS,
-  );
+  const [r, g, b, a] = getNumbersFromTable(kColor, OBJECT_NAME, ...KEYS);
 
   if (r === undefined) {
     error(

package/src/functions/levelGrid.ts

@@ -37,6 +37,7 @@ import {
 } from "./roomData";
 import { getRooms, getRoomsInsideGrid } from "./rooms";
 import { getGridIndexDelta } from "./roomShape";
+import { asNumber } from "./types";
 
 const LEFT = -1;
 const UP = -LEVEL_GRID_ROW_WIDTH;
@@ -177,8 +178,8 @@ export function getNewRoomCandidatesForLevel(): Array<
     (room) =>
       room.Data !== undefined &&
       room.Data.Type === RoomType.DEFAULT &&
-      room.Data.Subtype !== (DownpourRoomSubType.MIRROR as int) &&
-      room.Data.Subtype !== (MinesRoomSubType.MINESHAFT_ENTRANCE as int),
+      room.Data.Subtype !== asNumber(DownpourRoomSubType.MIRROR) &&
+      room.Data.Subtype !== asNumber(MinesRoomSubType.MINESHAFT_ENTRANCE),
   );
 
   const newRoomCandidates: Array<[int, DoorSlot, int]> = [];

package/src/functions/nextStage.ts

@@ -13,6 +13,7 @@ import {
   calculateStageTypeRepentance,
   onRepentanceStage,
 } from "./stage";
+import { asNumber } from "./types";
 
 /**
  * Helper function to get the stage that a trapdoor or heaven door would take the player to, based
@@ -53,7 +54,7 @@ export function getNextStage(): LevelStage {
     case GridRoom.SECRET_EXIT: {
       if (repentanceStage) {
         // e.g. From Downpour 2 to Mines 1, etc.
-        return (stage as int) + 1;
+        return asNumber(stage) + 1;
       }
 
       if (stage === LevelStage.DEPTHS_2) {
@@ -109,7 +110,7 @@ export function getNextStage(): LevelStage {
   }
 
   // By default, go to the next floor.
-  return (stage as int) + 1;
+  return asNumber(stage) + 1;
 }
 
 function getNextStageBackwardsPath(
@@ -118,7 +119,7 @@ function getNextStageBackwardsPath(
 ): LevelStage {
   // If we have no stage history to work with, then default to the previous stage.
   if (!areFeaturesInitialized()) {
-    return (stage as int) - 1;
+    return asNumber(stage) - 1;
   }
 
   const visitedDownpour1 = hasVisitedStage(
@@ -234,7 +235,7 @@ function getNextStageBackwardsPath(
     return LevelStage.DEPTHS_1;
   }
 
-  return (stage as int) - 1;
+  return asNumber(stage) - 1;
 }
 
 /**
@@ -262,7 +263,7 @@ export function getNextStageType(upwards = false): StageType {
   }
 
   // Second, handle the special case of being in a specific off-grid room.
-  if (roomGridIndex === (GridRoom.SECRET_EXIT as int)) {
+  if (roomGridIndex === asNumber(GridRoom.SECRET_EXIT)) {
     return calculateStageTypeRepentance(nextStage);
   }
 

package/src/functions/npcs.ts

@@ -17,6 +17,7 @@ import {
 } from "isaac-typescript-definitions";
 import { EGGY_STATE_FRAME_OF_FINAL_SPIDER } from "../core/constants";
 import { getNPCs } from "./entitiesSpecific";
+import { asNumber } from "./types";
 
 /**
  * Used to filter out certain NPCs when determining of an NPC is "alive" and/or should keep the
@@ -125,7 +126,7 @@ export function isDaddyLongLegsChildStompEntity(npc: EntityNPC): boolean {
 export function isDyingEggyWithNoSpidersLeft(npc: EntityNPC): boolean {
   return (
     npc.Type === EntityType.HOPPER &&
-    npc.Variant === (HopperVariant.EGGY as int) &&
+    npc.Variant === asNumber(HopperVariant.EGGY) &&
     npc.State === NpcState.SUICIDE &&
     npc.StateFrame >= EGGY_STATE_FRAME_OF_FINAL_SPIDER
   );
@@ -140,7 +141,7 @@ export function isDyingEggyWithNoSpidersLeft(npc: EntityNPC): boolean {
 export function isRaglingDeathPatch(npc: EntityNPC): boolean {
   return (
     npc.Type === EntityType.RAGLING &&
-    npc.Variant === (RaglingVariant.RAG_MANS_RAGLING as int) &&
+    npc.Variant === asNumber(RaglingVariant.RAG_MANS_RAGLING) &&
     // They go to `STATE_SPECIAL` when they are patches on the ground.
     npc.State === NpcState.SPECIAL
   );

package/src/functions/pills.ts

@@ -30,6 +30,7 @@ import {
   PILL_EFFECT_TYPES,
 } from "../objects/pillEffectTypes";
 import { getEnumValues } from "./enums";
+import { asNumber, asPillColor } from "./types";
 import { irange } from "./utils";
 
 /**
@@ -55,7 +56,7 @@ export function getAllPillColors(): PillColor[] {
  * Helper function to get an array with every valid pill effect. This includes modded pill effects.
  */
 export function getAllPillEffects(): PillEffect[] {
-  return irange(FIRST_PILL_EFFECT, LAST_PILL_EFFECT) as PillEffect[];
+  return irange(FIRST_PILL_EFFECT, LAST_PILL_EFFECT);
 }
 
 /**
@@ -74,12 +75,12 @@ export function getFalsePHDPillEffect(pillEffect: PillEffect): PillEffect {
  * corresponds to the horse pill color for blue/blue.
  */
 export function getHorsePillColor(pillColor: PillColor): PillColor {
-  return pillColor + HORSE_PILL_ADJUSTMENT; // eslint-disable-line isaacscript/strict-enums
+  return asNumber(pillColor) + HORSE_PILL_ADJUSTMENT;
 }
 
 /** Helper function to get an array with every non-gold horse pill color. */
 export function getHorsePillColors(): PillColor[] {
-  return irange(FIRST_HORSE_PILL_COLOR, LAST_HORSE_PILL_COLOR) as PillColor[];
+  return irange(FIRST_HORSE_PILL_COLOR, LAST_HORSE_PILL_COLOR);
 }
 
 /**
@@ -92,7 +93,7 @@ export function getModdedPillEffects(): PillEffect[] {
     return [];
   }
 
-  return irange(FIRST_MODDED_PILL_EFFECT, LAST_PILL_EFFECT) as PillEffect[];
+  return irange(FIRST_MODDED_PILL_EFFECT, LAST_PILL_EFFECT);
 }
 
 /**
@@ -103,15 +104,16 @@ export function getModdedPillEffects(): PillEffect[] {
  * If called with a non-horse pill color, this function will return back the same color.
  */
 export function getNormalPillColorFromHorse(pillColor: PillColor): PillColor {
-  // eslint-disable-next-line isaacscript/strict-enums
-  const normalPillColor = (pillColor - HORSE_PILL_ADJUSTMENT) as PillColor;
+  const normalPillColor = asPillColor(
+    asNumber(pillColor) - HORSE_PILL_ADJUSTMENT,
+  );
 
   return normalPillColor > PillColor.NULL ? normalPillColor : pillColor;
 }
 
 /** Helper function to get an array with every non-gold and non-horse pill color. */
 export function getNormalPillColors(): PillColor[] {
-  return irange(FIRST_PILL_COLOR, LAST_NORMAL_PILL_COLOR) as PillColor[];
+  return irange(FIRST_PILL_COLOR, LAST_NORMAL_PILL_COLOR);
 }
 
 /**
@@ -197,9 +199,9 @@ export function getPillEffectType(
 
 /** Helper function to get an array with every vanilla pill effect. */
 export function getVanillaPillEffects(): PillEffect[] {
-  return irange(FIRST_PILL_EFFECT, LAST_VANILLA_PILL_EFFECT) as PillEffect[];
+  return irange(FIRST_PILL_EFFECT, LAST_VANILLA_PILL_EFFECT);
 }
 
 export function isHorsePill(pillColor: PillColor): boolean {
-  return pillColor > (HORSE_PILL_ADJUSTMENT as PillColor);
+  return asNumber(pillColor) > HORSE_PILL_ADJUSTMENT;
 }

package/src/functions/playerIndex.ts

@@ -96,9 +96,11 @@ export function getPlayerIndex(
   let playerToUse = player;
   const isSubPlayer = player.IsSubPlayer();
   if (isSubPlayer) {
+    const subPlayer = player as EntitySubPlayer;
+
     // The "getSubPlayerParent" function will return undefined in the situation where we are on Dead
     // Tainted Lazarus in the `POST_PLAYER_INIT` callback.
-    const playerParent = getSubPlayerParent(player as EntitySubPlayer);
+    const playerParent = getSubPlayerParent(subPlayer);
     if (playerParent !== undefined) {
       playerToUse = playerParent;
     }

package/src/functions/players.ts

@@ -23,6 +23,7 @@ import { getCollectibleArray } from "./collectibleSet";
 import { getEnumValues } from "./enums";
 import { getPlayerIndexVanilla, getPlayers } from "./playerIndex";
 import { addTearsStat } from "./tears";
+import { isNumber } from "./types";
 import { repeat } from "./utils";
 
 const STAT_CACHE_FLAGS_SET: ReadonlySet<CacheFlag> = new Set([
@@ -225,16 +226,14 @@ export function getActiveItemSlot(
  * Helper function to get how long Azazel's Brimstone laser should be. You can pass either an
  * `EntityPlayer` object or a tear height stat.
  *
- * The formula for calculating it is: 32 - 2.5 * player.TearHeight
+ * The formula for calculating it is: 32 - 2.5 * tearHeight
  */
 export function getAzazelBrimstoneDistance(
   playerOrTearHeight: EntityPlayer | float,
 ): float {
-  let tearHeight = tonumber(playerOrTearHeight);
-  if (tearHeight === undefined) {
-    const player = playerOrTearHeight as EntityPlayer;
-    tearHeight = player.TearHeight;
-  }
+  const tearHeight = isNumber(playerOrTearHeight)
+    ? playerOrTearHeight
+    : playerOrTearHeight.TearHeight;
 
   return 32 - 2.5 * tearHeight;
 }

package/src/functions/pocketItems.ts

@@ -10,6 +10,7 @@ import { PocketItemType } from "../enums/PocketItemType";
 import { PocketItemDescription } from "../interfaces/PocketItemDescription";
 import { getEnumValues } from "./enums";
 import { isCharacter } from "./players";
+import { asNumber } from "./types";
 
 /**
  * Helper function to get the `PocketItemSlot` that the player's pocket active collectible item is
@@ -63,8 +64,8 @@ export function getPocketItems(player: EntityPlayer): PocketItemDescription[] {
   let pocketItemIdentified = false;
   let pocketItem2Identified = false;
   for (const slot of pocketItemSlots) {
-    const card = player.GetCard(slot as PocketItemSlot);
-    const pillColor = player.GetPill(slot as PocketItemSlot);
+    const card = player.GetCard(slot);
+    const pillColor = player.GetPill(slot);
 
     if (card !== Card.NULL) {
       pocketItems.push({
@@ -106,8 +107,7 @@ export function getPocketItems(player: EntityPlayer): PocketItemDescription[] {
       });
     }
 
-    // eslint-disable-next-line isaacscript/strict-enums
-    if (slot + 1 === maxPocketItems) {
+    if (asNumber(slot) + 1 === maxPocketItems) {
       break;
     }
   }

package/src/functions/rng.ts

@@ -41,11 +41,14 @@ export function deserializeRNG(rng: SerializedRNG): RNG {
     );
   }
 
-  const [seed] = getNumbersFromTable(
-    rng as LuaMap<string, unknown>,
-    OBJECT_NAME,
-    ...KEYS,
-  );
+  const [seed] = getNumbersFromTable(rng, OBJECT_NAME, ...KEYS);
+
+  if (seed === undefined) {
+    error(
+      `Failed to deserialize a ${OBJECT_NAME} object since the provided object did not have a value for: seed`,
+    );
+  }
+
   return newRNG(seed as Seed);
 }
 

package/src/functions/rooms.ts

@@ -16,10 +16,10 @@ import {
   StageID,
 } from "isaac-typescript-definitions";
 import { game, sfxManager } from "../core/cachedClasses";
-import { MAX_LEVEL_GRID_INDEX, NUM_DIMENSIONS } from "../core/constants";
+import { MAX_LEVEL_GRID_INDEX } from "../core/constants";
 import { ROOM_TYPE_NAMES } from "../objects/roomTypeNames";
 import { MINE_SHAFT_ROOM_SUB_TYPE_SET } from "../sets/mineShaftRoomSubTypesSet";
-import { inDimension } from "./dimensions";
+import { getAllDimensions, inDimension } from "./dimensions";
 import {
   closeAllDoors,
   getDoors,
@@ -45,7 +45,8 @@ import {
 } from "./roomData";
 import { reloadRoom } from "./roomTransition";
 import { getGotoCommand } from "./stage";
-import { erange, irange } from "./utils";
+import { asNumber } from "./types";
+import { irange } from "./utils";
 
 /**
  * Helper function for quickly switching to a new room without playing a particular animation. Use
@@ -207,7 +208,7 @@ export function getRoomsInsideGrid(
   const level = game.GetLevel();
 
   const dimensions = includeExtraDimensionalRooms
-    ? (erange(NUM_DIMENSIONS) as Dimension[])
+    ? getAllDimensions()
     : [Dimension.CURRENT];
 
   /** We use a map instead of an array because room shapes occupy more than one room grid index. */
@@ -284,8 +285,10 @@ export function inAngelShop(): boolean {
   const roomType = room.GetType();
   const roomSubType = getRoomSubType();
 
-  // eslint-disable-next-line isaacscript/strict-enums
-  return roomType === RoomType.ANGEL && roomSubType === AngelRoomSubType.SHOP;
+  return (
+    roomType === RoomType.ANGEL &&
+    roomSubType === asNumber(AngelRoomSubType.SHOP)
+  );
 }
 
 export function inBeastRoom(): boolean {
@@ -294,8 +297,8 @@ export function inBeastRoom(): boolean {
   const roomSubType = getRoomSubType();
 
   return (
-    // eslint-disable-next-line isaacscript/strict-enums
-    roomType === RoomType.DUNGEON && roomSubType === DungeonSubType.BEAST_ROOM
+    roomType === RoomType.DUNGEON &&
+    roomSubType === asNumber(DungeonSubType.BEAST_ROOM)
   );
 }
 
@@ -312,7 +315,7 @@ export function inBossRoomOf(bossID: BossID): boolean {
   return (
     roomType === RoomType.BOSS &&
     roomStageID === StageID.SPECIAL_ROOMS &&
-    roomSubType === bossID // eslint-disable-line isaacscript/strict-enums
+    roomSubType === asNumber(bossID)
   );
 }
 
@@ -326,13 +329,14 @@ export function inCrawlSpace(): boolean {
   const roomType = room.GetType();
   const roomSubType = getRoomSubType();
 
-  // eslint-disable-next-line isaacscript/strict-enums
-  return roomType === RoomType.DUNGEON && roomSubType === DungeonSubType.NORMAL;
+  return (
+    roomType === RoomType.DUNGEON &&
+    roomSubType === asNumber(DungeonSubType.NORMAL)
+  );
 }
 
 /**
- * We cannot use the standard code in the `inDimension` function for this purpose since it is bugged
- * with the Death Certificate area.
+ * Helper function to detect if the current room is one of the room in the Death Certificate area.
  */
 export function inDeathCertificateArea(): boolean {
   const roomStageID = getRoomStageID();
@@ -340,17 +344,16 @@ export function inDeathCertificateArea(): boolean {
 
   return (
     roomStageID === StageID.HOME &&
-    // eslint-disable-next-line isaacscript/strict-enums
-    (roomSubType === HomeRoomSubType.DEATH_CERTIFICATE_ENTRANCE ||
-      // eslint-disable-next-line isaacscript/strict-enums
-      roomSubType === HomeRoomSubType.DEATH_CERTIFICATE_ITEMS)
+    (roomSubType === asNumber(HomeRoomSubType.DEATH_CERTIFICATE_ENTRANCE) ||
+      roomSubType === asNumber(HomeRoomSubType.DEATH_CERTIFICATE_ITEMS))
   );
 }
 
 /**
  * Helper function to detect if the current room is a Treasure Room created when entering with a
- * Devil's Crown trinket. Under the hood, this checks for the `RoomDescriptorFlag.DEVIL_TREASURE`
- * flag.
+ * Devil's Crown trinket.
+ *
+ * Under the hood, this checks for `RoomDescriptorFlag.DEVIL_TREASURE`.
  */
 export function inDevilsCrownTreasureRoom(): boolean {
   const roomDescriptor = getRoomDescriptorReadOnly();
@@ -368,8 +371,7 @@ export function inDoubleTrouble(): boolean {
 export function inGenesisRoom(): boolean {
   const roomGridIndex = getRoomGridIndex();
 
-  // eslint-disable-next-line isaacscript/strict-enums
-  return roomGridIndex === GridRoom.GENESIS;
+  return roomGridIndex === asNumber(GridRoom.GENESIS);
 }
 
 /** Helper function to determine if the current room shape is one of the four L room shapes. */
@@ -388,8 +390,7 @@ export function inLRoom(): boolean {
 export function inMegaSatanRoom(): boolean {
   const roomGridIndex = getRoomGridIndex();
 
-  // eslint-disable-next-line isaacscript/strict-enums
-  return roomGridIndex === GridRoom.MEGA_SATAN;
+  return roomGridIndex === asNumber(GridRoom.MEGA_SATAN);
 }
 
 /**
@@ -420,7 +421,7 @@ export function inMinibossRoomOf(minibossID: MinibossID): boolean {
   return (
     roomType === RoomType.MINI_BOSS &&
     roomStageID === StageID.SPECIAL_ROOMS &&
-    roomSubType === minibossID // eslint-disable-line isaacscript/strict-enums
+    roomSubType === asNumber(minibossID)
   );
 }
 
@@ -434,8 +435,7 @@ export function inMinibossRoomOf(minibossID: MinibossID): boolean {
 export function inSecretShop(): boolean {
   const roomGridIndex = getRoomGridIndex();
 
-  // eslint-disable-next-line isaacscript/strict-enums
-  return roomGridIndex === GridRoom.SECRET_SHOP;
+  return roomGridIndex === asNumber(GridRoom.SECRET_SHOP);
 }
 
 /**

package/src/functions/spawnCollectible.ts

@@ -1,6 +1,5 @@
 import {
   CollectibleType,
-  PickupPrice,
   PickupVariant,
   PlayerType,
 } from "isaac-typescript-definitions";
@@ -65,7 +64,7 @@ export function spawnCollectible(
 
     // We can set the price to any arbitrary value; it will auto-update to the true price on the
     // next frame.
-    collectible.Price = 15 as PickupPrice;
+    collectible.Price = 15;
   }
 
   if (isQuestCollectible(collectibleType) && areFeaturesInitialized()) {

package/src/functions/stage.ts

@@ -8,6 +8,7 @@ import { game } from "../core/cachedClasses";
 import { ROOM_TYPE_GOTO_PREFIXES } from "../objects/roomTypeGotoPrefixes";
 import { STAGE_TYPE_SUFFIXES } from "../objects/stageTypeSuffixes";
 import { STAGE_TYPE_TO_LETTER } from "../objects/stageTypeToLetter";
+import { asLevelStage, asNumber } from "./types";
 
 /**
  * Helper function that calculates what the stage type should be for the provided stage. This
@@ -57,7 +58,7 @@ export function calculateStageTypeRepentance(stage: LevelStage): StageType {
   // This algorithm is from Kilburn. We add one because the alt path is offset by 1 relative to the
   // normal path.
   const seeds = game.GetSeeds();
-  const adjustedStage = ((stage as int) + 1) as LevelStage;
+  const adjustedStage = asLevelStage(asNumber(stage) + 1);
   const stageSeed = seeds.GetStageSeed(adjustedStage);
 
   // Kilburn does not know why he divided the stage seed by 2 first.
@@ -79,7 +80,7 @@ export function getEffectiveStage(): int {
   const stage = level.GetStage();
 
   if (onRepentanceStage()) {
-    return stage + 1; // eslint-disable-line isaacscript/strict-enums
+    return asNumber(stage) + 1;
   }
 
   return stage;

package/src/functions/trinkets.ts

@@ -21,6 +21,7 @@ import { hasFlag } from "./flag";
 import { isTrinket } from "./pickupVariants";
 import { isCharacter } from "./players";
 import { clearSprite } from "./sprites";
+import { asNumber } from "./types";
 import { irange } from "./utils";
 
 /**
@@ -41,7 +42,7 @@ const TRINKET_SPRITE_LAYER = 0;
  * corresponds to the golden trinket sub-type for Swallowed Penny.
  */
 export function getGoldenTrinketType(trinketType: TrinketType): TrinketType {
-  return trinketType + GOLDEN_TRINKET_ADJUSTMENT; // eslint-disable-line isaacscript/strict-enums
+  return asNumber(trinketType) + GOLDEN_TRINKET_ADJUSTMENT;
 }
 
 /**
@@ -54,7 +55,7 @@ export function getModdedTrinketTypes(): TrinketType[] {
     return [];
   }
 
-  return irange(FIRST_MODDED_TRINKET_TYPE, LAST_TRINKET_TYPE) as TrinketType[];
+  return irange(FIRST_MODDED_TRINKET_TYPE, LAST_TRINKET_TYPE);
 }
 
 /**
@@ -140,12 +141,12 @@ export function getTrinketName(trinketType: TrinketType): string {
 
 /** Helper function to get an array that contains every trinket type. */
 export function getTrinketTypes(): TrinketType[] {
-  return irange(FIRST_TRINKET_TYPE, LAST_TRINKET_TYPE) as TrinketType[];
+  return irange(FIRST_TRINKET_TYPE, LAST_TRINKET_TYPE);
 }
 
 /** Helper function to get an array that represents every vanilla trinket type. */
 export function getVanillaTrinketTypes(): TrinketType[] {
-  return irange(FIRST_TRINKET_TYPE, LAST_VANILLA_TRINKET_TYPE) as TrinketType[];
+  return irange(FIRST_TRINKET_TYPE, LAST_VANILLA_TRINKET_TYPE);
 }
 
 /**
@@ -165,7 +166,7 @@ export function hasOpenTrinketSlot(player: EntityPlayer): boolean {
 }
 
 export function isGoldenTrinket(trinketType: TrinketType): boolean {
-  return trinketType > (GOLDEN_TRINKET_ADJUSTMENT as TrinketType);
+  return asNumber(trinketType) > GOLDEN_TRINKET_ADJUSTMENT;
 }
 
 /**