Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drive piano digit shortcuts from server instrument metadata

Browse Source
This commit is contained in:
Jage9
2026-02-24 19:44:01 -05:00
parent 60c0ced7b7
commit a588148039
3 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/audio/pianoSynth.ts
View File

@@ -15,6 +15,22 @@ export const PIANO_INSTRUMENT_OPTIONS = [
export type PianoInstrumentId = (typeof PIANO_INSTRUMENT_OPTIONS)[number];
/** Returns whether a runtime string is one of the supported piano instrument ids. */
export function isPianoInstrumentId(value: string): value is PianoInstrumentId {
return (
value === 'piano' ||
value === 'electric_piano' ||
value === 'guitar' ||
value === 'organ' ||
value === 'bass' ||
value === 'violin' ||
value === 'synth_lead' ||
value === 'brass' ||
value === 'nintendo' ||
value === 'drum_kit'
);
}
type VoiceRuntime = {
gain: GainNode;
panner: StereoPannerNode | null;

32
client/src/items/types/piano/runtime.ts
View File

@@ -1,11 +1,12 @@
import {
DEFAULT_PIANO_SETTINGS_BY_INSTRUMENT,
PIANO_INSTRUMENT_OPTIONS,
PianoSynth,
isPianoInstrumentId,
type PianoInstrumentId,
} from '../../../audio/pianoSynth';
import { type IncomingMessage, type OutgoingMessage } from '../../../network/protocol';
import { type GameMode, type WorldItem } from '../../../state/gameState';
import { getItemPropertyOptionValues } from '../../itemRegistry';
const PIANO_WHITE_KEY_MIDI_BY_CODE: Record<string, number> = {
KeyA: 60,
@@ -321,8 +322,9 @@ export class PianoController {
if (code.startsWith('Digit')) {
const digit = Number(code.slice(5));
const instrumentIndex = digit === 0 ? 9 : digit - 1;
if (Number.isInteger(instrumentIndex) && instrumentIndex >= 0 && instrumentIndex < PIANO_INSTRUMENT_OPTIONS.length) {
const instrument = PIANO_INSTRUMENT_OPTIONS[instrumentIndex];
const shortcutInstruments = this.getShortcutInstruments();
if (Number.isInteger(instrumentIndex) && instrumentIndex >= 0 && instrumentIndex < shortcutInstruments.length) {
const instrument = shortcutInstruments[instrumentIndex];
if (instrument) {
const defaults = DEFAULT_PIANO_SETTINGS_BY_INSTRUMENT[instrument];
const voiceMode = this.defaultsVoiceModeForInstrument(instrument);
@@ -646,18 +648,24 @@ export class PianoController {
private normalizePianoInstrument(value: unknown): PianoInstrumentId {
const raw = String(value ?? 'piano').trim().toLowerCase();
if (raw === 'electric_piano') return 'electric_piano';
if (raw === 'guitar') return 'guitar';
if (raw === 'organ') return 'organ';
if (raw === 'bass') return 'bass';
if (raw === 'violin') return 'violin';
if (raw === 'synth_lead') return 'synth_lead';
if (raw === 'brass') return 'brass';
if (raw === 'nintendo') return 'nintendo';
if (raw === 'drum_kit') return 'drum_kit';
if (isPianoInstrumentId(raw)) return raw;
return 'piano';
}
private getShortcutInstruments(): PianoInstrumentId[] {
const options = getItemPropertyOptionValues('piano', 'instrument') ?? [];
const normalized: PianoInstrumentId[] = [];
const seen = new Set<string>();
for (const option of options) {
const raw = option.trim().toLowerCase();
if (!isPianoInstrumentId(raw) || seen.has(raw)) continue;
seen.add(raw);
normalized.push(raw);
if (normalized.length >= 10) break;
}
return normalized;
}
private getPianoMidiForCode(code: string): number | null {
if (code in PIANO_WHITE_KEY_MIDI_BY_CODE) {
return PIANO_WHITE_KEY_MIDI_BY_CODE[code]!;