feat(audio): fewer personal best calls in Open Practice
On fresh packs every driver beats their best almost every lap early in the day. No call for a driver's first 10 laps since the practice started or was reset, at most one per driver a minute, and 0.1 s over the last called time. Adjustable under Settings → Audio; 0 turns a rule off. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
633e0efa1f
commit
cade201d5a
10 files changed
+135
-2
No files matched your search
@@ -2130,6 +2130,10 @@ const TRANSLATIONS = {
|
||||
"audio.max_delay": "Största fördröjning (sek)",
|
||||
"audio.per_competitor": "Olika passing-ton per förare/bil",
|
||||
"audio.race_callouts": "Utrop under race",
|
||||
"audio.practice_pb_warmup": "Träning: tyst personbästa första varven",
|
||||
"audio.practice_pb_cooldown": "Träning: sekunder mellan PB-utrop per förare",
|
||||
"audio.practice_pb_min_gain": "Träning: minsta förbättring för utrop (s)",
|
||||
"audio.practice_pb_hint": "Gäller open practice. På nyladdade ackar slår alla sin bästa tid nästan varje varv i början av dagen. Bästa varvet visas ändå på skärm och overlay. 0 stänger av regeln.",
|
||||
"audio.race_callouts_passing": "Bara passeringsljud (som tidtagningssystem)",
|
||||
"audio.race_callouts_full": "Speaker - namn, bästa varv, ny ledare",
|
||||
"audio.test": "Testa",
|
||||
@@ -3963,6 +3967,10 @@ const TRANSLATIONS = {
|
||||
"audio.max_delay": "Maximum delay (seconds)",
|
||||
"audio.per_competitor": "Different passing tone per driver/car",
|
||||
"audio.race_callouts": "Calls during a race",
|
||||
"audio.practice_pb_warmup": "Practice: silent personal best for first laps",
|
||||
"audio.practice_pb_cooldown": "Practice: seconds between PB calls per driver",
|
||||
"audio.practice_pb_min_gain": "Practice: minimum improvement to call (s)",
|
||||
"audio.practice_pb_hint": "Open Practice. On fresh packs everyone beats their best almost every lap early in the day. The best lap is still shown on screen and in the overlay. 0 turns a rule off.",
|
||||
"audio.race_callouts_passing": "Passing tone only (like timing systems)",
|
||||
"audio.race_callouts_full": "Speaker - names, best laps, new leader",
|
||||
"audio.test": "Test",
|
||||
|
||||
+16
-1
@@ -2,8 +2,12 @@ import { decoderDiagnostics } from "./decoder_diagnostics.js";
|
||||
import { getControlledLapStreak } from "./training_logic.js";
|
||||
import { usesPersonalClock, getLatestClockStartTs } from "./prologue_logic.js";
|
||||
import { isSuspectLap, getSuspectReferenceLaps } from "./suspect_laps_logic.js";
|
||||
import { shouldCallPracticePersonalBest } from "./practice_callouts_logic.js";
|
||||
import { normalizeRaceAudioSettings } from "./race_audio.js";
|
||||
|
||||
const PRACTICE_SESSION_TYPES = new Set(["open_practice", "free_practice", "practice"]);
|
||||
// Last personal best *called* per driver, per practice day and layout (practice_callouts_logic.js).
|
||||
const lastPracticePbCall = new Map();
|
||||
|
||||
function getCurrentPracticePaceLaps(result, competitorKey) {
|
||||
const laps = [];
|
||||
@@ -271,6 +275,11 @@ export function disconnectDecoderHelper(options = {}, deps) {
|
||||
updateConnectionBadge();
|
||||
}
|
||||
|
||||
function getPracticePbRules(state) {
|
||||
const audio = normalizeRaceAudioSettings(state.settings?.raceAudio);
|
||||
return { warmupLaps: audio.practicePbWarmupLaps, cooldownSec: audio.practicePbCooldownSec, minGainMs: audio.practicePbMinGainMs };
|
||||
}
|
||||
|
||||
export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
const {
|
||||
state, t, getActiveSession, ensureSessionResult, normalizeStartMode, getSessionLapWindow,
|
||||
@@ -555,7 +564,13 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") {
|
||||
}
|
||||
}
|
||||
if (suspect) pushOverlayEvent("suspect", `${entry.displayName || entry.driverName} • ${formatLap(lapMs)} ⚠`);
|
||||
if (!suspect && previousPersonalBest && lapMs < previousPersonalBest) triggerRaceAudio("personal_best", { variables: audioVariables, driverId: entry.driverId, competitorKey: key, logData: { raceId: session.eventId, driverId: entry.driverId, lapNumber: entry.laps, lapTime: lapMs } });
|
||||
const isPracticeSession = PRACTICE_SESSION_TYPES.has(String(session.type || "").toLowerCase());
|
||||
const pbCallKey = `${session.id}:${Number(session.resultsResetAt || 0)}:${layoutId}:${key}`;
|
||||
const callPersonalBest = !suspect && (isPracticeSession
|
||||
? shouldCallPracticePersonalBest({ lapNumber: entry.laps, lapMs, previousBestMs: previousPersonalBest, lastCall: lastPracticePbCall.get(pbCallKey), now: Date.now(), rules: getPracticePbRules(state) })
|
||||
: Boolean(previousPersonalBest && lapMs < previousPersonalBest));
|
||||
if (callPersonalBest && isPracticeSession) lastPracticePbCall.set(pbCallKey, { at: Date.now(), lapMs });
|
||||
if (callPersonalBest) triggerRaceAudio("personal_best", { variables: audioVariables, driverId: entry.driverId, competitorKey: key, logData: { raceId: session.eventId, driverId: entry.driverId, lapNumber: entry.laps, lapTime: lapMs } });
|
||||
if (!suspect && previousSessionFastest && lapMs < previousSessionFastest) triggerRaceAudio("fastest_lap", { variables: audioVariables, driverId: entry.driverId, competitorKey: key, logData: { raceId: session.eventId, driverId: entry.driverId, lapNumber: entry.laps, lapTime: lapMs } });
|
||||
if (!suspect && previousTrackRecord && lapMs < previousTrackRecord) triggerRaceAudio("track_record", { variables: audioVariables, driverId: entry.driverId, competitorKey: key, logData: { raceId: session.eventId, driverId: entry.driverId, lapNumber: entry.laps, lapTime: lapMs } });
|
||||
if (previousPosition >= 0 && currentPosition >= 0 && currentPosition < previousPosition) triggerRaceAudio("position_gain", { driverId: entry.driverId, competitorKey: key });
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
// Open Practice "personal best" calls. On a fresh pack every driver beats their own best almost
|
||||
// every lap for the first laps of the day (the results start empty after a new practice or
|
||||
// "Reset – new practice day"), so with a few drivers on track the speaker never stops. The
|
||||
// rules below only decide what is *called*; the best lap itself is still shown everywhere.
|
||||
// - warm-up: nothing for a driver's first N laps of the day,
|
||||
// - cooldown: at most one call per driver per N seconds,
|
||||
// - minimum gain: after a call, the next one needs a best that beats the *called* time by this
|
||||
// much, so a run of tiny improvements is called once they add up. The first personal best
|
||||
// after the warm-up is always called.
|
||||
// Each rule is off at 0.
|
||||
export const PRACTICE_PB_DEFAULTS = Object.freeze({ warmupLaps: 10, cooldownSec: 60, minGainMs: 100 });
|
||||
|
||||
export function shouldCallPracticePersonalBest({ lapNumber, lapMs, previousBestMs, lastCall = null, now, rules = PRACTICE_PB_DEFAULTS }) {
|
||||
if (!previousBestMs || !(lapMs < previousBestMs)) return false;
|
||||
if (rules.warmupLaps && lapNumber <= rules.warmupLaps) return false;
|
||||
if (!lastCall) return true;
|
||||
if (rules.cooldownSec && now - lastCall.at < rules.cooldownSec * 1000) return false;
|
||||
return lastCall.lapMs - lapMs >= rules.minGainMs;
|
||||
}
|
||||
@@ -85,6 +85,10 @@ export function normalizeRaceAudioSettings(value = {}) {
|
||||
maxStartDelay,
|
||||
perCompetitorPassingTone: source.perCompetitorPassingTone === true,
|
||||
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)),
|
||||
practicePbCooldownSec: Math.round(clamp(source.practicePbCooldownSec, 60, 0, 600)),
|
||||
practicePbMinGainMs: Math.round(clamp(source.practicePbMinGainMs, 100, 0, 2000)),
|
||||
events,
|
||||
templates: source.templates && typeof source.templates === "object" ? { ...source.templates } : {},
|
||||
};
|
||||
|
||||
@@ -251,6 +251,9 @@ export function renderSettings(deps) {
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioEnabled" form="settingsForm" ${raceAudio.enabled ? "checked" : ""} /><span>${t("audio.enabled")}</span></label>
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioMuted" form="settingsForm" ${raceAudio.muted ? "checked" : ""} /><span>${t("audio.mute")}</span></label>
|
||||
<label><span>${t("audio.race_callouts")}</span><select name="raceAudioRaceCallouts" form="settingsForm"><option value="passing" ${raceAudio.raceCallouts === "passing" ? "selected" : ""}>${t("audio.race_callouts_passing")}</option><option value="full" ${raceAudio.raceCallouts === "full" ? "selected" : ""}>${t("audio.race_callouts_full")}</option></select></label>
|
||||
<label title="${t("audio.practice_pb_hint")}"><span>${t("audio.practice_pb_warmup")}</span><input type="number" min="0" max="30" step="1" name="raceAudioPbWarmup" form="settingsForm" value="${raceAudio.practicePbWarmupLaps}" /></label>
|
||||
<label title="${t("audio.practice_pb_hint")}"><span>${t("audio.practice_pb_cooldown")}</span><input type="number" min="0" max="600" step="10" name="raceAudioPbCooldown" form="settingsForm" value="${raceAudio.practicePbCooldownSec}" /></label>
|
||||
<label title="${t("audio.practice_pb_hint")}"><span>${t("audio.practice_pb_min_gain")}</span><input type="number" min="0" max="2" step="0.05" name="raceAudioPbMinGain" form="settingsForm" value="${raceAudio.practicePbMinGainMs / 1000}" /></label>
|
||||
<label><span>${t("audio.language")}</span><select name="raceAudioLanguage" form="settingsForm"><option value="sv" ${raceAudio.language === "sv" ? "selected" : ""}>Svenska</option><option value="en" ${raceAudio.language === "en" ? "selected" : ""}>English</option></select></label>
|
||||
<label><span>${t("audio.voice_select")}</span><select name="raceAudioVoiceUri" form="settingsForm"><option value="">${t("audio.voice_auto")}</option>${raceAudioVoiceOptions}</select></label>
|
||||
<label><span>${t("audio.voice_rate")}</span><input type="range" min="0.65" max="1.35" step="0.05" name="raceAudioVoiceRate" form="settingsForm" value="${raceAudio.voiceRate}" /></label>
|
||||
@@ -629,6 +632,9 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
randomStartDelay: form.get("raceAudioRandomDelay") === "on", minStartDelay: Number(form.get("raceAudioMinDelay")),
|
||||
maxStartDelay: Number(form.get("raceAudioMaxDelay")), perCompetitorPassingTone: form.get("raceAudioPerCompetitor") === "on",
|
||||
raceCallouts: String(form.get("raceAudioRaceCallouts") || "passing"),
|
||||
practicePbWarmupLaps: Number(form.get("raceAudioPbWarmup")),
|
||||
practicePbCooldownSec: Number(form.get("raceAudioPbCooldown")),
|
||||
practicePbMinGainMs: Math.round(Number(form.get("raceAudioPbMinGain")) * 1000),
|
||||
events,
|
||||
});
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user