Release Healer Man 0.1.9

src/game/combatAudio.ts

@@ -18,11 +18,35 @@ let context: AudioContext | null = null;
 let masterGain: GainNode | null = null;
 let groupGains: Record<CombatActorGroup, GainNode> | null = null;
 let configuredSettings: CombatPresentationSettings | null = null;
-let configuredMasterVolume = 0.8;
+let configuredMasterVolume = 0;
 const activeVoices: ActiveVoice[] = [];
 const activeMasterVoices = new Set<() => void>();
 const decodedBuffers = new Map<string, Promise<AudioBuffer | null>>();
 
+export function masterAudioOutputEnabled(masterVolume: number): boolean {
+  return Number.isFinite(masterVolume) && masterVolume > 0;
+}
+
+export function combatAudioOutputEnabled(
+  settings: CombatPresentationSettings,
+  masterVolume: number,
+): boolean {
+  return masterAudioOutputEnabled(masterVolume)
+    && (["player", "party", "enemy"] as const).some((group) => (
+      settings.audioEnabled[group] && settings.audioVolume[group] > 0
+    ));
+}
+
+function combatAudioGroupOutputEnabled(
+  settings: CombatPresentationSettings,
+  masterVolume: number,
+  group: CombatActorGroup,
+): boolean {
+  return masterAudioOutputEnabled(masterVolume)
+    && settings.audioEnabled[group]
+    && settings.audioVolume[group] > 0;
+}
+
 function audioContextConstructor(): typeof AudioContext | null {
   if (typeof window === "undefined") return null;
   return window.AudioContext
@@ -66,7 +90,11 @@ export function configureCombatAudio(
   configuredSettings = settings;
   configuredMasterVolume = Number.isFinite(masterVolume)
     ? Math.max(0, Math.min(1, masterVolume))
-    : 0.8;
+    : 0;
+  if (!masterAudioOutputEnabled(configuredMasterVolume)) {
+    resetCombatAudio();
+    if (context?.state === "running") void context.suspend().catch(() => undefined);
+  }
   applyCombatAudioSettings();
 }
 
@@ -113,6 +141,10 @@ const SCHOOL_FREQUENCY: Readonly<Record<CombatPresentationSchool, number>> = {
 };
 
 function playSynthesizedCombatCue(event: CombatPresentationEvent): void {
+  if (
+    !configuredSettings
+    || !combatAudioGroupOutputEnabled(configuredSettings, configuredMasterVolume, event.actorGroup)
+  ) return;
   const audioContext = ensureContext();
   if (!audioContext || !groupGains || !configuredSettings?.audioEnabled[event.actorGroup]) return;
   void audioContext.resume().catch(() => undefined);
@@ -181,9 +213,15 @@ export async function playMasterAudioCue(
   url: string,
   volume = 1,
 ): Promise<(() => void) | null> {
+  if (!masterAudioOutputEnabled(configuredMasterVolume)) return null;
   const audioContext = ensureContext();
   const buffer = await decodeAudio(url);
-  if (!audioContext || !buffer || !masterGain) return null;
+  if (
+    !masterAudioOutputEnabled(configuredMasterVolume)
+    || !audioContext
+    || !buffer
+    || !masterGain
+  ) return null;
   void audioContext.resume().catch(() => undefined);
   const source = audioContext.createBufferSource();
   const envelope = audioContext.createGain();
@@ -211,9 +249,19 @@ export async function playMasterAudioCue(
 
 async function playBufferedCombatCue(event: CombatPresentationEvent, sound: CombatEffectSoundAsset): Promise<boolean> {
   if (!sound.url) return false;
+  if (
+    !configuredSettings
+    || !combatAudioGroupOutputEnabled(configuredSettings, configuredMasterVolume, event.actorGroup)
+  ) return false;
   const audioContext = ensureContext();
   const buffer = await decodeAudio(sound.url);
-  if (!audioContext || !buffer || !groupGains || !configuredSettings?.audioEnabled[event.actorGroup]) return false;
+  if (
+    !configuredSettings
+    || !combatAudioGroupOutputEnabled(configuredSettings, configuredMasterVolume, event.actorGroup)
+    || !audioContext
+    || !buffer
+    || !groupGains
+  ) return false;
   void audioContext.resume().catch(() => undefined);
   const source = audioContext.createBufferSource();
   const envelope = audioContext.createGain();
@@ -248,7 +296,10 @@ export function playCombatAudio(event: CombatPresentationEvent): void {
     stopCombatAudioGroup(event.actorGroup);
     return;
   }
-  if (!configuredSettings?.audioEnabled[event.actorGroup] || configuredSettings.audioVolume[event.actorGroup] <= 0) return;
+  if (
+    !configuredSettings
+    || !combatAudioGroupOutputEnabled(configuredSettings, configuredMasterVolume, event.actorGroup)
+  ) return;
   const sound = weightedSound(event);
   if (!sound) {
     playSynthesizedCombatCue(event);