Images & alot of fixes

config.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Bettercrewlink</name>
-    <description></description>
+    <description />
     <author email="[email protected]" href="https://bettercrewlink.app">OhMyGuus</author>
     <content src="index.html" />
     <access origin="*" />
@@ -20,7 +20,6 @@
     <preference name="SplashScreenDelay" value="3000" />
     <platform name="android">
         <preference name="APP_SECRET" value="968c50f3-eb43-4ceb-9b3d-55458601a601" />
-
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
             <application android:networkSecurityConfig="@xml/network_security_config" />
         </edit-config>
@@ -100,6 +99,4 @@
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="cordova-plugin-ionic-webview" spec="^4.0.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
-
-
 </widget>

src/app/comp/AudioController.service.ts

@@ -61,10 +61,11 @@ export default class AudioController extends EventEmitterO {
 		const muffle = context.createBiquadFilter();
 		muffle.type = 'lowpass';
 		muffle.Q.value = 0;
+		// const reverb = context.createConvolver();
+		// reverb.buffer = convolverBuffer.current;
 
 		source.connect(pan);
-		pan.connect(muffle);
-		muffle.connect(gain);
+		pan.connect(gain);
 
 		const audioContext = pan.context;
 		const panPos = [3, 0];
@@ -85,99 +86,170 @@ export default class AudioController extends EventEmitterO {
 			gain,
 			pan,
 			muffle,
+			destination: context.destination,
+			muffleConnected: false,
 		} as AudioElement;
 	}
 
+	applyEffect(gain: AudioNode, effectNode: AudioNode, destination: AudioNode, player: Player) {
+		try {
+			gain.disconnect(destination);
+			gain.connect(effectNode);
+			effectNode.connect(destination);
+		} catch {
+			console.log('error with applying effect: ', player.name, effectNode);
+		}
+	}
+
+	restoreEffect(gain: AudioNode, effectNode: AudioNode, destination: AudioNode, player: Player) {
+		try {
+			effectNode.disconnect(destination);
+			gain.disconnect(effectNode);
+			gain.connect(destination);
+		} catch {
+			console.log('error with applying effect: ', player.name, effectNode);
+		}
+	}
+
 	// move to different controller
-	updateAudioLocation(currentGameState: AmongUsState, element: SocketElement, localPLayer: Player) {
+	updateAudioLocation(state: AmongUsState, element: SocketElement, localPLayer: Player): number {
 		// console.log('updateAudioLocation ->', { element });
 		if (!element.audioElement || !element.client || !element.player || !localPLayer) {
-			if (element?.audioElement?.gain?.gain) {
-				element.audioElement.gain.gain.value = 0;
-			}
-			return;
+			console.log(element.audioElement, element.client, element.player, localPLayer);
+			return 0;
 		}
 		// console.log('[updateAudioLocation]');
 		const pan = element.audioElement.pan;
 		const gain = element.audioElement.gain;
 		const muffle = element.audioElement.muffle;
 		const audioContext = pan.context;
+		// const reverb = element.audioElement.reverb;
+		const destination = element.audioElement.destination;
+		const lobbySettings = this.connectionController.lobbySettings;
+		let maxdistance = lobbySettings.maxDistance;
 
 		const other = element.player; // this.getPlayer(element.client?.clientId);
 		let panPos = [other.x - localPLayer.x, other.y - localPLayer.y];
-		switch (currentGameState.gameState) {
+		let endGain = 0;
+		switch (state.gameState) {
 			case GameState.MENU:
-				gain.gain.value = 0;
+				endGain = 0;
 				break;
 
 			case GameState.LOBBY:
-				gain.gain.value = 1;
+				endGain = 1;
 				break;
 
 			case GameState.TASKS:
-				gain.gain.value = 1;
+				endGain = 1;
 
-				if (
-					!localPLayer.isDead &&
-					this.connectionController.lobbySettings.commsSabotage &&
-					currentGameState.comsSabotaged
-				) {
-					gain.gain.value = 0;
+				if (lobbySettings.meetingGhostOnly) {
+					endGain = 0;
 				}
-
-				// Mute other players which are in a vent
-				if (other.inVent && !this.connectionController.lobbySettings.hearImpostorsInVents) {
-					gain.gain.value = 0;
+				if (!localPLayer.isDead && lobbySettings.commsSabotage && state.comsSabotaged && !localPLayer.isImpostor) {
+					endGain = 0;
 				}
 
+				// Mute other players which are in a vent
 				if (
-					!localPLayer.isDead &&
-					other.isDead &&
-					localPLayer.isImpostor &&
-					this.connectionController.lobbySettings.haunting
+					other.inVent &&
+					!(lobbySettings.hearImpostorsInVents || (lobbySettings.impostersHearImpostersInvent && localPLayer.inVent))
 				) {
-					gain.gain.value = gain.gain.value * 0.02; //0.005;
+					endGain = 0;
+				}
+
+				// if (
+				// 	lobbySettings.wallsBlockAudio &&
+				// 	!me.isDead &&
+				// 	poseCollide({ x: me.x, y: me.y }, { x: other.x, y: other.y }, gameState.map)
+				// ) {
+				// 	endGain = 0;
+				// }
+
+				if (!localPLayer.isDead && other.isDead && localPLayer.isImpostor && lobbySettings.haunting) {
+					// if (!element.audioElement.reverbConnected) {
+					// 	element.audioElement.reverbConnected = true;
+					// 	this.applyEffect(gain, reverb, destination, other);
+					// }
+					endGain = 0.2;
 				} else {
-					if (!localPLayer.isDead && (other.isDead || currentGameState.comsSabotaged)) {
-						gain.gain.value = 0;
+					if (other.isDead && !localPLayer.isDead) {
+						endGain = 0;
 					}
 				}
 
 				break;
-
 			case GameState.DISCUSSION:
 				panPos = [0, 0];
-				gain.gain.value = 1;
-
+				endGain = 1;
 				// Mute dead players for still living players
 				if (!localPLayer.isDead && other.isDead) {
-					gain.gain.value = 0;
+					endGain = 0;
 				}
 				break;
 
 			case GameState.UNKNOWN:
 			default:
-				gain.gain.value = 0;
+				endGain = 0;
 				break;
 		}
 
+		if (!other.isDead || state.gameState !== GameState.TASKS || !localPLayer.isImpostor || localPLayer.isDead) {
+			// if (element.audioElement.reverbConnected && reverb) {
+			// 	element.audioElement.reverbConnected = false;
+			// 	this.restoreEffect(gain, reverb, destination, other);
+			// }
+		}
+
+		if (lobbySettings.deadOnly) {
+			panPos = [0, 0];
+			if (!localPLayer.isDead || !other.isDead) {
+				endGain = 0;
+			}
+		}
+
+		const isOnCamera = false;
 		// Muffling in vents
-		if (localPLayer.inVent || other.inVent) {
-			muffle.frequency.value = 1200;
-			muffle.Q.value = 20;
-			if (gain.gain.value === 1) gain.gain.value = 0.7; // Too loud at 1
+		if (
+			((localPLayer.inVent && !localPLayer.isDead) || (other.inVent && !other.isDead)) &&
+			state.gameState === GameState.TASKS
+		) {
+			if (!element.audioElement.muffleConnected) {
+				element.audioElement.muffleConnected = true;
+				this.applyEffect(gain, muffle, destination, other);
+			}
+			maxdistance = isOnCamera ? 3 : 0.8;
+			muffle.frequency.value = isOnCamera ? 2300 : 2000;
+			muffle.Q.value = isOnCamera ? -15 : 20;
+			if (endGain === 1) {
+				endGain = isOnCamera ? 0.8 : 0.5;
+			} // Too loud at 1
 		} else {
-			muffle.frequency.value = 20000;
-			muffle.Q.value = 0;
+			if (element.audioElement.muffleConnected) {
+				element.audioElement.muffleConnected = false;
+				this.restoreEffect(gain, muffle, destination, other);
+			}
 		}
 
+		// Mute players if distancte between two players is too big
+		// console.log({ x: other.x, y: other.y }, Math.sqrt(panPos[0] * panPos[0] + panPos[1] * panPos[1]));
+		//console.log(state.currentCamera);
+		if (Math.sqrt(panPos[0] * panPos[0] + panPos[1] * panPos[1]) > maxdistance) {
+			return 0;
+		}
+
+		// if (!settings.enableSpatialAudio) {
+		// 	panPos = [0, 0];
+		// }
+
 		if (pan.positionZ) {
 			pan.positionZ.setValueAtTime(-0.5, audioContext.currentTime);
 			pan.positionX.setValueAtTime(panPos[0], audioContext.currentTime);
 			pan.positionY.setValueAtTime(panPos[1], audioContext.currentTime);
 		} else {
 			pan.setPosition(panPos[0], panPos[1], -0.5);
 		}
+		return endGain;
 	}
 
 	disconnect() {
@@ -190,7 +262,6 @@ export default class AudioController extends EventEmitterO {
 
 		if (!socketElement.audioElement) {
 			console.log('disconnectElement -> !socketElement.audioElement -> ', socketElement);
-
 			return;
 		}
 		console.log('disconnectElement -> !uff?');

src/app/comp/ConnectionController.service.ts

@@ -27,7 +27,6 @@ export declare interface IConnectionController {
 	connect(voiceserver: string, gamecode: string, username: string, deviceID: string, natFix: boolean);
 }
 
-
 @Injectable({
 	providedIn: 'root',
 })
@@ -211,8 +210,12 @@ export class ConnectionController extends EventEmitterO implements IConnectionCo
 		}
 
 		this.socketElements.forEach((value) => {
-			console.log(JSON.stringify(value));
-			this.audioController.updateAudioLocation(this.currentGameState, value, this.localPLayer);
+			value.updatePLayer(this);
+			if (value?.audioElement?.gain) {
+				const endGain = this.audioController.updateAudioLocation(this.currentGameState, value, this.localPLayer);
+				console.log(endGain);
+				value.audioElement.gain.gain.value = endGain;
+			}
 		});
 	}
 

src/app/comp/smallInterfaces.ts

@@ -33,22 +33,36 @@ export interface AudioElement {
 	gain: GainNode;
 	pan: PannerNode;
 	muffle: BiquadFilterNode;
+	// reverb: ConvolverNode;
+	destination: AudioNode;
+	// reverbConnected: boolean;
+	muffleConnected: boolean;
 }
 
 
 export interface ILobbySettings {
 	maxDistance: number;
 	haunting: boolean;
 	hearImpostorsInVents: boolean;
+	impostersHearImpostersInvent: boolean;
 	commsSabotage: boolean;
+	deadOnly: boolean;
+	meetingGhostOnly: boolean;
+	hearThroughCameras: boolean;
+	wallsBlockAudio: boolean;
 }
 
 
 export const DEFAULT_LOBBYSETTINGS: ILobbySettings = {
-	maxDistance: 5.6,
+	maxDistance: 5.32,
 	haunting: false,
 	hearImpostorsInVents: false,
+	impostersHearImpostersInvent: false,
 	commsSabotage: false,
+	deadOnly: false,
+	hearThroughCameras: false,
+	wallsBlockAudio: false,
+	meetingGhostOnly: false,
 };
 
 export class SocketElement {

src/app/global-header/global-header.component.html

@@ -13,10 +13,10 @@
 		<ion-title
 			*ngIf="gameHelper.cManager.connectionState !== 0"
 			class="ion-text-center"
-			>BetterCrewlink Mobile v0.0.8</ion-title
+			>BetterCrewlink Mobile v0.0.9</ion-title
 		>
 		<ion-title *ngIf="gameHelper.cManager.connectionState == 0" class="ion-text-center"
-			>BetterCrewlink Mobile v0.0.8</ion-title
+			>BetterCrewlink Mobile v0.0.9</ion-title
     >
 
 	</ion-toolbar>

src/app/pages/game/game.component.html

@@ -1,6 +1,5 @@
 <ion-content color="secondary">
 	<ion-grid>
-		{{gameHelper.cManager.connectionState}}
 		<ng-container [ngSwitch]="gameHelper.cManager.connectionState">
 			<ng-container *ngSwitchDefault>
 				<ion-row class="ion-justify-content-center">