isaacscript-common 20.11.2 → 20.11.4

package/dist/index.d.ts

@@ -2494,6 +2494,7 @@ declare class CustomTrapdoors extends Feature {
     private postPEffectUpdateReordered;
     private checkJumpComplete;
     private shouldTrapdoorSpawnOpen;
+    private logStateChanged;
     /**
      * Helper function to specify where your custom trapdoor should take the player. Call this once at
      * the beginning of your mod for each kind of custom trapdoor that you want to have. The provided
@@ -13395,11 +13396,6 @@ declare class RunInNFrames extends Feature {
  */
 export declare function runMergeTests(): void;
 
-/**
- * Using the "luamod" console command with a mod that has custom shaders can crash the game. A
- * simple fix for this is automatically applied to any upgraded mods. This method was originally
- * discovered by AgentCucco.
- */
 declare class RunNextRoom extends Feature {
     vConditionalFunc: () => boolean;
     private postNewRoomReordered;

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 20.11.2
+isaacscript-common 20.11.4
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -39206,6 +39206,8 @@ local ____TrapdoorAnimation = require("src.enums.private.TrapdoorAnimation")
 local TrapdoorAnimation = ____TrapdoorAnimation.TrapdoorAnimation
 local ____easing = require("src.functions.easing")
 local easeOutSine = ____easing.easeOutSine
+local ____log = require("src.functions.log")
+local log = ____log.log
 local ____playerCenter = require("src.functions.playerCenter")
 local movePlayersToCenter = ____playerCenter.movePlayersToCenter
 local ____playerIndex = require("src.functions.playerIndex")
@@ -39272,12 +39274,13 @@ end
 function goToVanillaStage(self, destinationStage, destinationStageType)
     setStage(nil, destinationStage, destinationStageType)
 end
+local DEBUG = false
 local TRAPDOOR_OPEN_DISTANCE = 60
 local TRAPDOOR_OPEN_DISTANCE_AFTER_BOSS = TRAPDOOR_OPEN_DISTANCE * 2.5
 local TRAPDOOR_BOSS_REACTION_FRAMES = 30
 local TRAPDOOR_TOUCH_DISTANCE = 16.5
-ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL = __TS__New(Set, {"Happy", "Sad", "Jump"})
-local PIXELATION_TO_BLACK_FRAMES = 52
+ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL = __TS__New(Set, {"Death", "Happy", "Sad", "Jump"})
+local PIXELATION_TO_BLACK_FRAMES = 60
 local OTHER_PLAYER_TRAPDOOR_JUMP_DELAY_GAME_FRAMES = 6
 local OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES = 5
 ____exports.CustomTrapdoors = __TS__Class()
@@ -39346,6 +39349,7 @@ function CustomTrapdoors.prototype.checkAllPlayersJumpComplete(self)
     local roomGridIndex = getRoomGridIndex(nil)
     self.v.run.state = StageTravelState.PIXELATION_TO_BLACK
     self.v.run.stateRenderFrame = renderFrameCount
+    self:logStateChanged()
     teleport(nil, roomGridIndex, Direction.NO_DIRECTION, RoomTransitionAnim.PIXELATION)
 end
 function CustomTrapdoors.prototype.checkPixelationToBlackComplete(self)
@@ -39359,6 +39363,7 @@ function CustomTrapdoors.prototype.checkPixelationToBlackComplete(self)
         return
     end
     self.v.run.state = StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END
+    self:logStateChanged()
     hud:SetVisible(false)
     self.runInNFrames:runNextGameFrame(function()
         local level = game:GetLevel()
@@ -39404,9 +39409,11 @@ function CustomTrapdoors.prototype.checkSecondPixelationHalfWay(self)
         return
     end
     self.v.run.state = StageTravelState.PIXELATION_TO_ROOM
+    self:logStateChanged()
     hud:SetVisible(true)
     self.runNextRoom:runNextRoom(function()
         self.v.run.state = StageTravelState.PLAYERS_LAYING_DOWN
+        self:logStateChanged()
         movePlayersToCenter(nil)
         for ____, player in ipairs(getAllPlayers(nil)) do
             player:AnimateAppear()
@@ -39423,6 +39430,7 @@ function CustomTrapdoors.prototype.checkAllPlayersLayingDownComplete(self)
         return
     end
     self.v.run.state = StageTravelState.NONE
+    self:logStateChanged()
     local tstlClassName = getTSTLClassName(nil, self)
     if tstlClassName == nil then
         error("Failed to find get the class name for the custom trapdoor feature.")
@@ -39488,6 +39496,7 @@ end
 function CustomTrapdoors.prototype.playerTouchedCustomTrapdoor(self, gridEntity, trapdoorDescription, player)
     self.v.run.state = StageTravelState.PLAYERS_JUMPING_DOWN
     self.v.run.customTrapdoorActivated = trapdoorDescription
+    self:logStateChanged()
     local tstlClassName = getTSTLClassName(nil, self)
     if tstlClassName == nil then
         error("Failed to find get the class name for the custom trapdoor feature.")
@@ -39580,6 +39589,14 @@ function CustomTrapdoors.prototype.shouldTrapdoorSpawnOpen(self, gridEntity, fir
     end
     return self:shouldTrapdoorOpen(gridEntity, firstSpawn)
 end
+function CustomTrapdoors.prototype.logStateChanged(self)
+    if DEBUG then
+        log(
+            nil,
+            ((("Custom trapdoors state changed: " .. StageTravelState[self.v.run.state]) .. " (") .. tostring(self.v.run.state)) .. ")"
+        )
+    end
+end
 function CustomTrapdoors.prototype.registerCustomTrapdoorDestination(self, destinationName, destinationFunc)
     if self.destinationFuncMap:has(destinationName) then
         error(("Failed to register a custom trapdoor type of " .. destinationName) .. " since this custom trapdoor type has already been registered.")
@@ -39591,7 +39608,7 @@ function CustomTrapdoors.prototype.spawnCustomTrapdoor(self, gridIndexOrPosition
         anm2Path = "gfx/grid/door_11_trapdoor.anm2"
     end
     if destinationName ~= nil and not self.destinationFuncMap:has(destinationName) then
-        error(("Failed to spawn a custom trapdoor with a destination of \"" .. destinationName) .. "\" since a destination with that name has not been registered with the \"registerCustomTrapdoor\" function.")
+        error(("Failed to spawn a custom trapdoor with a destination of \"" .. destinationName) .. "\" since a destination with that name has not been registered with the \"registerCustomTrapdoorDestination\" function. (If you are trying to go to a custom stage, the custom stage library should automatically do this for you when your mod first boots.)")
     end
     if destinationStage == nil then
         destinationStage = self.stageHistory:getNextStageWithHistory()
@@ -42151,12 +42168,10 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__ObjectAssign = ____lualib.__TS__ObjectAssign
-local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Decorate = ____lualib.__TS__Decorate
 local ____exports = {}
 local getRoomTypeMap
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
-local DoorSlot = ____isaac_2Dtypescript_2Ddefinitions.DoorSlot
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local LevelCurse = ____isaac_2Dtypescript_2Ddefinitions.LevelCurse
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
@@ -42178,7 +42193,8 @@ local UIStreakAnimation = ____UIStreakAnimation.UIStreakAnimation
 local ____array = require("src.functions.array")
 local isArray = ____array.isArray
 local ____doors = require("src.functions.doors")
-local doorSlotFlagsToDoorSlots = ____doors.doorSlotFlagsToDoorSlots
+local doorSlotsToDoorSlotFlags = ____doors.doorSlotsToDoorSlotFlags
+local getDoorSlotsForRoomShape = ____doors.getDoorSlotsForRoomShape
 local ____flag = require("src.functions.flag")
 local hasFlag = ____flag.hasFlag
 local removeFlag = ____flag.removeFlag
@@ -42410,19 +42426,16 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
             local doorSlotFlags = room.Data.Doors
             local roomsMetadata = roomDoorSlotFlagMap:get(doorSlotFlags)
             if roomsMetadata == nil then
-                logError(
-                    nil,
-                    (((((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name
-                )
-                local header = ("For reference, a DoorSlotFlags of " .. tostring(doorSlotFlags)) .. " is equal to the following doors being enabled:\n"
-                local doorSlots = doorSlotFlagsToDoorSlots(nil, doorSlotFlags)
-                local doorSlotLines = __TS__ArrayMap(
-                    doorSlots,
-                    function(____, doorSlot) return ((("- DoorSlot." .. DoorSlot[doorSlot]) .. " (") .. tostring(doorSlot)) .. ")" end
-                )
-                local explanation = header .. table.concat(doorSlotLines, "\n")
-                logError(nil, explanation)
-                goto __continue26
+                local allDoorSlots = getDoorSlotsForRoomShape(nil, roomShape)
+                local allDoorSlotFlags = doorSlotsToDoorSlotFlags(nil, allDoorSlots)
+                roomsMetadata = roomDoorSlotFlagMap:get(allDoorSlotFlags)
+                if roomsMetadata == nil then
+                    logError(
+                        nil,
+                        (((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") + all doors enabled for custom stage: ") .. customStage.name
+                    )
+                    goto __continue26
+                end
             end
             local randomRoom
             if roomType == RoomType.BOSS then

package/dist/src/classes/features/other/CustomStages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomStages.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CustomStages.ts"],"names":[],"mappings":"AAsCA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAoChD,qBAAa,YAAa,SAAQ,OAAO;IA8BvC,oCAAoC;IACpC,OAAO,CAAC,eAAe,CAAkC;IAEzD,+BAA+B;IAC/B,OAAO,CAAC,yBAAyB,CAAwC;IAEzE,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,YAAY,CAAe;IAqDnC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,eAAe,CAMrB;IAGF,OAAO,CAAC,UAAU,CAQhB;IAGF,OAAO,CAAC,aAAa,CAcnB;IAGF,OAAO,CAAC,eAAe,CAUrB;IAIF,OAAO,CAAC,2BAA2B,CAejC;IAGF,OAAO,CAAC,kBAAkB,CAqBxB;IAGF,OAAO,CAAC,oBAAoB,CAe1B;IAEF,gDAAgD;IAChD,OAAO,CAAC,iBAAiB;IA+FzB;;;;;;;;;;;;;;;;OAgBG;IAEI,cAAc,CACnB,IAAI,EAAE,MAAM,EACZ,UAAU,UAAO,EACjB,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,IAAI;IAoEP;;;;;OAKG;IAEI,kBAAkB,IAAI,IAAI;CAGlC"}
+{"version":3,"file":"CustomStages.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CustomStages.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAoChD,qBAAa,YAAa,SAAQ,OAAO;IA8BvC,oCAAoC;IACpC,OAAO,CAAC,eAAe,CAAkC;IAEzD,+BAA+B;IAC/B,OAAO,CAAC,yBAAyB,CAAwC;IAEzE,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,sBAAsB,CAAyB;IACvD,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,YAAY,CAAe;IAqDnC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,eAAe,CAMrB;IAGF,OAAO,CAAC,UAAU,CAQhB;IAGF,OAAO,CAAC,aAAa,CAcnB;IAGF,OAAO,CAAC,eAAe,CAUrB;IAIF,OAAO,CAAC,2BAA2B,CAejC;IAGF,OAAO,CAAC,kBAAkB,CAqBxB;IAGF,OAAO,CAAC,oBAAoB,CAe1B;IAEF,gDAAgD;IAChD,OAAO,CAAC,iBAAiB;IA+FzB;;;;;;;;;;;;;;;;OAgBG;IAEI,cAAc,CACnB,IAAI,EAAE,MAAM,EACZ,UAAU,UAAO,EACjB,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,IAAI;IAoEP;;;;;OAKG;IAEI,kBAAkB,IAAI,IAAI;CAGlC"}

package/dist/src/classes/features/other/CustomStages.lua

@@ -4,12 +4,10 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__ObjectAssign = ____lualib.__TS__ObjectAssign
-local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Decorate = ____lualib.__TS__Decorate
 local ____exports = {}
 local getRoomTypeMap
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
-local DoorSlot = ____isaac_2Dtypescript_2Ddefinitions.DoorSlot
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local LevelCurse = ____isaac_2Dtypescript_2Ddefinitions.LevelCurse
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
@@ -31,7 +29,8 @@ local UIStreakAnimation = ____UIStreakAnimation.UIStreakAnimation
 local ____array = require("src.functions.array")
 local isArray = ____array.isArray
 local ____doors = require("src.functions.doors")
-local doorSlotFlagsToDoorSlots = ____doors.doorSlotFlagsToDoorSlots
+local doorSlotsToDoorSlotFlags = ____doors.doorSlotsToDoorSlotFlags
+local getDoorSlotsForRoomShape = ____doors.getDoorSlotsForRoomShape
 local ____flag = require("src.functions.flag")
 local hasFlag = ____flag.hasFlag
 local removeFlag = ____flag.removeFlag
@@ -263,19 +262,16 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
             local doorSlotFlags = room.Data.Doors
             local roomsMetadata = roomDoorSlotFlagMap:get(doorSlotFlags)
             if roomsMetadata == nil then
-                logError(
-                    nil,
-                    (((((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name
-                )
-                local header = ("For reference, a DoorSlotFlags of " .. tostring(doorSlotFlags)) .. " is equal to the following doors being enabled:\n"
-                local doorSlots = doorSlotFlagsToDoorSlots(nil, doorSlotFlags)
-                local doorSlotLines = __TS__ArrayMap(
-                    doorSlots,
-                    function(____, doorSlot) return ((("- DoorSlot." .. DoorSlot[doorSlot]) .. " (") .. tostring(doorSlot)) .. ")" end
-                )
-                local explanation = header .. table.concat(doorSlotLines, "\n")
-                logError(nil, explanation)
-                goto __continue26
+                local allDoorSlots = getDoorSlotsForRoomShape(nil, roomShape)
+                local allDoorSlotFlags = doorSlotsToDoorSlotFlags(nil, allDoorSlots)
+                roomsMetadata = roomDoorSlotFlagMap:get(allDoorSlotFlags)
+                if roomsMetadata == nil then
+                    logError(
+                        nil,
+                        (((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") + all doors enabled for custom stage: ") .. customStage.name
+                    )
+                    goto __continue26
+                end
             end
             local randomRoom
             if roomType == RoomType.BOSS then

package/dist/src/classes/features/other/CustomTrapdoors.d.ts

@@ -36,6 +36,7 @@ export declare class CustomTrapdoors extends Feature {
     private postPEffectUpdateReordered;
     private checkJumpComplete;
     private shouldTrapdoorSpawnOpen;
+    private logStateChanged;
     /**
      * Helper function to specify where your custom trapdoor should take the player. Call this once at
      * the beginning of your mod for each kind of custom trapdoor that you want to have. The provided

package/dist/src/classes/features/other/CustomTrapdoors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomTrapdoors.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CustomTrapdoors.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,UAAU,EAKV,SAAS,EACV,MAAM,8BAA8B,CAAC;AA4BtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AA4BhD,qBAAa,eAAgB,SAAQ,OAAO;IAC1C,qCAAqC;IACrC,OAAO,CAAC,kBAAkB,CAGtB;IAqBJ;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAY;IAE/B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,YAAY,CAAe;IAmDnC,OAAO,CAAC,UAAU,CAMhB;IAEF,OAAO,CAAC,2BAA2B;IA8BnC,OAAO,CAAC,8BAA8B;IAkDtC,OAAO,CAAC,6BAA6B;IAqBrC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,4BAA4B;IAuCpC,OAAO,CAAC,iCAAiC;IAqBzC,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,kCAAkC,CAaxC;IAEF,OAAO,CAAC,4BAA4B;IAcpC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,sBAAsB;IAmB9B,OAAO,CAAC,gCAAgC;IAuCxC,OAAO,CAAC,2BAA2B;IAoCnC,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,8BAA8B;IAmDtC,OAAO,CAAC,0BAA0B,CAEhC;IAEF,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IA4B/B;;;;;;;;;;;;;;;;;;OAkBG;IAEI,iCAAiC,CACtC,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,CACf,gBAAgB,EAAE,UAAU,EAC5B,oBAAoB,EAAE,SAAS,KAC5B,IAAI,GACR,IAAI;IAUP;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IAEI,mBAAmB,CACxB,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,eAAe,CAAC,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,UAAU,EAC7B,oBAAoB,CAAC,EAAE,SAAS,EAChC,QAAQ,SAAmC,EAC3C,SAAS,CAAC,EAAE,OAAO,GAClB,UAAU;CA0Dd"}
+{"version":3,"file":"CustomTrapdoors.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CustomTrapdoors.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,UAAU,EAKV,SAAS,EACV,MAAM,8BAA8B,CAAC;AA6BtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AA+BhD,qBAAa,eAAgB,SAAQ,OAAO;IAC1C,qCAAqC;IACrC,OAAO,CAAC,kBAAkB,CAGtB;IAqBJ;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAY;IAE/B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,YAAY,CAAe;IAmDnC,OAAO,CAAC,UAAU,CAMhB;IAEF,OAAO,CAAC,2BAA2B;IA+BnC,OAAO,CAAC,8BAA8B;IAmDtC,OAAO,CAAC,6BAA6B;IAqBrC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,4BAA4B;IAyCpC,OAAO,CAAC,iCAAiC;IAsBzC,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,kCAAkC,CAaxC;IAEF,OAAO,CAAC,4BAA4B;IAcpC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,sBAAsB;IAmB9B,OAAO,CAAC,gCAAgC;IAuCxC,OAAO,CAAC,2BAA2B;IAqCnC,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,8BAA8B;IAmDtC,OAAO,CAAC,0BAA0B,CAEhC;IAEF,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IA4B/B,OAAO,CAAC,eAAe;IAUvB;;;;;;;;;;;;;;;;;;OAkBG;IAEI,iCAAiC,CACtC,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,CACf,gBAAgB,EAAE,UAAU,EAC5B,oBAAoB,EAAE,SAAS,KAC5B,IAAI,GACR,IAAI;IAUP;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IAEI,mBAAmB,CACxB,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,eAAe,CAAC,EAAE,MAAM,EACxB,gBAAgB,CAAC,EAAE,UAAU,EAC7B,oBAAoB,CAAC,EAAE,SAAS,EAChC,QAAQ,SAAmC,EAC3C,SAAS,CAAC,EAAE,OAAO,GAClB,UAAU;CA0Dd"}

package/dist/src/classes/features/other/CustomTrapdoors.lua

@@ -40,6 +40,8 @@ local ____TrapdoorAnimation = require("src.enums.private.TrapdoorAnimation")
 local TrapdoorAnimation = ____TrapdoorAnimation.TrapdoorAnimation
 local ____easing = require("src.functions.easing")
 local easeOutSine = ____easing.easeOutSine
+local ____log = require("src.functions.log")
+local log = ____log.log
 local ____playerCenter = require("src.functions.playerCenter")
 local movePlayersToCenter = ____playerCenter.movePlayersToCenter
 local ____playerIndex = require("src.functions.playerIndex")
@@ -106,13 +108,14 @@ end
 function goToVanillaStage(self, destinationStage, destinationStageType)
     setStage(nil, destinationStage, destinationStageType)
 end
+local DEBUG = false
 --- This also applies to crawl spaces. The value was determined through trial and error.
 local TRAPDOOR_OPEN_DISTANCE = 60
 local TRAPDOOR_OPEN_DISTANCE_AFTER_BOSS = TRAPDOOR_OPEN_DISTANCE * 2.5
 local TRAPDOOR_BOSS_REACTION_FRAMES = 30
 local TRAPDOOR_TOUCH_DISTANCE = 16.5
-ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL = __TS__New(Set, {"Happy", "Sad", "Jump"})
-local PIXELATION_TO_BLACK_FRAMES = 52
+ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL = __TS__New(Set, {"Death", "Happy", "Sad", "Jump"})
+local PIXELATION_TO_BLACK_FRAMES = 60
 local OTHER_PLAYER_TRAPDOOR_JUMP_DELAY_GAME_FRAMES = 6
 local OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES = 5
 ____exports.CustomTrapdoors = __TS__Class()
@@ -181,6 +184,7 @@ function CustomTrapdoors.prototype.checkAllPlayersJumpComplete(self)
     local roomGridIndex = getRoomGridIndex(nil)
     self.v.run.state = StageTravelState.PIXELATION_TO_BLACK
     self.v.run.stateRenderFrame = renderFrameCount
+    self:logStateChanged()
     teleport(nil, roomGridIndex, Direction.NO_DIRECTION, RoomTransitionAnim.PIXELATION)
 end
 function CustomTrapdoors.prototype.checkPixelationToBlackComplete(self)
@@ -194,6 +198,7 @@ function CustomTrapdoors.prototype.checkPixelationToBlackComplete(self)
         return
     end
     self.v.run.state = StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END
+    self:logStateChanged()
     hud:SetVisible(false)
     self.runInNFrames:runNextGameFrame(function()
         local level = game:GetLevel()
@@ -239,9 +244,11 @@ function CustomTrapdoors.prototype.checkSecondPixelationHalfWay(self)
         return
     end
     self.v.run.state = StageTravelState.PIXELATION_TO_ROOM
+    self:logStateChanged()
     hud:SetVisible(true)
     self.runNextRoom:runNextRoom(function()
         self.v.run.state = StageTravelState.PLAYERS_LAYING_DOWN
+        self:logStateChanged()
         movePlayersToCenter(nil)
         for ____, player in ipairs(getAllPlayers(nil)) do
             player:AnimateAppear()
@@ -258,6 +265,7 @@ function CustomTrapdoors.prototype.checkAllPlayersLayingDownComplete(self)
         return
     end
     self.v.run.state = StageTravelState.NONE
+    self:logStateChanged()
     local tstlClassName = getTSTLClassName(nil, self)
     if tstlClassName == nil then
         error("Failed to find get the class name for the custom trapdoor feature.")
@@ -323,6 +331,7 @@ end
 function CustomTrapdoors.prototype.playerTouchedCustomTrapdoor(self, gridEntity, trapdoorDescription, player)
     self.v.run.state = StageTravelState.PLAYERS_JUMPING_DOWN
     self.v.run.customTrapdoorActivated = trapdoorDescription
+    self:logStateChanged()
     local tstlClassName = getTSTLClassName(nil, self)
     if tstlClassName == nil then
         error("Failed to find get the class name for the custom trapdoor feature.")
@@ -415,6 +424,14 @@ function CustomTrapdoors.prototype.shouldTrapdoorSpawnOpen(self, gridEntity, fir
     end
     return self:shouldTrapdoorOpen(gridEntity, firstSpawn)
 end
+function CustomTrapdoors.prototype.logStateChanged(self)
+    if DEBUG then
+        log(
+            nil,
+            ((("Custom trapdoors state changed: " .. StageTravelState[self.v.run.state]) .. " (") .. tostring(self.v.run.state)) .. ")"
+        )
+    end
+end
 function CustomTrapdoors.prototype.registerCustomTrapdoorDestination(self, destinationName, destinationFunc)
     if self.destinationFuncMap:has(destinationName) then
         error(("Failed to register a custom trapdoor type of " .. destinationName) .. " since this custom trapdoor type has already been registered.")
@@ -426,7 +443,7 @@ function CustomTrapdoors.prototype.spawnCustomTrapdoor(self, gridIndexOrPosition
         anm2Path = "gfx/grid/door_11_trapdoor.anm2"
     end
     if destinationName ~= nil and not self.destinationFuncMap:has(destinationName) then
-        error(("Failed to spawn a custom trapdoor with a destination of \"" .. destinationName) .. "\" since a destination with that name has not been registered with the \"registerCustomTrapdoor\" function.")
+        error(("Failed to spawn a custom trapdoor with a destination of \"" .. destinationName) .. "\" since a destination with that name has not been registered with the \"registerCustomTrapdoorDestination\" function. (If you are trying to go to a custom stage, the custom stage library should automatically do this for you when your mod first boots.)")
     end
     if destinationStage == nil then
         destinationStage = self.stageHistory:getNextStageWithHistory()

package/dist/src/classes/features/other/RunNextRoom.d.ts

@@ -1,9 +1,4 @@
 import { Feature } from "../../private/Feature";
-/**
- * Using the "luamod" console command with a mod that has custom shaders can crash the game. A
- * simple fix for this is automatically applied to any upgraded mods. This method was originally
- * discovered by AgentCucco.
- */
 export declare class RunNextRoom extends Feature {
     vConditionalFunc: () => boolean;
     private postNewRoomReordered;

package/dist/src/classes/features/other/RunNextRoom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RunNextRoom.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/RunNextRoom.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,OAAO;IAStB,gBAAgB,QAAO,OAAO,CAAU;IAYxD,OAAO,CAAC,oBAAoB,CAM1B;IAEF;;;;;;;;OAQG;IAEI,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,IAAI;CAG3C"}
+{"version":3,"file":"RunNextRoom.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/RunNextRoom.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,qBAAa,WAAY,SAAQ,OAAO;IAStB,gBAAgB,QAAO,OAAO,CAAU;IAYxD,OAAO,CAAC,oBAAoB,CAM1B;IAEF;;;;;;;;OAQG;IAEI,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,IAAI;CAG3C"}

package/dist/src/classes/features/other/RunNextRoom.lua

@@ -11,9 +11,6 @@ local ____array = require("src.functions.array")
 local emptyArray = ____array.emptyArray
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
---- Using the "luamod" console command with a mod that has custom shaders can crash the game. A
--- simple fix for this is automatically applied to any upgraded mods. This method was originally
--- discovered by AgentCucco.
 ____exports.RunNextRoom = __TS__Class()
 local RunNextRoom = ____exports.RunNextRoom
 RunNextRoom.name = "RunNextRoom"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "20.11.2",
+  "version": "20.11.4",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/features/other/CustomStages.ts

@@ -1,6 +1,5 @@
 import {
   ControllerIndex,
-  DoorSlot,
   DoorSlotFlag,
   GridEntityType,
   LevelCurse,
@@ -17,7 +16,10 @@ import { ISCFeature } from "../../../enums/ISCFeature";
 import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { UIStreakAnimation } from "../../../enums/private/UIStreakAnimation";
 import { isArray } from "../../../functions/array";
-import { doorSlotFlagsToDoorSlots } from "../../../functions/doors";
+import {
+  doorSlotsToDoorSlotFlags,
+  getDoorSlotsForRoomShape,
+} from "../../../functions/doors";
 import { hasFlag, removeFlag } from "../../../functions/flag";
 import { logError } from "../../../functions/logMisc";
 import { newRNG } from "../../../functions/rng";
@@ -348,20 +350,20 @@ export class CustomStages extends Feature {
       }
 
       const doorSlotFlags = room.Data.Doors;
-      const roomsMetadata = roomDoorSlotFlagMap.get(doorSlotFlags);
+      let roomsMetadata = roomDoorSlotFlagMap.get(doorSlotFlags);
       if (roomsMetadata === undefined) {
-        logError(
-          `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) + RoomShape.${RoomShape[roomShape]} (${roomShape}) + DoorSlotFlags ${doorSlotFlags} for custom stage: ${customStage.name}`,
-        );
-
-        const header = `For reference, a DoorSlotFlags of ${doorSlotFlags} is equal to the following doors being enabled:\n`;
-        const doorSlots = doorSlotFlagsToDoorSlots(doorSlotFlags);
-        const doorSlotLines = doorSlots.map(
-          (doorSlot) => `- DoorSlot.${DoorSlot[doorSlot]} (${doorSlot})`,
-        );
-        const explanation = header + doorSlotLines.join("\n");
-        logError(explanation);
-        continue;
+        // The custom stage does not have any rooms for the specific room type + room shape + door
+        // slot combination. As a fallback, check to see if the custom stage has one or more rooms
+        // for this specific room type + room shape + all doors.
+        const allDoorSlots = getDoorSlotsForRoomShape(roomShape);
+        const allDoorSlotFlags = doorSlotsToDoorSlotFlags(allDoorSlots);
+        roomsMetadata = roomDoorSlotFlagMap.get(allDoorSlotFlags);
+        if (roomsMetadata === undefined) {
+          logError(
+            `Failed to find any custom rooms for RoomType.${RoomType[roomType]} (${roomType}) + RoomShape.${RoomShape[roomShape]} (${roomShape}) + all doors enabled for custom stage: ${customStage.name}`,
+          );
+          continue;
+        }
       }
 
       let randomRoom: CustomStageRoomMetadata;

package/src/classes/features/other/CustomTrapdoors.ts

@@ -21,6 +21,7 @@ import { GridEntityTypeCustom } from "../../../enums/private/GridEntityTypeCusto
 import { StageTravelState } from "../../../enums/private/StageTravelState";
 import { TrapdoorAnimation } from "../../../enums/private/TrapdoorAnimation";
 import { easeOutSine } from "../../../functions/easing";
+import { log } from "../../../functions/log";
 import { movePlayersToCenter } from "../../../functions/playerCenter";
 import {
   getAllPlayers,
@@ -48,6 +49,8 @@ import { RunInNFrames } from "./RunInNFrames";
 import { RunNextRoom } from "./RunNextRoom";
 import { StageHistory } from "./StageHistory";
 
+const DEBUG = false as boolean;
+
 /** This also applies to crawl spaces. The value was determined through trial and error. */
 const TRAPDOOR_OPEN_DISTANCE = 60;
 
@@ -57,12 +60,13 @@ const TRAPDOOR_BOSS_REACTION_FRAMES = 30;
 const TRAPDOOR_TOUCH_DISTANCE = 16.5;
 
 const ANIMATIONS_THAT_PREVENT_STAGE_TRAVEL: ReadonlySet<string> = new Set([
+  "Death",
   "Happy",
   "Sad",
   "Jump",
 ]);
 
-const PIXELATION_TO_BLACK_FRAMES = 52;
+const PIXELATION_TO_BLACK_FRAMES = 60;
 
 const OTHER_PLAYER_TRAPDOOR_JUMP_DELAY_GAME_FRAMES = 6;
 const OTHER_PLAYER_TRAPDOOR_JUMP_DURATION_GAME_FRAMES = 5;
@@ -180,6 +184,7 @@ export class CustomTrapdoors extends Feature {
 
     this.v.run.state = StageTravelState.PIXELATION_TO_BLACK;
     this.v.run.stateRenderFrame = renderFrameCount;
+    this.logStateChanged();
 
     // In order to display the pixelation effect that should happen when we go to a new floor, we
     // need to start a room transition. We arbitrarily pick the current room for this purpose. (We
@@ -214,6 +219,7 @@ export class CustomTrapdoors extends Feature {
     }
 
     this.v.run.state = StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END;
+    this.logStateChanged();
 
     // Now, we display a black sprite on top of the pixelation effect, to prevent showing the rest
     // of the animation.
@@ -303,11 +309,13 @@ export class CustomTrapdoors extends Feature {
     }
 
     this.v.run.state = StageTravelState.PIXELATION_TO_ROOM;
+    this.logStateChanged();
 
     hud.SetVisible(true);
 
     this.runNextRoom.runNextRoom(() => {
       this.v.run.state = StageTravelState.PLAYERS_LAYING_DOWN;
+      this.logStateChanged();
 
       // After the room transition, the players will be placed next to a door, but they should be in
       // the center of the room to emulate what happens on a vanilla stage.
@@ -333,6 +341,7 @@ export class CustomTrapdoors extends Feature {
     }
 
     this.v.run.state = StageTravelState.NONE;
+    this.logStateChanged();
 
     const tstlClassName = getTSTLClassName(this);
     if (tstlClassName === undefined) {
@@ -473,6 +482,7 @@ export class CustomTrapdoors extends Feature {
   ) {
     this.v.run.state = StageTravelState.PLAYERS_JUMPING_DOWN;
     this.v.run.customTrapdoorActivated = trapdoorDescription;
+    this.logStateChanged();
 
     const tstlClassName = getTSTLClassName(this);
     if (tstlClassName === undefined) {
@@ -620,6 +630,16 @@ export class CustomTrapdoors extends Feature {
     return this.shouldTrapdoorOpen(gridEntity, firstSpawn);
   }
 
+  private logStateChanged(): void {
+    if (DEBUG) {
+      log(
+        `Custom trapdoors state changed: ${
+          StageTravelState[this.v.run.state]
+        } (${this.v.run.state})`,
+      );
+    }
+  }
+
   /**
    * Helper function to specify where your custom trapdoor should take the player. Call this once at
    * the beginning of your mod for each kind of custom trapdoor that you want to have. The provided
@@ -708,7 +728,7 @@ export class CustomTrapdoors extends Feature {
       !this.destinationFuncMap.has(destinationName)
     ) {
       error(
-        `Failed to spawn a custom trapdoor with a destination of "${destinationName}" since a destination with that name has not been registered with the "registerCustomTrapdoor" function.`,
+        `Failed to spawn a custom trapdoor with a destination of "${destinationName}" since a destination with that name has not been registered with the "registerCustomTrapdoorDestination" function. (If you are trying to go to a custom stage, the custom stage library should automatically do this for you when your mod first boots.)`,
       );
     }