Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added proprietary/sounds/music/iron-horizon.mp3
Binary file not shown.
Binary file added proprietary/sounds/music/prelude-to-war.mp3
Binary file not shown.
Binary file added proprietary/sounds/music/world-divided.mp3
Binary file not shown.
4 changes: 3 additions & 1 deletion resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,9 @@
"toggle_terrain": "Toggle Terrain",
"exit_game_label": "Exit Game",
"exit_game_info": "Return to main menu",
"background_music_volume": "Background Music Volume",
"main_menu_music_volume": "Main Menu Music",
"main_menu_music_volume_desc": "Adjust the volume of the main menu music.",
"background_music_volume": "In-Game Music Volume",
"sound_effects_volume": "Sound Effects Volume"
},
"chat": {
Expand Down
6 changes: 6 additions & 0 deletions src/client/Main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import {
import "./components/baseComponents/Button";
import "./components/baseComponents/Modal";
import { getUserMe, isLoggedIn } from "./jwt";
import MenuSoundManager from "./sound/MenuSoundManager";
import "./styles.css";

declare global {
Expand Down Expand Up @@ -367,6 +368,10 @@ class Client {
});

this.initializeFuseTag();
MenuSoundManager.setBackgroundMusicVolume(
this.userSettings.mainMenuMusicVolume(),
);
MenuSoundManager.playBackgroundMusic();
}

private handleHash() {
Expand Down Expand Up @@ -491,6 +496,7 @@ class Client {
gameRecord: lobby.gameRecord,
},
() => {
MenuSoundManager.stopBackgroundMusic();
console.log("Closing modals");
document.getElementById("settings-button")?.classList.add("hidden");
document
Expand Down
24 changes: 24 additions & 0 deletions src/client/UserSettingModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { SettingKeybind } from "./components/baseComponents/setting/SettingKeybi
import "./components/baseComponents/setting/SettingNumber";
import "./components/baseComponents/setting/SettingSlider";
import "./components/baseComponents/setting/SettingToggle";
import MenuSoundManager from "./sound/MenuSoundManager";

@customElement("user-setting")
export class UserSettingModal extends LitElement {
Expand Down Expand Up @@ -206,6 +207,17 @@ export class UserSettingModal extends LitElement {
this.userSettings.set("settings.performanceOverlay", enabled);
}

private onMenuVolumeChange(e: CustomEvent<{ value: number }>) {
const value = e.detail?.value;
if (typeof value === "number") {
const volume = value / 100;
this.userSettings.setMainMenuMusicVolume(volume);
MenuSoundManager.setBackgroundMusicVolume(volume);
} else {
console.warn("Slider event missing detail.value", e);
}
}

private handleKeybindChange(
e: CustomEvent<{ action: string; value: string; key: string }>,
) {
Expand Down Expand Up @@ -273,6 +285,18 @@ export class UserSettingModal extends LitElement {

private renderBasicSettings() {
return html`
<!-- Main Menu Music -->
<setting-slider
label="${translateText("user_setting.main_menu_music_volume")}"
description="${translateText(
"user_setting.main_menu_music_volume_desc",
)}"
min="0"
max="100"
.value=${this.userSettings.mainMenuMusicVolume() * 100}
@change=${this.onMenuVolumeChange}
></setting-slider>
Comment on lines +288 to +298
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't we already have a music setting?


<!-- 🌙 Dark Mode -->
<setting-toggle
label="${translateText("user_setting.dark_mode_label")}"
Expand Down
15 changes: 14 additions & 1 deletion src/client/index.html
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is unrelated to the background music, can you put it in another PR? Looks good though

Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,26 @@
background-image: url("/images/EuropeBackgroundBlurred.webp");
background-position: center;
background-attachment: fixed;
background-size: cover;
background-size: 200%;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: -1;
animation: move-background 200s linear infinite;
}

@keyframes move-background {
0% {
background-position: 0% 50%;
}
50% {
background-position: 100% 50%;
}
100% {
background-position: 0% 50%;
}
}

.bg-image::before {
Expand Down
62 changes: 62 additions & 0 deletions src/client/sound/MenuSoundManager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { Howl } from "howler";
import ironHorizon from "../../../proprietary/sounds/music/iron-horizon.mp3";
import preludeToWar from "../../../proprietary/sounds/music/prelude-to-war.mp3";
import worldDivided from "../../../proprietary/sounds/music/world-divided.mp3";

class MenuSoundManager {
private backgroundMusic: Howl[] = [];
private currentTrack: number = 0;
private backgroundMusicVolume: number = 0;

constructor() {
this.backgroundMusic = [
new Howl({
src: [ironHorizon],
loop: false,
onend: this.playNext.bind(this),
volume: 0,
}),
new Howl({
src: [worldDivided],
loop: false,
onend: this.playNext.bind(this),
volume: 0,
}),
new Howl({
src: [preludeToWar],
loop: false,
onend: this.playNext.bind(this),
volume: 0,
}),
];
}

public playBackgroundMusic(): void {
if (
this.backgroundMusic.length > 0 &&
!this.backgroundMusic[this.currentTrack].playing()
) {
this.backgroundMusic[this.currentTrack].play();
}
}

public stopBackgroundMusic(): void {
if (this.backgroundMusic.length > 0) {
this.backgroundMusic[this.currentTrack].stop();
}
}

public setBackgroundMusicVolume(volume: number): void {
this.backgroundMusicVolume = Math.max(0, Math.min(1, volume));
this.backgroundMusic.forEach((track) => {
track.volume(this.backgroundMusicVolume);
});
}

private playNext(): void {
this.currentTrack = (this.currentTrack + 1) % this.backgroundMusic.length;
this.playBackgroundMusic();
}
}

export default new MenuSoundManager();
14 changes: 14 additions & 0 deletions src/client/sound/SoundManager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Howl } from "howler";
import evan from "../../../proprietary/sounds/music/evan.mp3";
import of2 from "../../../proprietary/sounds/music/of2.mp3";
import of4 from "../../../proprietary/sounds/music/of4.mp3";
import openfront from "../../../proprietary/sounds/music/openfront.mp3";
import war from "../../../proprietary/sounds/music/war.mp3";
Expand Down Expand Up @@ -29,6 +31,18 @@ class SoundManager {
onend: this.playNext.bind(this),
volume: 0,
}),
new Howl({
src: [evan],
loop: false,
onend: this.playNext.bind(this),
volume: 0,
}),
new Howl({
src: [of2],
loop: false,
onend: this.playNext.bind(this),
volume: 0,
}),
new Howl({
src: [war],
loop: false,
Expand Down
8 changes: 8 additions & 0 deletions src/core/game/UserSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,14 @@ export class UserSettings {
return this.getFloat("settings.backgroundMusicVolume", 0);
}

setMainMenuMusicVolume(volume: number): void {
this.setFloat("settings.mainMenuMusicVolume", volume);
}

mainMenuMusicVolume(): number {
return this.getFloat("settings.mainMenuMusicVolume", 0.2);
}

setBackgroundMusicVolume(volume: number): void {
this.setFloat("settings.backgroundMusicVolume", volume);
}
Expand Down
Loading