Make spectate mode song be music volume dependent.

Praccen · Oct 2, 2023 · 27d1ec6 · 27d1ec6
1 parent af1ba57
commit 27d1ec6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/code/src/Engine/Audio/AudioPlayer.ts b/code/src/Engine/Audio/AudioPlayer.ts
@@ -27,10 +27,9 @@ export default class AudioPlayer {
 			"light_up.mp3", //https://pixabay.com/sound-effects/match-lighting-candle-81020/
 			"fire.mp3", //https://pixabay.com/sound-effects/small-artisanal-oven-at-night-23698/
 			"success_1.mp3", //https://pixabay.com/sound-effects/ahhhh-37191/
-			"credits_theme_1.mp3", //https://pixabay.com/music/modern-classical-simple-piano-melody-9834/
 		];
 		const sound_effect_volume_multilpliers_list = [
-			0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1, 0.5,
+			0.5, 0.5, 1, 1, 0.5, 0.5, 1, 1,
 		];
 		let count = 0;
 		for (const file of sound_effect_files) {
@@ -42,8 +41,12 @@ export default class AudioPlayer {
 			count++;
 		}
 
-		const song_files = ["theme_1.mp3"]; //https://pixabay.com/music/scary-childrens-tunes-dark-ambient-horror-cinematic-halloween-atmosphere-scary-118585/
-		const song_files_volume_multilpliers_list = [0.5];
+		const song_files = 
+		[
+			"theme_1.mp3", //https://pixabay.com/music/scary-childrens-tunes-dark-ambient-horror-cinematic-halloween-atmosphere-scary-118585/
+			"credits_theme_1.mp3", //https://pixabay.com/music/modern-classical-simple-piano-melody-9834/
+		]; 
+		const song_files_volume_multilpliers_list = [0.5, 0.5];
 		count = 0;
 		for (const file of song_files) {
 			this.songs[file.split(".")[0]] = new Audio(this.songs_dir + "/" + file);

diff --git a/code/src/Engine/Client/Client.ts b/code/src/Engine/Client/Client.ts
@@ -105,7 +105,7 @@ export class Client {
 							.get(msg.id)
 							.bodyEntity.getComponent(ComponentTypeEnum.POSITIONPARENT)
 					);
-					if (posComp) {
+					if (posComp && !this.bodyEntities.get(msg.id).is_accending) {
 						posComp.position.x = msg.x_pos;
 						posComp.position.y = msg.y_pos;
 						posComp.position.z = msg.z_pos;

diff --git a/code/src/Game/Character.ts b/code/src/Game/Character.ts
@@ -48,7 +48,7 @@ export default abstract class Character {
 	protected trigger_download_needed: boolean;
 	protected allCharacterDict: object;
 	protected drag_addition: number = 10;
-	protected is_accending: boolean;
+	is_accending: boolean;
 	accended: boolean;
 	protected accentionTimerThreshold: number = 4;
 	protected accention_rotation_base: number = 0.1;

diff --git a/code/src/Game/PlayerCharacter.ts b/code/src/Game/PlayerCharacter.ts
@@ -28,7 +28,6 @@ export default class PlayerCharacter extends Character {
 		) as ParticleSpawnerComponent;
 		particleSpawnerComp.destructor();
 		this.ecsManager.removeEntity(this.bodyEntity.id);
-		this.audioPlayer.playAudio("credits_theme_1", true);
 	}
 
 	extinguish_audio_operations() {

diff --git a/code/src/Game/States/SpectateMode.ts b/code/src/Game/States/SpectateMode.ts
@@ -42,6 +42,8 @@ export default class SpectateMode extends State {
 		super.init();
 		this.game.rendering.camera.setPosition(0, 0, 0);
 		this.overlay.show();
+		this.sa.audioPlayer.stopAll();
+		this.sa.audioPlayer.playAudio("credits_theme_1", true);
 	}
 
 	reset() {

diff --git a/out/Assets/Audio/Effects/credits_theme_1.mp3 → out/Assets/Audio/Music/credits_theme_1.mp3 b/out/Assets/Audio/Effects/credits_theme_1.mp3 → out/Assets/Audio/Music/credits_theme_1.mp3
diff --git a/out/Assets/Audio/Songs/theme_1.mp3 b/out/Assets/Audio/Songs/theme_1.mp3
diff --git a/out/Assets/placements/Placements.txt b/out/Assets/placements/Placements.txt
@@ -138,6 +138,7 @@ Placement:Candle
 -19.72,-3.17,9.76|0.171,0.171,0.171|0,229,0|0,0,0|XYZ
 -31.77,-2.9,11.96|0.171,0.171,0.171|0,229,0|0,0,0|XYZ
 -2.98,-3.1,22.54|0.171,0.171,0.171|0,229,0|0,0,0|XYZ
+9.39,-3.55,31.17|0.171,0.171,0.171|0,229,0|0,0,0|XYZ
 Placement:Gravestone 1
 -9.14,-3.24,-0.39|0.292,0.292,0.292|0,0,0|0,0,0|XYZ
 -15.16,-3.22,-21.88|0.299,0.299,0.299|0,-22,0|0,0,0|XYZ