isaacscript-common 7.1.0 → 7.2.1

package/src/callbacks/postSlotDestroyed.ts

@@ -36,7 +36,7 @@ export function postSlotDestroyedInit(mod: ModUpgraded): void {
 
   mod.AddCallback(
     ModCallback.POST_ENTITY_REMOVE,
-    postEntityRemove,
+    postEntityRemoveSlot,
     EntityType.SLOT,
   ); // 67
 
@@ -51,7 +51,8 @@ function hasSubscriptions() {
 }
 
 // ModCallback.POST_ENTITY_REMOVE (67)
-function postEntityRemove(entity: Entity) {
+// EntityType.SLOT (6)
+function postEntityRemoveSlot(entity: Entity) {
   const slot = entity as EntitySlot;
   const ptrHash = GetPtrHash(slot);
   const gameFrameCount = game.GetFrameCount();

package/src/callbacks/reorderedCallbacks.ts

@@ -31,8 +31,8 @@ import {
   postNewRoomReorderedHasSubscriptions,
 } from "./subscriptions/postNewRoomReordered";
 
-let currentStage = null as int | null;
-let currentStageType = null as int | null;
+let currentStage: int | null = null;
+let currentStageType: int | null = null;
 let usedGlowingHourGlass = false;
 let forceNewLevel = false;
 let forceNewRoom = false;

package/src/classes/DefaultMap.ts

@@ -1,12 +1,5 @@
 import { isFunction, isPrimitive } from "../functions/types";
 
-// eslint-disable-next-line isaacscript/complete-sentences-jsdoc
-/**
- * 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[]> = (...args: Args) => V;
-
 /**
  * `DefaultMap` is a data structure that makes working with default values easier.
  *
@@ -116,7 +109,7 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
       this.defaultValue = undefined;
       this.defaultValueFactory = defaultValueOrFactoryFunction;
     } else {
-      this.defaultValue = defaultValueOrFactoryFunction as Value;
+      this.defaultValue = defaultValueOrFactoryFunction;
       this.defaultValueFactory = undefined;
     }
   }
@@ -169,6 +162,13 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
   }
 }
 
+// eslint-disable-next-line isaacscript/complete-sentences-jsdoc
+/**
+ * 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[]> = (...args: Args) => V;
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 function test() {
   // Boolean

package/src/core/constants.ts

@@ -1,5 +1,4 @@
 import {
-  CollectibleType,
   Dimension,
   DisplayFlag,
   ItemPoolType,
@@ -7,6 +6,7 @@ import {
 } from "isaac-typescript-definitions";
 import { getEnumLength } from "../functions/enums";
 import { addFlag } from "../functions/flag";
+import { asCollectibleType } from "../functions/types";
 import { NUM_NORMAL_PILL_COLORS } from "./constantsFirstLast";
 
 /**
@@ -64,8 +64,8 @@ export const EMPTY_PNG_PATH = "gfx/none.png";
  * encountered by the player. The first TMTRAINER item takes the final possible 32 bit number. The
  * second TMTRAINER item subtracts one from that, and so on.
  */
-export const FIRST_GLITCHED_COLLECTIBLE_TYPE = ((1 << 32) -
-  1) as CollectibleType;
+
+export const FIRST_GLITCHED_COLLECTIBLE_TYPE = asCollectibleType((1 << 32) - 1);
 
 /** Game frames are what is returned by the `Game.GetFrameCount` method. */
 export const GAME_FRAMES_PER_SECOND = 30;

package/src/core/constantsFirstLast.ts

@@ -9,6 +9,14 @@ import {
   TrinketType,
 } from "isaac-typescript-definitions";
 import { getEnumLength, getLastEnumValue } from "../functions/enums";
+import {
+  asCard,
+  asCollectibleType,
+  asNumber,
+  asPillEffect,
+  asPlayerType,
+  asTrinketType,
+} from "../functions/types";
 import { itemConfig } from "./cachedClasses";
 
 // ------------
@@ -24,8 +32,9 @@ export const FIRST_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION;
  * Equal to `itemConfig.GetCollectibles().Size - 1`. (`Size` includes invalid collectibles, like
  * 666. We subtract one to account for `CollectibleType.NULL`.)
  */
-export const LAST_COLLECTIBLE_TYPE = (itemConfig.GetCollectibles().Size -
-  1) as CollectibleType;
+export const LAST_COLLECTIBLE_TYPE = asCollectibleType(
+  itemConfig.GetCollectibles().Size - 1,
+);
 
 /**
  * Calculated from the `CollectibleType` enum.
@@ -39,8 +48,9 @@ export const LAST_VANILLA_COLLECTIBLE_TYPE = getLastEnumValue(CollectibleType);
  * If there are no modded collectibles, this constant will represent a collectible type that does
  * not exist.
  */
-export const FIRST_MODDED_COLLECTIBLE_TYPE =
-  ((LAST_VANILLA_COLLECTIBLE_TYPE as int) + 1) as CollectibleType;
+export const FIRST_MODDED_COLLECTIBLE_TYPE = asCollectibleType(
+  asNumber(LAST_VANILLA_COLLECTIBLE_TYPE) + 1,
+);
 
 /** Calculated from the `CollectibleType` enum. `CollectibleType.NULL` is not included. */
 export const NUM_VANILLA_COLLECTIBLE_TYPES = getEnumLength(CollectibleType) - 1;
@@ -79,7 +89,7 @@ export const FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY;
  * Equal to `itemConfig.GetTrinkets().Size - 1`. (We subtract one to account for
  * `TrinketType.NULL`.)
  */
-export const LAST_TRINKET_TYPE = NUM_TRINKET_TYPES as TrinketType;
+export const LAST_TRINKET_TYPE = asTrinketType(NUM_TRINKET_TYPES);
 
 /** Calculated from the `TrinketType` enum. */
 export const LAST_VANILLA_TRINKET_TYPE = getLastEnumValue(TrinketType);
@@ -87,8 +97,9 @@ export const LAST_VANILLA_TRINKET_TYPE = getLastEnumValue(TrinketType);
 /**
  * If there are no modded trinkets, this constant will represent a trinket type that does not exist.
  */
-export const FIRST_MODDED_TRINKET_TYPE = ((LAST_VANILLA_TRINKET_TYPE as int) +
-  1) as TrinketType;
+export const FIRST_MODDED_TRINKET_TYPE = asTrinketType(
+  asNumber(LAST_VANILLA_TRINKET_TYPE) + 1,
+);
 
 // -----
 // Cards
@@ -114,13 +125,13 @@ export const FIRST_CARD = Card.FOOL;
  *
  * Equal to `itemConfig.GetCards().Size - 1`. (We subtract one to account for `Card.NULL`.)
  */
-export const LAST_CARD = NUM_CARDS as Card;
+export const LAST_CARD = asCard(NUM_CARDS);
 
 /** Calculated from the `Card` enum. */
 export const MAX_VANILLA_CARD = getLastEnumValue(Card);
 
 /** If there are no modded cards, this constant will represent a card that does not exist. */
-export const FIRST_MODDED_CARD = ((MAX_VANILLA_CARD as int) + 1) as Card;
+export const FIRST_MODDED_CARD = asCard(asNumber(MAX_VANILLA_CARD) + 1);
 
 // ------------
 // Pill Effects
@@ -153,7 +164,7 @@ export const FIRST_PILL_EFFECT = PillEffect.BAD_GAS;
  * Equal to `itemConfig.GetPillEffects().Size - 1`. (We subtract one to account for
  * `PillEffect.NULL`.)
  */
-export const LAST_PILL_EFFECT = NUM_PILL_EFFECTS as PillEffect;
+export const LAST_PILL_EFFECT = asPillEffect(NUM_PILL_EFFECTS);
 
 /** Calculated from the `PillEffect` enum. */
 export const LAST_VANILLA_PILL_EFFECT = getLastEnumValue(PillEffect);
@@ -162,8 +173,9 @@ export const LAST_VANILLA_PILL_EFFECT = getLastEnumValue(PillEffect);
  * If there are no modded pill effects, this constant will represent a pill effect that does not
  * exist.
  */
-export const FIRST_MODDED_PILL_EFFECT = ((LAST_VANILLA_PILL_EFFECT as int) +
-  1) as PillEffect;
+export const FIRST_MODDED_PILL_EFFECT = asPillEffect(
+  asNumber(LAST_VANILLA_PILL_EFFECT) + 1,
+);
 
 // -----------
 // Pill Colors
@@ -207,9 +219,12 @@ export const LAST_VANILLA_CHARACTER = getLastEnumValue(PlayerType);
 
 /**
  * If there are no modded characters, this constant will represent a character that does not exist.
+ * (There is no way to determine the amount of modded characters at run-time, since there is no
+ * exposed player config.)
  */
-export const FIRST_MODDED_CHARACTER = ((LAST_VANILLA_CHARACTER as int) +
-  1) as PlayerType;
+export const FIRST_MODDED_CHARACTER = asPlayerType(
+  asNumber(LAST_VANILLA_CHARACTER) + 1,
+);
 
 // ----------
 // Room Types

package/src/enums/AmbushType.ts

@@ -1,3 +1,4 @@
+/** This is used by the `POST_AMBUSH_STARTED` and `POST_AMBUSH_FINISHED` custom callbacks. */
 export enum AmbushType {
   CHALLENGE_ROOM,
   BOSS_RUSH,

package/src/enums/CornerType.ts

@@ -1,3 +1,4 @@
+/** This is used by the `getRoomShapeCorners` helper function. */
 export enum CornerType {
   TOP_LEFT,
   TOP_RIGHT,

package/src/enums/PocketItemType.ts

@@ -1,3 +1,4 @@
+/** This is used in the various pocket item helper functions. */
 export enum PocketItemType {
   EMPTY,
   CARD,

package/src/enums/RockAltType.ts

@@ -1,3 +1,4 @@
+/** This is used in the various rock alt type helper functions. */
 export enum RockAltType {
   URN,
   MUSHROOM,

package/src/enums/SaveDataKey.ts

@@ -0,0 +1,10 @@
+/**
+ * These are the types of keys that you can put on the local variables that you feed to the save
+ * data manager.
+ */
+export enum SaveDataKey {
+  PERSISTENT = "persistent",
+  RUN = "run",
+  LEVEL = "level",
+  ROOM = "room",
+}

package/src/enums/SerializationType.ts

@@ -1,3 +1,4 @@
+/** This is used with the `deepCopy` and `merge` functions. */
 export enum SerializationType {
   NONE,
   SERIALIZE,

package/src/enums/SlotDestructionType.ts

@@ -1,3 +1,4 @@
+/** This is used in the `POST_SLOT_DESTROYED` custom callback. */
 export enum SlotDestructionType {
   NORMAL,
   COLLECTIBLE_PAYOUT,

package/src/enums/StatType.ts

@@ -33,15 +33,15 @@ export enum StatType {
   /** Corresponds to `CacheFlag.FLYING` (1 << 7) and `EntityPlayer.CanFly`. */
   FLYING,
 
-  // `CacheFlag.WEAPON` (1 << 8) does not have a corresponding `EntityPlayer` field.
-  // `CacheFlag.FAMILIARS` (1 << 9) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.WEAPON` (1 << 8) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.FAMILIARS` (1 << 9) does not have a corresponding `EntityPlayer` field.
 
   /** Corresponds to `CacheFlag.LUCK` (1 << 10) and `EntityPlayer.Luck`. */
   LUCK,
 
-  /** Corresponds to `CacheFlag.SIZE` (1 << 11) and `EntityPlayer.SizeMulti`. */
-  SIZE,
-
-  // `CacheFlag.COLOR` (1 << 12) does not have a corresponding `EntityPlayer` field.
-  // `CacheFlag.PICKUP_VISION` (1 << 13) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.SIZE` (1 << 12) does not have a corresponding `EntityPlayer` field. (After picking
+  //   up Magic Mushroom, the values of `EntityPlayer.Size` and `EntityPlayer.SizeMulti` do not
+  //   change.)
+  // - `CacheFlag.COLOR` (1 << 12) does not have a corresponding `EntityPlayer` field.
+  // - `CacheFlag.PICKUP_VISION` (1 << 13) does not have a corresponding `EntityPlayer` field.
 }

package/src/enums/index.ts

@@ -4,6 +4,7 @@ export * from "./HealthType";
 export * from "./ModCallbackCustom";
 export * from "./PocketItemType";
 export * from "./RockAltType";
+export * from "./SaveDataKey";
 export * from "./SerializationType";
 export * from "./SlotDestructionType";
 export * from "./StatType";

package/src/enums/indexTypeDoc.ts

@@ -4,6 +4,7 @@ export * as HealthType from "./HealthType";
 export * as ModCallbackCustom from "./ModCallbackCustom";
 export * as PocketItemType from "./PocketItemType";
 export * as RockAltType from "./RockAltType";
+export * as SaveDataKey from "./SaveDataKey";
 export * as SerializationType from "./SerializationType";
 export * as SlotDestructionType from "./SlotDestructionType";
 export * as StatType from "./StatType";

package/src/features/customGridEntity.ts

@@ -23,6 +23,7 @@ import {
   spawnGridEntityWithVariant,
 } from "../functions/gridEntities";
 import { getRoomListIndex } from "../functions/roomData";
+import { asNumber } from "../functions/types";
 import { isVector } from "../functions/vector";
 import { GridEntityCustomData } from "../interfaces/GridEntityCustomData";
 import { runNextGameFrame } from "./runInNFrames";
@@ -251,7 +252,7 @@ export function spawnCustomGridEntity(
     existingGridEntity !== undefined &&
     existingGridEntity.GetType() === GridEntityType.DECORATION &&
     existingGridEntity.GetVariant() ===
-      (DecorationVariant.CUSTOM_GRID_ENTITY as int);
+      asNumber(DecorationVariant.CUSTOM_GRID_ENTITY);
   const decoration = isExistingDecoration
     ? existingGridEntity
     : spawnGridEntityWithVariant(

package/src/features/customStage/backdrop.ts

@@ -91,7 +91,7 @@ const BACKDROP_ROOM_TYPE_SET: ReadonlySet<RoomType> = new Set([
   RoomType.MINI_BOSS,
 ]);
 
-export function setBackdrop(customStage: CustomStage): void {
+export function setCustomStageBackdrop(customStage: CustomStage): void {
   const room = game.GetRoom();
   const roomType = room.GetType();
   const decorationSeed = room.GetDecorationSeed();
@@ -131,11 +131,12 @@ function spawnWallEntity(
 
   // We spawn an effect instead of simply rendering a static sprite in order to emulate how vanilla
   // does this. (`EntityFlag.RENDER_WALL` is intended for this purpose.)
+  const seed = 1 as Seed;
   const wallEffect = spawnEffectWithSeed(
     BACKDROP_EFFECT_VARIANT,
     BACKDROP_EFFECT_SUBTYPE,
     VectorZero,
-    1 as Seed,
+    seed,
   );
   wallEffect.AddEntityFlags(EntityFlag.RENDER_WALL);
 
@@ -195,11 +196,12 @@ function spawnFloorEntity(customStage: CustomStage, rng: RNG) {
 
   // We spawn an effect instead of simply rendering a static sprite in order to emulate how vanilla
   // does this. (`EntityFlag.RENDER_FLOOR` is intended for this purpose.)
+  const seed = 1 as Seed;
   const floorEffect = spawnEffectWithSeed(
     BACKDROP_EFFECT_VARIANT,
     0,
     VectorZero,
-    1 as Seed,
+    seed,
   );
   floorEffect.AddEntityFlags(EntityFlag.RENDER_FLOOR);
 

package/src/features/customStage/customStageGridEntities.ts

@@ -15,6 +15,7 @@ import {
   getTrinkets,
 } from "../../functions/pickupsSpecific";
 import { calculateStageType } from "../../functions/stage";
+import { asNumber } from "../../functions/types";
 import { vectorEquals } from "../../functions/vector";
 import { CustomStage } from "../../interfaces/private/CustomStage";
 import { TrapdoorDestination } from "../../types/TrapdoorDestination";
@@ -40,7 +41,7 @@ export function setCustomDecorationGraphics(
 
   // Ignore custom grid entities. (They are represented as decorations with a non-zero variant.)
   const variant = gridEntity.GetVariant();
-  if (variant !== (DecorationVariant.VANILLA_DECORATION as int)) {
+  if (variant !== asNumber(DecorationVariant.VANILLA_DECORATION)) {
     return;
   }
 

package/src/features/customStage/exports.ts

@@ -24,6 +24,7 @@ import {
   getRoomsInsideGrid,
 } from "../../functions/rooms";
 import { setStage } from "../../functions/stage";
+import { asNumber } from "../../functions/types";
 import { CustomStage } from "../../interfaces/private/CustomStage";
 import { getRandomCustomStageRoom } from "./customStageUtils";
 import v, {
@@ -77,7 +78,7 @@ export function setCustomStage(
     level.SetStage(LevelStage.BASEMENT_1, StageType.ORIGINAL);
   }
 
-  let baseStage: int =
+  let baseStage =
     customStage.baseStage === undefined
       ? DEFAULT_BASE_STAGE
       : customStage.baseStage;
@@ -88,11 +89,11 @@ export function setCustomStage(
   const baseStageType =
     customStage.baseStageType === undefined
       ? DEFAULT_BASE_STAGE_TYPE
-      : (customStage.baseStageType as StageType);
+      : customStage.baseStageType;
 
-  const reseed = (stage as int) >= baseStage;
+  const reseed = asNumber(stage) >= baseStage;
 
-  setStage(baseStage as LevelStage, baseStageType, reseed);
+  setStage(baseStage as LevelStage, baseStageType as StageType, reseed);
 
   setStageRoomsData(customStage, rng, verbose);
 

package/src/features/customStage/init.ts

@@ -16,7 +16,7 @@ import {
 } from "../../interfaces/CustomStageLua";
 import { CustomStage, RoomTypeMap } from "../../interfaces/private/CustomStage";
 import { saveDataManager } from "../saveDataManager/exports";
-import { setBackdrop } from "./backdrop";
+import { setCustomStageBackdrop } from "./backdrop";
 import {
   convertVanillaTrapdoors,
   removeUrnRewards,
@@ -196,7 +196,7 @@ function postNewRoomReordered() {
     return;
   }
 
-  setBackdrop(customStage);
+  setCustomStageBackdrop(customStage);
   setShadows(customStage);
   playVersusScreenAnimation(customStage);
 }

package/src/features/customStage/shadows.ts

@@ -56,11 +56,12 @@ export function setShadows(customStage: CustomStage): void {
   // We spawn an effect instead of simply rendering a static sprite so that the effect will properly
   // slide in during a room transition animation. (It looks stupid if the shadow stays statically
   // rendering throughout this animation.)
+  const seed = 1 as Seed;
   const shadowEffect = spawnEffectWithSeed(
     SHADOW_EFFECT_VARIANT,
     SHADOW_EFFECT_SUBTYPE,
     centerPos,
-    1 as Seed,
+    seed,
   );
 
   const sprite = shadowEffect.GetSprite();

package/src/features/deployJSONRoom.ts

@@ -40,7 +40,6 @@ import {
   convertXMLGridEntityType,
   getAllGridIndexes,
   getGridEntities,
-  getGridEntityIDFromConstituents,
   removeAllGridExcept,
   removeGridEntity,
   setGridEntityInvisible,
@@ -53,6 +52,7 @@ import { getRoomListIndex } from "../functions/roomData";
 import { gridCoordinatesToWorldPosition } from "../functions/roomGrid";
 import { setRoomCleared, setRoomUncleared } from "../functions/rooms";
 import { spawnCollectible } from "../functions/spawnCollectible";
+import { asCollectibleType, asNumber } from "../functions/types";
 import { JSONRoom } from "../interfaces/JSONRoomsFile";
 import { runNextGameFrame } from "./runInNFrames";
 import { saveDataManager } from "./saveDataManager/exports";
@@ -462,8 +462,8 @@ function spawnAllEntities(
     }
 
     const entityTypeString = firstXMLEntity.$.type;
-    const entityType = tonumber(entityTypeString);
-    if (entityType === undefined) {
+    const entityTypeNumber = tonumber(entityTypeString);
+    if (entityTypeNumber === undefined) {
       error(
         `Failed to convert the entity type to a number: ${entityTypeString}`,
       );
@@ -482,31 +482,26 @@ function spawnAllEntities(
     }
 
     // Note that XML entity type 1000 is a rock, not an effect.
-    if (entityType >= 1000) {
+    if (entityTypeNumber >= 1000) {
+      const gridEntityXMLType = entityTypeNumber as GridEntityXMLType;
       if (verbose) {
-        const gridEntityID = getGridEntityIDFromConstituents(
-          entityType as GridEntityType,
-          variant,
+        log(
+          `Spawning grid entity ${gridEntityXMLType}.${variant} at: (${x}, ${y})`,
         );
-        log(`Spawning grid entity ${gridEntityID} at: (${x}, ${y})`);
       }
-      spawnGridEntityForJSONRoom(
-        entityType as GridEntityXMLType,
-        variant,
-        x,
-        y,
-      );
+      spawnGridEntityForJSONRoom(gridEntityXMLType, variant, x, y);
     } else {
+      const entityType = entityTypeNumber as EntityType;
       if (verbose) {
         const entityID = getEntityIDFromConstituents(
-          entityType as EntityType,
+          entityType,
           variant,
           subType,
         );
         log(`Spawning normal entity ${entityID} at: (${x}, ${y})`);
       }
       const entity = spawnNormalEntityForJSONRoom(
-        entityType as EntityType,
+        entityType,
         variant,
         subType,
         x,
@@ -589,11 +584,11 @@ function spawnNormalEntityForJSONRoom(
   let entity: Entity;
   if (
     entityType === EntityType.PICKUP &&
-    (variant as PickupVariant) === PickupVariant.COLLECTIBLE
+    variant === asNumber(PickupVariant.COLLECTIBLE)
   ) {
     const options = roomType === RoomType.ANGEL;
     entity = spawnCollectible(
-      subType as CollectibleType,
+      asCollectibleType(subType),
       position,
       seed,
       options,
@@ -605,7 +600,7 @@ function spawnNormalEntityForJSONRoom(
   // For some reason, Pitfalls do not spawn with the correct collision classes.
   if (
     entityType === EntityType.PITFALL &&
-    (variant as PitfallVariant) === PitfallVariant.PITFALL
+    variant === asNumber(PitfallVariant.PITFALL)
   ) {
     entity.EntityCollisionClass = EntityCollisionClass.ENEMIES;
     entity.GridCollisionClass = EntityGridCollisionClass.WALLS;

package/src/features/extraConsoleCommands/listCommands.ts

@@ -89,6 +89,7 @@ import { gridCoordinatesToWorldPosition } from "../../functions/roomGrid";
 import { changeRoom } from "../../functions/rooms";
 import { onSetSeed, restart, setUnseeded } from "../../functions/run";
 import { getGoldenTrinketType } from "../../functions/trinkets";
+import { asCard } from "../../functions/types";
 import { irange, printConsole, printEnabled } from "../../functions/utils";
 import { CARD_MAP } from "../../maps/cardMap";
 import { CHARACTER_MAP } from "../../maps/characterMap";
@@ -343,12 +344,12 @@ export function cards(): void {
   let cardType = 1;
   for (let y = 0; y <= 6; y++) {
     for (let x = 0; x <= 12; x++) {
-      if ((cardType as Card) === LAST_CARD) {
+      if (asCard(cardType) === LAST_CARD) {
         return;
       }
 
       const position = gridCoordinatesToWorldPosition(x, y);
-      spawnCard(cardType as Card, position);
+      spawnCard(asCard(cardType), position);
       cardType++;
     }
   }

package/src/features/fastReset.ts

@@ -34,7 +34,7 @@ function checkResetInput() {
     return;
   }
 
-  // Disable the fast-reset feature if the custom console is open.
+  // Disable the fast-reset feature if any custom consoles are open.
   if (AwaitingTextInput) {
     return;
   }

package/src/features/indexTypeDoc.ts

@@ -9,7 +9,8 @@ export * as DebugDisplay from "./debugDisplay/exports";
 export * as DeployJSONRoom from "./deployJSONRoom";
 export * as DisableAllSound from "./disableAllSound";
 export * as DisableInputs from "./disableInputs";
-export * as ExtraConsoleCommands from "./extraConsoleCommands/exports";
+export * as ExtraConsoleCommandsInit from "./extraConsoleCommands/exports";
+export * as ExtraConsoleCommandsList from "./extraConsoleCommands/listCommands";
 export * as FadeInRemover from "./fadeInRemover";
 export * as FastReset from "./fastReset";
 export * as ForgottenSwitch from "./forgottenSwitch";

package/src/features/saveDataManager/exports.ts

@@ -1,4 +1,4 @@
-import { SaveDataKey } from "../../enums/private/SaveDataKey";
+import { SaveDataKey } from "../../enums/SaveDataKey";
 import { SerializationType } from "../../enums/SerializationType";
 import { errorIfFeaturesNotInitialized } from "../../featuresInitialized";
 import { deepCopy } from "../../functions/deepCopy";
@@ -227,7 +227,7 @@ export function saveDataManagerSetGlobal(): void {
  */
 export function saveDataManagerReset(
   key: string,
-  childObjectKey: string,
+  childObjectKey: SaveDataKey,
 ): void {
   errorIfFeaturesNotInitialized(SAVE_DATA_MANAGER_FEATURE_NAME);
 
@@ -237,12 +237,12 @@ export function saveDataManagerReset(
     );
   }
 
-  const saveData = saveDataMap.get(key) as Record<string, unknown> | undefined;
+  const saveData = saveDataMap.get(key);
   if (saveData === undefined) {
     error(
       `The ${SAVE_DATA_MANAGER_FEATURE_NAME} is not managing save data for a key of: ${key}`,
     );
   }
 
-  restoreDefaultSaveData(key, saveData, childObjectKey as SaveDataKey);
+  restoreDefaultSaveData(key, saveData, childObjectKey);
 }

package/src/features/saveDataManager/main.ts

@@ -2,7 +2,7 @@ import { ModCallback } from "isaac-typescript-definitions";
 import { ModUpgraded } from "../../classes/ModUpgraded";
 import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
-import { SaveDataKey } from "../../enums/private/SaveDataKey";
+import { SaveDataKey } from "../../enums/SaveDataKey";
 import { SerializationType } from "../../enums/SerializationType";
 import { deepCopy } from "../../functions/deepCopy";
 import { logError } from "../../functions/log";

package/src/features/saveDataManager/save.ts

@@ -61,7 +61,7 @@ function getAllSaveDataToWriteToDisk(
       // that is unnecessary. Make a copy of the data and recursively convert all TypeScriptToLua
       // Maps into Lua tables.
       const saveDataCopy = deepCopy(
-        saveDataWithoutRoom as LuaMap,
+        saveDataWithoutRoom,
         SerializationType.SERIALIZE,
         subscriberName,
       );

package/src/functions/bitSet128.ts

@@ -37,11 +37,7 @@ export function deserializeBitSet128(
     );
   }
 
-  const [l, h] = getNumbersFromTable(
-    bitSet128 as LuaMap<string, unknown>,
-    OBJECT_NAME,
-    ...KEYS,
-  );
+  const [l, h] = getNumbersFromTable(bitSet128, OBJECT_NAME, ...KEYS);
 
   if (l === undefined) {
     error(

package/src/functions/bosses.ts

@@ -14,6 +14,7 @@ import { getNPCs, spawnNPC } from "./entitiesSpecific";
 import { getAliveNPCs } from "./npcs";
 import { isRNG } from "./rng";
 import { copySet } from "./set";
+import { asNumber } from "./types";
 import { repeat } from "./utils";
 
 const BOSSES_THAT_REQUIRE_MULTIPLE_SPAWNS: ReadonlySet<EntityType> = new Set([
@@ -194,7 +195,7 @@ function getNumBossSegments(
 
     // 69
     case EntityType.LOKI: {
-      return (variant as LokiVariant) === LokiVariant.LOKII ? 2 : 1;
+      return variant === asNumber(LokiVariant.LOKII) ? 2 : 1;
     }
 
     // 237