isaacscript-common 6.20.2 → 6.21.0

package/src/features/customStage/customStageGridEntities.ts

@@ -1,11 +1,13 @@
 import {
   CollectibleType,
   EntityType,
+  GridEntityType,
   TrinketType,
 } from "isaac-typescript-definitions";
 import { DecorationVariant } from "../../enums/DecorationVariant";
 import { removeEntities } from "../../functions/entities";
 import { getNPCs } from "../../functions/entitiesSpecific";
+import { removeGridEntity } from "../../functions/gridEntities";
 import {
   getCoins,
   getCollectibles,
@@ -13,6 +15,8 @@ import {
 } from "../../functions/pickupsSpecific";
 import { vectorEquals } from "../../functions/vector";
 import { CustomStage } from "../../interfaces/CustomStage";
+import { spawnCustomTrapdoor } from "../customTrapdoor/exports";
+import v from "./v";
 
 /** For `GridEntityType.DECORATION` (1) */
 export function setCustomDecorationGraphics(
@@ -25,6 +29,11 @@ export function setCustomDecorationGraphics(
     return;
   }
 
+  const gridEntityType = gridEntity.GetType();
+  if (gridEntityType !== GridEntityType.DECORATION) {
+    return;
+  }
+
   // 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)) {
@@ -51,6 +60,11 @@ export function setCustomRockGraphics(
     return;
   }
 
+  const gridEntityRock = gridEntity.ToRock();
+  if (gridEntityRock === undefined) {
+    return;
+  }
+
   const sprite = gridEntity.GetSprite();
   const fileName = sprite.GetFilename();
   if (fileName === "gfx/grid/grid_rock.anm2") {
@@ -73,6 +87,11 @@ export function setCustomPitGraphics(
     return;
   }
 
+  const gridEntityPit = gridEntity.ToPit();
+  if (gridEntityPit === undefined) {
+    return;
+  }
+
   const sprite = gridEntity.GetSprite();
   const fileName = sprite.GetFilename();
   if (fileName === "gfx/grid/grid_pit.anm2") {
@@ -86,6 +105,17 @@ export function setCustomDoorGraphics(
   customStage: CustomStage,
   gridEntity: GridEntity,
 ): void {
+  // If the end-user did not specify custom pit graphics, default to Basement graphics. (We don't
+  // have to adjust anything for this case.)
+  if (customStage.doorPNGPaths === undefined) {
+    return;
+  }
+
+  const gridEntityDoor = gridEntity.ToDoor();
+  if (gridEntityDoor === undefined) {
+    return;
+  }
+
   const sprite = gridEntity.GetSprite();
   const fileName = sprite.GetFilename();
   const doorPNGPath = getNewDoorPNGPath(customStage, fileName);
@@ -148,6 +178,23 @@ function getNewDoorPNGPath(
   return undefined;
 }
 
+export function convertVanillaTrapdoors(
+  customStage: CustomStage,
+  gridEntity: GridEntity,
+): void {
+  const gridEntityType = gridEntity.GetType();
+  if (gridEntityType !== GridEntityType.TRAPDOOR) {
+    return;
+  }
+
+  removeGridEntity(gridEntity, true);
+
+  const destination: [string, int] | undefined = v.run.firstFloor
+    ? [customStage.name, 2]
+    : undefined;
+  spawnCustomTrapdoor(gridEntity.Position, destination);
+}
+
 /**
  * The rewards are based on the ones from the wiki:
  * https://bindingofisaacrebirth.fandom.com/wiki/Rocks#Urns

package/src/features/customStage/exports.ts

@@ -8,15 +8,15 @@ import {
 import { game } from "../../cachedClasses";
 import { reorderedCallbacksSetStage } from "../../callbacks/reorderedCallbacks";
 import { getEntityIDFromConstituents } from "../../functions/entities";
-import { log, logError } from "../../functions/log";
+import { logError } from "../../functions/log";
 import { newRNG } from "../../functions/rng";
 import {
   getRoomDataForTypeVariant,
   getRoomsInGrid,
 } from "../../functions/rooms";
 import { setStage } from "../../functions/stage";
+import { CustomStage } from "../../interfaces/CustomStage";
 import { getRandomCustomStageRoom } from "./customStageUtils";
-import { topStreakTextStart } from "./streakText";
 import v, {
   customBossPNGPaths,
   customStageCachedRoomData,
@@ -33,13 +33,13 @@ const DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL;
  * more details: https://isaacscript.github.io/main/custom-stages/
  *
  * @param name The name of the custom stage, corresponding to what is in the "tsconfig.json" file.
- * @param _firstFloor Whether to go to the first floor or the second floor. For example, if you have
- *                    a custom stage emulating Caves, then the first floor would be Caves 1, and the
- *                    second floor would be Caves 2.
+ * @param firstFloor Whether to go to the first floor or the second floor. For example, if you have
+ *                   a custom stage emulating Caves, then the first floor would be Caves 1, and the
+ *                   second floor would be Caves 2.
  */
 export function setCustomStage(
   name: string,
-  _firstFloor = true,
+  firstFloor = true,
   verbose = false,
 ): void {
   const customStage = customStagesMap.get(name);
@@ -50,24 +50,53 @@ export function setCustomStage(
   }
 
   const level = game.GetLevel();
-  const startingRoomGridIndex = level.GetStartingRoomIndex();
   const seeds = game.GetSeeds();
   const startSeed = seeds.GetStartSeed();
   const rng = newRNG(startSeed);
 
   v.run.currentCustomStage = customStage;
+  v.run.firstFloor = firstFloor;
 
-  const baseStage =
+  let baseStage: int =
     customStage.baseStage === undefined
       ? DEFAULT_BASE_STAGE
-      : (customStage.baseStage as LevelStage);
+      : customStage.baseStage;
+  if (!firstFloor) {
+    baseStage++;
+  }
   const baseStageType =
     customStage.baseStageType === undefined
       ? DEFAULT_BASE_STAGE_TYPE
       : (customStage.baseStageType as StageType);
-  setStage(baseStage, baseStageType);
+  setStage(baseStage as LevelStage, baseStageType);
+
+  setStageRoomsData(customStage, rng, verbose);
+
+  // Set the stage to an invalid value, which will prevent the walls and floors from loading. We
+  // must use `StageType.WRATH_OF_THE_LAMB` instead of `StageType.ORIGINAL` or else the walls will
+  // not render properly. DeadInfinity suspects that this might be because it is trying to use the
+  // Dark Room's backdrop (instead of The Chest).
+  const stage = -1 as LevelStage;
+  const stageType = StageType.WRATH_OF_THE_LAMB;
+  level.SetStage(stage, stageType);
+  reorderedCallbacksSetStage(stage, stageType);
+
+  // We must reload the current room in order for the `Level.SetStage` method to take effect.
+  // Furthermore, we need to cancel the queued warp to the `GridRoom.DEBUG` room. We can accomplish
+  // both of these things by initiating a room transition to an arbitrary room. However, we rely on
+  // the parent function to do this, since for normal purposes, we need to initiate a room
+  // transition for the pixelation effect.
+}
+
+/** Pick a custom room for each vanilla room. */
+function setStageRoomsData(
+  customStage: CustomStage,
+  rng: RNG,
+  verbose: boolean,
+) {
+  const level = game.GetLevel();
+  const startingRoomGridIndex = level.GetStartingRoomIndex();
 
-  // Now, we need to pick a custom room for each vanilla room.
   for (const room of getRoomsInGrid()) {
     // The starting floor of each room should stay empty.
     if (room.SafeGridIndex === startingRoomGridIndex) {
@@ -85,7 +114,7 @@ export function setCustomStage(
       // special rooms.)
       if (roomType === RoomType.DEFAULT) {
         logError(
-          `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) for custom stage: ${name}`,
+          `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) for custom stage: ${customStage.name}`,
         );
       }
       continue;
@@ -95,7 +124,7 @@ export function setCustomStage(
     const roomDoorSlotFlagMap = roomShapeMap.get(roomShape);
     if (roomDoorSlotFlagMap === undefined) {
       logError(
-        `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) + RoomShape.${RoomShape[roomShape]} (${roomShape}) for custom stage: ${name}`,
+        `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) + RoomShape.${RoomShape[roomShape]} (${roomShape}) for custom stage: ${customStage.name}`,
       );
       continue;
     }
@@ -104,7 +133,7 @@ export function setCustomStage(
     const roomsMetadata = roomDoorSlotFlagMap.get(doorSlotFlags);
     if (roomsMetadata === undefined) {
       logError(
-        `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) + RoomShape.${RoomShape[roomShape]} (${roomShape}) + DoorSlotFlags ${doorSlotFlags} for custom stage: ${name}`,
+        `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) + RoomShape.${RoomShape[roomShape]} (${roomShape}) + DoorSlotFlags ${doorSlotFlags} for custom stage: ${customStage.name}`,
       );
       continue;
     }
@@ -121,7 +150,7 @@ export function setCustomStage(
       );
       if (newRoomData === undefined) {
         logError(
-          `Failed to get the room data for room variant ${randomRoom.variant} for custom stage: ${name}`,
+          `Failed to get the room data for room variant ${randomRoom.variant} for custom stage: ${customStage.name}`,
         );
         continue;
       }
@@ -131,31 +160,6 @@ export function setCustomStage(
 
     room.Data = newRoomData;
   }
-
-  // Set the stage to an invalid value, which will prevent the walls and floors from loading. We
-  // must use `StageType.WRATH_OF_THE_LAMB` instead of `StageType.ORIGINAL` or else the walls will
-  // not render properly. DeadInfinity suspects that this might be because it is trying to use the
-  // Dark Room's backdrop (instead of The Chest).
-  const stage = -1 as LevelStage;
-  const stageType = StageType.WRATH_OF_THE_LAMB;
-  level.SetStage(stage, stageType);
-  reorderedCallbacksSetStage(stage, stageType);
-
-  // We must reload the current room in order for the `Level.SetStage` method to take effect.
-  // Furthermore, we need to cancel the queued warp to the `GridRoom.DEBUG` room. We can accomplish
-  // both of these things by initiating a room transition to an arbitrary room. However, we rely on
-  // the parent function to do this, since for normal purposes, we need to initiate a room
-  // transition for the pixelation effect.
-}
-
-export function setCustomStageDebug(): void {
-  const customStage = v.run.currentCustomStage;
-  if (customStage === null) {
-    log("No custom stage is currently loaded.");
-    return;
-  }
-
-  topStreakTextStart();
 }
 
 /**

package/src/features/customStage/init.ts

@@ -18,6 +18,7 @@ import {
 import { saveDataManager } from "../saveDataManager/exports";
 import { setBackdrop } from "./backdrop";
 import {
+  convertVanillaTrapdoors,
   removeUrnRewards,
   setCustomDecorationGraphics,
   setCustomDoorGraphics,
@@ -26,12 +27,7 @@ import {
 } from "./customStageGridEntities";
 import * as metadataJSON from "./metadata.json"; // This will correspond to "metadata.lua" at run-time.
 import { setShadows } from "./shadows";
-import {
-  streakTextGetShaderParams,
-  streakTextInit,
-  streakTextPostGameStarted,
-  streakTextPostRender,
-} from "./streakText";
+import { streakTextGetShaderParams, streakTextPostRender } from "./streakText";
 import v, { customStagesMap } from "./v";
 import {
   playVersusScreenAnimation,
@@ -47,12 +43,10 @@ export function customStageInit(mod: ModUpgraded): void {
   }
 
   saveDataManager("customStage", v);
-  streakTextInit();
   versusScreenInit();
 
   mod.AddCallback(ModCallback.POST_RENDER, postRender); // 2
   mod.AddCallback(ModCallback.POST_CURSE_EVAL, postCurseEval); // 12
-  mod.AddCallback(ModCallback.POST_GAME_STARTED, postGameStarted); // 15
   mod.AddCallback(ModCallback.GET_SHADER_PARAMS, getShaderParams); // 21
   mod.AddCallbackCustom(
     ModCallbackCustom.POST_GRID_ENTITY_BROKEN,
@@ -61,7 +55,7 @@ export function customStageInit(mod: ModUpgraded): void {
   );
   mod.AddCallbackCustom(
     ModCallbackCustom.POST_GRID_ENTITY_INIT,
-    postGridEntityBrokenInit,
+    postGridEntityInit,
   );
   mod.AddCallbackCustom(
     ModCallbackCustom.POST_NEW_ROOM_REORDERED,
@@ -150,19 +144,13 @@ function postCurseEval(
   }
 
   // Prevent XL floors on custom stages, since the streak text will not work properly.
-  if (hasFlag(curses, LevelCurse.MAZE)) {
-    return removeFlag(curses, LevelCurse.MAZE);
+  if (hasFlag(curses, LevelCurse.LABYRINTH)) {
+    return removeFlag(curses, LevelCurse.LABYRINTH);
   }
 
   return undefined;
 }
 
-// ModCallback.POST_GAME_STARTED (15)
-function postGameStarted() {
-  // We don't early return here because we need to unconditionally reset the sprites.
-  streakTextPostGameStarted();
-}
-
 // ModCallback.GET_SHADER_PARAMS (22)
 function getShaderParams(
   shaderName: string,
@@ -188,7 +176,7 @@ function postGridEntityBrokenRockAlt(gridEntity: GridEntity) {
 }
 
 // ModCallbackCustom.POST_GRID_ENTITY_INIT
-function postGridEntityBrokenInit(gridEntity: GridEntity) {
+function postGridEntityInit(gridEntity: GridEntity) {
   const customStage = v.run.currentCustomStage;
   if (customStage === null) {
     return;
@@ -198,6 +186,7 @@ function postGridEntityBrokenInit(gridEntity: GridEntity) {
   setCustomRockGraphics(customStage, gridEntity);
   setCustomPitGraphics(customStage, gridEntity);
   setCustomDoorGraphics(customStage, gridEntity);
+  convertVanillaTrapdoors(customStage, gridEntity);
 }
 
 // ModCallbackCustom.POST_NEW_ROOM_REORDERED

package/src/features/customStage/shadows.ts

@@ -17,6 +17,7 @@ type ShadowAnimation = "1x1" | "1x2" | "2x1" | "2x2";
  * time passes, like most other effects.
  */
 const SHADOW_EFFECT_VARIANT = EffectVariant.LADDER;
+const SHADOW_EFFECT_SUBTYPE = 102;
 
 /** The animation comes from StageAPI. */
 const ROOM_SHAPE_TO_SHADOW_ANIMATION: {
@@ -57,7 +58,7 @@ export function setShadows(customStage: CustomStage): void {
   // rendering throughout this animation.)
   const shadowEffect = spawnEffectWithSeed(
     SHADOW_EFFECT_VARIANT,
-    0,
+    SHADOW_EFFECT_SUBTYPE,
     centerPos,
     1 as Seed,
   );

package/src/features/customStage/streakText.ts

@@ -7,15 +7,12 @@ import {
   getScreenTopCenterPos,
 } from "../../functions/ui";
 import { CustomStage } from "../../interfaces/CustomStage";
+import {
+  UIStreakAnimation,
+  UI_STREAK_ANIMATION_END_FRAMES,
+} from "./customStageConstants";
 import v from "./v";
 
-enum UIStreakAnimation {
-  TEXT = "Text",
-  TEXT_IN = "TextIn",
-  TEXT_OUT = "TextOut",
-  TEXT_STAY = "TextStay",
-}
-
 /** This must match the name of the shader in "shaders.xml". */
 const EMPTY_SHADER_NAME = "IsaacScript-RenderAboveHUD";
 
@@ -47,9 +44,6 @@ const STREAK_TEXT_BOTTOM_Y_OFFSET = -9;
  */
 const NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT = 11;
 
-/** Corresponds to the vanilla value; determined through trial and error. */
-const TEXT_PLAYBACK_SPEED = 0.5;
-
 /** Taken from StageAPI. */
 const TEXT_IN_ADJUSTMENTS = [-800, -639, -450, -250, -70, 10, 6, 3];
 
@@ -82,33 +76,6 @@ const TEXT_OUT_SCALES = [
   Vector(3, 0.2),
 ];
 
-/**
- * We do not actually need to render this sprite at all. It's only purpose is to be an invisible
- * reference for when and where we need to render the stage's name. Thus, we specify "false" for
- * "loadGraphics", but still manage playing its animations in the code below.
- */
-const topStreakSprite = Sprite();
-
-/**
- * We do not actually need to render this sprite at all. It's only purpose is to be an invisible
- * reference for when and where we need to render the stage's name. Thus, we specify "false" for
- * "loadGraphics", but still manage playing its animations in the code below.
- */
-const bottomStreakSprite = Sprite();
-
-/**
- * We must load the sprites in an init function 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.)
- */
-export function streakTextInit(): void {
-  topStreakSprite.Load("resources/gfx/ui/ui_streak.anm2", false);
-  topStreakSprite.PlaybackSpeed = TEXT_PLAYBACK_SPEED;
-
-  bottomStreakSprite.Load("resources/gfx/ui/ui_streak.anm2", false);
-  bottomStreakSprite.PlaybackSpeed = TEXT_PLAYBACK_SPEED;
-}
-
 // ModCallback.POST_RENDER (2)
 export function streakTextPostRender(): void {
   // The top streak only plays when the player arrives on the floor (or continues a game from the
@@ -124,7 +91,7 @@ export function streakTextPostRender(): void {
 function checkEndTopStreakText() {
   if (
     v.run.topStreakTextStartedRenderFrame === null ||
-    !topStreakSprite.IsPlaying(UIStreakAnimation.TEXT_STAY)
+    v.run.topStreakText.animation !== UIStreakAnimation.TEXT_STAY
   ) {
     return;
   }
@@ -133,7 +100,10 @@ function checkEndTopStreakText() {
   const elapsedFrames =
     renderFrameCount - v.run.topStreakTextStartedRenderFrame;
   if (elapsedFrames >= 115) {
-    playTextOut(topStreakSprite);
+    v.run.topStreakText.animation = UIStreakAnimation.TEXT;
+    // We adjust by the frame backwards by an arbitrary amount to roughly align with the speed of
+    // the vanilla animation.
+    v.run.topStreakText.frame = TEXT_OUT_FRAME - 2;
   }
 }
 
@@ -165,7 +135,7 @@ function trackMapInputPressed() {
  * slides in from the left.
  */
 function checkStartBottomStreakText() {
-  if (bottomStreakSprite.IsPlaying()) {
+  if (v.run.bottomStreakText.animation !== UIStreakAnimation.NONE) {
     return;
   }
 
@@ -180,7 +150,8 @@ function checkStartBottomStreakText() {
   const gameFrameCount = game.GetFrameCount();
   const elapsedFrames = gameFrameCount - earliestFrame;
   if (elapsedFrames >= NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT) {
-    bottomStreakSprite.Play(UIStreakAnimation.TEXT, true);
+    v.run.bottomStreakText.animation = UIStreakAnimation.TEXT;
+    v.run.bottomStreakText.frame = 0;
   }
 }
 
@@ -189,7 +160,7 @@ function checkStartBottomStreakText() {
  * right.
  */
 function checkEndBottomStreakText() {
-  if (!bottomStreakSprite.IsPlaying(UIStreakAnimation.TEXT_STAY)) {
+  if (v.run.bottomStreakText.animation !== UIStreakAnimation.TEXT_STAY) {
     return;
   }
 
@@ -197,16 +168,13 @@ function checkEndBottomStreakText() {
     ...v.run.controllerIndexPushingMapRenderFrame.values(),
   ];
   if (pushedMapFrames.length === 0) {
-    playTextOut(bottomStreakSprite);
+    v.run.bottomStreakText.animation = UIStreakAnimation.TEXT;
+    // We adjust by the frame backwards by an arbitrary amount to roughly align with the speed of
+    // the vanilla animation.
+    v.run.bottomStreakText.frame = TEXT_OUT_FRAME - 2;
   }
 }
 
-// ModCallback.POST_GAME_STARTED (15)
-export function streakTextPostGameStarted(): void {
-  topStreakSprite.Stop();
-  bottomStreakSprite.Stop();
-}
-
 // ModCallback.GET_SHADER_PARAMS (22)
 export function streakTextGetShaderParams(
   customStage: CustomStage,
@@ -218,27 +186,44 @@ export function streakTextGetShaderParams(
 
   const topCenterPos = getScreenTopCenterPos();
   const topStreakPosition = topCenterPos.add(STREAK_SPRITE_TOP_OFFSET);
-  renderSprite(customStage, topStreakSprite, topStreakPosition);
+  renderStreakText(customStage, v.run.topStreakText, topStreakPosition);
 
   const bottomCenterPos = getScreenBottomCenterPos();
   const bottomStreakPosition = bottomCenterPos.add(STREAK_SPRITE_BOTTOM_OFFSET);
-  renderSprite(customStage, bottomStreakSprite, bottomStreakPosition);
+  renderStreakText(customStage, v.run.bottomStreakText, bottomStreakPosition);
 }
 
-function renderSprite(
+function renderStreakText(
   customStage: CustomStage,
-  sprite: Sprite,
+  streakText: { animation: UIStreakAnimation; frame: int; pauseFrame: boolean },
   position: Vector,
 ) {
-  sprite.Update();
-  if (!sprite.IsPlaying()) {
+  if (streakText.animation === UIStreakAnimation.NONE) {
+    return;
+  }
+
+  if (streakText.animation !== UIStreakAnimation.TEXT_STAY) {
+    const { pauseFrame } = streakText;
+    streakText.pauseFrame = !streakText.pauseFrame;
+
+    if (!pauseFrame) {
+      streakText.frame++;
+    }
+  }
+
+  const endFrame = UI_STREAK_ANIMATION_END_FRAMES[streakText.animation];
+  if (streakText.frame > endFrame) {
+    streakText.animation = UIStreakAnimation.NONE;
+    streakText.frame = 0;
     return;
   }
 
-  const animation = sprite.GetAnimation() as UIStreakAnimation;
-  const frame = sprite.GetFrame();
-  if (animation === UIStreakAnimation.TEXT && frame === TEXT_STAY_FRAME) {
-    sprite.Play(UIStreakAnimation.TEXT_STAY, true);
+  if (
+    streakText.animation === UIStreakAnimation.TEXT &&
+    streakText.frame === TEXT_STAY_FRAME
+  ) {
+    streakText.animation = UIStreakAnimation.TEXT_STAY;
+    streakText.frame = 0;
   }
 
   const isPaused = game.IsPaused();
@@ -248,39 +233,22 @@ function renderSprite(
 
   const font = fonts.upheaval;
   const { name } = customStage;
-  const length = font.GetStringWidthUTF8(name);
+  const numberSuffix = v.run.firstFloor ? "I" : "II";
+  const nameWithNumberSuffix = `${name} ${numberSuffix}`;
+  const length = font.GetStringWidthUTF8(nameWithNumberSuffix);
   const centeredX = position.X - length / 2;
 
   let adjustment = 0;
   let scale = VectorOne;
-  switch (animation) {
-    case UIStreakAnimation.TEXT: {
-      if (frame < TEXT_STAY_FRAME) {
-        adjustment = TEXT_IN_ADJUSTMENTS[frame] ?? 0;
-        scale = TEXT_IN_SCALES[frame] ?? VectorOne;
-      } else {
-        const adjustedFrame = frame - TEXT_OUT_FRAME;
-        adjustment = TEXT_OUT_ADJUSTMENTS[adjustedFrame] ?? 0;
-        scale = TEXT_OUT_SCALES[adjustedFrame] ?? VectorOne;
-      }
 
-      break;
-    }
-
-    case UIStreakAnimation.TEXT_IN: {
-      adjustment = TEXT_IN_ADJUSTMENTS[frame] ?? 0;
-      scale = TEXT_IN_SCALES[frame] ?? VectorOne;
-      break;
-    }
-
-    case UIStreakAnimation.TEXT_OUT: {
-      adjustment = TEXT_OUT_ADJUSTMENTS[frame] ?? 0;
-      scale = TEXT_OUT_SCALES[frame] ?? VectorOne;
-      break;
-    }
-
-    default: {
-      break;
+  if (streakText.animation === UIStreakAnimation.TEXT) {
+    if (streakText.frame < TEXT_STAY_FRAME) {
+      adjustment = TEXT_IN_ADJUSTMENTS[streakText.frame] ?? 0;
+      scale = TEXT_IN_SCALES[streakText.frame] ?? VectorOne;
+    } else {
+      const adjustedFrame = streakText.frame - TEXT_OUT_FRAME;
+      adjustment = TEXT_OUT_ADJUSTMENTS[adjustedFrame] ?? 0;
+      scale = TEXT_OUT_SCALES[adjustedFrame] ?? VectorOne;
     }
   }
 
@@ -288,7 +256,7 @@ function renderSprite(
   const adjustedY = position.Y + STREAK_TEXT_BOTTOM_Y_OFFSET;
 
   font.DrawStringScaled(
-    name,
+    nameWithNumberSuffix,
     adjustedX,
     adjustedY,
     scale.X,
@@ -297,12 +265,6 @@ function renderSprite(
   );
 }
 
-function playTextOut(sprite: Sprite) {
-  sprite.Play(UIStreakAnimation.TEXT, true);
-  // We adjust by 2 to roughly align with the speed of the vanilla animation.
-  sprite.SetFrame(TEXT_OUT_FRAME - 2);
-}
-
 export function topStreakTextStart(): void {
   const level = game.GetLevel();
   const renderFrameCount = Isaac.GetFrameCount();
@@ -311,6 +273,7 @@ export function topStreakTextStart(): void {
   level.ShowName(false);
 
   // Initiate the animation for the custom text.
+  v.run.topStreakText.animation = UIStreakAnimation.TEXT;
+  v.run.topStreakText.frame = 0;
   v.run.topStreakTextStartedRenderFrame = renderFrameCount;
-  topStreakSprite.Play(UIStreakAnimation.TEXT, true);
 }

package/src/features/customStage/v.ts

@@ -1,15 +1,32 @@
 import { ControllerIndex } from "isaac-typescript-definitions";
 import { CustomStage } from "../../interfaces/CustomStage";
+import { UIStreakAnimation } from "./customStageConstants";
 
 const v = {
   run: {
     currentCustomStage: null as CustomStage | null,
+
+    /** Whether we are on e.g. Caves 1 or Caves 2. */
+    firstFloor: true,
+
     showingBossVersusScreen: false,
 
     /** Values are the render frame that the controller first pressed the map button. */
     controllerIndexPushingMapRenderFrame: new Map<ControllerIndex, int>(),
 
     topStreakTextStartedRenderFrame: null as int | null,
+
+    topStreakText: {
+      animation: UIStreakAnimation.NONE,
+      frame: 0,
+      pauseFrame: false,
+    },
+
+    bottomStreakText: {
+      animation: UIStreakAnimation.NONE,
+      frame: 0,
+      pauseFrame: false,
+    },
   },
 
   room: {