diff --git a/apps/web/src/lib/feedback.test.ts b/apps/web/src/lib/feedback.test.ts index 1c983f3..5daec48 100644 --- a/apps/web/src/lib/feedback.test.ts +++ b/apps/web/src/lib/feedback.test.ts @@ -1,8 +1,9 @@ import { beforeEach, expect, mock, test } from 'bun:test'; -/** A fake Web Audio graph that records every oscillator note: frequency, start and peak level. */ +/** A fake Web Audio graph that records every oscillator note: frequency (and where it glides to), start and peak level. */ interface Note { freq: number; + to: number; start: number; peak: number; } @@ -45,7 +46,7 @@ class FakeCtx { return { connect: () => {} }; }, start(t: number) { - notes.push({ freq: frequency.value, start: t, peak: g!.gain.peak }); + notes.push({ freq: frequency.value, to: frequency.peak, start: t, peak: g!.gain.peak }); }, stop() {}, }; @@ -79,9 +80,9 @@ test('chat sound is 10% under the game sounds', () => { for (const n of notes) byStart.set(n.start, (byStart.get(n.start) ?? 0) + n.peak); const loudest = Math.max(...byStart.values()); expect(loudest).toBeCloseTo(game * 0.9, 6); - // Two rising notes ("띠릭"). - const mains = [...new Set(notes.map((n) => n.start))].sort().map((t) => Math.min(...notes.filter((n) => n.start === t).map((n) => n.freq))); - expect(mains).toEqual([1568, 2093]); + // Two bubbles ("뽀록"), each gliding up from a low start. + expect(notes.map((n) => n.freq)).toEqual([380, 520]); + expect(notes.map((n) => n.to)).toEqual([1150, 1500]); }); test('chat sound follows the volume setting and is silent when sound is off', async () => { diff --git a/apps/web/src/lib/feedback.ts b/apps/web/src/lib/feedback.ts index 0d77885..0e0b04b 100644 --- a/apps/web/src/lib/feedback.ts +++ b/apps/web/src/lib/feedback.ts @@ -195,19 +195,16 @@ export const CHAT_LEVEL = GAME_LEVEL * 0.9; let lastChatAt = -Infinity; /** - * StarCraft-like chat "띠릭": two quick, glassy notes going up (sine + a soft octave on top), about 0.2 s. - * The layers of a note add up to CHAT_LEVEL at most. Lines arriving in a burst share one sound. + * Chat "뽀록": two water-drop bubbles like a messenger, each a sine gliding up fast (about 0.15 s in all). + * Kept apart from the UI/game sounds, which are steady notes (click, good, myTurn …), so it is not mistaken for one. + * The louder bubble peaks at CHAT_LEVEL. Lines arriving in a burst share one sound. */ export function chatSound(): void { const now = performance.now(); if (now - lastChatAt < 80) return; lastChatAt = now; - const main = CHAT_LEVEL * 0.8; - const air = CHAT_LEVEL * 0.2; - tone(1568, 70, 'sine', main, 0, { attack: 3, slideTo: 1661 }); - tone(3136, 50, 'sine', air, 0, { attack: 3 }); - tone(2093, 140, 'sine', main, 65, { attack: 3 }); - tone(4186, 90, 'sine', air, 65, { attack: 3 }); + tone(380, 70, 'sine', CHAT_LEVEL, 0, { attack: 2, slideTo: 1150 }); + tone(520, 80, 'sine', CHAT_LEVEL * 0.7, 75, { attack: 2, slideTo: 1500 }); } /** Plays the chat sound whenever `lastKey` (the newest live chat line) changes after the first render. */ diff --git a/e2e/chat.e2e.ts b/e2e/chat.e2e.ts index 2f08a63..7ae7920 100644 --- a/e2e/chat.e2e.ts +++ b/e2e/chat.e2e.ts @@ -242,14 +242,14 @@ try { if (await a.locator('.room-bar').getByRole('button', { name: /^채팅/ }).count()) throw new Error('chat button still on the wide bar'); }); - await step('채팅 소리: 새 줄마다 "띠릭"(보낸 사람도), 다시 들어올 때 받는 지난 줄은 조용히', async () => { - // Count the chat sound's first note (1568 Hz) as it is scheduled. + await step('채팅 소리: 새 줄마다 "뽀록"(보낸 사람도), 다시 들어올 때 받는 지난 줄은 조용히', async () => { + // Count the chat sound's first bubble (starts at 380 Hz) as it is scheduled. const rec = () => { const w = window as unknown as { __chatBeeps: number }; w.__chatBeeps = 0; const orig = AudioParam.prototype.setValueAtTime; AudioParam.prototype.setValueAtTime = function (v: number, t: number) { - if (v === 1568) w.__chatBeeps++; + if (v === 380) w.__chatBeeps++; return orig.call(this, v, t); }; };