isaacscript-common 6.20.1 → 6.22.0

package/dist/features/customStage/exports.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local ____exports = {}
+local setStageRoomsData
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
@@ -13,101 +14,114 @@ local reorderedCallbacksSetStage = ____reorderedCallbacks.reorderedCallbacksSetS
 local ____entities = require("functions.entities")
 local getEntityIDFromConstituents = ____entities.getEntityIDFromConstituents
 local ____log = require("functions.log")
-local log = ____log.log
 local logError = ____log.logError
 local ____rng = require("functions.rng")
 local newRNG = ____rng.newRNG
 local ____rooms = require("functions.rooms")
 local getRoomDataForTypeVariant = ____rooms.getRoomDataForTypeVariant
-local getRooms = ____rooms.getRooms
+local getRoomsInGrid = ____rooms.getRoomsInGrid
 local ____stage = require("functions.stage")
 local setStage = ____stage.setStage
 local ____customStageUtils = require("features.customStage.customStageUtils")
 local getRandomCustomStageRoom = ____customStageUtils.getRandomCustomStageRoom
-local ____streakText = require("features.customStage.streakText")
-local topStreakTextStart = ____streakText.topStreakTextStart
 local ____v = require("features.customStage.v")
 local v = ____v.default
 local customBossPNGPaths = ____v.customBossPNGPaths
 local customStageCachedRoomData = ____v.customStageCachedRoomData
 local customStagesMap = ____v.customStagesMap
-local DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2
-local DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL
---- Helper function to warp to a custom stage/level.
--- 
--- Custom stages/levels must first be defined in the "tsconfig.json" file. See the documentation for
--- more details: https://isaacscript.github.io/main/custom-stages/
-function ____exports.setCustomStage(self, name, verbose)
-    if verbose == nil then
-        verbose = false
-    end
-    local customStage = customStagesMap:get(name)
-    if customStage == nil then
-        error(("Failed to set the custom stage of \"" .. name) .. "\" because it was not found in the custom stages map. (Try restarting IsaacScript / recompiling the mod, and try again. If that does not work, you probably forgot to define it in your \"tsconfig.json\" file.) See the website for more details on how to set up custom stages.")
-    end
+function setStageRoomsData(self, customStage, rng, verbose)
     local level = game:GetLevel()
     local startingRoomGridIndex = level:GetStartingRoomIndex()
-    local seeds = game:GetSeeds()
-    local startSeed = seeds:GetStartSeed()
-    local rng = newRNG(nil, startSeed)
-    v.run.currentCustomStage = customStage
-    local baseStage = customStage.baseStage == nil and DEFAULT_BASE_STAGE or customStage.baseStage
-    local baseStageType = customStage.baseStageType == nil and DEFAULT_BASE_STAGE_TYPE or customStage.baseStageType
-    setStage(nil, baseStage, baseStageType)
-    for ____, room in ipairs(getRooms(nil)) do
+    for ____, room in ipairs(getRoomsInGrid(nil)) do
         do
             if room.SafeGridIndex == startingRoomGridIndex then
-                goto __continue4
+                goto __continue7
             end
             if room.Data == nil then
-                goto __continue4
+                goto __continue7
             end
             local roomType = room.Data.Type
             local roomShapeMap = customStage.roomTypeMap:get(roomType)
             if roomShapeMap == nil then
                 if roomType == RoomType.DEFAULT then
-                    logError((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. name)
+                    logError((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name)
                 end
-                goto __continue4
+                goto __continue7
             end
             local roomShape = room.Data.Shape
             local roomDoorSlotFlagMap = roomShapeMap:get(roomShape)
             if roomDoorSlotFlagMap == nil then
-                logError((((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. name)
-                goto __continue4
+                logError((((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name)
+                goto __continue7
             end
             local doorSlotFlags = room.Data.Doors
             local roomsMetadata = roomDoorSlotFlagMap:get(doorSlotFlags)
             if roomsMetadata == nil then
-                logError((((((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. name)
-                goto __continue4
+                logError((((((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name)
+                goto __continue7
             end
             local randomRoom = getRandomCustomStageRoom(nil, roomsMetadata, rng, verbose)
             local newRoomData = customStageCachedRoomData:get(randomRoom.variant)
             if newRoomData == nil then
                 newRoomData = getRoomDataForTypeVariant(nil, roomType, randomRoom.variant, false)
                 if newRoomData == nil then
-                    logError((("Failed to get the room data for room variant " .. tostring(randomRoom.variant)) .. " for custom stage: ") .. name)
-                    goto __continue4
+                    logError((("Failed to get the room data for room variant " .. tostring(randomRoom.variant)) .. " for custom stage: ") .. customStage.name)
+                    goto __continue7
                 end
                 customStageCachedRoomData:set(randomRoom.variant, newRoomData)
             end
             room.Data = newRoomData
         end
-        ::__continue4::
+        ::__continue7::
     end
-    local stage = -1
-    local stageType = StageType.WRATH_OF_THE_LAMB
-    level:SetStage(stage, stageType)
-    reorderedCallbacksSetStage(nil, stage, stageType)
 end
-function ____exports.setCustomStageDebug(self)
-    local customStage = v.run.currentCustomStage
+____exports.DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2
+____exports.DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL
+____exports.INVALID_STAGE_VALUE = -1
+--- Helper function to warp to a custom stage/level.
+-- 
+-- Custom stages/levels must first be defined in the "tsconfig.json" file. See the documentation for
+-- 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 Optional. 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. Default is true.
+-- @param verbose Optional. Whether to log additional information about the rooms that are chosen.
+-- Default is false.
+function ____exports.setCustomStage(self, name, firstFloor, verbose)
+    if firstFloor == nil then
+        firstFloor = true
+    end
+    if verbose == nil then
+        verbose = false
+    end
+    local customStage = customStagesMap:get(name)
     if customStage == nil then
-        log("No custom stage is currently loaded.")
-        return
+        error(("Failed to set the custom stage of \"" .. name) .. "\" because it was not found in the custom stages map. (Try restarting IsaacScript / recompiling the mod / restarting the game, and try again. If that does not work, you probably forgot to define it in your \"tsconfig.json\" file.) See the website for more details on how to set up custom stages.")
     end
-    topStreakTextStart(nil)
+    local level = game:GetLevel()
+    local stage = level:GetStage()
+    local seeds = game:GetSeeds()
+    local startSeed = seeds:GetStartSeed()
+    local rng = newRNG(nil, startSeed)
+    v.run.currentCustomStage = customStage
+    v.run.firstFloor = firstFloor
+    if stage == ____exports.INVALID_STAGE_VALUE then
+        level:SetStage(LevelStage.BASEMENT_1, StageType.ORIGINAL)
+    end
+    local baseStage = customStage.baseStage == nil and ____exports.DEFAULT_BASE_STAGE or customStage.baseStage
+    if not firstFloor then
+        baseStage = baseStage + 1
+    end
+    local baseStageType = customStage.baseStageType == nil and ____exports.DEFAULT_BASE_STAGE_TYPE or customStage.baseStageType
+    local reseed = stage >= baseStage
+    setStage(nil, baseStage, baseStageType, reseed)
+    setStageRoomsData(nil, customStage, rng, verbose)
+    local targetStage = ____exports.INVALID_STAGE_VALUE
+    local targetStageType = StageType.WRATH_OF_THE_LAMB
+    level:SetStage(targetStage, targetStageType)
+    reorderedCallbacksSetStage(nil, targetStage, targetStageType)
 end
 --- By default, unknown bosses will be drawn on the boss "versus" screen as "???". If your custom
 -- stage has custom bosses, you can use this function to register the corresponding graphic file
@@ -136,4 +150,9 @@ function ____exports.registerCustomBoss(self, entityType, variant, subType, name
     local entityID = getEntityIDFromConstituents(nil, entityType, variant, subType)
     customBossPNGPaths:set(entityID, {namePNGPath, portraitPNGPath})
 end
+--- Helper function to disable the custom stage. This is typically called before taking the player to
+-- a vanilla floor.
+function ____exports.disableCustomStage(self)
+    v.run.currentCustomStage = nil
+end
 return ____exports

package/dist/features/customStage/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/init.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAiCxD,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CA4BtD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/init.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA6BxD,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CA0BtD"}

package/dist/features/customStage/init.lua

@@ -3,7 +3,7 @@ local Map = ____lualib.Map
 local __TS__ObjectAssign = ____lualib.__TS__ObjectAssign
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local initRoomTypeMaps, getRoomTypeMap, postRender, postCurseEval, postGameStarted, getShaderParams, postGridEntityBrokenRockAlt, postGridEntityBrokenInit, postNewRoomReordered
+local initRoomTypeMaps, getRoomTypeMap, postRender, postCurseEval, getShaderParams, postGridEntityBrokenRockAlt, postGridEntityInit, postNewRoomReordered
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local LevelCurse = ____isaac_2Dtypescript_2Ddefinitions.LevelCurse
@@ -20,6 +20,7 @@ local saveDataManager = ____exports.saveDataManager
 local ____backdrop = require("features.customStage.backdrop")
 local setBackdrop = ____backdrop.setBackdrop
 local ____customStageGridEntities = require("features.customStage.customStageGridEntities")
+local convertVanillaTrapdoors = ____customStageGridEntities.convertVanillaTrapdoors
 local removeUrnRewards = ____customStageGridEntities.removeUrnRewards
 local setCustomDecorationGraphics = ____customStageGridEntities.setCustomDecorationGraphics
 local setCustomDoorGraphics = ____customStageGridEntities.setCustomDoorGraphics
@@ -30,8 +31,6 @@ local ____shadows = require("features.customStage.shadows")
 local setShadows = ____shadows.setShadows
 local ____streakText = require("features.customStage.streakText")
 local streakTextGetShaderParams = ____streakText.streakTextGetShaderParams
-local streakTextInit = ____streakText.streakTextInit
-local streakTextPostGameStarted = ____streakText.streakTextPostGameStarted
 local streakTextPostRender = ____streakText.streakTextPostRender
 local ____v = require("features.customStage.v")
 local v = ____v.default
@@ -89,14 +88,11 @@ function postCurseEval(self, curses)
     if customStage == nil then
         return nil
     end
-    if hasFlag(nil, curses, LevelCurse.MAZE) then
-        return removeFlag(nil, curses, LevelCurse.MAZE)
+    if hasFlag(nil, curses, LevelCurse.LABYRINTH) then
+        return removeFlag(nil, curses, LevelCurse.LABYRINTH)
     end
     return nil
 end
-function postGameStarted(self)
-    streakTextPostGameStarted(nil)
-end
 function getShaderParams(self, shaderName)
     local customStage = v.run.currentCustomStage
     if customStage == nil then
@@ -112,7 +108,7 @@ function postGridEntityBrokenRockAlt(self, gridEntity)
     end
     removeUrnRewards(nil, customStage, gridEntity)
 end
-function postGridEntityBrokenInit(self, gridEntity)
+function postGridEntityInit(self, gridEntity)
     local customStage = v.run.currentCustomStage
     if customStage == nil then
         return
@@ -121,6 +117,7 @@ function postGridEntityBrokenInit(self, gridEntity)
     setCustomRockGraphics(nil, customStage, gridEntity)
     setCustomPitGraphics(nil, customStage, gridEntity)
     setCustomDoorGraphics(nil, customStage, gridEntity)
+    convertVanillaTrapdoors(nil, customStage, gridEntity)
 end
 function postNewRoomReordered(self)
     local customStage = v.run.currentCustomStage
@@ -137,14 +134,12 @@ function ____exports.customStageInit(self, mod)
         return
     end
     saveDataManager(nil, "customStage", v)
-    streakTextInit(nil)
     versusScreenInit(nil)
     mod:AddCallback(ModCallback.POST_RENDER, postRender)
     mod:AddCallback(ModCallback.POST_CURSE_EVAL, postCurseEval)
-    mod:AddCallback(ModCallback.POST_GAME_STARTED, postGameStarted)
     mod:AddCallback(ModCallback.GET_SHADER_PARAMS, getShaderParams)
     mod:AddCallbackCustom(ModCallbackCustom.POST_GRID_ENTITY_BROKEN, postGridEntityBrokenRockAlt, GridEntityType.ROCK_ALT)
-    mod:AddCallbackCustom(ModCallbackCustom.POST_GRID_ENTITY_INIT, postGridEntityBrokenInit)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_GRID_ENTITY_INIT, postGridEntityInit)
     mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end
 return ____exports

package/dist/features/customStage/shadows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadows.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/shadows.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAoC3D,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAqCzD"}
+{"version":3,"file":"shadows.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/shadows.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAqC3D,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAqCzD"}

package/dist/features/customStage/shadows.lua

@@ -19,6 +19,7 @@ local v = ____v.default
 -- We arbitrarily choose a ladder for this purpose because it will not automatically despawn after
 -- time passes, like most other effects.
 local SHADOW_EFFECT_VARIANT = EffectVariant.LADDER
+local SHADOW_EFFECT_SUBTYPE = 102
 --- The animation comes from StageAPI.
 local ROOM_SHAPE_TO_SHADOW_ANIMATION = {
     [RoomShape.SHAPE_1x1] = "1x1",
@@ -50,7 +51,7 @@ function ____exports.setShadows(self, customStage)
     local shadowEffect = spawnEffectWithSeed(
         nil,
         SHADOW_EFFECT_VARIANT,
-        0,
+        SHADOW_EFFECT_SUBTYPE,
         centerPos,
         1
     )

package/dist/features/customStage/streakText.d.ts

@@ -1,12 +1,5 @@
 import { CustomStage } from "../../interfaces/CustomStage";
-/**
- * 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 declare function streakTextInit(): void;
 export declare function streakTextPostRender(): void;
-export declare function streakTextPostGameStarted(): void;
 export declare function streakTextGetShaderParams(customStage: CustomStage, shaderName: string): void;
 export declare function topStreakTextStart(): void;
 //# sourceMappingURL=streakText.d.ts.map

package/dist/features/customStage/streakText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streakText.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/streakText.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AA0F3D;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAMrC;AAGD,wBAAgB,oBAAoB,IAAI,IAAI,CAS3C;AAmFD,wBAAgB,yBAAyB,IAAI,IAAI,CAGhD;AAGD,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,GACjB,IAAI,CAYN;AAgFD,wBAAgB,kBAAkB,IAAI,IAAI,CAUzC"}
+{"version":3,"file":"streakText.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/streakText.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAuE3D,wBAAgB,oBAAoB,IAAI,IAAI,CAS3C;AA0FD,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,GACjB,IAAI,CAYN;AA0ED,wBAAgB,kBAAkB,IAAI,IAAI,CAWzC"}

package/dist/features/customStage/streakText.lua

@@ -1,7 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Spread = ____lualib.__TS__Spread
 local ____exports = {}
-local checkEndTopStreakText, trackMapInputPressed, checkStartBottomStreakText, checkEndBottomStreakText, renderSprite, playTextOut, UIStreakAnimation, TEXT_STAY_FRAME, TEXT_OUT_FRAME, STREAK_TEXT_BOTTOM_Y_OFFSET, NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT, TEXT_IN_ADJUSTMENTS, TEXT_OUT_ADJUSTMENTS, TEXT_IN_SCALES, TEXT_OUT_SCALES, topStreakSprite, bottomStreakSprite
+local checkEndTopStreakText, trackMapInputPressed, checkStartBottomStreakText, checkEndBottomStreakText, renderStreakText, TEXT_STAY_FRAME, TEXT_OUT_FRAME, STREAK_TEXT_BOTTOM_Y_OFFSET, NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT, TEXT_IN_ADJUSTMENTS, TEXT_OUT_ADJUSTMENTS, TEXT_IN_SCALES, TEXT_OUT_SCALES
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ButtonAction = ____isaac_2Dtypescript_2Ddefinitions.ButtonAction
 local ControllerIndex = ____isaac_2Dtypescript_2Ddefinitions.ControllerIndex
@@ -16,16 +16,20 @@ local getEnumValues = ____enums.getEnumValues
 local ____ui = require("functions.ui")
 local getScreenBottomCenterPos = ____ui.getScreenBottomCenterPos
 local getScreenTopCenterPos = ____ui.getScreenTopCenterPos
+local ____customStageConstants = require("features.customStage.customStageConstants")
+local UIStreakAnimation = ____customStageConstants.UIStreakAnimation
+local UI_STREAK_ANIMATION_END_FRAMES = ____customStageConstants.UI_STREAK_ANIMATION_END_FRAMES
 local ____v = require("features.customStage.v")
 local v = ____v.default
 function checkEndTopStreakText(self)
-    if v.run.topStreakTextStartedRenderFrame == nil or not topStreakSprite:IsPlaying(UIStreakAnimation.TEXT_STAY) then
+    if v.run.topStreakTextStartedRenderFrame == nil or v.run.topStreakText.animation ~= UIStreakAnimation.TEXT_STAY then
         return
     end
     local renderFrameCount = Isaac.GetFrameCount()
     local elapsedFrames = renderFrameCount - v.run.topStreakTextStartedRenderFrame
     if elapsedFrames >= 115 then
-        playTextOut(nil, topStreakSprite)
+        v.run.topStreakText.animation = UIStreakAnimation.TEXT
+        v.run.topStreakText.frame = TEXT_OUT_FRAME - 2
     end
 end
 function trackMapInputPressed(self)
@@ -43,7 +47,7 @@ function trackMapInputPressed(self)
     end
 end
 function checkStartBottomStreakText(self)
-    if bottomStreakSprite:IsPlaying() then
+    if v.run.bottomStreakText.animation ~= UIStreakAnimation.NONE then
         return
     end
     local pushedMapFrames = {__TS__Spread(v.run.controllerIndexPushingMapRenderFrame:values())}
@@ -54,81 +58,69 @@ function checkStartBottomStreakText(self)
     local gameFrameCount = game:GetFrameCount()
     local elapsedFrames = gameFrameCount - earliestFrame
     if elapsedFrames >= NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT then
-        bottomStreakSprite:Play(UIStreakAnimation.TEXT, true)
+        v.run.bottomStreakText.animation = UIStreakAnimation.TEXT
+        v.run.bottomStreakText.frame = 0
     end
 end
 function checkEndBottomStreakText(self)
-    if not bottomStreakSprite:IsPlaying(UIStreakAnimation.TEXT_STAY) then
+    if v.run.bottomStreakText.animation ~= UIStreakAnimation.TEXT_STAY then
         return
     end
     local pushedMapFrames = {__TS__Spread(v.run.controllerIndexPushingMapRenderFrame:values())}
     if #pushedMapFrames == 0 then
-        playTextOut(nil, bottomStreakSprite)
+        v.run.bottomStreakText.animation = UIStreakAnimation.TEXT
+        v.run.bottomStreakText.frame = TEXT_OUT_FRAME - 2
     end
 end
-function renderSprite(self, customStage, sprite, position)
-    sprite:Update()
-    if not sprite:IsPlaying() then
+function renderStreakText(self, customStage, streakText, position)
+    if streakText.animation == UIStreakAnimation.NONE then
         return
     end
-    local animation = sprite:GetAnimation()
-    local frame = sprite:GetFrame()
-    if animation == UIStreakAnimation.TEXT and frame == TEXT_STAY_FRAME then
-        sprite:Play(UIStreakAnimation.TEXT_STAY, true)
+    if streakText.animation ~= UIStreakAnimation.TEXT_STAY then
+        local ____streakText_0 = streakText
+        local pauseFrame = ____streakText_0.pauseFrame
+        streakText.pauseFrame = not streakText.pauseFrame
+        if not pauseFrame then
+            streakText.frame = streakText.frame + 1
+        end
+    end
+    local endFrame = UI_STREAK_ANIMATION_END_FRAMES[streakText.animation]
+    if streakText.frame > endFrame then
+        streakText.animation = UIStreakAnimation.NONE
+        streakText.frame = 0
+        return
+    end
+    if streakText.animation == UIStreakAnimation.TEXT and streakText.frame == TEXT_STAY_FRAME then
+        streakText.animation = UIStreakAnimation.TEXT_STAY
+        streakText.frame = 0
     end
     local isPaused = game:IsPaused()
     if isPaused then
         return
     end
     local font = fonts.upheaval
-    local ____customStage_0 = customStage
-    local name = ____customStage_0.name
-    local length = font:GetStringWidthUTF8(name)
+    local ____customStage_1 = customStage
+    local name = ____customStage_1.name
+    local numberSuffix = v.run.firstFloor and "I" or "II"
+    local nameWithNumberSuffix = (name .. " ") .. numberSuffix
+    local length = font:GetStringWidthUTF8(nameWithNumberSuffix)
     local centeredX = position.X - length / 2
     local adjustment = 0
     local scale = VectorOne
-    repeat
-        local ____switch27 = animation
-        local ____cond27 = ____switch27 == UIStreakAnimation.TEXT
-        if ____cond27 then
-            do
-                if frame < TEXT_STAY_FRAME then
-                    adjustment = TEXT_IN_ADJUSTMENTS[frame + 1] or 0
-                    scale = TEXT_IN_SCALES[frame + 1] or VectorOne
-                else
-                    local adjustedFrame = frame - TEXT_OUT_FRAME
-                    adjustment = TEXT_OUT_ADJUSTMENTS[adjustedFrame + 1] or 0
-                    scale = TEXT_OUT_SCALES[adjustedFrame + 1] or VectorOne
-                end
-                break
-            end
-        end
-        ____cond27 = ____cond27 or ____switch27 == UIStreakAnimation.TEXT_IN
-        if ____cond27 then
-            do
-                adjustment = TEXT_IN_ADJUSTMENTS[frame + 1] or 0
-                scale = TEXT_IN_SCALES[frame + 1] or VectorOne
-                break
-            end
-        end
-        ____cond27 = ____cond27 or ____switch27 == UIStreakAnimation.TEXT_OUT
-        if ____cond27 then
-            do
-                adjustment = TEXT_OUT_ADJUSTMENTS[frame + 1] or 0
-                scale = TEXT_OUT_SCALES[frame + 1] or VectorOne
-                break
-            end
-        end
-        do
-            do
-                break
-            end
+    if streakText.animation == UIStreakAnimation.TEXT then
+        if streakText.frame < TEXT_STAY_FRAME then
+            adjustment = TEXT_IN_ADJUSTMENTS[streakText.frame + 1] or 0
+            scale = TEXT_IN_SCALES[streakText.frame + 1] or VectorOne
+        else
+            local adjustedFrame = streakText.frame - TEXT_OUT_FRAME
+            adjustment = TEXT_OUT_ADJUSTMENTS[adjustedFrame + 1] or 0
+            scale = TEXT_OUT_SCALES[adjustedFrame + 1] or VectorOne
         end
-    until true
+    end
     local adjustedX = centeredX + adjustment
     local adjustedY = position.Y + STREAK_TEXT_BOTTOM_Y_OFFSET
     font:DrawStringScaled(
-        name,
+        nameWithNumberSuffix,
         adjustedX,
         adjustedY,
         scale.X,
@@ -136,27 +128,16 @@ function renderSprite(self, customStage, sprite, position)
         KColorDefault
     )
 end
-function playTextOut(self, sprite)
-    sprite:Play(UIStreakAnimation.TEXT, true)
-    sprite:SetFrame(TEXT_OUT_FRAME - 2)
-end
-UIStreakAnimation = UIStreakAnimation or ({})
-UIStreakAnimation.TEXT = "Text"
-UIStreakAnimation.TEXT_IN = "TextIn"
-UIStreakAnimation.TEXT_OUT = "TextOut"
-UIStreakAnimation.TEXT_STAY = "TextStay"
 --- This must match the name of the shader in "shaders.xml".
 local EMPTY_SHADER_NAME = "IsaacScript-RenderAboveHUD"
 TEXT_STAY_FRAME = 8
 TEXT_OUT_FRAME = 60
 --- This matches the offset that the vanilla game uses; determined via trial and error.
-local STREAK_SPRITE_TOP_OFFSET = Vector(0, 48.25)
+local STREAK_SPRITE_TOP_OFFSET = Vector(0, 47)
 --- This matches the offset that the vanilla game uses; determined via trial and error.
 local STREAK_SPRITE_BOTTOM_OFFSET = Vector(0, -48.25)
 STREAK_TEXT_BOTTOM_Y_OFFSET = -9
 NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT = 11
---- Corresponds to the vanilla value; determined through trial and error.
-local TEXT_PLAYBACK_SPEED = 0.5
 TEXT_IN_ADJUSTMENTS = {
     -800,
     -639,
@@ -201,43 +182,29 @@ TEXT_OUT_SCALES = {
     Vector(2.59, 0.38),
     Vector(3, 0.2)
 }
-topStreakSprite = Sprite()
-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.)
-function ____exports.streakTextInit(self)
-    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
-end
 function ____exports.streakTextPostRender(self)
     checkEndTopStreakText(nil)
     trackMapInputPressed(nil)
     checkStartBottomStreakText(nil)
     checkEndBottomStreakText(nil)
 end
-function ____exports.streakTextPostGameStarted(self)
-    topStreakSprite:Stop()
-    bottomStreakSprite:Stop()
-end
 function ____exports.streakTextGetShaderParams(self, customStage, shaderName)
     if shaderName ~= EMPTY_SHADER_NAME then
         return
     end
     local topCenterPos = getScreenTopCenterPos(nil)
     local topStreakPosition = topCenterPos + STREAK_SPRITE_TOP_OFFSET
-    renderSprite(nil, customStage, topStreakSprite, topStreakPosition)
+    renderStreakText(nil, customStage, v.run.topStreakText, topStreakPosition)
     local bottomCenterPos = getScreenBottomCenterPos(nil)
     local bottomStreakPosition = bottomCenterPos + STREAK_SPRITE_BOTTOM_OFFSET
-    renderSprite(nil, customStage, bottomStreakSprite, bottomStreakPosition)
+    renderStreakText(nil, customStage, v.run.bottomStreakText, bottomStreakPosition)
 end
 function ____exports.topStreakTextStart(self)
     local level = game:GetLevel()
     local renderFrameCount = Isaac.GetFrameCount()
     level:ShowName(false)
+    v.run.topStreakText.animation = UIStreakAnimation.TEXT
+    v.run.topStreakText.frame = 0
     v.run.topStreakTextStartedRenderFrame = renderFrameCount
-    topStreakSprite:Play(UIStreakAnimation.TEXT, true)
 end
 return ____exports

package/dist/features/customStage/v.d.ts

@@ -1,12 +1,25 @@
 import { ControllerIndex } from "isaac-typescript-definitions";
 import { CustomStage } from "../../interfaces/CustomStage";
+import { UIStreakAnimation } from "./customStageConstants";
 declare const v: {
     run: {
         currentCustomStage: CustomStage | null;
+        /** Whether we are on e.g. Caves 1 or Caves 2. */
+        firstFloor: boolean;
         showingBossVersusScreen: boolean;
         /** Values are the render frame that the controller first pressed the map button. */
         controllerIndexPushingMapRenderFrame: Map<ControllerIndex, number>;
         topStreakTextStartedRenderFrame: number | null;
+        topStreakText: {
+            animation: UIStreakAnimation;
+            frame: number;
+            pauseFrame: boolean;
+        };
+        bottomStreakText: {
+            animation: UIStreakAnimation;
+            frame: number;
+            pauseFrame: boolean;
+        };
     };
     room: {
         showingShadows: boolean;

package/dist/features/customStage/v.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/v.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,QAAA,MAAM,CAAC;;;;QAKH,oFAAoF;;;;;;;CASvF,CAAC;AACF,eAAe,CAAC,CAAC;AAEjB,oCAAoC;AACpC,eAAO,MAAM,eAAe,0BAAiC,CAAC;AAE9D,+BAA+B;AAC/B,eAAO,MAAM,yBAAyB,mCAAuC,CAAC;AAE9E,4BAA4B;AAC5B,eAAO,MAAM,kBAAkB,6DAG5B,CAAC"}
+{"version":3,"file":"v.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/v.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,QAAA,MAAM,CAAC;;;QAIH,iDAAiD;;;QAKjD,oFAAoF;;;;;;;;;;;;;;;;;CAqBvF,CAAC;AACF,eAAe,CAAC,CAAC;AAEjB,oCAAoC;AACpC,eAAO,MAAM,eAAe,0BAAiC,CAAC;AAE9D,+BAA+B;AAC/B,eAAO,MAAM,yBAAyB,mCAAuC,CAAC;AAE9E,4BAA4B;AAC5B,eAAO,MAAM,kBAAkB,6DAG5B,CAAC"}

package/dist/features/customStage/v.lua

@@ -2,12 +2,17 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
+local ____customStageConstants = require("features.customStage.customStageConstants")
+local UIStreakAnimation = ____customStageConstants.UIStreakAnimation
 local v = {
     run = {
         currentCustomStage = nil,
+        firstFloor = true,
         showingBossVersusScreen = false,
         controllerIndexPushingMapRenderFrame = __TS__New(Map),
-        topStreakTextStartedRenderFrame = nil
+        topStreakTextStartedRenderFrame = nil,
+        topStreakText = {animation = UIStreakAnimation.NONE, frame = 0, pauseFrame = false},
+        bottomStreakText = {animation = UIStreakAnimation.NONE, frame = 0, pauseFrame = false}
     },
     room = {showingShadows = false}
 }

package/dist/features/customStage/versusScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versusScreen.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/versusScreen.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAqE3D;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAavC;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAuDxE;AA+ED,wBAAgB,sBAAsB,IAAI,IAAI,CAoC7C"}
+{"version":3,"file":"versusScreen.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/versusScreen.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AA2E3D;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAavC;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAwExE;AAoFD,wBAAgB,sBAAsB,IAAI,IAAI,CAoC7C"}