isaacscript-common 6.21.0 → 6.22.2

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

@@ -1,5 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 /** For `GridEntityType.DECORATION` (1) */
 export declare function setCustomDecorationGraphics(customStage: CustomStage, gridEntity: GridEntity): void;
 /** For `GridEntityType.ROCK` (2) */

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

@@ -1 +1 @@
-{"version":3,"file":"customStageGridEntities.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/customStageGridEntities.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,0CAA0C;AAC1C,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAyBN;AAED,oCAAoC;AACpC,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAqBN;AAED,mCAAmC;AACnC,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAkBN;AAED,mCAAmC;AACnC,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAmBN;AAuDD,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAYN;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAsBN"}
+{"version":3,"file":"customStageGridEntities.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/customStageGridEntities.ts"],"names":[],"mappings":";AAkBA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAMnE,0CAA0C;AAC1C,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAyBN;AAED,oCAAoC;AACpC,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAqBN;AAED,mCAAmC;AACnC,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAkBN;AAED,mCAAmC;AACnC,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAmBN;AAuDD,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAsBN;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,GACrB,IAAI,CAsBN"}

package/dist/features/customStage/customStageGridEntities.lua

@@ -19,10 +19,14 @@ local ____pickupsSpecific = require("functions.pickupsSpecific")
 local getCoins = ____pickupsSpecific.getCoins
 local getCollectibles = ____pickupsSpecific.getCollectibles
 local getTrinkets = ____pickupsSpecific.getTrinkets
+local ____stage = require("functions.stage")
+local calculateStageType = ____stage.calculateStageType
 local ____vector = require("functions.vector")
 local vectorEquals = ____vector.vectorEquals
 local ____exports = require("features.customTrapdoor.exports")
 local spawnCustomTrapdoor = ____exports.spawnCustomTrapdoor
+local ____exports = require("features.customStage.exports")
+local DEFAULT_BASE_STAGE = ____exports.DEFAULT_BASE_STAGE
 local ____v = require("features.customStage.v")
 local v = ____v.default
 function getNewDoorPNGPath(self, customStage, fileName)
@@ -226,7 +230,10 @@ function ____exports.convertVanillaTrapdoors(self, customStage, gridEntity)
         return
     end
     removeGridEntity(nil, gridEntity, true)
-    local destination = v.run.firstFloor and ({customStage.name, 2}) or nil
+    local baseStage = customStage.baseStage == nil and DEFAULT_BASE_STAGE or customStage.baseStage
+    local vanillaNextStage = baseStage + 2
+    local vanillaNextStageType = calculateStageType(nil, vanillaNextStage)
+    local destination = v.run.firstFloor and ({customStage.name, 2}) or ({vanillaNextStage, vanillaNextStageType})
     spawnCustomTrapdoor(nil, gridEntity.Position, destination)
 end
 --- The rewards are based on the ones from the wiki:

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

@@ -1,4 +1,14 @@
-import { EntityType } from "isaac-typescript-definitions";
+/**
+ * These are helper functions relating to creating custom stages with the built-in standard library.
+ * For more information about custom stages, see the [main
+ * documentation page](https://isaacscript.github.io/main/custom-stages).
+ *
+ * @module
+ */
+import { EntityType, LevelStage, StageType } from "isaac-typescript-definitions";
+export declare const DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2;
+export declare const DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL;
+export declare const INVALID_STAGE_VALUE: LevelStage;
 /**
  * Helper function to warp to a custom stage/level.
  *
@@ -6,9 +16,11 @@ import { EntityType } from "isaac-typescript-definitions";
  * more details: https://isaacscript.github.io/main/custom-stages/
  *
  * @param name The name of the custom stage, corresponding to what is in the "tsconfig.json" file.
- * @param firstFloor Whether to go to the first floor or the second floor. For example, if you have
- *                   a custom stage emulating Caves, then the first floor would be Caves 1, and the
- *                   second floor would be Caves 2.
+ * @param firstFloor 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.
  */
 export declare function setCustomStage(name: string, firstFloor?: boolean, verbose?: boolean): void;
 /**
@@ -37,4 +49,9 @@ export declare function setCustomStage(name: string, firstFloor?: boolean, verbo
  *                        will be displayed on the right side of the boss "versus" screen.
  */
 export declare function registerCustomBoss(entityType: EntityType, variant: int, subType: int, namePNGPath: string, portraitPNGPath: string): void;
+/**
+ * Helper function to disable the custom stage. This is typically called before taking the player to
+ * a vanilla floor.
+ */
+export declare function disableCustomStage(): void;
 //# sourceMappingURL=exports.d.ts.map

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,EACL,UAAU,EAKX,MAAM,8BAA8B,CAAC;AAsBtC;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,IAAI,CA6CN;AA4ED;;;;;;;;;;;;;;;;;;;;;;;;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":"AACA;;;;;;GAMG;AAEH,OAAO,EACL,UAAU,EACV,UAAU,EAGV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAmBtC,eAAO,MAAM,kBAAkB,wBAAwB,CAAC;AACxD,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAE1D,eAAO,MAAM,mBAAmB,YAAmB,CAAC;AAEpD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,IAAI,CAwDN;AA4ED;;;;;;;;;;;;;;;;;;;;;;;;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;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}

package/dist/features/customStage/exports.lua

@@ -7,10 +7,10 @@ local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local StageType = ____isaac_2Dtypescript_2Ddefinitions.StageType
-local ____cachedClasses = require("cachedClasses")
-local game = ____cachedClasses.game
 local ____reorderedCallbacks = require("callbacks.reorderedCallbacks")
-local reorderedCallbacksSetStage = ____reorderedCallbacks.reorderedCallbacksSetStage
+local reorderedCallbacksSetStageInternal = ____reorderedCallbacks.reorderedCallbacksSetStageInternal
+local ____cachedClasses = require("core.cachedClasses")
+local game = ____cachedClasses.game
 local ____entities = require("functions.entities")
 local getEntityIDFromConstituents = ____entities.getEntityIDFromConstituents
 local ____log = require("functions.log")
@@ -35,10 +35,10 @@ function setStageRoomsData(self, customStage, rng, verbose)
     for ____, room in ipairs(getRoomsInGrid(nil)) do
         do
             if room.SafeGridIndex == startingRoomGridIndex then
-                goto __continue6
+                goto __continue7
             end
             if room.Data == nil then
-                goto __continue6
+                goto __continue7
             end
             local roomType = room.Data.Type
             local roomShapeMap = customStage.roomTypeMap:get(roomType)
@@ -46,19 +46,19 @@ function setStageRoomsData(self, customStage, rng, verbose)
                 if roomType == RoomType.DEFAULT then
                     logError((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name)
                 end
-                goto __continue6
+                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: ") .. customStage.name)
-                goto __continue6
+                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: ") .. customStage.name)
-                goto __continue6
+                goto __continue7
             end
             local randomRoom = getRandomCustomStageRoom(nil, roomsMetadata, rng, verbose)
             local newRoomData = customStageCachedRoomData:get(randomRoom.variant)
@@ -66,26 +66,29 @@ function setStageRoomsData(self, customStage, rng, verbose)
                 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: ") .. customStage.name)
-                    goto __continue6
+                    goto __continue7
                 end
                 customStageCachedRoomData:set(randomRoom.variant, newRoomData)
             end
             room.Data = newRoomData
         end
-        ::__continue6::
+        ::__continue7::
     end
 end
-local DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2
-local DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL
+____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 Whether to go to the first floor or the second floor. For example, if you have
--- a custom stage emulating Caves, then the first floor would be Caves 1, and the
--- second floor would be Caves 2.
+-- @param firstFloor 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
@@ -98,22 +101,27 @@ function ____exports.setCustomStage(self, name, firstFloor, verbose)
         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
     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
-    local baseStage = customStage.baseStage == nil and DEFAULT_BASE_STAGE or customStage.baseStage
+    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 DEFAULT_BASE_STAGE_TYPE or customStage.baseStageType
-    setStage(nil, baseStage, baseStageType)
+    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 stage = -1
-    local stageType = StageType.WRATH_OF_THE_LAMB
-    level:SetStage(stage, stageType)
-    reorderedCallbacksSetStage(nil, stage, stageType)
+    local targetStage = ____exports.INVALID_STAGE_VALUE
+    local targetStageType = StageType.WRATH_OF_THE_LAMB
+    level:SetStage(targetStage, targetStageType)
+    reorderedCallbacksSetStageInternal(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
@@ -142,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/shadows.d.ts

@@ -1,3 +1,3 @@
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 export declare function setShadows(customStage: CustomStage): void;
 //# sourceMappingURL=shadows.d.ts.map

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;AAqC3D,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,sCAAsC,CAAC;AAqCnE,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAqCzD"}

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

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

@@ -1,4 +1,4 @@
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 export declare function streakTextPostRender(): void;
 export declare function streakTextGetShaderParams(customStage: CustomStage, shaderName: string): void;
 export declare function topStreakTextStart(): void;

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;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"}
+{"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

@@ -5,10 +5,10 @@ local checkEndTopStreakText, trackMapInputPressed, checkStartBottomStreakText, c
 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")
@@ -133,7 +133,7 @@ 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

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

@@ -1,5 +1,5 @@
 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: {

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;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"}
+{"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/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:
@@ -14,17 +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 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 set to undefined, 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] | [customStageName: string, floorNum: int], 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;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,WAAW,CAAC,EACR,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,GACzC,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,EAC5C,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
@@ -45,12 +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 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 set to undefined, 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":"AASA,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"}

package/dist/features/customTrapdoor/init.lua

@@ -2,14 +2,14 @@ local ____lualib = require("lualib_bundle")
 local __TS__ArraySome = ____lualib.__TS__ArraySome
 local Map = ____lualib.Map
 local ____exports = {}
-local postRender, checkAllPlayersJumpComplete, checkPixelationToBlackComplete, checkPausingOnBlackComplete, checkAllPlayersLayingDownComplete, goToCustomDestination, anyPlayerPlayingExtraAnimation, postPEffectUpdate, checkJumpComplete, postGridEntityCustomUpdateTrapdoor
+local postRender, checkAllPlayersJumpComplete, checkPixelationToBlackComplete, checkSecondPixelationHalfWay, checkAllPlayersLayingDownComplete, goToCustomDestination, anyPlayerPlayingExtraAnimation, postPEffectUpdate, checkJumpComplete, postGridEntityCustomUpdateTrapdoor
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local Direction = ____isaac_2Dtypescript_2Ddefinitions.Direction
 local EntityCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityCollisionClass
 local EntityGridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityGridCollisionClass
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local RoomTransitionAnim = ____isaac_2Dtypescript_2Ddefinitions.RoomTransitionAnim
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
@@ -29,6 +29,7 @@ local setStage = ____stage.setStage
 local ____types = require("functions.types")
 local isString = ____types.isString
 local ____exports = require("features.customStage.exports")
+local disableCustomStage = ____exports.disableCustomStage
 local setCustomStage = ____exports.setCustomStage
 local ____streakText = require("features.customStage.streakText")
 local topStreakTextStart = ____streakText.topStreakTextStart
@@ -55,7 +56,7 @@ local v = ____v.default
 function postRender(self)
     checkAllPlayersJumpComplete(nil)
     checkPixelationToBlackComplete(nil)
-    checkPausingOnBlackComplete(nil)
+    checkSecondPixelationHalfWay(nil)
     checkAllPlayersLayingDownComplete(nil)
     drawBlackSprite(nil)
 end
@@ -78,25 +79,33 @@ function checkPixelationToBlackComplete(self)
     end
     local hud = game:GetHUD()
     local renderFrameCount = Isaac.GetFrameCount()
-    local roomGridIndex = getRoomGridIndex(nil)
     local renderFrameScreenBlack = v.run.stateRenderFrame + PIXELATION_TO_BLACK_FRAMES
     if renderFrameCount < renderFrameScreenBlack then
         return
     end
-    v.run.state = StageTravelState.PAUSING_ON_BLACK
-    v.run.stateRenderFrame = renderFrameCount
+    v.run.state = StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END
     hud:SetVisible(false)
-    goToCustomDestination(nil)
-    teleport(
+    runNextGameFrame(
         nil,
-        roomGridIndex,
-        Direction.NO_DIRECTION,
-        RoomTransitionAnim.PIXELATION,
-        true
+        function()
+            local level = game:GetLevel()
+            local startingRoomIndex = level:GetStartingRoomIndex()
+            local futureRenderFrameCount = Isaac.GetFrameCount()
+            v.run.state = StageTravelState.WAITING_FOR_SECOND_PIXELATION_TO_GET_HALF_WAY
+            v.run.stateRenderFrame = futureRenderFrameCount
+            goToCustomDestination(nil)
+            teleport(
+                nil,
+                startingRoomIndex,
+                Direction.NO_DIRECTION,
+                RoomTransitionAnim.PIXELATION,
+                true
+            )
+        end
     )
 end
-function checkPausingOnBlackComplete(self)
-    if v.run.state ~= StageTravelState.PAUSING_ON_BLACK or v.run.stateRenderFrame == nil then
+function checkSecondPixelationHalfWay(self)
+    if v.run.state ~= StageTravelState.WAITING_FOR_SECOND_PIXELATION_TO_GET_HALF_WAY or v.run.stateRenderFrame == nil then
         return
     end
     local hud = game:GetHUD()
@@ -110,8 +119,8 @@ function checkPausingOnBlackComplete(self)
     runNextRoom(
         nil,
         function()
-            movePlayersToCenter(nil)
             v.run.state = StageTravelState.PLAYERS_LAYING_DOWN
+            movePlayersToCenter(nil)
             for ____, player in ipairs(getAllPlayers(nil)) do
                 player:AnimateAppear()
                 player.EntityCollisionClass = EntityCollisionClass.ALL
@@ -145,6 +154,7 @@ function goToCustomDestination(self)
         local firstFloor = arg2 == 1
         setCustomStage(nil, "Slaughterhouse", firstFloor)
     else
+        disableCustomStage(nil)
         setStage(nil, arg1, arg2)
     end
 end

package/dist/features/customTrapdoor/openClose.lua

@@ -2,7 +2,7 @@ local ____exports = {}
 local shouldTrapdoorOpen, isPlayerCloseAfterBoss, shouldBeClosedFromStartingInRoomWithEnemies, open
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____TrapdoorAnimation = require("enums.private.TrapdoorAnimation")
 local TrapdoorAnimation = ____TrapdoorAnimation.TrapdoorAnimation

package/dist/features/customTrapdoor/touched.lua

@@ -10,7 +10,7 @@ local EntityCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityCollisio
 local EntityGridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityGridCollisionClass
 local EntityPartition = ____isaac_2Dtypescript_2Ddefinitions.EntityPartition
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
-local ____constants = require("constants")
+local ____constants = require("core.constants")
 local VectorZero = ____constants.VectorZero
 local ____StageTravelState = require("enums.private.StageTravelState")
 local StageTravelState = ____StageTravelState.StageTravelState
@@ -73,6 +73,7 @@ function setPlayerAttributes(self, trapdoorPlayer, position)
         player.Velocity = VectorZero
         player.EntityCollisionClass = EntityCollisionClass.NONE
         player.GridCollisionClass = EntityGridCollisionClass.NONE
+        player:StopExtraAnimation()
     end
 end
 function dropTaintedForgotten(self, player)