feat(audio): trumpet start and fanfare finish by default, start/finish signal chosen in settings (1.56.0)
This commit is contained in:
1 parent
36fe1e3933
commit
a8aaeae02f
15 files changed
+73
-21
No files matched your search
+12
-4
@@ -7,7 +7,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([
|
||||
event("race_1_minute", "start", "normal"), event("race_30_seconds", "start", "normal"),
|
||||
event("race_10_seconds", "start", "normal", true, "effects/warning.wav"),
|
||||
event("drivers_ready", "start", "high"), event("start_sequence", "start", "high"),
|
||||
event("start_tone", "start", "high", false, "effects/start_horn.wav"),
|
||||
event("start_tone", "start", "high", false, "effects/start_trumpet.wav"),
|
||||
event("false_start", "start", "critical", true, "effects/warning.wav", 1000), event("restart_race", "start", "high"),
|
||||
event("staggered_release", "start", "normal"),
|
||||
event("prologue_start", "start", "normal"), event("prologue_minutes", "start", "normal"),
|
||||
@@ -27,7 +27,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([
|
||||
event("one_minute_remaining", "race", "normal"), event("thirty_seconds_remaining", "race", "normal"),
|
||||
event("ten_seconds_remaining", "race", "normal", true, "effects/warning.wav"),
|
||||
event("time_expired", "race", "high", true, "effects/warning.wav"),
|
||||
event("race_finished", "race", "high", true, "effects/finish_horn.wav"),
|
||||
event("race_finished", "race", "high", true, "effects/finish_fanfare.wav"),
|
||||
event("track_call", "control", "critical", true, "effects/warning.wav", 1000), event("track_clear", "control", "critical"),
|
||||
event("yellow_flag", "control", "critical", true, "effects/warning.wav"), event("red_flag", "control", "critical", true, "effects/warning.wav"),
|
||||
event("race_paused", "control", "critical", true, "effects/warning.wav"), event("race_resumed", "control", "high"),
|
||||
@@ -38,7 +38,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([
|
||||
event("entering_pits", "pit", "low", false, "effects/transponder_pass.wav"), event("leaving_pits", "pit", "low", false, "effects/transponder_pass.wav"),
|
||||
event("pit_speed_warning", "pit", "high", true, "effects/warning.wav"),
|
||||
event("qualifying_start", "qualifying", "high"), event("qualifying_remaining", "qualifying", "normal"),
|
||||
event("qualifying_finished", "qualifying", "high", true, "effects/finish_horn.wav"), event("provisional_pole", "qualifying", "normal"),
|
||||
event("qualifying_finished", "qualifying", "high", true, "effects/finish_fanfare.wav"), event("provisional_pole", "qualifying", "normal"),
|
||||
event("pole_position", "qualifying", "normal", true, "effects/fastest_lap_trophy.wav"),
|
||||
event("race_winner", "results", "high", true, "effects/fastest_lap_trophy.wav"), event("second_place", "results", "normal"),
|
||||
event("third_place", "results", "normal"), event("podium", "results", "normal"),
|
||||
@@ -55,6 +55,11 @@ const clamp = (value, fallback, min = 0, max = 1) => {
|
||||
return Math.max(min, Math.min(max, Number.isFinite(number) ? number : fallback));
|
||||
};
|
||||
|
||||
// The start and finish signals can be chosen in Settings (the files are in the sound pack).
|
||||
export const START_SOUNDS = Object.freeze({ trumpet: "effects/start_trumpet.wav", horn: "effects/start_horn.wav", beep: "effects/start_beep.wav" });
|
||||
export const FINISH_SOUNDS = Object.freeze({ fanfare: "effects/finish_fanfare.wav", horn: "effects/finish_horn.wav", classic: "effects/race_finish.wav" });
|
||||
const FINISH_EVENTS = new Set(["race_finished", "qualifying_finished"]);
|
||||
|
||||
export function normalizeRaceAudioSettings(value = {}) {
|
||||
const source = value && typeof value === "object" ? value : {};
|
||||
const events = {};
|
||||
@@ -85,6 +90,8 @@ export function normalizeRaceAudioSettings(value = {}) {
|
||||
minStartDelay,
|
||||
maxStartDelay,
|
||||
perCompetitorPassingTone: source.perCompetitorPassingTone === true,
|
||||
startSound: Object.hasOwn(START_SOUNDS, source.startSound) ? source.startSound : "trumpet",
|
||||
finishSound: Object.hasOwn(FINISH_SOUNDS, source.finishSound) ? source.finishSound : "fanfare",
|
||||
raceCallouts: source.raceCallouts === "full" ? "full" : "passing",
|
||||
// Open Practice personal best calls (practice_callouts_logic.js); 0 turns a rule off.
|
||||
practicePbWarmupLaps: Math.round(clamp(source.practicePbWarmupLaps, 10, 0, 30)),
|
||||
@@ -182,7 +189,8 @@ export function createRaceAudioEngine(options = {}) {
|
||||
if (!settings.enabled || settings.muted || !configured.effect || !definition?.effect) return false;
|
||||
await loadManifest();
|
||||
const customPath = safeEffectPath(eventOptions.effectPath);
|
||||
const effectPath = customPath || safeEffectPath(manifest?.events?.[key]?.effect || definition.effect);
|
||||
const chosen = key === "start_tone" ? START_SOUNDS[settings.startSound] : FINISH_EVENTS.has(key) ? FINISH_SOUNDS[settings.finishSound] : "";
|
||||
const effectPath = customPath || chosen || safeEffectPath(manifest?.events?.[key]?.effect || definition.effect);
|
||||
const isPassing = key === "transponder_pass" || key === "transponder_detected";
|
||||
const volume = settings.masterVolume * (isPassing ? settings.passingVolume : settings.effectsVolume);
|
||||
const rate = settings.perCompetitorPassingTone && isPassing && eventOptions.variant ? variantPlaybackRate(eventOptions.variant) : undefined;
|
||||
|
||||
Reference in new issue
Block a user