isaacscript-common 6.20.2 → 6.22.1

package/dist/features/customStage/shadows.lua

@@ -2,7 +2,7 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
 local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____array = require("functions.array")
 local getRandomArrayElement = ____array.getRandomArrayElement
@@ -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;
+import { CustomStage } from "../../interfaces/private/CustomStage";
 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,sCAAsC,CAAC;AAuEnE,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,14 +1,14 @@
 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
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("core.cachedClasses")
 local fonts = ____cachedClasses.fonts
 local game = ____cachedClasses.game
-local ____constants = require("constants")
+local ____constants = require("core.constants")
 local KColorDefault = ____constants.KColorDefault
 local VectorOne = ____constants.VectorOne
 local ____enums = require("functions.enums")
@@ -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 { CustomStage } from "../../interfaces/private/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,sCAAsC,CAAC;AACnE,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

@@ -1,4 +1,4 @@
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/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

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,sCAAsC,CAAC;AA2EnE;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAavC;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAwExE;AAoFD,wBAAgB,sBAAsB,IAAI,IAAI,CAoC7C"}

package/dist/features/customStage/versusScreen.lua

@@ -1,14 +1,16 @@
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
+local __TS__ArraySome = ____lualib.__TS__ArraySome
 local ____exports = {}
-local getPlayerPNGPaths, getBossPNGPaths, DEFAULT_CHARACTER, PNG_PATH_PREFIX, PLAYER_PORTRAIT_PNG_PATH_PREFIX
+local willVanillaVersusScreenPlay, getPlayerPNGPaths, getBossPNGPaths, DEFAULT_CHARACTER, PNG_PATH_PREFIX, PLAYER_PORTRAIT_PNG_PATH_PREFIX
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local SoundEffect = ____isaac_2Dtypescript_2Ddefinitions.SoundEffect
 local StageID = ____isaac_2Dtypescript_2Ddefinitions.StageID
-local ____cachedClasses = require("cachedClasses")
+local StageType = ____isaac_2Dtypescript_2Ddefinitions.StageType
+local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local sfxManager = ____cachedClasses.sfxManager
 local ____array = require("functions.array")
@@ -34,11 +36,24 @@ local VERSUS_SCREEN_DIRT_SPOT_COLORS = ____versusScreenDirtSpotColors.VERSUS_SCR
 local ____pause = require("features.pause")
 local pause = ____pause.pause
 local unpause = ____pause.unpause
+local ____runInNFrames = require("features.runInNFrames")
+local runNextGameFrame = ____runInNFrames.runNextGameFrame
 local ____customStageConstants = require("features.customStage.customStageConstants")
 local ISAACSCRIPT_CUSTOM_STAGE_GFX_PATH = ____customStageConstants.ISAACSCRIPT_CUSTOM_STAGE_GFX_PATH
+local ____exports = require("features.customStage.exports")
+local DEFAULT_BASE_STAGE = ____exports.DEFAULT_BASE_STAGE
+local DEFAULT_BASE_STAGE_TYPE = ____exports.DEFAULT_BASE_STAGE_TYPE
+local INVALID_STAGE_VALUE = ____exports.INVALID_STAGE_VALUE
 local ____v = require("features.customStage.v")
 local v = ____v.default
 local customBossPNGPaths = ____v.customBossPNGPaths
+function willVanillaVersusScreenPlay(self)
+    local bosses = getBosses(nil)
+    return __TS__ArraySome(
+        bosses,
+        function(____, boss) return boss:GetBossID() ~= 0 end
+    )
+end
 function getPlayerPNGPaths(self)
     local player = Isaac.GetPlayer()
     local character = player:GetPlayerType()
@@ -126,10 +141,26 @@ end
 function ____exports.playVersusScreenAnimation(self, customStage)
     local room = game:GetRoom()
     local roomType = room:GetType()
+    local roomCleared = room:IsClear()
     local hud = game:GetHUD()
     if roomType ~= RoomType.BOSS then
         return
     end
+    if roomCleared then
+        return
+    end
+    if willVanillaVersusScreenPlay(nil) then
+        local level = game:GetLevel()
+        level:SetStage(DEFAULT_BASE_STAGE, DEFAULT_BASE_STAGE_TYPE)
+        runNextGameFrame(
+            nil,
+            function()
+                local futureLevel = game:GetLevel()
+                futureLevel:SetStage(INVALID_STAGE_VALUE, StageType.ORIGINAL)
+            end
+        )
+        return
+    end
     v.run.showingBossVersusScreen = true
     pause(nil)
     hud:SetVisible(false)

package/dist/features/customTrapdoor/blackSprite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blackSprite.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/blackSprite.ts"],"names":[],"mappings":"AAUA,wBAAgB,eAAe,IAAI,IAAI,CAYtC"}
+{"version":3,"file":"blackSprite.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/blackSprite.ts"],"names":[],"mappings":"AAUA,wBAAgB,eAAe,IAAI,IAAI,CAgBtC"}

package/dist/features/customTrapdoor/blackSprite.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-local ____constants = require("constants")
+local ____constants = require("core.constants")
 local VectorZero = ____constants.VectorZero
 local ____StageTravelState = require("enums.private.StageTravelState")
 local StageTravelState = ____StageTravelState.StageTravelState
@@ -7,7 +7,7 @@ local ____v = require("features.customTrapdoor.v")
 local v = ____v.default
 local blackSprite = Sprite()
 function ____exports.drawBlackSprite(self)
-    if v.run.state ~= StageTravelState.PAUSING_ON_BLACK then
+    if v.run.state ~= StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END and v.run.state ~= StageTravelState.WAITING_FOR_SECOND_PIXELATION_TO_GET_HALF_WAY then
         return
     end
     if not blackSprite:IsLoaded() then

package/dist/features/customTrapdoor/customTrapdoorConstants.d.ts

@@ -1,6 +1,10 @@
 import { GridEntityType } from "isaac-typescript-definitions";
 export declare const CUSTOM_TRAPDOOR_FEATURE_NAME = "customTrapdoor";
 export declare const GridEntityTypeCustom: {
+    /**
+     * We arbitrarily choose 1000 as to not conflict with end-user mods. (The expectation is that
+     * end-user mods will begin their enums with values of 1 and increment upwards.)
+     */
     readonly TRAPDOOR_CUSTOM: GridEntityType;
 };
 /** This also applies to crawl spaces. The value was determined through trial and error. */

package/dist/features/customTrapdoor/customTrapdoorConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customTrapdoorConstants.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/customTrapdoorConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,eAAO,MAAM,4BAA4B,mBAAmB,CAAC;AAE7D,eAAO,MAAM,oBAAoB;;CAEvB,CAAC;AAEX,2FAA2F;AAC3F,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,eAAO,MAAM,iCAAiC,QAA+B,CAAC;AAC9E,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,eAAO,MAAM,oCAAoC,EAAE,WAAW,CAAC,MAAM,CAClC,CAAC;AAEpC,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAE7C,eAAO,MAAM,4CAA4C,IAAI,CAAC;AAC9D,eAAO,MAAM,+CAA+C,IAAI,CAAC"}
+{"version":3,"file":"customTrapdoorConstants.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/customTrapdoorConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,eAAO,MAAM,4BAA4B,mBAAmB,CAAC;AAE7D,eAAO,MAAM,oBAAoB;IAC/B;;;OAGG;;CAEK,CAAC;AAEX,2FAA2F;AAC3F,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,eAAO,MAAM,iCAAiC,QAA+B,CAAC;AAC9E,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,eAAO,MAAM,oCAAoC,EAAE,WAAW,CAAC,MAAM,CAClC,CAAC;AAEpC,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAE7C,eAAO,MAAM,4CAA4C,IAAI,CAAC;AAC9D,eAAO,MAAM,+CAA+C,IAAI,CAAC"}

package/dist/features/customTrapdoor/exports.d.ts

@@ -1,4 +1,7 @@
-import { LevelStage, StageType } from "isaac-typescript-definitions";
+/// <reference types="isaac-typescript-definitions" />
+/// <reference types="isaac-typescript-definitions" />
+/// <reference types="isaac-typescript-definitions" />
+import { TrapdoorDestination } from "../../types/TrapdoorDestination";
 /**
  * Helper function to spawn a trapdoor grid entity that will have one or more of the following
  * attributes:
@@ -6,7 +9,6 @@ import { LevelStage, StageType } from "isaac-typescript-definitions";
  * - custom destination (or custom logic for after the player enters)
  * - custom graphics
  * - custom logic for opening/closing
- * - TODO: player jumping animation?
  *
  * You can use this function to take the player to your custom stage.
  *
@@ -15,15 +17,17 @@ import { LevelStage, StageType } from "isaac-typescript-definitions";
  *
  * @param gridIndexOrPosition The location in the room to spawn the trapdoor.
  * @param destination Optional. Used to specify where the player will go after jumping into the
- *                    trapdoor. Can either be a tuple containing the stage and stage type, or a
- *                    string containing the name of a custom stage. If not specified at all, then
- *                    the "normal" destination corresponding to the current stage and room will be
- *                    used (e.g. the next floor).
+ *                    trapdoor. Can either be a vanilla stage tuple, a custom stage tuple, or
+ *                    undefined. For example, a destination of `[LevelStage.CAVES_1,
+ *                    StageType.ORIGINAL]` corresponds to Caves 1, and a destination of
+ *                    `["Slaughterhouse", 1]` corresponds to a custom stage of Slaughterhouse 1. If
+ *                    the destination is undefined, then the "normal" destination corresponding to
+ *                    the current stage and room will be used (e.g. the next floor, in most cases).
  * @param anm2Path Optional. The path to the anm2 file to use. By default, the vanilla trapdoor anm2
  *                 of "gfx/grid/door_11_trapdoor.anm2" will be used. The specified anm2 file must
  *                 have animations called "Opened", "Closed", and "Open Animation".
  * @param spawnOpen Optional. Whether or not to spawn the trapdoor in an open state. By default,
  *                  behavior will be used that emulates a vanilla trapdoor.
  */
-export declare function spawnCustomTrapdoor(gridIndexOrPosition: int | Vector, destination?: [stage: LevelStage, stageType: StageType] | string, anm2Path?: string, spawnOpen?: boolean): GridEntity;
+export declare function spawnCustomTrapdoor(gridIndexOrPosition: int | Vector, destination?: TrapdoorDestination, anm2Path?: string, spawnOpen?: boolean): GridEntity;
 //# sourceMappingURL=exports.d.ts.map

package/dist/features/customTrapdoor/exports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAgBtC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,GAAG,MAAM,EAChE,QAAQ,SAAmC,EAC3C,SAAS,CAAC,EAAE,OAAO,GAClB,UAAU,CAwCZ"}
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/exports.ts"],"names":[],"mappings":";;;AAYA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAStE;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,WAAW,CAAC,EAAE,mBAAmB,EACjC,QAAQ,SAAmC,EAC3C,SAAS,CAAC,EAAE,OAAO,GAClB,UAAU,CAwCZ"}

package/dist/features/customTrapdoor/exports.lua

@@ -4,7 +4,7 @@ local ____exports = {}
 local getDefaultDestination
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local GridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.GridCollisionClass
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____TrapdoorAnimation = require("enums.private.TrapdoorAnimation")
 local TrapdoorAnimation = ____TrapdoorAnimation.TrapdoorAnimation
@@ -37,7 +37,6 @@ end
 -- - custom destination (or custom logic for after the player enters)
 -- - custom graphics
 -- - custom logic for opening/closing
--- - TODO: player jumping animation?
 -- 
 -- You can use this function to take the player to your custom stage.
 -- 
@@ -46,10 +45,12 @@ end
 -- 
 -- @param gridIndexOrPosition The location in the room to spawn the trapdoor.
 -- @param destination Optional. Used to specify where the player will go after jumping into the
--- trapdoor. Can either be a tuple containing the stage and stage type, or a
--- string containing the name of a custom stage. If not specified at all, then
--- the "normal" destination corresponding to the current stage and room will be
--- used (e.g. the next floor).
+-- trapdoor. Can either be a vanilla stage tuple, a custom stage tuple, or
+-- undefined. For example, a destination of `[LevelStage.CAVES_1,
+-- StageType.ORIGINAL]` corresponds to Caves 1, and a destination of
+-- `["Slaughterhouse", 1]` corresponds to a custom stage of Slaughterhouse 1. If
+-- the destination is undefined, then the "normal" destination corresponding to
+-- the current stage and room will be used (e.g. the next floor, in most cases).
 -- @param anm2Path Optional. The path to the anm2 file to use. By default, the vanilla trapdoor anm2
 -- of "gfx/grid/door_11_trapdoor.anm2" will be used. The specified anm2 file must
 -- have animations called "Opened", "Closed", and "Open Animation".

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAyBxD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAUzD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/customTrapdoor/init.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA0BxD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAUzD"}