isaacscript-common 6.11.2 → 6.14.0

package/src/features/collectibleItemPoolType.ts

@@ -1,5 +1,5 @@
 // The item pool type of a collectible is not stored on the collectible. Thus, we scan for incoming
-// item pool types in the PreGetCollectible callback, and then assume that the next spawned
+// item pool types in the `PRE_GET_COLLECTIBLE` callback, and then assume that the next spawned
 // collectible has this item pool type.
 
 import {
@@ -45,8 +45,8 @@ function postPickupInitCollectible(pickup: EntityPickup) {
 
 /**
  * Helper function to get the item pool type that a given collectible came from. Since there is no
- * native method in the API to get this, we listen in the PreGetCollectible callback for item pool
- * types, and then assume that the next spawned collectible will match.
+ * native method in the API to get this, we listen in the `PRE_GET_COLLECTIBLE` callback for item
+ * pool types, and then assume that the next spawned collectible will match.
  */
 export function getCollectibleItemPoolType(
   collectible: EntityPickup,

package/src/features/customGridEntity.ts

@@ -228,8 +228,8 @@ export function spawnCustomGridEntity(
  *                   Default is true. This is generally a good idea because if the room is not
  *                   updated, you will be unable to spawn another grid entity on the same tile until
  *                   a frame has passed. However, doing this is expensive, since it involves a call
- *                   to `Isaac.GetRoomEntities`, so set it to false if you need to invoke this
- *                   function multiple times.
+ *                   to `Isaac.GetRoomEntities`, so set it to false if you need to run this function
+ *                   multiple times.
  * @returns The grid entity that was removed. Returns undefined if no grid entity was found at the
  *          given location or if the given grid entity was not a custom grid entity.
  */
@@ -274,3 +274,28 @@ export function removeCustomGrid(
 
   return decoration;
 }
+
+/**
+ * Helper function to get the custom grid entities in the current room. Returns an array of tuples
+ * containing the raw decoration grid entity and the associated entity data.
+ */
+export function getCustomGridEntities(): Array<
+  [gridEntity: GridEntity, data: CustomGridEntityData]
+> {
+  const roomListIndex = getRoomListIndex();
+  const roomCustomGridEntities = v.level.customGridEntities.get(roomListIndex);
+  if (roomCustomGridEntities === undefined) {
+    return [];
+  }
+
+  const room = game.GetRoom();
+  const customGridEntities: Array<[GridEntity, CustomGridEntityData]> = [];
+  for (const [gridIndex, data] of roomCustomGridEntities.entries()) {
+    const gridEntity = room.GetGridEntity(gridIndex);
+    if (gridEntity !== undefined) {
+      customGridEntities.push([gridEntity, data]);
+    }
+  }
+
+  return customGridEntities;
+}

package/src/features/customTrapdoor/blackSprite.ts

@@ -1,16 +1,22 @@
 import { VectorZero } from "../../constants";
 import { StageTravelState } from "../../enums/private/StageTravelState";
-import { ISAACSCRIPT_CUSTOM_STAGE_GFX_PATH } from "../customStage/customStageConstants";
 import v from "./v";
 
-const sprite = Sprite();
-sprite.Load(`${ISAACSCRIPT_CUSTOM_STAGE_GFX_PATH}/black.anm2`, true);
-sprite.SetFrame("Default", 0);
+// In order to represent a black sprite, we just use the first frame of the boss versus screen
+// animation. However, we must lazy load the sprite in order to prevent issues with mods that
+// replace the vanilla files. (For some reason, loading the sprites will cause the overwrite to no
+// longer apply on the second and subsequent runs.)
+const blackSprite = Sprite();
 
 export function drawBlackSprite(): void {
   if (v.run.state !== StageTravelState.PAUSING_ON_BLACK) {
     return;
   }
 
-  sprite.RenderLayer(0, VectorZero);
+  if (!blackSprite.IsLoaded()) {
+    blackSprite.Load("gfx/ui/boss/versusscreen.anm2", true);
+    blackSprite.SetFrame("Scene", 0);
+  }
+
+  blackSprite.RenderLayer(0, VectorZero);
 }

package/src/features/customTrapdoor/customTrapdoorConstants.ts

@@ -19,5 +19,5 @@ export const ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL: ReadonlySet<string> =
 
 export const PIXELATION_TO_BLACK_FRAMES = 52;
 
-export const OTHER_PLAYER_TRAPDOOR_JUMP_DELAY_GAME_FRAMES = 10;
-export const OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES = 8;
+export const OTHER_PLAYER_TRAPDOOR_JUMP_DELAY_GAME_FRAMES = 6;
+export const OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES = 5;

package/src/features/customTrapdoor/init.ts

@@ -21,6 +21,7 @@ import { saveDataManager } from "../saveDataManager/exports";
 import { drawBlackSprite } from "./blackSprite";
 import {
   CUSTOM_TRAPDOOR_FEATURE_NAME,
+  GridEntityTypeCustom,
   PIXELATION_TO_BLACK_FRAMES,
 } from "./customTrapdoorConstants";
 import { checkCustomTrapdoorOpenClose } from "./openClose";
@@ -33,8 +34,9 @@ export function customTrapdoorInit(mod: ModUpgraded): void {
   mod.AddCallback(ModCallback.POST_RENDER, postRender); // 2
   mod.AddCallback(ModCallback.POST_PEFFECT_UPDATE, postPEffectUpdate); // 4
   mod.AddCallbackCustom(
-    ModCallbackCustom.POST_GRID_ENTITY_UPDATE,
-    postGridEntityUpdateTrapdoor,
+    ModCallbackCustom.POST_GRID_ENTITY_CUSTOM_UPDATE,
+    postGridEntityCustomUpdateTrapdoor,
+    GridEntityTypeCustom.TRAPDOOR_CUSTOM,
   );
 }
 
@@ -198,9 +200,9 @@ function checkJumpComplete(player: EntityPlayer) {
   }
 }
 
-// ModCallbackCustom.POST_GRID_ENTITY_UPDATE
-// GridEntityType.TRAPDOOR (17)
-function postGridEntityUpdateTrapdoor(gridEntity: GridEntity) {
+// ModCallbackCustom.POST_GRID_ENTITY_CUSTOM_UPDATE
+// GridEntityTypeCustom.TRAPDOOR_CUSTOM
+function postGridEntityCustomUpdateTrapdoor(gridEntity: GridEntity) {
   const roomListIndex = getRoomListIndex();
   const gridIndex = gridEntity.GetGridIndex();
 

package/src/features/customTrapdoor/touched.ts

@@ -1,20 +1,23 @@
 import {
+  ButtonAction,
   EntityCollisionClass,
+  EntityGridCollisionClass,
   EntityPartition,
   PlayerType,
 } from "isaac-typescript-definitions";
 import { VectorZero } from "../../constants";
 import { StageTravelState } from "../../enums/private/StageTravelState";
+import { easeOutSine } from "../../functions/easing";
 import {
+  getAllPlayers,
   getOtherPlayers,
-  getPlayers,
   isChildPlayer,
 } from "../../functions/playerIndex";
 import { isCharacter } from "../../functions/players";
 import { CustomTrapdoorDescription } from "../../interfaces/private/CustomTrapdoorDescription";
-import { disableAllInputs } from "../disableInputs";
+import { disableAllInputsExceptFor } from "../disableInputs";
 import { isPlayerUsingPony } from "../ponyDetection";
-import { runInNGameFrames, runNextGameFrame } from "../runInNFrames";
+import { runInNGameFrames, runNextRenderFrame } from "../runInNFrames";
 import {
   ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL,
   CUSTOM_TRAPDOOR_FEATURE_NAME,
@@ -78,7 +81,8 @@ function playerTouchedCustomTrapdoor(
   v.run.state = StageTravelState.PLAYERS_JUMPING_DOWN;
   v.run.destination = trapdoorDescription.destination;
 
-  disableAllInputs(CUSTOM_TRAPDOOR_FEATURE_NAME);
+  const whitelist = new Set([ButtonAction.CONSOLE]);
+  disableAllInputsExceptFor(CUSTOM_TRAPDOOR_FEATURE_NAME, whitelist);
   setPlayerAttributes(player, gridEntity.Position);
   dropTaintedForgotten(player);
 
@@ -95,6 +99,35 @@ function playerTouchedCustomTrapdoor(
   });
 }
 
+function setPlayerAttributes(trapdoorPlayer: EntityPlayer, position: Vector) {
+  // Snap the player to the exact position of the trapdoor so that they cleanly jump down the hole.
+  trapdoorPlayer.Position = position;
+
+  for (const player of getAllPlayers()) {
+    // Disable the controls to prevent the player from moving, shooting, and so on. (We also disable
+    // the inputs in the `INPUT_ACTION` callback, but that does not prevent mouse inputs.)
+    player.ControlsEnabled = false;
+
+    // Freeze all players.
+    player.Velocity = VectorZero;
+
+    // We don't want enemy attacks to move the players.
+    player.EntityCollisionClass = EntityCollisionClass.NONE;
+    player.GridCollisionClass = EntityGridCollisionClass.NONE;
+
+    player.SubType = -1;
+  }
+}
+
+function dropTaintedForgotten(player: EntityPlayer) {
+  if (isCharacter(player, PlayerType.THE_FORGOTTEN_B)) {
+    const taintedSoul = player.GetOtherTwin();
+    if (taintedSoul !== undefined) {
+      taintedSoul.ThrowHeldEntity(VectorZero);
+    }
+  }
+}
+
 function startDelayedJump(entityPtr: EntityPtr, trapdoorPosition: Vector) {
   const entity = entityPtr.Ref;
   if (entity === undefined) {
@@ -108,14 +141,18 @@ function startDelayedJump(entityPtr: EntityPtr, trapdoorPosition: Vector) {
 
   player.PlayExtraAnimation("Trapdoor");
 
-  adjustPlayerVelocityToTrapdoor(entityPtr, player.Position, trapdoorPosition);
+  adjustPlayerPositionToTrapdoor(entityPtr, player.Position, trapdoorPosition);
 }
 
-function adjustPlayerVelocityToTrapdoor(
+function adjustPlayerPositionToTrapdoor(
   entityPtr: EntityPtr,
   startPos: Vector,
   endPos: Vector,
 ) {
+  if (v.run.state !== StageTravelState.PLAYERS_JUMPING_DOWN) {
+    return;
+  }
+
   const entity = entityPtr.Ref;
   if (entity === undefined) {
     return;
@@ -126,50 +163,33 @@ function adjustPlayerVelocityToTrapdoor(
     return;
   }
 
+  runNextRenderFrame(() => {
+    adjustPlayerPositionToTrapdoor(entityPtr, startPos, endPos);
+  });
+
   const sprite = player.GetSprite();
   if (sprite.IsFinished("Trapdoor")) {
+    player.Position = endPos;
+    player.Velocity = VectorZero;
     return;
   }
 
   const frame = sprite.GetFrame();
-  if (frame > OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES) {
+  if (frame >= OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES) {
     // We have already arrived at the trapdoor.
+    player.Position = endPos;
+    player.Velocity = VectorZero;
     return;
   }
 
+  // Make the player jump towards the trapdoor. We use an easing function so that the distance
+  // traveled is not linear, emulating what the game does.
   const totalDifference = endPos.sub(startPos);
-  const differencePerFrame = totalDifference.div(
-    OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES,
-  );
-  const differenceForThisFrame = differencePerFrame.mul(frame + 1);
+  const progress = frame / OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES;
+  const easeProgress = easeOutSine(progress);
+  const differenceForThisFrame = totalDifference.mul(easeProgress);
   const targetPosition = startPos.add(differenceForThisFrame);
-  const calculatedVelocity = player.Position.sub(targetPosition);
-
-  player.Velocity = calculatedVelocity;
-
-  runNextGameFrame(() => {
-    adjustPlayerVelocityToTrapdoor(entityPtr, startPos, endPos);
-  });
-}
 
-function setPlayerAttributes(trapdoorPlayer: EntityPlayer, position: Vector) {
-  // Snap the player to the exact position of the trapdoor so that they cleanly jump down the hole.
-  trapdoorPlayer.Position = position;
-
-  for (const player of getPlayers()) {
-    // Freeze all players.
-    player.Velocity = VectorZero;
-
-    // We don't want enemy attacks to move the players.
-    player.EntityCollisionClass = EntityCollisionClass.NONE;
-  }
-}
-
-function dropTaintedForgotten(player: EntityPlayer) {
-  if (isCharacter(player, PlayerType.THE_FORGOTTEN_B)) {
-    const taintedSoul = player.GetOtherTwin();
-    if (taintedSoul !== undefined) {
-      taintedSoul.ThrowHeldEntity(VectorZero);
-    }
-  }
+  player.Position = targetPosition;
+  player.Velocity = VectorZero;
 }

package/src/features/deployJSONRoom.ts

@@ -225,7 +225,7 @@ function respawnPersistentEntities() {
  * Specifically, this will clear the current room of all entities and grid entities, and then spawn
  * all of the entries and grid entities in the provided JSON room.
  *
- * This function is meant to be used in the PostNewRoom callback.
+ * This function is meant to be used in the `POST_NEW_ROOM` callback.
  *
  * For example:
  *
@@ -277,7 +277,7 @@ export function deployJSONRoom(
  * Specifically, this will clear the current room of all entities and grid entities, and then spawn
  * all of the entries and grid entities in one of the provided JSON rooms.
  *
- * This function is meant to be used in the PostNewRoom callback.
+ * This function is meant to be used in the `POST_NEW_ROOM` callback.
  *
  * Note that this function does not simply choose a random element in the provided array; it will
  * properly account for each room weight using the algorithm from:
@@ -355,8 +355,8 @@ export function emptyRoom(fillWithDecorations: boolean): void {
 }
 
 /**
- * We remove entities in the PostNewRoom callback instead of in the PreRoomEntitySpawn callback so
- * that they will not re-appear when we re-enter the room.
+ * We remove entities in the `POST_NEW_ROOM` callback instead of in the PreRoomEntitySpawn callback
+ * so that they will not re-appear when we re-enter the room.
  */
 function removeSpecificNPCs() {
   const room = game.GetRoom();

package/src/features/extraConsoleCommands/exports.ts

@@ -24,9 +24,10 @@ export function enableExtraConsoleCommands(mod: ModUpgraded): void {
  *
  * The standard library comes with many existing console commands that are useful for debugging, but
  * you can also add your own commands that are useful for your particular mod. It's easier to add
- * commands to the existing command system than to add logic manually to the ExecuteCmd callback.
+ * commands to the existing command system than to add your own logic manually to the `EXECUTE_CMD`
+ * callback.
  *
- * Before using this function, you must first invoke `enableExtraConsoleCommands`.
+ * Before using this function, you must first run the `enableExtraConsoleCommands` function.
  */
 export function addConsoleCommand(
   commandName: string,
@@ -59,7 +60,7 @@ export function addConsoleCommand(
  * The standard library comes with many existing console commands that are useful for debugging. If
  * you want to disable one of them, use this function.
  *
- * Before using this function, you must first invoke `enableExtraConsoleCommands`.
+ * Before using this function, you must first run the `enableExtraConsoleCommands` function.
  */
 export function removeConsoleCommand(commandName: string): void {
   if (!isExtraConsoleCommandsInitialized()) {

package/src/features/extraConsoleCommands/init.ts

@@ -27,7 +27,7 @@ export function extraConsoleCommandsInit(mod: ModUpgraded): void {
 function initMap() {
   extraConsoleCommandsFunctionMap.set("1hp", commands.oneHP);
   extraConsoleCommandsFunctionMap.set("addCharges", commands.addCharges);
-  extraConsoleCommandsFunctionMap.set("angel", commands.angel);
+  extraConsoleCommandsFunctionMap.set("angelRoom", commands.angelRoom);
   extraConsoleCommandsFunctionMap.set("ascent", commands.ascent);
   extraConsoleCommandsFunctionMap.set("bedroom", commands.bedroom);
   extraConsoleCommandsFunctionMap.set("bh", commands.bh);
@@ -46,7 +46,7 @@ function initMap() {
   );
   extraConsoleCommandsFunctionMap.set("bombs", commands.bombs);
   extraConsoleCommandsFunctionMap.set("boneHearts", commands.boneHearts);
-  extraConsoleCommandsFunctionMap.set("boss", commands.boss);
+  extraConsoleCommandsFunctionMap.set("bossRoom", commands.bossRoom);
   extraConsoleCommandsFunctionMap.set("bossRush", commands.bossRush);
   extraConsoleCommandsFunctionMap.set("brokenHearts", commands.brokenHearts);
   extraConsoleCommandsFunctionMap.set("card", commands.card);
@@ -66,7 +66,7 @@ function initMap() {
   extraConsoleCommandsFunctionMap.set("d6", commands.d6);
   extraConsoleCommandsFunctionMap.set("damage", commands.damage);
   extraConsoleCommandsFunctionMap.set("dd", commands.dd);
-  extraConsoleCommandsFunctionMap.set("devil", commands.devil);
+  extraConsoleCommandsFunctionMap.set("devilRoom", commands.devilRoom);
   extraConsoleCommandsFunctionMap.set("dirtyBedroom", commands.dirtyBedroom);
   extraConsoleCommandsFunctionMap.set("disableCurses", commands.disableCurses);
   extraConsoleCommandsFunctionMap.set(
@@ -89,7 +89,7 @@ function initMap() {
     commandsDisplay.effectsDisplay,
   );
   extraConsoleCommandsFunctionMap.set("eh", commands.eh);
-  extraConsoleCommandsFunctionMap.set("error", commands.error);
+  extraConsoleCommandsFunctionMap.set("errorRoom", commands.errorRoom);
   extraConsoleCommandsFunctionMap.set("eternalHearts", commands.eternalHearts);
   extraConsoleCommandsFunctionMap.set(
     "familiarDisplay",
@@ -113,10 +113,9 @@ function initMap() {
   extraConsoleCommandsFunctionMap.set("grid2", commands.grid2);
   extraConsoleCommandsFunctionMap.set("gridCosts", commands.gridCosts);
   extraConsoleCommandsFunctionMap.set("gridEntities", commands.gridEntities);
-  extraConsoleCommandsFunctionMap.set("h", commands.h);
   extraConsoleCommandsFunctionMap.set("hearts", commands.hearts);
   extraConsoleCommandsFunctionMap.set("hitboxes", commands.hitboxes);
-  extraConsoleCommandsFunctionMap.set("iAmError", commands.iAmError);
+  extraConsoleCommandsFunctionMap.set("iAmErrorRoom", commands.iAmErrorRoom);
   extraConsoleCommandsFunctionMap.set("key", commands.key);
   extraConsoleCommandsFunctionMap.set("keys", commands.keys);
   extraConsoleCommandsFunctionMap.set(
@@ -146,7 +145,6 @@ function initMap() {
   extraConsoleCommandsFunctionMap.set("mana", commands.mana);
   extraConsoleCommandsFunctionMap.set("map", commands.map);
   extraConsoleCommandsFunctionMap.set("maxHearts", commands.maxHearts);
-  extraConsoleCommandsFunctionMap.set("mh", commands.mh);
   extraConsoleCommandsFunctionMap.set("miniboss", commands.miniboss);
   extraConsoleCommandsFunctionMap.set("noCurses", commands.noCurses);
   extraConsoleCommandsFunctionMap.set("npcDisplay", commandsDisplay.npcDisplay);
@@ -207,7 +205,6 @@ function initMap() {
     commandsDisplay.projectilesDisplay,
   );
   extraConsoleCommandsFunctionMap.set("redHearts", commands.redHearts);
-  extraConsoleCommandsFunctionMap.set("rh", commands.rh);
   extraConsoleCommandsFunctionMap.set("right", commands.right);
   extraConsoleCommandsFunctionMap.set(
     "rockDisplay",
@@ -221,13 +218,12 @@ function initMap() {
   extraConsoleCommandsFunctionMap.set("rottenHearts", commands.rottenHearts);
   extraConsoleCommandsFunctionMap.set("runTests", commands.runTests);
   extraConsoleCommandsFunctionMap.set("s", commands.s);
-  extraConsoleCommandsFunctionMap.set("sacrifice", commands.sacrifice);
-  extraConsoleCommandsFunctionMap.set("secret", commands.secret);
+  extraConsoleCommandsFunctionMap.set("sacrificeRoom", commands.sacrificeRoom);
+  extraConsoleCommandsFunctionMap.set("secretRoom", commands.secretRoom);
   extraConsoleCommandsFunctionMap.set("seedStick", commands.seedStick);
   extraConsoleCommandsFunctionMap.set("seeds", commands.seedsCommand);
   extraConsoleCommandsFunctionMap.set("setCharges", commands.setCharges);
   extraConsoleCommandsFunctionMap.set("setPosition", commands.setPosition);
-  extraConsoleCommandsFunctionMap.set("sh", commands.sh);
   extraConsoleCommandsFunctionMap.set("shop", commands.shop);
   extraConsoleCommandsFunctionMap.set(
     "slotDisplay",
@@ -256,8 +252,12 @@ function initMap() {
     "spikesDisplay",
     commandsDisplay.spikesDisplay,
   );
-  extraConsoleCommandsFunctionMap.set("supersecret", commands.superSecret);
+  extraConsoleCommandsFunctionMap.set(
+    "superSecretRoom",
+    commands.superSecretRoom,
+  );
   extraConsoleCommandsFunctionMap.set("startingRoom", commands.startingRoom);
+  extraConsoleCommandsFunctionMap.set("startRoom", commands.startRoom);
   extraConsoleCommandsFunctionMap.set(
     "tearDisplay",
     commandsDisplay.tearDisplay,
@@ -267,14 +267,18 @@ function initMap() {
     "tearsDisplay",
     commandsDisplay.tearsDisplay,
   );
+  extraConsoleCommandsFunctionMap.set("tests", commands.tests);
   extraConsoleCommandsFunctionMap.set("tntDisplay", commandsDisplay.tntDisplay);
   extraConsoleCommandsFunctionMap.set(
     "tntsDisplay",
     commandsDisplay.tntsDisplay,
   );
   extraConsoleCommandsFunctionMap.set("trapdoor", commands.trapdoorCommand);
-  extraConsoleCommandsFunctionMap.set("treasure", commands.treasure);
-  extraConsoleCommandsFunctionMap.set("ultraSecret", commands.ultraSecret);
+  extraConsoleCommandsFunctionMap.set("treasureRoom", commands.treasureRoom);
+  extraConsoleCommandsFunctionMap.set(
+    "ultraSecretRoom",
+    commands.ultraSecretRoom,
+  );
   extraConsoleCommandsFunctionMap.set("unseed", commands.unseed);
   extraConsoleCommandsFunctionMap.set("up", commands.up);
   extraConsoleCommandsFunctionMap.set("warp", commands.warp);

package/src/features/extraConsoleCommands/listCommands.ts

@@ -1,16 +1,23 @@
 // This file is arbitrarily named "listCommands.ts" instead of "commands.ts" so that it will appear
-// below the "init" page.
+// below "exports.ts".
 
 // cspell:ignore addcharges
 /**
  * This is a list of custom console commands that are included with the standard library.
  *
- * Note that as a quality of life feature, you do not have to match the casing of the command. For
- * example, you can type the "addCharges" command as "addcharges", and it will still work the same.
+ * As a quality of life feature, you do not have to match the casing of the command. For example,
+ * you can type the "addCharges" command as "addcharges", and it will still work the same.
+ *
+ * Additionally, you can also abbreviate any command by omitting letters that do not overlap with
+ * any other command. For example, the command of "c" will be interpreted as the "card" command.
  *
  * In order for the custom console commands to work, you first have to call
  * `enableExtraConsoleCommands`. (See the "Extra Console Commands (Init)" page for more details.)
  *
+ * Each command has a corresponding function of the same name, but these functions are not actually
+ * exported for end-user consumption. (This is to cut down on namespace conflicts and because the
+ * names of the functions are not very descriptive.)
+ *
  * @module
  */
 
@@ -33,19 +40,17 @@ import {
   TrinketType,
 } from "isaac-typescript-definitions";
 import { game, sfxManager } from "../../cachedClasses";
-import {
-  FIRST_ROOM_TYPE,
-  FIRST_STAGE,
-  LAST_ROOM_TYPE,
-  LAST_STAGE,
-  MAX_LEVEL_GRID_INDEX,
-} from "../../constants";
+import { MAX_LEVEL_GRID_INDEX } from "../../constants";
 import {
   FIRST_CARD,
   FIRST_CHARACTER,
   FIRST_PILL_EFFECT,
+  FIRST_ROOM_TYPE,
+  FIRST_STAGE,
   LAST_CARD,
   LAST_PILL_EFFECT,
+  LAST_ROOM_TYPE,
+  LAST_STAGE,
   LAST_VANILLA_CHARACTER,
 } from "../../constantsFirstLast";
 import { HealthType } from "../../enums/HealthType";
@@ -153,7 +158,7 @@ export function addCharges(params: string): void {
  * Warps to the Angel Room for the floor. If the Devil Room has already been visited or initialized,
  * this will uninitialize it and make an Angel Room instead.
  */
-export function angel(): void {
+export function angelRoom(): void {
   devilAngel(false);
 }
 
@@ -278,7 +283,7 @@ export function boneHearts(params: string): void {
 }
 
 /** Warps to the first Boss Room on the floor. */
-export function boss(): void {
+export function bossRoom(): void {
   warpToRoomType(RoomType.BOSS);
 }
 
@@ -475,14 +480,14 @@ export function damage(): void {
 
 /** Alias for the "devil" command. */
 export function dd(): void {
-  devil();
+  devilRoom();
 }
 
 /**
  * Warps to the Devil Room for the floor. If the Angel Room has already been visited or initialized,
  * this will uninitialize it and make an Devil Room instead.
  */
-export function devil(): void {
+export function devilRoom(): void {
   devilAngel(true);
 }
 
@@ -502,7 +507,7 @@ export function down(params: string): void {
   movePlayer(params, Direction.DOWN);
 }
 
-/** Warps to the Dungeon (i.e. crawl space) for the floor. */
+/** Warps to the Dungeon (i.e. the crawl space room) for the floor. */
 export function dungeon(): void {
   changeRoom(GridRoom.DUNGEON);
 }
@@ -520,8 +525,8 @@ export function eh(params: string): void {
 }
 
 /** Alias for the "iAmError" command. */
-export function error(): void {
-  iAmError();
+export function errorRoom(): void {
+  iAmErrorRoom();
 }
 
 /**
@@ -665,11 +670,6 @@ export function gridEntities(): void {
   }
 }
 
-/** Alias for the "hearts" command. */
-export function h(params: string): void {
-  hearts(params);
-}
-
 /**
  * Gives a half red heart. Provide a number to give a custom amount of hearts. (You can use negative
  * numbers to remove hearts.)
@@ -684,7 +684,7 @@ export function hitboxes(): void {
 }
 
 /** Warps to the I AM ERROR room for the floor. */
-export function iAmError(): void {
+export function iAmErrorRoom(): void {
   changeRoom(GridRoom.ERROR);
 }
 
@@ -818,11 +818,6 @@ export function maxHearts(params: string): void {
   addHeart(params, HealthType.MAX_HEARTS);
 }
 
-/** Alias for the "maxHearts" command. */
-export function mh(params: string): void {
-  maxHearts(params);
-}
-
 /** Warps to the first Miniboss Room on the floor. */
 export function miniboss(): void {
   warpToRoomType(RoomType.MINI_BOSS);
@@ -966,11 +961,6 @@ export function redHearts(params: string): void {
   hearts(params);
 }
 
-/** Alias for the "redHearts" command. */
-export function rh(params: string): void {
-  redHearts(params);
-}
-
 /** Moves the player 0.5 units right. Provide a number to move a custom amount of units. */
 export function right(params: string): void {
   movePlayer(params, Direction.RIGHT);
@@ -1050,12 +1040,12 @@ export function s(params: string): void {
 }
 
 /** Warps to the first Sacrifice Room on the floor. */
-export function sacrifice(): void {
+export function sacrificeRoom(): void {
   warpToRoomType(RoomType.SACRIFICE);
 }
 
 /** Warps to the first Secret Room on the floor. */
-export function secret(): void {
+export function secretRoom(): void {
   warpToRoomType(RoomType.SECRET);
 }
 
@@ -1162,11 +1152,6 @@ export function setPosition(params: string): void {
   player.Position = position;
 }
 
-/** Alias for the "soulHearts" command. */
-export function sh(params: string): void {
-  soulHearts(params);
-}
-
 /** Warps to the first shop on the floor. */
 export function shop(): void {
   warpToRoomType(RoomType.SHOP);
@@ -1282,8 +1267,13 @@ export function startingRoom(): void {
   changeRoom(startingRoomIndex);
 }
 
+/** Alias for the "startingRoom" command. */
+export function startRoom(): void {
+  startingRoom();
+}
+
 /** Warps to the first Super Secret Room on the floor. */
-export function superSecret(): void {
+export function superSecretRoom(): void {
   warpToRoomType(RoomType.SUPER_SECRET);
 }
 
@@ -1301,18 +1291,23 @@ export function tears(): void {
   printEnabled(v.run.maxDamage, "debug tear-rate");
 }
 
+/** Alias for the "runTests" command. */
+export function tests(): void {
+  runTests();
+}
+
 /** Creates a trapdoor next to the player. */
 export function trapdoorCommand(): void {
   spawnTrapdoorOrCrawlSpace(true);
 }
 
 /** Warps to the first Treasure Room on the floor. */
-export function treasure(): void {
+export function treasureRoom(): void {
   warpToRoomType(RoomType.TREASURE);
 }
 
 /** Warps to the first Ultra Secret Room on the floor. */
-export function ultraSecret(): void {
+export function ultraSecretRoom(): void {
   warpToRoomType(RoomType.ULTRA_SECRET);
 }