Merge branch 'main' of github.com:Chocobois/built-to-scale

src/components/Intermission.ts

@@ -16,6 +16,7 @@ export const enum Mode {
 export class Intermission extends Phaser.GameObjects.Container {
 	public scene: GameScene;
 	public mode: Mode;
+	public transitionProgress: number;
 
 	private graphics: Phaser.GameObjects.Graphics;
 	private cutscene: Phaser.GameObjects.Image;
@@ -75,6 +76,7 @@ export class Intermission extends Phaser.GameObjects.Container {
 		this.add(this.subtitles);
 
 		this.queuedLines = [];
+		this.transitionProgress = 0;
 
 		/* Button */
 
@@ -218,11 +220,13 @@ export class Intermission extends Phaser.GameObjects.Container {
 			to: 1,
 			ease: Phaser.Math.Easing.Quintic.InOut,
 			onUpdate: (tween, target, key, current: number) => {
+				this.transitionProgress = current;
 				let radius = current * 0.6 * this.scene.W;
 				this.redrawMask(this.scene.CX, this.scene.CY, radius);
 			},
 			onComplete: () => {
 				this.setVisible(false);
+				this.transitionProgress = 0;
 			},
 		});
 	}

src/scenes/GameScene.ts

@@ -1403,33 +1403,32 @@ export class GameScene extends BaseScene {
 	}
 
 	updateMusicState() {
+		const clamp = Phaser.Math.Clamp;
+		const tween = this.intermission.transitionProgress;
 		const volumeModifier = 0.4;
+
 		let intendedVolume = {
 			base: 1,
 			cutscene: 0,
 			downtime: 0,
 		}
 
-		switch (this.state) {
-			case GameState.Shopping:
-			case GameState.Cutscene:
-			case GameState.Intermission:
-				intendedVolume = {
-					base: 0,
-					cutscene: 0,
-					downtime: 1,
-				};
-				break;
-
-			case GameState.Day:
-			default:
-				break;
+		if (this.state != GameState.Day) intendedVolume = {
+			base: 0,
+			cutscene: 0,
+			downtime: 1,
+		};
+
+		if (this.intermission.visible) {
+			intendedVolume.cutscene = 1 - tween;
+			intendedVolume.downtime *= tween;
+			intendedVolume.base *= tween;
 		}
 
-		console.log(intendedVolume)
+		console.debug(tween, intendedVolume)
 
-		this.musicBase.setVolume(intendedVolume.base * volumeModifier);
-		this.musicDowntime.setVolume(intendedVolume.downtime * volumeModifier);
-		this.musicCutscene.setVolume(intendedVolume.cutscene * volumeModifier);
+		this.musicBase.setVolume(		 clamp(intendedVolume.base,		  0, 1) * volumeModifier);
+		this.musicDowntime.setVolume(clamp(intendedVolume.downtime, 0, 1) * volumeModifier);
+		this.musicCutscene.setVolume(clamp(intendedVolume.cutscene, 0, 1) * volumeModifier);
 	}
 }