isaacscript-common 30.4.4-dev.0 → 30.4.5

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 30.4.4-dev.0
+isaacscript-common 30.4.5
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -44295,6 +44295,7 @@ local removeUrnRewards = ____rockAlt.removeUrnRewards
 local ____rooms = require("src.functions.rooms")
 local getRoomDataForTypeVariant = ____rooms.getRoomDataForTypeVariant
 local getRoomsInsideGrid = ____rooms.getRoomsInsideGrid
+local inRoomType = ____rooms.inRoomType
 local ____sound = require("src.functions.sound")
 local getMusicForStage = ____sound.getMusicForStage
 local ____stage = require("src.functions.stage")
@@ -44379,6 +44380,14 @@ function CustomStages.prototype.____constructor(self, customGridEntities, custom
         end
         streakTextPostRender(nil)
         versusScreenPostRender(nil, self.pause, self.disableAllSound)
+        if customStage.music ~= nil then
+            local currentMusic = musicManager:GetCurrentMusicID()
+            local music = Isaac.GetMusicIdByName(customStage.music)
+            if currentMusic == music then
+                musicManager:Resume()
+                musicManager:UpdateVolume()
+            end
+        end
     end
     self.postCurseEval = function(____, curses)
         local customStage = v.run.currentCustomStage
@@ -44442,6 +44451,13 @@ function CustomStages.prototype.____constructor(self, customGridEntities, custom
             self.pause,
             self.runInNFrames
         )
+        if customStage.music ~= nil and inRoomType(nil, RoomType.DEFAULT) then
+            local music = Isaac.GetMusicIdByName(customStage.music)
+            local currentMusic = musicManager:GetCurrentMusicID()
+            if currentMusic ~= music then
+                musicManager:Fadein(music)
+            end
+        end
     end
     self.featuresUsed = {
         ISCFeature.CUSTOM_GRID_ENTITIES,
@@ -44485,10 +44501,10 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
     for ____, room in ipairs(getRoomsInsideGrid(nil)) do
         do
             if room.SafeGridIndex == startingRoomGridIndex then
-                goto __continue27
+                goto __continue31
             end
             if room.Data == nil then
-                goto __continue27
+                goto __continue31
             end
             local roomType = room.Data.Type
             local roomShapeMap = customStage.roomTypeMap:get(roomType)
@@ -44496,13 +44512,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 if roomType == RoomType.DEFAULT then
                     logError((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name)
                 end
-                goto __continue27
+                goto __continue31
             end
             local roomShape = room.Data.Shape
             local roomDoorSlotFlagMap = roomShapeMap:get(roomShape)
             if roomDoorSlotFlagMap == nil then
                 logError((((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name)
-                goto __continue27
+                goto __continue31
             end
             local doorSlotFlags = room.Data.Doors
             local roomsMetadata = roomDoorSlotFlagMap:get(doorSlotFlags)
@@ -44512,13 +44528,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 roomsMetadata = roomDoorSlotFlagMap:get(allDoorSlotFlags)
                 if roomsMetadata == nil then
                     logError((((((((("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 __continue27
+                    goto __continue31
                 end
             end
             local randomRoom
             if roomType == RoomType.BOSS then
                 if customStage.bossPool == nil then
-                    goto __continue27
+                    goto __continue31
                 end
                 randomRoom = getRandomBossRoomFromPool(
                     nil,
@@ -44541,13 +44557,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 )
                 if newRoomData == nil then
                     logError((("Failed to get the room data for room variant " .. tostring(randomRoom.variant)) .. " for custom stage: ") .. customStage.name)
-                    goto __continue27
+                    goto __continue31
                 end
                 self.customStageCachedRoomData:set(randomRoom.variant, newRoomData)
             end
             room.Data = newRoomData
         end
-        ::__continue27::
+        ::__continue31::
     end
 end
 function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakText, verbose)
@@ -44600,11 +44616,11 @@ function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakTex
         end
     end
     local music = (customStageMusic == nil or customStageMusic == -1) and getMusicForStage(nil, baseStage, baseStageType) or customStageMusic
-    Isaac.DebugString("GETTING HERE - music: " .. tostring(music))
     self.runInNFrames:runInNRenderFrames(
         function()
             musicManager:Enable()
-            musicManager:Crossfade(music)
+            musicManager:Play(music)
+            musicManager:UpdateVolume()
         end,
         MUSIC_DELAY_RENDER_FRAMES
     )

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":"AAwCA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AA2ChD,qBAAa,YAAa,SAAQ,OAAO;IAIvC,oCAAoC;IACpC,OAAO,CAAC,eAAe,CAAkC;IAEzD,+BAA+B;IAC/B,OAAO,CAAC,yBAAyB,CAA8B;IAE/D,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,CAarB;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,CAc1B;IAEF,gDAAgD;IAChD,OAAO,CAAC,iBAAiB;IAgGzB;;;;;;;;;;;;;;;;OAgBG;IAEI,cAAc,CACnB,IAAI,EAAE,MAAM,EACZ,UAAU,UAAO,EACjB,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,IAAI;IAqGP;;;;;OAKG;IAEI,kBAAkB,IAAI,IAAI;CAGlC"}
+{"version":3,"file":"CustomStages.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CustomStages.ts"],"names":[],"mappings":"AAyCA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AA2ChD,qBAAa,YAAa,SAAQ,OAAO;IAIvC,oCAAoC;IACpC,OAAO,CAAC,eAAe,CAAkC;IAEzD,+BAA+B;IAC/B,OAAO,CAAC,yBAAyB,CAA8B;IAE/D,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,CAarB;IAGF,OAAO,CAAC,UAAU,CAmBhB;IAGF,OAAO,CAAC,aAAa,CAcnB;IAGF,OAAO,CAAC,eAAe,CAUrB;IAIF,OAAO,CAAC,2BAA2B,CAejC;IAGF,OAAO,CAAC,kBAAkB,CAqBxB;IAGF,OAAO,CAAC,oBAAoB,CAwB1B;IAEF,gDAAgD;IAChD,OAAO,CAAC,iBAAiB;IAgGzB;;;;;;;;;;;;;;;;OAgBG;IAEI,cAAc,CACnB,IAAI,EAAE,MAAM,EACZ,UAAU,UAAO,EACjB,UAAU,UAAO,EACjB,OAAO,UAAQ,GACd,IAAI;IAkGP;;;;;OAKG;IAEI,kBAAkB,IAAI,IAAI;CAGlC"}

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

@@ -42,6 +42,7 @@ local removeUrnRewards = ____rockAlt.removeUrnRewards
 local ____rooms = require("src.functions.rooms")
 local getRoomDataForTypeVariant = ____rooms.getRoomDataForTypeVariant
 local getRoomsInsideGrid = ____rooms.getRoomsInsideGrid
+local inRoomType = ____rooms.inRoomType
 local ____sound = require("src.functions.sound")
 local getMusicForStage = ____sound.getMusicForStage
 local ____stage = require("src.functions.stage")
@@ -128,6 +129,14 @@ function CustomStages.prototype.____constructor(self, customGridEntities, custom
         end
         streakTextPostRender(nil)
         versusScreenPostRender(nil, self.pause, self.disableAllSound)
+        if customStage.music ~= nil then
+            local currentMusic = musicManager:GetCurrentMusicID()
+            local music = Isaac.GetMusicIdByName(customStage.music)
+            if currentMusic == music then
+                musicManager:Resume()
+                musicManager:UpdateVolume()
+            end
+        end
     end
     self.postCurseEval = function(____, curses)
         local customStage = v.run.currentCustomStage
@@ -191,6 +200,13 @@ function CustomStages.prototype.____constructor(self, customGridEntities, custom
             self.pause,
             self.runInNFrames
         )
+        if customStage.music ~= nil and inRoomType(nil, RoomType.DEFAULT) then
+            local music = Isaac.GetMusicIdByName(customStage.music)
+            local currentMusic = musicManager:GetCurrentMusicID()
+            if currentMusic ~= music then
+                musicManager:Fadein(music)
+            end
+        end
     end
     self.featuresUsed = {
         ISCFeature.CUSTOM_GRID_ENTITIES,
@@ -234,10 +250,10 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
     for ____, room in ipairs(getRoomsInsideGrid(nil)) do
         do
             if room.SafeGridIndex == startingRoomGridIndex then
-                goto __continue27
+                goto __continue31
             end
             if room.Data == nil then
-                goto __continue27
+                goto __continue31
             end
             local roomType = room.Data.Type
             local roomShapeMap = customStage.roomTypeMap:get(roomType)
@@ -245,13 +261,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 if roomType == RoomType.DEFAULT then
                     logError((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name)
                 end
-                goto __continue27
+                goto __continue31
             end
             local roomShape = room.Data.Shape
             local roomDoorSlotFlagMap = roomShapeMap:get(roomShape)
             if roomDoorSlotFlagMap == nil then
                 logError((((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name)
-                goto __continue27
+                goto __continue31
             end
             local doorSlotFlags = room.Data.Doors
             local roomsMetadata = roomDoorSlotFlagMap:get(doorSlotFlags)
@@ -261,13 +277,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 roomsMetadata = roomDoorSlotFlagMap:get(allDoorSlotFlags)
                 if roomsMetadata == nil then
                     logError((((((((("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 __continue27
+                    goto __continue31
                 end
             end
             local randomRoom
             if roomType == RoomType.BOSS then
                 if customStage.bossPool == nil then
-                    goto __continue27
+                    goto __continue31
                 end
                 randomRoom = getRandomBossRoomFromPool(
                     nil,
@@ -290,13 +306,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 )
                 if newRoomData == nil then
                     logError((("Failed to get the room data for room variant " .. tostring(randomRoom.variant)) .. " for custom stage: ") .. customStage.name)
-                    goto __continue27
+                    goto __continue31
                 end
                 self.customStageCachedRoomData:set(randomRoom.variant, newRoomData)
             end
             room.Data = newRoomData
         end
-        ::__continue27::
+        ::__continue31::
     end
 end
 function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakText, verbose)
@@ -349,11 +365,11 @@ function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakTex
         end
     end
     local music = (customStageMusic == nil or customStageMusic == -1) and getMusicForStage(nil, baseStage, baseStageType) or customStageMusic
-    Isaac.DebugString("GETTING HERE - music: " .. tostring(music))
     self.runInNFrames:runInNRenderFrames(
         function()
             musicManager:Enable()
-            musicManager:Crossfade(music)
+            musicManager:Play(music)
+            musicManager:UpdateVolume()
         end,
         MUSIC_DELAY_RENDER_FRAMES
     )

package/package.json

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

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

@@ -26,6 +26,7 @@ import { removeUrnRewards } from "../../../functions/rockAlt";
 import {
   getRoomDataForTypeVariant,
   getRoomsInsideGrid,
+  inRoomType,
 } from "../../../functions/rooms";
 import { getMusicForStage } from "../../../functions/sound";
 import { setStage } from "../../../functions/stage";
@@ -203,6 +204,17 @@ export class CustomStages extends Feature {
 
     streakTextPostRender();
     versusScreenPostRender(this.pause, this.disableAllSound);
+
+    // Fix the bug where the music will stop after loading a new room. (This does not work if placed
+    // in the `POST_NEW_ROOM_REORDERED` callback or the `POST_UPDATE` callback.)
+    if (customStage.music !== undefined) {
+      const currentMusic = musicManager.GetCurrentMusicID();
+      const music = Isaac.GetMusicIdByName(customStage.music);
+      if (currentMusic === music) {
+        musicManager.Resume();
+        musicManager.UpdateVolume();
+      }
+    }
   };
 
   // ModCallback.POST_CURSE_EVAL (12)
@@ -293,6 +305,16 @@ export class CustomStages extends Feature {
       this.pause,
       this.runInNFrames,
     );
+
+    // Fix the bug where music from special rooms (like the "Boss Over" music) will persist for the
+    // rest of the floor.
+    if (customStage.music !== undefined && inRoomType(RoomType.DEFAULT)) {
+      const music = Isaac.GetMusicIdByName(customStage.music);
+      const currentMusic = musicManager.GetCurrentMusicID();
+      if (currentMusic !== music) {
+        musicManager.Fadein(music);
+      }
+    }
   };
 
   /** Pick a custom room for each vanilla room. */
@@ -500,13 +522,10 @@ export class CustomStages extends Feature {
         ? getMusicForStage(baseStage, baseStageType)
         : customStageMusic;
 
-    Isaac.DebugString(`GETTING HERE - music: ${music}`);
-
     this.runInNFrames.runInNRenderFrames(() => {
-      // By default, the `MusicManager.Play` method will play the music at max volume (1.0), which
-      // is around twice as loud as the vanilla music plays.
       musicManager.Enable();
-      musicManager.Crossfade(music);
+      musicManager.Play(music);
+      musicManager.UpdateVolume();
     }, MUSIC_DELAY_RENDER_FRAMES);
 
     // We must reload the current room in order for the `Level.SetStage` method to take effect.