isaacscript-common 6.8.0 → 6.10.1

package/dist/features/customStage/customStageGridEntities.lua

@@ -203,13 +203,13 @@ function ____exports.removeUrnRewards(self, customStage, gridEntity)
     if customStage.rocksPNGPath == nil then
         return
     end
-    local spiders = getNPCs(nil, EntityType.SPIDER)
-    removeEntitiesSpawnedFromGridEntity(nil, spiders, gridEntity)
     local coins = getCoins(nil)
     removeEntitiesSpawnedFromGridEntity(nil, coins, gridEntity)
     local quarters = getCollectibles(nil, CollectibleType.QUARTER)
     removeEntitiesSpawnedFromGridEntity(nil, quarters, gridEntity)
     local swallowedPennies = getTrinkets(nil, TrinketType.SWALLOWED_PENNY)
     removeEntitiesSpawnedFromGridEntity(nil, swallowedPennies, gridEntity)
+    local spiders = getNPCs(nil, EntityType.SPIDER)
+    removeEntitiesSpawnedFromGridEntity(nil, spiders, gridEntity)
 end
 return ____exports

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

@@ -1 +1 @@
-{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAOX,MAAM,8BAA8B,CAAC;AAsBtC;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,IAAI,CA+GlE;AAQD,wBAAgB,mBAAmB,IAAI,IAAI,CAQ1C;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,IAAI,CAGN"}
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAOX,MAAM,8BAA8B,CAAC;AAsBtC;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,IAAI,CA+GlE;AAUD,wBAAgB,mBAAmB,IAAI,IAAI,CAQ1C;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,IAAI,CAGN"}

package/dist/features/customStage/exports.lua

@@ -34,15 +34,16 @@ local ____runNextRoom = require("features.runNextRoom")
 local runNextRoom = ____runNextRoom.runNextRoom
 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 ____versusScreen = require("features.customStage.versusScreen")
-local playVersusScreenAnimation = ____versusScreen.playVersusScreenAnimation
 function postRoomTransition(self)
     movePlayersToCenter(nil)
+    topStreakTextStart(nil)
 end
 local DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2
 local DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL
@@ -56,7 +57,7 @@ function ____exports.setCustomStage(self, name, verbose)
     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. (This means that you probably forgot to define it in your \"tsconfig.json\" file.) See the website for more details on how to set up custom stages.")
+        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
     local level = game:GetLevel()
     local startingRoomGridIndex = level:GetStartingRoomIndex()
@@ -124,7 +125,7 @@ function ____exports.setCustomStageDebug(self)
         log("No custom stage is currently loaded.")
         return
     end
-    playVersusScreenAnimation(nil, customStage, true)
+    topStreakTextStart(nil)
 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

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":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA0BxD,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAuBtD"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/init.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA8BxD,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAoBtD"}

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, getShaderParams, postGridEntityBrokenRockAlt, postGridEntityBrokenInit, postNewRoomReordered
+local initRoomTypeMaps, getRoomTypeMap, postRender, postGameStarted, getShaderParams, postGridEntityBrokenRockAlt, postGridEntityBrokenInit, postNewRoomReordered
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
@@ -26,6 +26,7 @@ local ____shadows = require("features.customStage.shadows")
 local setShadows = ____shadows.setShadows
 local ____streakText = require("features.customStage.streakText")
 local streakTextGetShaderParams = ____streakText.streakTextGetShaderParams
+local streakTextPostGameStarted = ____streakText.streakTextPostGameStarted
 local streakTextPostRender = ____streakText.streakTextPostRender
 local ____v = require("features.customStage.v")
 local v = ____v.default
@@ -74,11 +75,18 @@ function postRender(self)
     if customStage == nil then
         return
     end
-    streakTextPostRender(nil, customStage)
+    streakTextPostRender(nil)
     versusScreenPostRender(nil)
 end
+function postGameStarted(self)
+    streakTextPostGameStarted(nil)
+end
 function getShaderParams(self, shaderName)
-    streakTextGetShaderParams(nil, shaderName)
+    local customStage = v.run.currentCustomStage
+    if customStage == nil then
+        return
+    end
+    streakTextGetShaderParams(nil, customStage, shaderName)
     return nil
 end
 function postGridEntityBrokenRockAlt(self, gridEntity)
@@ -111,6 +119,7 @@ function ____exports.customStageInit(self, mod)
     saveDataManager(nil, "customStage", v)
     initRoomTypeMaps(nil)
     mod:AddCallback(ModCallback.POST_RENDER, postRender)
+    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)

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

@@ -1,4 +1,6 @@
 import { CustomStage } from "../../interfaces/CustomStage";
-export declare function streakTextPostRender(customStage: CustomStage): void;
-export declare function streakTextGetShaderParams(shaderName: string): 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":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAU3D,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAgBnE;AAMD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAMlE"}
+{"version":3,"file":"streakText.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/streakText.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AA+F3D,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;AAiFD,wBAAgB,kBAAkB,IAAI,IAAI,CAUzC"}

package/dist/features/customStage/streakText.lua

@@ -1,38 +1,239 @@
+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 ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ButtonAction = ____isaac_2Dtypescript_2Ddefinitions.ButtonAction
+local ControllerIndex = ____isaac_2Dtypescript_2Ddefinitions.ControllerIndex
 local ____cachedClasses = require("cachedClasses")
 local fonts = ____cachedClasses.fonts
 local game = ____cachedClasses.game
 local ____constants = require("constants")
 local KColorDefault = ____constants.KColorDefault
+local VectorOne = ____constants.VectorOne
+local ____enums = require("functions.enums")
+local getEnumValues = ____enums.getEnumValues
 local ____ui = require("functions.ui")
 local getScreenBottomCenterPos = ____ui.getScreenBottomCenterPos
-local ____utils = require("functions.utils")
-local todo = ____utils.todo
+local getScreenTopCenterPos = ____ui.getScreenTopCenterPos
 local ____v = require("features.customStage.v")
 local v = ____v.default
---- This must match the name of the shader in "shaders.xml".
-local EMPTY_SHADER_NAME = "IsaacScript-RenderAboveHUD"
---- This matches the offset that the vanilla game uses.
-local STREAK_TEXT_BOTTOM_OFFSET = Vector(0, -60)
-function ____exports.streakTextPostRender(self, customStage)
-    if not v.run.showingStreakText then
+function checkEndTopStreakText(self)
+    if v.run.topStreakTextStartedRenderFrame == nil or not topStreakSprite:IsPlaying(UIStreakAnimation.TEXT_STAY) then
+        return
+    end
+    local renderFrameCount = Isaac.GetFrameCount()
+    local elapsedFrames = renderFrameCount - v.run.topStreakTextStartedRenderFrame
+    if elapsedFrames >= 115 then
+        playTextOut(nil, topStreakSprite)
+    end
+end
+function trackMapInputPressed(self)
+    for ____, controllerIndex in ipairs(getEnumValues(nil, ControllerIndex)) do
+        local gameFrameCount = game:GetFrameCount()
+        local oldPushedMapFrame = v.run.controllerIndexPushingMapRenderFrame:get(controllerIndex)
+        local isPushingMap = Input.IsActionPressed(ButtonAction.MAP, controllerIndex)
+        if isPushingMap then
+            if oldPushedMapFrame == nil then
+                v.run.controllerIndexPushingMapRenderFrame:set(controllerIndex, gameFrameCount)
+            end
+        else
+            v.run.controllerIndexPushingMapRenderFrame:delete(controllerIndex)
+        end
+    end
+end
+function checkStartBottomStreakText(self)
+    if bottomStreakSprite:IsPlaying() then
+        return
+    end
+    local pushedMapFrames = {__TS__Spread(v.run.controllerIndexPushingMapRenderFrame:values())}
+    if #pushedMapFrames == 0 then
+        return
+    end
+    local earliestFrame = math.min(table.unpack(pushedMapFrames))
+    local gameFrameCount = game:GetFrameCount()
+    local elapsedFrames = gameFrameCount - earliestFrame
+    if elapsedFrames >= NUM_RENDER_FRAMES_MAP_HELD_BEFORE_STREAK_TEXT then
+        bottomStreakSprite:Play(UIStreakAnimation.TEXT, true)
+    end
+end
+function checkEndBottomStreakText(self)
+    if not bottomStreakSprite:IsPlaying(UIStreakAnimation.TEXT_STAY) then
         return
     end
+    local pushedMapFrames = {__TS__Spread(v.run.controllerIndexPushingMapRenderFrame:values())}
+    if #pushedMapFrames == 0 then
+        playTextOut(nil, bottomStreakSprite)
+    end
+end
+function renderSprite(self, customStage, sprite, position)
+    sprite:Update()
+    if not sprite:IsPlaying() 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)
+    end
     local isPaused = game:IsPaused()
     if isPaused then
         return
     end
     local font = fonts.upheaval
-    local length = font:GetStringWidthUTF8(customStage.name)
-    local bottomCenterPos = getScreenBottomCenterPos(nil)
-    local position = bottomCenterPos + STREAK_TEXT_BOTTOM_OFFSET
-    local adjustedX = position.X - length / 2
-    font:DrawString(customStage.name, adjustedX, position.Y, KColorDefault)
+    local ____customStage_0 = customStage
+    local name = ____customStage_0.name
+    local length = font:GetStringWidthUTF8(name)
+    local centeredX = position.X - length / 2
+    local adjustment = 0
+    local scale = VectorOne
+    repeat
+        local ____switch26 = animation
+        local ____cond26 = ____switch26 == UIStreakAnimation.TEXT
+        if ____cond26 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
+        ____cond26 = ____cond26 or ____switch26 == UIStreakAnimation.TEXT_IN
+        if ____cond26 then
+            do
+                adjustment = TEXT_IN_ADJUSTMENTS[frame + 1] or 0
+                scale = TEXT_IN_SCALES[frame + 1] or VectorOne
+                break
+            end
+        end
+        ____cond26 = ____cond26 or ____switch26 == UIStreakAnimation.TEXT_OUT
+        if ____cond26 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
+        end
+    until true
+    local adjustedX = centeredX + adjustment
+    local adjustedY = position.Y + STREAK_TEXT_BOTTOM_Y_OFFSET
+    sprite:RenderLayer(0, position)
+    font:DrawStringScaled(
+        name,
+        adjustedX,
+        adjustedY,
+        scale.X,
+        scale.Y,
+        KColorDefault
+    )
+end
+function playTextOut(self, sprite)
+    sprite:Play(UIStreakAnimation.TEXT, true)
+    sprite:SetFrame(TEXT_OUT_FRAME - 2)
 end
-function ____exports.streakTextGetShaderParams(self, shaderName)
+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)
+--- 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,
+    -450,
+    -250,
+    -70,
+    10,
+    6,
+    3
+}
+TEXT_OUT_ADJUSTMENTS = {
+    0,
+    -5,
+    -10,
+    -15,
+    -20,
+    144,
+    308,
+    472,
+    636,
+    800
+}
+TEXT_IN_SCALES = {
+    Vector(3, 0.2),
+    Vector(2.6, 0.36),
+    Vector(2.2, 0.52),
+    Vector(1.8, 0.68),
+    Vector(1.4, 0.84),
+    Vector(0.95, 1.05),
+    Vector(0.97, 1.03),
+    Vector(0.98, 1.02)
+}
+TEXT_OUT_SCALES = {
+    Vector(1, 1),
+    Vector(0.99, 1.03),
+    Vector(0.98, 1.05),
+    Vector(0.96, 1.08),
+    Vector(0.95, 1.1),
+    Vector(1.36, 0.92),
+    Vector(1.77, 0.74),
+    Vector(2.18, 0.56),
+    Vector(2.59, 0.38),
+    Vector(3, 0.2)
+}
+topStreakSprite = Sprite()
+topStreakSprite:Load("resources/gfx/ui/ui_streak.anm2", false)
+topStreakSprite.PlaybackSpeed = TEXT_PLAYBACK_SPEED
+bottomStreakSprite = Sprite()
+bottomStreakSprite:Load("resources/gfx/ui/ui_streak.anm2", false)
+bottomStreakSprite.PlaybackSpeed = TEXT_PLAYBACK_SPEED
+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
-    todo(nil)
+    local topCenterPos = getScreenTopCenterPos(nil)
+    local topStreakPosition = topCenterPos + STREAK_SPRITE_TOP_OFFSET
+    renderSprite(nil, customStage, topStreakSprite, topStreakPosition)
+    local bottomCenterPos = getScreenBottomCenterPos(nil)
+    local bottomStreakPosition = bottomCenterPos + STREAK_SPRITE_BOTTOM_OFFSET
+    renderSprite(nil, customStage, bottomStreakSprite, bottomStreakPosition)
+end
+function ____exports.topStreakTextStart(self)
+    local level = game:GetLevel()
+    local renderFrameCount = Isaac.GetFrameCount()
+    level:ShowName(false)
+    v.run.topStreakTextStartedRenderFrame = renderFrameCount
+    topStreakSprite:Play(UIStreakAnimation.TEXT, true)
 end
 return ____exports

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

@@ -1,10 +1,12 @@
-/// <reference types="isaac-typescript-definitions" />
+import { ControllerIndex } from "isaac-typescript-definitions";
 import { CustomStage } from "../../interfaces/CustomStage";
 declare const v: {
     run: {
         currentCustomStage: CustomStage | null;
-        showingStreakText: boolean;
         showingBossVersusScreen: boolean;
+        /** Values are the render frame that the controller first pressed the map button. */
+        controllerIndexPushingMapRenderFrame: Map<ControllerIndex, number>;
+        topStreakTextStartedRenderFrame: number | null;
     };
     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,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,QAAA,MAAM,CAAC;;;;;;;;;CAUN,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;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"}

package/dist/features/customStage/v.lua

@@ -2,7 +2,15 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local v = {run = {currentCustomStage = nil, showingStreakText = false, showingBossVersusScreen = false}, room = {showingShadows = false}}
+local v = {
+    run = {
+        currentCustomStage = nil,
+        showingBossVersusScreen = false,
+        controllerIndexPushingMapRenderFrame = __TS__New(Map),
+        topStreakTextStartedRenderFrame = nil
+    },
+    room = {showingShadows = false}
+}
 ____exports.default = v
 --- Indexed by custom stage name.
 ____exports.customStagesMap = __TS__New(Map)

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

@@ -1,4 +1,4 @@
 import { CustomStage } from "../../interfaces/CustomStage";
-export declare function playVersusScreenAnimation(customStage: CustomStage, force?: boolean): void;
+export declare function playVersusScreenAnimation(customStage: CustomStage): void;
 export declare function versusScreenPostRender(): void;
 //# sourceMappingURL=versusScreen.d.ts.map

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;AAiF3D,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,WAAW,EACxB,KAAK,UAAQ,GACZ,IAAI,CAuDN;AA+ED,wBAAgB,sBAAsB,IAAI,IAAI,CAoC7C"}
+{"version":3,"file":"versusScreen.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/versusScreen.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAiF3D,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAuDxE;AA+ED,wBAAgB,sBAAsB,IAAI,IAAI,CAoC7C"}

package/dist/features/customStage/versusScreen.lua

@@ -118,14 +118,11 @@ versusScreenBackgroundSprite:Load("gfx/ui/boss/versusscreen.anm2", true)
 -- color it with the `Color` property.
 local versusScreenDirtSpotSprite = Sprite()
 versusScreenDirtSpotSprite:Load("gfx/ui/boss/versusscreen.anm2", true)
-function ____exports.playVersusScreenAnimation(self, customStage, force)
-    if force == nil then
-        force = false
-    end
+function ____exports.playVersusScreenAnimation(self, customStage)
     local room = game:GetRoom()
     local roomType = room:GetType()
     local hud = game:GetHUD()
-    if roomType ~= RoomType.BOSS and not force then
+    if roomType ~= RoomType.BOSS then
         return
     end
     v.run.showingBossVersusScreen = true

package/dist/features/extraConsoleCommands/init.lua

@@ -138,6 +138,7 @@ function initMap(self)
     extraConsoleCommandsFunctionMap:set("rocksDisplay", commandsDisplay.rocksDisplay)
     extraConsoleCommandsFunctionMap:set("room", commands.roomCommand)
     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)

package/dist/features/extraConsoleCommands/listCommands.d.ts

@@ -274,6 +274,14 @@ export declare function roomCommand(): void;
  * numbers to remove hearts.)
  */
 export declare function rottenHearts(params: string): void;
+/**
+ * Run the suite of tests that prove that the "deepCopy" helper function and the "merge" function
+ * work properly. For more information, see the `runDeepCopyTests` and the `runMergeTests`
+ * functions.
+ *
+ * In general, running the tests is only useful if you are troubleshooting the save data manager.
+ */
+export declare function runTests(): void;
 /**
  * Alias for the "stage" command.
  *

package/dist/features/extraConsoleCommands/listCommands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listCommands.d.ts","sourceRoot":"","sources":["../../../src/features/extraConsoleCommands/listCommands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"listCommands.d.ts","sourceRoot":"","sources":["../../../src/features/extraConsoleCommands/listCommands.ts"],"names":[],"mappings":"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"}

package/dist/features/extraConsoleCommands/listCommands.lua

@@ -42,6 +42,8 @@ local ____charge = require("functions.charge")
 local addCharge = ____charge.addCharge
 local ____collectibles = require("functions.collectibles")
 local isValidCollectibleType = ____collectibles.isValidCollectibleType
+local ____deepCopyTests = require("functions.deepCopyTests")
+local runDeepCopyTests = ____deepCopyTests.runDeepCopyTests
 local ____entitiesSpecific = require("functions.entitiesSpecific")
 local getNPCs = ____entitiesSpecific.getNPCs
 local ____enums = require("functions.enums")
@@ -57,6 +59,8 @@ local logSeedEffects = ____log.logSeedEffects
 local logSounds = ____log.logSounds
 local ____map = require("functions.map")
 local getMapPartialMatch = ____map.getMapPartialMatch
+local ____mergeTests = require("functions.mergeTests")
+local runMergeTests = ____mergeTests.runMergeTests
 local ____pickupsSpecific = require("functions.pickupsSpecific")
 local spawnCard = ____pickupsSpecific.spawnCard
 local spawnPill = ____pickupsSpecific.spawnPill
@@ -850,6 +854,15 @@ end
 function ____exports.rottenHearts(self, params)
     addHeart(nil, params, HealthType.ROTTEN)
 end
+--- Run the suite of tests that prove that the "deepCopy" helper function and the "merge" function
+-- work properly. For more information, see the `runDeepCopyTests` and the `runMergeTests`
+-- functions.
+-- 
+-- In general, running the tests is only useful if you are troubleshooting the save data manager.
+function ____exports.runTests(self)
+    runDeepCopyTests(nil)
+    runMergeTests(nil)
+end
 --- Alias for the "stage" command.
 -- 
 -- For example:

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

@@ -1 +1 @@
-{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/exports.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAarD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoFG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,CAAC,EAAE,QAAQ,EACX,eAAe,CAAC,EAAE,MAAM,OAAO,GAC9B,IAAI,CAuCN;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAQD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,GACrB,IAAI,CAiBN"}
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/exports.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAarD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoFG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,CAAC,EAAE,QAAQ,EACX,eAAe,CAAC,EAAE,MAAM,OAAO,GAC9B,IAAI,CAkCN;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAQD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,GACrB,IAAI,CAiBN"}

package/dist/features/saveDataManager/exports.lua

@@ -1,5 +1,4 @@
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__TypeOf = ____lualib.__TS__TypeOf
 local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
 local ____exports = {}
@@ -117,11 +116,10 @@ function ____exports.saveDataManager(self, key, v, conditionalFunc)
     if #saveDataKeys == 1 and saveDataKeys[1] == "room" then
         conditionalFunc = function() return false end
     end
-    local saveDataTable = v
-    local saveDataCopy = deepCopy(nil, saveDataTable, SerializationType.NONE, key)
+    local saveDataCopy = deepCopy(nil, v, SerializationType.NONE, key)
     saveDataDefaultsMap[key] = saveDataCopy
     if conditionalFunc ~= nil then
-        saveDataConditionalFuncMap:set(key, conditionalFunc)
+        saveDataConditionalFuncMap[key] = conditionalFunc
     end
 end
 --- The save data manager will automatically load variables from disk at the appropriate times (i.e.

package/dist/features/saveDataManager/load.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
 /// <reference types="typescript-to-lua/language-extensions" />
 import { SaveData } from "../../interfaces/SaveData";
-export declare function loadFromDisk(mod: Mod, oldSaveData: LuaTable<string, SaveData>): void;
+export declare function loadFromDisk(mod: Mod, oldSaveData: LuaMap<string, SaveData>): void;
 //# sourceMappingURL=load.d.ts.map

package/dist/features/saveDataManager/load.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/load.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AASrD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,GACtC,IAAI,CAsDN"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/load.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AASrD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GACpC,IAAI,CAqDN"}

package/dist/features/saveDataManager/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/main.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAwGrD,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,GACvB,IAAI,CA6CN"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/main.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAwGrD,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,GACvB,IAAI,CA4CN"}

package/dist/features/saveDataManager/main.lua

@@ -1,5 +1,4 @@
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}

package/dist/features/saveDataManager/maps.d.ts

@@ -5,7 +5,7 @@ import { SaveData } from "../../interfaces/SaveData";
  * Maps for the master map so that we can access the variables via the in-game console when
  * debugging. (TSTL Maps don't expose the map keys as normal keys.)
  */
-export declare const saveDataMap: LuaTable<string, SaveData>;
-export declare const saveDataDefaultsMap: LuaTable<string, SaveData>;
-export declare const saveDataConditionalFuncMap: Map<string, () => boolean>;
+export declare const saveDataMap: LuaMap<string, SaveData>;
+export declare const saveDataDefaultsMap: LuaMap<string, SaveData>;
+export declare const saveDataConditionalFuncMap: LuaMap<string, () => boolean>;
 //# sourceMappingURL=maps.d.ts.map

package/dist/features/saveDataManager/maps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/maps.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,WAAW,4BAAmC,CAAC;AAE5D,eAAO,MAAM,mBAAmB,4BAAmC,CAAC;AACpE,eAAO,MAAM,0BAA0B,oBAAyB,OAAO,CAAG,CAAC"}
+{"version":3,"file":"maps.d.ts","sourceRoot":"","sources":["../../../src/features/saveDataManager/maps.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD;;;;GAIG;AACH,eAAO,MAAM,WAAW,0BAAiC,CAAC;AAE1D,eAAO,MAAM,mBAAmB,0BAAiC,CAAC;AAClE,eAAO,MAAM,0BAA0B,uBAA4B,OAAO,CAAG,CAAC"}

package/dist/features/saveDataManager/maps.lua

@@ -1,11 +1,8 @@
-local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
-local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 --- The save data map is indexed by subscriber name. We use Lua tables instead of TypeScriptToLua
 -- Maps for the master map so that we can access the variables via the in-game console when
 -- debugging. (TSTL Maps don't expose the map keys as normal keys.)
 ____exports.saveDataMap = {}
 ____exports.saveDataDefaultsMap = {}
-____exports.saveDataConditionalFuncMap = __TS__New(Map)
+____exports.saveDataConditionalFuncMap = {}
 return ____exports