isaacscript-common 20.14.3 → 20.14.5

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 20.14.3
+isaacscript-common 20.14.5
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -25,15 +25,7 @@ information about using TypeScript, see the website: https://isaacscript.github.
 
 --]]
 
----@diagnostic disable: assign-type-mismatch
----@diagnostic disable: deprecated
----@diagnostic disable: lowercase-global
----@diagnostic disable: need-check-nil
----@diagnostic disable: redefined-local
----@diagnostic disable: redundant-parameter
----@diagnostic disable: unused-function
----@diagnostic disable: unused-local
----@diagnostic disable: unused-vararg
+---@diagnostic disable
 
 
 local ____modules = {}
@@ -42265,6 +42257,7 @@ function getRoomTypeMap(self, customStageLua)
     end
     return roomTypeMap
 end
+local MUSIC_DELAY_RENDER_FRAMES = 70
 ____exports.CustomStages = __TS__Class()
 local CustomStages = ____exports.CustomStages
 CustomStages.name = "CustomStages"
@@ -42493,6 +42486,7 @@ function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakTex
     local baseStageType = customStage.baseStageType == nil and DEFAULT_BASE_STAGE_TYPE or customStage.baseStageType
     local reseed = asNumber(nil, stage) >= baseStage
     setStage(nil, baseStage, baseStageType, reseed)
+    musicManager:Disable()
     self:setStageRoomsData(customStage, rng, verbose)
     local targetStage = CUSTOM_FLOOR_STAGE
     local targetStageType = CUSTOM_FLOOR_STAGE_TYPE
@@ -42504,9 +42498,13 @@ function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakTex
         end)
     end
     local music = customStage.music == nil and getMusicForStage(nil, baseStage, baseStageType) or Isaac.GetMusicIdByName(customStage.music)
-    self.runInNFrames:runNextGameFrame(function()
-        musicManager:Play(music, 0.5)
-    end)
+    self.runInNFrames:runInNRenderFrames(
+        function()
+            musicManager:Enable()
+            musicManager:Crossfade(music)
+        end,
+        MUSIC_DELAY_RENDER_FRAMES
+    )
 end
 function CustomStages.prototype.disableCustomStage(self)
     self.v.run.currentCustomStage = nil

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":"AAyCA,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,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,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;IAiFP;;;;;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;AA0ChD,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,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,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;IAuFP;;;;;OAKG;IAEI,kBAAkB,IAAI,IAAI;CAGlC"}

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

@@ -102,6 +102,9 @@ function getRoomTypeMap(self, customStageLua)
     end
     return roomTypeMap
 end
+--- 60 does not work correctly (the music kicking in from stage -1 will mute it), so we use 70 to be
+-- safe.
+local MUSIC_DELAY_RENDER_FRAMES = 70
 ____exports.CustomStages = __TS__Class()
 local CustomStages = ____exports.CustomStages
 CustomStages.name = "CustomStages"
@@ -330,6 +333,7 @@ function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakTex
     local baseStageType = customStage.baseStageType == nil and DEFAULT_BASE_STAGE_TYPE or customStage.baseStageType
     local reseed = asNumber(nil, stage) >= baseStage
     setStage(nil, baseStage, baseStageType, reseed)
+    musicManager:Disable()
     self:setStageRoomsData(customStage, rng, verbose)
     local targetStage = CUSTOM_FLOOR_STAGE
     local targetStageType = CUSTOM_FLOOR_STAGE_TYPE
@@ -341,9 +345,13 @@ function CustomStages.prototype.setCustomStage(self, name, firstFloor, streakTex
         end)
     end
     local music = customStage.music == nil and getMusicForStage(nil, baseStage, baseStageType) or Isaac.GetMusicIdByName(customStage.music)
-    self.runInNFrames:runNextGameFrame(function()
-        musicManager:Play(music, 0.5)
-    end)
+    self.runInNFrames:runInNRenderFrames(
+        function()
+            musicManager:Enable()
+            musicManager:Crossfade(music)
+        end,
+        MUSIC_DELAY_RENDER_FRAMES
+    )
 end
 function CustomStages.prototype.disableCustomStage(self)
     self.v.run.currentCustomStage = nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "20.14.3",
+  "version": "20.14.5",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^11.0.2"
+    "isaac-typescript-definitions": "^11.0.3"
   }
 }

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

@@ -75,6 +75,12 @@ import { DisableAllSound } from "./DisableAllSound";
 import { Pause } from "./Pause";
 import { RunInNFrames } from "./RunInNFrames";
 
+/**
+ * 60 does not work correctly (the music kicking in from stage -1 will mute it), so we use 70 to be
+ * safe.
+ */
+const MUSIC_DELAY_RENDER_FRAMES = 70;
+
 export class CustomStages extends Feature {
   /** @internal */
   public override v = {
@@ -476,6 +482,10 @@ export class CustomStages extends Feature {
 
     setStage(baseStage, baseStageType, reseed);
 
+    // As soon as we warp to the base stage, the base stage music will begin to play. Thus, we
+    // temporarily mute all music.
+    musicManager.Disable();
+
     this.setStageRoomsData(customStage, rng, verbose);
 
     // Set the stage to an invalid value, which will prevent the walls and floors from loading.
@@ -503,11 +513,13 @@ export class CustomStages extends Feature {
       customStage.music === undefined
         ? getMusicForStage(baseStage, baseStageType)
         : Isaac.GetMusicIdByName(customStage.music);
-    this.runInNFrames.runNextGameFrame(() => {
+
+    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.Play(music, 0.5);
-    });
+      musicManager.Enable();
+      musicManager.Crossfade(music);
+    }, MUSIC_DELAY_RENDER_FRAMES);
 
     // We must reload the current room in order for the `Level.SetStage` method to take effect.
     // Furthermore, we need to cancel the queued warp to the `GridRoom.DEBUG` room. We can