isaacscript-common 7.4.2 → 7.5.1

package/dist/features/customStage/customStageGridEntities.lua

@@ -7,8 +7,6 @@ local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
-local ____DecorationVariant = require("enums.DecorationVariant")
-local DecorationVariant = ____DecorationVariant.DecorationVariant
 local ____entities = require("functions.entities")
 local removeEntities = ____entities.removeEntities
 local ____entitiesSpecific = require("functions.entitiesSpecific")
@@ -21,10 +19,10 @@ local getCollectibles = ____pickupsSpecific.getCollectibles
 local getTrinkets = ____pickupsSpecific.getTrinkets
 local ____stage = require("functions.stage")
 local calculateStageType = ____stage.calculateStageType
-local ____types = require("functions.types")
-local asNumber = ____types.asNumber
 local ____vector = require("functions.vector")
 local vectorEquals = ____vector.vectorEquals
+local ____customGridEntity = require("features.customGridEntity")
+local isCustomGridEntity = ____customGridEntity.isCustomGridEntity
 local ____exports = require("features.customTrapdoor.exports")
 local spawnCustomTrapdoor = ____exports.spawnCustomTrapdoor
 local ____exports = require("features.customStage.exports")
@@ -33,9 +31,9 @@ local ____v = require("features.customStage.v")
 local v = ____v.default
 function getNewDoorPNGPath(self, customStage, fileName)
     repeat
-        local ____switch21 = fileName
-        local ____cond21 = ____switch21 == "gfx/grid/door_01_normaldoor.anm2"
-        if ____cond21 then
+        local ____switch24 = fileName
+        local ____cond24 = ____switch24 == "gfx/grid/door_01_normaldoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_normal_0 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_normal_0 ~= nil then
@@ -44,8 +42,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_normal_0
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_02_treasureroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_02_treasureroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_treasureRoom_2 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_treasureRoom_2 ~= nil then
@@ -54,8 +52,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_treasureRoom_2
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_03_ambushroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_03_ambushroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_normalChallengeRoom_4 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_normalChallengeRoom_4 ~= nil then
@@ -64,8 +62,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_normalChallengeRoom_4
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_04_selfsacrificeroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_04_selfsacrificeroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_curseRoom_6 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_curseRoom_6 ~= nil then
@@ -74,8 +72,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_curseRoom_6
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_05_arcaderoomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_05_arcaderoomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_arcade_8 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_arcade_8 ~= nil then
@@ -84,8 +82,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_arcade_8
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_07_devilroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_07_devilroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_devilRoom_10 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_devilRoom_10 ~= nil then
@@ -94,8 +92,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_devilRoom_10
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_07_holyroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_07_holyroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_angelRoom_12 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_angelRoom_12 ~= nil then
@@ -104,8 +102,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_angelRoom_12
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_08_holeinwall.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_08_holeinwall.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_secretRoom_14 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_secretRoom_14 ~= nil then
@@ -114,8 +112,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_secretRoom_14
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_09_bossambushroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_09_bossambushroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_bossChallengeRoom_16 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_bossChallengeRoom_16 ~= nil then
@@ -124,8 +122,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_bossChallengeRoom_16
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_10_bossroomdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_10_bossroomdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_bossRoom_18 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_bossRoom_18 ~= nil then
@@ -134,8 +132,8 @@ function getNewDoorPNGPath(self, customStage, fileName)
                 return ____customStage_doorPNGPaths_bossRoom_18
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == "gfx/grid/door_15_bossrushdoor.anm2"
-        if ____cond21 then
+        ____cond24 = ____cond24 or ____switch24 == "gfx/grid/door_15_bossrushdoor.anm2"
+        if ____cond24 then
             do
                 local ____customStage_doorPNGPaths_bossRush_20 = customStage.doorPNGPaths
                 if ____customStage_doorPNGPaths_bossRush_20 ~= nil then
@@ -159,12 +157,11 @@ function ____exports.setCustomDecorationGraphics(self, customStage, gridEntity)
     if customStage.decorationsPNGPath == nil then
         return
     end
-    local gridEntityType = gridEntity:GetType()
-    if gridEntityType ~= GridEntityType.DECORATION then
+    if isCustomGridEntity(nil, gridEntity) then
         return
     end
-    local variant = gridEntity:GetVariant()
-    if variant ~= asNumber(nil, DecorationVariant.VANILLA_DECORATION) then
+    local gridEntityType = gridEntity:GetType()
+    if gridEntityType ~= GridEntityType.DECORATION then
         return
     end
     local sprite = gridEntity:GetSprite()
@@ -179,6 +176,9 @@ function ____exports.setCustomRockGraphics(self, customStage, gridEntity)
     if customStage.rocksPNGPath == nil then
         return
     end
+    if isCustomGridEntity(nil, gridEntity) then
+        return
+    end
     local gridEntityRock = gridEntity:ToRock()
     if gridEntityRock == nil then
         return
@@ -198,6 +198,9 @@ function ____exports.setCustomPitGraphics(self, customStage, gridEntity)
     if customStage.pitsPNGPath == nil then
         return
     end
+    if isCustomGridEntity(nil, gridEntity) then
+        return
+    end
     local gridEntityPit = gridEntity:ToPit()
     if gridEntityPit == nil then
         return
@@ -214,6 +217,9 @@ function ____exports.setCustomDoorGraphics(self, customStage, gridEntity)
     if customStage.doorPNGPaths == nil then
         return
     end
+    if isCustomGridEntity(nil, gridEntity) then
+        return
+    end
     local gridEntityDoor = gridEntity:ToDoor()
     if gridEntityDoor == nil then
         return

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

@@ -1,6 +1,6 @@
 /// <reference types="isaac-typescript-definitions" />
 /// <reference types="isaac-typescript-definitions" />
-import { CustomStageRoomMetadata } from "../../interfaces/CustomStageLua";
+import { CustomStageBossPoolEntry, CustomStageRoomMetadata } from "../../interfaces/CustomStageTSConfig";
 /**
  * Helper function to get a random custom stage room from an array of custom stage rooms.
  *
@@ -9,4 +9,5 @@ import { CustomStageRoomMetadata } from "../../interfaces/CustomStageLua";
  * https://stackoverflow.com/questions/1761626/weighted-random-numbers
  */
 export declare function getRandomCustomStageRoom(roomsMetadata: readonly CustomStageRoomMetadata[], seedOrRNG?: Seed | RNG, verbose?: boolean): CustomStageRoomMetadata;
+export declare function getRandomBossRoomFromPool(roomsMetadata: readonly CustomStageRoomMetadata[], bossPool: readonly CustomStageBossPoolEntry[], seedOrRNG?: Seed | RNG, verbose?: boolean): CustomStageRoomMetadata;
 //# sourceMappingURL=customStageUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"customStageUtils.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/customStageUtils.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,SAAS,uBAAuB,EAAE,EACjD,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,uBAAuB,CAYzB"}
+{"version":3,"file":"customStageUtils.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/customStageUtils.ts"],"names":[],"mappings":";;AAIA,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sCAAsC,CAAC;AAE9C;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,SAAS,uBAAuB,EAAE,EACjD,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,uBAAuB,CAYzB;AA0BD,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,SAAS,uBAAuB,EAAE,EACjD,QAAQ,EAAE,SAAS,wBAAwB,EAAE,EAC7C,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,uBAAuB,CAiBzB"}

package/dist/features/customStage/customStageUtils.lua

@@ -1,7 +1,8 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local getTotalWeightOfCustomStageRooms, getCustomStageRoomWithChosenWeight
+local getTotalWeightOfCustomStageRooms, getCustomStageRoomWithChosenWeight, getTotalWeightOfBossPool, getBossEntryWithChosenWeight
 local ____array = require("functions.array")
 local sumArray = ____array.sumArray
 local ____log = require("functions.log")
@@ -26,6 +27,22 @@ function getCustomStageRoomWithChosenWeight(self, roomsMetadata, chosenWeight)
     end
     error("Failed to get a custom stage room with chosen weight: " .. tostring(chosenWeight))
 end
+function getTotalWeightOfBossPool(self, bossPool)
+    local weights = __TS__ArrayMap(
+        bossPool,
+        function(____, bossEntry) return bossEntry.weight end
+    )
+    return sumArray(nil, weights)
+end
+function getBossEntryWithChosenWeight(self, bossPool, chosenWeight)
+    for ____, bossEntry in ipairs(bossPool) do
+        if chosenWeight < bossEntry.weight then
+            return bossEntry
+        end
+        chosenWeight = chosenWeight - bossEntry.weight
+    end
+    error("Failed to get a custom stage boss entry with chosen weight: " .. tostring(chosenWeight))
+end
 --- Helper function to get a random custom stage room from an array of custom stage rooms.
 -- 
 -- Note that this function does not simply choose a random element in the provided array; it will
@@ -48,4 +65,26 @@ function ____exports.getRandomCustomStageRoom(self, roomsMetadata, seedOrRNG, ve
     end
     return getCustomStageRoomWithChosenWeight(nil, roomsMetadata, chosenWeight)
 end
+function ____exports.getRandomBossRoomFromPool(self, roomsMetadata, bossPool, seedOrRNG, verbose)
+    if seedOrRNG == nil then
+        seedOrRNG = getRandomSeed(nil)
+    end
+    if verbose == nil then
+        verbose = false
+    end
+    local totalWeight = getTotalWeightOfBossPool(nil, bossPool)
+    if verbose then
+        log("Total weight of the custom stage boss pool provided: " .. tostring(totalWeight))
+    end
+    local chosenWeight = getRandomFloat(nil, 0, totalWeight, seedOrRNG)
+    if verbose then
+        log("Randomly chose weight for custom stage boss pool: " .. tostring(chosenWeight))
+    end
+    local bossEntry = getBossEntryWithChosenWeight(nil, bossPool, chosenWeight)
+    local roomsMetadataForBoss = __TS__ArrayFilter(
+        roomsMetadata,
+        function(____, roomMetadata) return roomMetadata.subType == bossEntry.subType end
+    )
+    return ____exports.getRandomCustomStageRoom(nil, roomsMetadataForBoss, seedOrRNG, verbose)
+end
 return ____exports

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

@@ -5,7 +5,7 @@
  *
  * @module
  */
-import { EntityType, LevelStage, StageType } from "isaac-typescript-definitions";
+import { 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;
@@ -23,30 +23,6 @@ export declare const INVALID_STAGE_VALUE: LevelStage;
  *                Default is false.
  */
 export declare function setCustomStage(name: string, firstFloor?: boolean, verbose?: boolean): void;
-/**
- * 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
- * files for them.
- *
- * For reference:
- * - The vanilla name sprite for Monstro is located at:
- *   `resources/gfx/ui/boss/bossname_20.0_monstro.png`
- * - The vanilla portrait sprite for Monstro is located at:
- *   `resources/gfx/ui/boss/portrait_20.0_monstro.png`
- *
- * (Note that boss metadata like this cannot be specified with the rest of the custom stage metadata
- * in the "tsconfig.json" file because there is not a way to retrieve the name of an entity at
- * run-time.)
- *
- * @param entityType The entity type of the custom boss.
- * @param variant The variant of the custom boss.
- * @param subType The sub-type of the custom boss.
- * @param namePNGPath The full path to the PNG file that contains the name of the boss that will be
- *                    displayed on the top of the boss "versus" screen.
- * @param portraitPNGPath The full path to the PNG file that contains the portrait of the boss that
- *                        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.

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":"AACA;;;;;;GAMG;AAEH,OAAO,EACL,UAAU,EACV,UAAU,EAGV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAoBtC,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;;;;;;;;;;;;;;;;;;;;;;GAsBG;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"}
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../src/features/customStage/exports.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAEH,OAAO,EAEL,UAAU,EAGV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAoBtC,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;AAkGD;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}

package/dist/features/customStage/exports.lua

@@ -1,8 +1,10 @@
 local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
+local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local ____exports = {}
 local setStageRoomsData
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local DoorSlot = ____isaac_2Dtypescript_2Ddefinitions.DoorSlot
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
@@ -11,8 +13,8 @@ local ____reorderedCallbacks = require("callbacks.reorderedCallbacks")
 local reorderedCallbacksSetStageInternal = ____reorderedCallbacks.reorderedCallbacksSetStageInternal
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
-local ____entities = require("functions.entities")
-local getEntityIDFromConstituents = ____entities.getEntityIDFromConstituents
+local ____doors = require("functions.doors")
+local doorSlotFlagsToDoorSlots = ____doors.doorSlotFlagsToDoorSlots
 local ____log = require("functions.log")
 local logError = ____log.logError
 local ____rng = require("functions.rng")
@@ -25,10 +27,10 @@ local setStage = ____stage.setStage
 local ____types = require("functions.types")
 local asNumber = ____types.asNumber
 local ____customStageUtils = require("features.customStage.customStageUtils")
+local getRandomBossRoomFromPool = ____customStageUtils.getRandomBossRoomFromPool
 local getRandomCustomStageRoom = ____customStageUtils.getRandomCustomStageRoom
 local ____v = require("features.customStage.v")
 local v = ____v.default
-local customBossPNGPaths = ____v.customBossPNGPaths
 local customStageCachedRoomData = ____v.customStageCachedRoomData
 local customStagesMap = ____v.customStagesMap
 function setStageRoomsData(self, customStage, rng, verbose)
@@ -60,9 +62,31 @@ function setStageRoomsData(self, customStage, rng, verbose)
             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)
+                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." .. tostring(DoorSlot[doorSlot])) .. " (") .. tostring(doorSlot)) .. ")" end
+                )
+                local explanation = header .. table.concat(doorSlotLines, "\n")
+                logError(explanation)
                 goto __continue7
             end
-            local randomRoom = getRandomCustomStageRoom(nil, roomsMetadata, rng, verbose)
+            local randomRoom
+            if roomType == RoomType.BOSS then
+                if customStage.bossPool == nil then
+                    goto __continue7
+                end
+                randomRoom = getRandomBossRoomFromPool(
+                    nil,
+                    roomsMetadata,
+                    customStage.bossPool,
+                    rng,
+                    verbose
+                )
+            else
+                randomRoom = getRandomCustomStageRoom(nil, roomsMetadata, rng, verbose)
+            end
             local newRoomData = customStageCachedRoomData:get(randomRoom.variant)
             if newRoomData == nil then
                 newRoomData = getRoomDataForTypeVariant(nil, roomType, randomRoom.variant, false)
@@ -125,31 +149,6 @@ function ____exports.setCustomStage(self, name, firstFloor, verbose)
     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
--- files for them.
--- 
--- For reference:
--- - The vanilla name sprite for Monstro is located at:
---   `resources/gfx/ui/boss/bossname_20.0_monstro.png`
--- - The vanilla portrait sprite for Monstro is located at:
---   `resources/gfx/ui/boss/portrait_20.0_monstro.png`
--- 
--- (Note that boss metadata like this cannot be specified with the rest of the custom stage metadata
--- in the "tsconfig.json" file because there is not a way to retrieve the name of an entity at
--- run-time.)
--- 
--- @param entityType The entity type of the custom boss.
--- @param variant The variant of the custom boss.
--- @param subType The sub-type of the custom boss.
--- @param namePNGPath The full path to the PNG file that contains the name of the boss that will be
--- displayed on the top of the boss "versus" screen.
--- @param portraitPNGPath The full path to the PNG file that contains the portrait of the boss that
--- will be displayed on the right side of the boss "versus" screen.
-function ____exports.registerCustomBoss(self, entityType, variant, subType, namePNGPath, portraitPNGPath)
-    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)

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

@@ -30,6 +30,4 @@ export default v;
 export declare const customStagesMap: Map<string, CustomStage>;
 /** Indexed by room variant. */
 export declare const customStageCachedRoomData: Map<number, Readonly<RoomConfig>>;
-/** Indexed by entity ID. */
-export declare const customBossPNGPaths: Map<string, [namePNGPath: string, portraitPNGPath: string]>;
 //# sourceMappingURL=v.d.ts.map

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

package/dist/features/customStage/v.lua

@@ -21,6 +21,4 @@ ____exports.default = v
 ____exports.customStagesMap = __TS__New(Map)
 --- Indexed by room variant.
 ____exports.customStageCachedRoomData = __TS__New(Map)
---- Indexed by entity ID.
-____exports.customBossPNGPaths = __TS__New(Map)
 return ____exports

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":"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"}
+{"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,CA2ExE;AAkGD,wBAAgB,sBAAsB,IAAI,IAAI,CAkC7C"}

package/dist/features/customStage/versusScreen.lua

@@ -1,8 +1,8 @@
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__ArraySome = ____lualib.__TS__ArraySome
+local __TS__ArrayFind = ____lualib.__TS__ArrayFind
 local ____exports = {}
-local willVanillaVersusScreenPlay, getPlayerPNGPaths, getBossPNGPaths, DEFAULT_CHARACTER, PNG_PATH_PREFIX, PLAYER_PORTRAIT_PNG_PATH_PREFIX
+local willVanillaVersusScreenPlay, getPlayerPNGPaths, getBossPNGPaths, getBossPNGPathsCustom, 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
@@ -17,8 +17,8 @@ local ____array = require("functions.array")
 local arrayRemove = ____array.arrayRemove
 local ____bosses = require("functions.bosses")
 local getBosses = ____bosses.getBosses
-local ____entities = require("functions.entities")
-local getEntityID = ____entities.getEntityID
+local ____roomData = require("functions.roomData")
+local getRoomSubType = ____roomData.getRoomSubType
 local ____utils = require("functions.utils")
 local erange = ____utils.erange
 local ____bossNamePNGFileNames = require("objects.bossNamePNGFileNames")
@@ -46,7 +46,6 @@ 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(
@@ -57,40 +56,51 @@ end
 function getPlayerPNGPaths(self)
     local player = Isaac.GetPlayer()
     local character = player:GetPlayerType()
-    local playerNamePNGFileName = PLAYER_NAME_PNG_FILE_NAMES[character]
-    if playerNamePNGFileName == nil then
-        playerNamePNGFileName = PLAYER_NAME_PNG_FILE_NAMES[DEFAULT_CHARACTER]
+    local namePNGFileName = PLAYER_NAME_PNG_FILE_NAMES[character]
+    if namePNGFileName == nil then
+        namePNGFileName = PLAYER_NAME_PNG_FILE_NAMES[DEFAULT_CHARACTER]
     end
-    local playerNamePNGPath = (PNG_PATH_PREFIX .. "/") .. tostring(playerNamePNGFileName)
-    local playerPortraitFileName = PLAYER_PORTRAIT_PNG_FILE_NAMES[character]
-    if playerNamePNGFileName == nil then
-        playerPortraitFileName = PLAYER_PORTRAIT_PNG_FILE_NAMES[DEFAULT_CHARACTER]
+    local namePNGPath = (PNG_PATH_PREFIX .. "/") .. tostring(namePNGFileName)
+    local portraitFileName = PLAYER_PORTRAIT_PNG_FILE_NAMES[character]
+    if namePNGFileName == nil then
+        portraitFileName = PLAYER_PORTRAIT_PNG_FILE_NAMES[DEFAULT_CHARACTER]
     end
-    local playerPortraitPNGPath = (PLAYER_PORTRAIT_PNG_PATH_PREFIX .. "/") .. tostring(playerPortraitFileName)
-    return {playerNamePNGPath, playerPortraitPNGPath}
+    local portraitPNGPath = (PLAYER_PORTRAIT_PNG_PATH_PREFIX .. "/") .. tostring(portraitFileName)
+    return {namePNGPath = namePNGPath, portraitPNGPath = portraitPNGPath}
 end
-function getBossPNGPaths(self)
+function getBossPNGPaths(self, customStage)
+    local paths = getBossPNGPathsCustom(nil, customStage)
+    if paths ~= nil then
+        return paths
+    end
     local bosses = getBosses(nil)
     local firstBoss = bosses[1]
-    if firstBoss ~= nil then
-        local entityID = getEntityID(nil, firstBoss)
-        local pngPaths = customBossPNGPaths:get(entityID)
-        if pngPaths ~= nil then
-            return pngPaths
-        end
-    end
     local bossID = firstBoss == nil and 0 or firstBoss:GetBossID()
     if bossID == 0 then
         local questionMarkSprite = (PNG_PATH_PREFIX .. "/") .. BOSS_NAME_PNG_FILE_NAMES[BossID.BLUE_BABY]
-        local bossNamePNGPath = questionMarkSprite
-        local bossPortraitPNGPath = questionMarkSprite
-        return {bossNamePNGPath, bossPortraitPNGPath}
-    end
-    local bossNamePNGFileName = BOSS_NAME_PNG_FILE_NAMES[bossID]
-    local bossNamePNGPath = (PNG_PATH_PREFIX .. "/") .. bossNamePNGFileName
-    local bossPortraitPNGFileName = BOSS_PORTRAIT_PNG_FILE_NAMES[bossID]
-    local bossPortraitPNGPath = (PNG_PATH_PREFIX .. "/") .. bossPortraitPNGFileName
-    return {bossNamePNGPath, bossPortraitPNGPath}
+        local namePNGPath = questionMarkSprite
+        local portraitPNGPath = questionMarkSprite
+        return {namePNGPath = namePNGPath, portraitPNGPath = portraitPNGPath}
+    end
+    local namePNGFileName = BOSS_NAME_PNG_FILE_NAMES[bossID]
+    local namePNGPath = (PNG_PATH_PREFIX .. "/") .. namePNGFileName
+    local portraitPNGFileName = BOSS_PORTRAIT_PNG_FILE_NAMES[bossID]
+    local portraitPNGPath = (PNG_PATH_PREFIX .. "/") .. portraitPNGFileName
+    return {namePNGPath = namePNGPath, portraitPNGPath = portraitPNGPath}
+end
+function getBossPNGPathsCustom(self, customStage)
+    if customStage.bossPool == nil then
+        return nil
+    end
+    local roomSubType = getRoomSubType(nil)
+    local matchingBossEntry = __TS__ArrayFind(
+        customStage.bossPool,
+        function(____, bossEntry) return bossEntry.subType == roomSubType end
+    )
+    if matchingBossEntry == nil then
+        return nil
+    end
+    return matchingBossEntry.versusScreen
 end
 DEFAULT_CHARACTER = PlayerType.ISAAC
 local DEFAULT_STAGE_ID = StageID.BASEMENT
@@ -164,37 +174,45 @@ function ____exports.playVersusScreenAnimation(self, customStage)
     v.run.showingBossVersusScreen = true
     pause(nil)
     hud:SetVisible(false)
-    local playerNamePNGPath, playerPortraitPNGPath = table.unpack(getPlayerPNGPaths(nil))
-    versusScreenSprite:ReplaceSpritesheet(PLAYER_NAME_ANM2_LAYER, playerNamePNGPath)
-    versusScreenSprite:ReplaceSpritesheet(PLAYER_PORTRAIT_ANM2_LAYER, playerPortraitPNGPath)
-    local bossNamePNGPath, bossPortraitPNGPath = table.unpack(getBossPNGPaths(nil))
-    versusScreenSprite:ReplaceSpritesheet(BOSS_NAME_ANM2_LAYER, bossNamePNGPath)
-    versusScreenSprite:ReplaceSpritesheet(BOSS_PORTRAIT_ANM2_LAYER, bossPortraitPNGPath)
+    do
+        local ____getPlayerPNGPaths_result_0 = getPlayerPNGPaths(nil)
+        local namePNGPath = ____getPlayerPNGPaths_result_0.namePNGPath
+        local portraitPNGPath = ____getPlayerPNGPaths_result_0.portraitPNGPath
+        versusScreenSprite:ReplaceSpritesheet(PLAYER_NAME_ANM2_LAYER, namePNGPath)
+        versusScreenSprite:ReplaceSpritesheet(PLAYER_PORTRAIT_ANM2_LAYER, portraitPNGPath)
+    end
+    do
+        local ____getBossPNGPaths_result_1 = getBossPNGPaths(nil, customStage)
+        local namePNGPath = ____getBossPNGPaths_result_1.namePNGPath
+        local portraitPNGPath = ____getBossPNGPaths_result_1.portraitPNGPath
+        versusScreenSprite:ReplaceSpritesheet(BOSS_NAME_ANM2_LAYER, namePNGPath)
+        versusScreenSprite:ReplaceSpritesheet(BOSS_PORTRAIT_ANM2_LAYER, portraitPNGPath)
+    end
     versusScreenSprite:LoadGraphics()
     local backgroundColor = VERSUS_SCREEN_BACKGROUND_COLORS[DEFAULT_STAGE_ID]
-    local ____customStage_versusScreen_backgroundColor_0 = customStage.versusScreen
-    if ____customStage_versusScreen_backgroundColor_0 ~= nil then
-        ____customStage_versusScreen_backgroundColor_0 = ____customStage_versusScreen_backgroundColor_0.backgroundColor
-    end
-    if ____customStage_versusScreen_backgroundColor_0 ~= nil then
-        local ____customStage_versusScreen_backgroundColor_2 = customStage.versusScreen.backgroundColor
-        local r = ____customStage_versusScreen_backgroundColor_2.r
-        local g = ____customStage_versusScreen_backgroundColor_2.g
-        local b = ____customStage_versusScreen_backgroundColor_2.b
-        local a = ____customStage_versusScreen_backgroundColor_2.a
+    local ____customStage_versusScreen_backgroundColor_2 = customStage.versusScreen
+    if ____customStage_versusScreen_backgroundColor_2 ~= nil then
+        ____customStage_versusScreen_backgroundColor_2 = ____customStage_versusScreen_backgroundColor_2.backgroundColor
+    end
+    if ____customStage_versusScreen_backgroundColor_2 ~= nil then
+        local ____customStage_versusScreen_backgroundColor_4 = customStage.versusScreen.backgroundColor
+        local r = ____customStage_versusScreen_backgroundColor_4.r
+        local g = ____customStage_versusScreen_backgroundColor_4.g
+        local b = ____customStage_versusScreen_backgroundColor_4.b
+        local a = ____customStage_versusScreen_backgroundColor_4.a
         backgroundColor = Color(r, g, b, a)
     end
     versusScreenBackgroundSprite.Color = backgroundColor
     local dirtSpotColor = VERSUS_SCREEN_DIRT_SPOT_COLORS[DEFAULT_STAGE_ID]
-    local ____customStage_versusScreen_dirtSpotColor_3 = customStage.versusScreen
-    if ____customStage_versusScreen_dirtSpotColor_3 ~= nil then
-        ____customStage_versusScreen_dirtSpotColor_3 = ____customStage_versusScreen_dirtSpotColor_3.dirtSpotColor
-    end
-    if ____customStage_versusScreen_dirtSpotColor_3 ~= nil then
-        local ____customStage_versusScreen_dirtSpotColor_5 = customStage.versusScreen.dirtSpotColor
-        local r = ____customStage_versusScreen_dirtSpotColor_5.r
-        local g = ____customStage_versusScreen_dirtSpotColor_5.g
-        local b = ____customStage_versusScreen_dirtSpotColor_5.b
+    local ____customStage_versusScreen_dirtSpotColor_5 = customStage.versusScreen
+    if ____customStage_versusScreen_dirtSpotColor_5 ~= nil then
+        ____customStage_versusScreen_dirtSpotColor_5 = ____customStage_versusScreen_dirtSpotColor_5.dirtSpotColor
+    end
+    if ____customStage_versusScreen_dirtSpotColor_5 ~= nil then
+        local ____customStage_versusScreen_dirtSpotColor_7 = customStage.versusScreen.dirtSpotColor
+        local r = ____customStage_versusScreen_dirtSpotColor_7.r
+        local g = ____customStage_versusScreen_dirtSpotColor_7.g
+        local b = ____customStage_versusScreen_dirtSpotColor_7.b
         dirtSpotColor = Color(r, g, b)
     end
     versusScreenDirtSpotSprite.Color = dirtSpotColor
@@ -214,10 +232,6 @@ function ____exports.versusScreenPostRender(self)
     if not v.run.showingBossVersusScreen then
         return
     end
-    local isPaused = game:IsPaused()
-    if isPaused then
-        return
-    end
     if versusScreenSprite:IsFinished(VERSUS_SCREEN_ANIMATION_NAME) then
         finishVersusScreenAnimation(nil)
         return