diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index cd8cd627579..542c7ac8db5 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -19,183 +19,32 @@ instrumentDir = dir instrumentObj = obj -/datum/song/proc/playnote(var/note as text) - //world << "Note: [note]" - var/soundfile - /*BYOND loads resource files at compile time if they are ''. This means you can't really manipulate them dynamically. - Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/ - switch(note) - if("Cn1") soundfile = "sound/[instrumentDir]/Cn1.[instrumentExt]" - if("C#1") soundfile = "sound/[instrumentDir]/C#1.[instrumentExt]" - if("Db1") soundfile = "sound/[instrumentDir]/Db1.[instrumentExt]" - if("Dn1") soundfile = "sound/[instrumentDir]/Dn1.[instrumentExt]" - if("D#1") soundfile = "sound/[instrumentDir]/D#1.[instrumentExt]" - if("Eb1") soundfile = "sound/[instrumentDir]/Eb1.[instrumentExt]" - if("En1") soundfile = "sound/[instrumentDir]/En1.[instrumentExt]" - if("E#1") soundfile = "sound/[instrumentDir]/E#1.[instrumentExt]" - if("Fb1") soundfile = "sound/[instrumentDir]/Fb1.[instrumentExt]" - if("Fn1") soundfile = "sound/[instrumentDir]/Fn1.[instrumentExt]" - if("F#1") soundfile = "sound/[instrumentDir]/F#1.[instrumentExt]" - if("Gb1") soundfile = "sound/[instrumentDir]/Gb1.[instrumentExt]" - if("Gn1") soundfile = "sound/[instrumentDir]/Gn1.[instrumentExt]" - if("G#1") soundfile = "sound/[instrumentDir]/G#1.[instrumentExt]" - if("Ab1") soundfile = "sound/[instrumentDir]/Ab1.[instrumentExt]" - if("An1") soundfile = "sound/[instrumentDir]/An1.[instrumentExt]" - if("A#1") soundfile = "sound/[instrumentDir]/A#1.[instrumentExt]" - if("Bb1") soundfile = "sound/[instrumentDir]/Bb1.[instrumentExt]" - if("Bn1") soundfile = "sound/[instrumentDir]/Bn1.[instrumentExt]" - if("B#1") soundfile = "sound/[instrumentDir]/B#1.[instrumentExt]" - if("Cb2") soundfile = "sound/[instrumentDir]/Cb2.[instrumentExt]" - if("Cn2") soundfile = "sound/[instrumentDir]/Cn2.[instrumentExt]" - if("C#2") soundfile = "sound/[instrumentDir]/C#2.[instrumentExt]" - if("Db2") soundfile = "sound/[instrumentDir]/Db2.[instrumentExt]" - if("Dn2") soundfile = "sound/[instrumentDir]/Dn2.[instrumentExt]" - if("D#2") soundfile = "sound/[instrumentDir]/D#2.[instrumentExt]" - if("Eb2") soundfile = "sound/[instrumentDir]/Eb2.[instrumentExt]" - if("En2") soundfile = "sound/[instrumentDir]/En2.[instrumentExt]" - if("E#2") soundfile = "sound/[instrumentDir]/E#2.[instrumentExt]" - if("Fb2") soundfile = "sound/[instrumentDir]/Fb2.[instrumentExt]" - if("Fn2") soundfile = "sound/[instrumentDir]/Fn2.[instrumentExt]" - if("F#2") soundfile = "sound/[instrumentDir]/F#2.[instrumentExt]" - if("Gb2") soundfile = "sound/[instrumentDir]/Gb2.[instrumentExt]" - if("Gn2") soundfile = "sound/[instrumentDir]/Gn2.[instrumentExt]" - if("G#2") soundfile = "sound/[instrumentDir]/G#2.[instrumentExt]" - if("Ab2") soundfile = "sound/[instrumentDir]/Ab2.[instrumentExt]" - if("An2") soundfile = "sound/[instrumentDir]/An2.[instrumentExt]" - if("A#2") soundfile = "sound/[instrumentDir]/A#2.[instrumentExt]" - if("Bb2") soundfile = "sound/[instrumentDir]/Bb2.[instrumentExt]" - if("Bn2") soundfile = "sound/[instrumentDir]/Bn2.[instrumentExt]" - if("B#2") soundfile = "sound/[instrumentDir]/B#2.[instrumentExt]" - if("Cb3") soundfile = "sound/[instrumentDir]/Cb3.[instrumentExt]" - if("Cn3") soundfile = "sound/[instrumentDir]/Cn3.[instrumentExt]" - if("C#3") soundfile = "sound/[instrumentDir]/C#3.[instrumentExt]" - if("Db3") soundfile = "sound/[instrumentDir]/Db3.[instrumentExt]" - if("Dn3") soundfile = "sound/[instrumentDir]/Dn3.[instrumentExt]" - if("D#3") soundfile = "sound/[instrumentDir]/D#3.[instrumentExt]" - if("Eb3") soundfile = "sound/[instrumentDir]/Eb3.[instrumentExt]" - if("En3") soundfile = "sound/[instrumentDir]/En3.[instrumentExt]" - if("E#3") soundfile = "sound/[instrumentDir]/E#3.[instrumentExt]" - if("Fb3") soundfile = "sound/[instrumentDir]/Fb3.[instrumentExt]" - if("Fn3") soundfile = "sound/[instrumentDir]/Fn3.[instrumentExt]" - if("F#3") soundfile = "sound/[instrumentDir]/F#3.[instrumentExt]" - if("Gb3") soundfile = "sound/[instrumentDir]/Gb3.[instrumentExt]" - if("Gn3") soundfile = "sound/[instrumentDir]/Gn3.[instrumentExt]" - if("G#3") soundfile = "sound/[instrumentDir]/G#3.[instrumentExt]" - if("Ab3") soundfile = "sound/[instrumentDir]/Ab3.[instrumentExt]" - if("An3") soundfile = "sound/[instrumentDir]/An3.[instrumentExt]" - if("A#3") soundfile = "sound/[instrumentDir]/A#3.[instrumentExt]" - if("Bb3") soundfile = "sound/[instrumentDir]/Bb3.[instrumentExt]" - if("Bn3") soundfile = "sound/[instrumentDir]/Bn3.[instrumentExt]" - if("B#3") soundfile = "sound/[instrumentDir]/B#3.[instrumentExt]" - if("Cb4") soundfile = "sound/[instrumentDir]/Cb4.[instrumentExt]" - if("Cn4") soundfile = "sound/[instrumentDir]/Cn4.[instrumentExt]" - if("C#4") soundfile = "sound/[instrumentDir]/C#4.[instrumentExt]" - if("Db4") soundfile = "sound/[instrumentDir]/Db4.[instrumentExt]" - if("Dn4") soundfile = "sound/[instrumentDir]/Dn4.[instrumentExt]" - if("D#4") soundfile = "sound/[instrumentDir]/D#4.[instrumentExt]" - if("Eb4") soundfile = "sound/[instrumentDir]/Eb4.[instrumentExt]" - if("En4") soundfile = "sound/[instrumentDir]/En4.[instrumentExt]" - if("E#4") soundfile = "sound/[instrumentDir]/E#4.[instrumentExt]" - if("Fb4") soundfile = "sound/[instrumentDir]/Fb4.[instrumentExt]" - if("Fn4") soundfile = "sound/[instrumentDir]/Fn4.[instrumentExt]" - if("F#4") soundfile = "sound/[instrumentDir]/F#4.[instrumentExt]" - if("Gb4") soundfile = "sound/[instrumentDir]/Gb4.[instrumentExt]" - if("Gn4") soundfile = "sound/[instrumentDir]/Gn4.[instrumentExt]" - if("G#4") soundfile = "sound/[instrumentDir]/G#4.[instrumentExt]" - if("Ab4") soundfile = "sound/[instrumentDir]/Ab4.[instrumentExt]" - if("An4") soundfile = "sound/[instrumentDir]/An4.[instrumentExt]" - if("A#4") soundfile = "sound/[instrumentDir]/A#4.[instrumentExt]" - if("Bb4") soundfile = "sound/[instrumentDir]/Bb4.[instrumentExt]" - if("Bn4") soundfile = "sound/[instrumentDir]/Bn4.[instrumentExt]" - if("B#4") soundfile = "sound/[instrumentDir]/B#4.[instrumentExt]" - if("Cb5") soundfile = "sound/[instrumentDir]/Cb5.[instrumentExt]" - if("Cn5") soundfile = "sound/[instrumentDir]/Cn5.[instrumentExt]" - if("C#5") soundfile = "sound/[instrumentDir]/C#5.[instrumentExt]" - if("Db5") soundfile = "sound/[instrumentDir]/Db5.[instrumentExt]" - if("Dn5") soundfile = "sound/[instrumentDir]/Dn5.[instrumentExt]" - if("D#5") soundfile = "sound/[instrumentDir]/D#5.[instrumentExt]" - if("Eb5") soundfile = "sound/[instrumentDir]/Eb5.[instrumentExt]" - if("En5") soundfile = "sound/[instrumentDir]/En5.[instrumentExt]" - if("E#5") soundfile = "sound/[instrumentDir]/E#5.[instrumentExt]" - if("Fb5") soundfile = "sound/[instrumentDir]/Fb5.[instrumentExt]" - if("Fn5") soundfile = "sound/[instrumentDir]/Fn5.[instrumentExt]" - if("F#5") soundfile = "sound/[instrumentDir]/F#5.[instrumentExt]" - if("Gb5") soundfile = "sound/[instrumentDir]/Gb5.[instrumentExt]" - if("Gn5") soundfile = "sound/[instrumentDir]/Gn5.[instrumentExt]" - if("G#5") soundfile = "sound/[instrumentDir]/G#5.[instrumentExt]" - if("Ab5") soundfile = "sound/[instrumentDir]/Ab5.[instrumentExt]" - if("An5") soundfile = "sound/[instrumentDir]/An5.[instrumentExt]" - if("A#5") soundfile = "sound/[instrumentDir]/A#5.[instrumentExt]" - if("Bb5") soundfile = "sound/[instrumentDir]/Bb5.[instrumentExt]" - if("Bn5") soundfile = "sound/[instrumentDir]/Bn5.[instrumentExt]" - if("B#5") soundfile = "sound/[instrumentDir]/B#5.[instrumentExt]" - if("Cb6") soundfile = "sound/[instrumentDir]/Cb6.[instrumentExt]" - if("Cn6") soundfile = "sound/[instrumentDir]/Cn6.[instrumentExt]" - if("C#6") soundfile = "sound/[instrumentDir]/C#6.[instrumentExt]" - if("Db6") soundfile = "sound/[instrumentDir]/Db6.[instrumentExt]" - if("Dn6") soundfile = "sound/[instrumentDir]/Dn6.[instrumentExt]" - if("D#6") soundfile = "sound/[instrumentDir]/D#6.[instrumentExt]" - if("Eb6") soundfile = "sound/[instrumentDir]/Eb6.[instrumentExt]" - if("En6") soundfile = "sound/[instrumentDir]/En6.[instrumentExt]" - if("E#6") soundfile = "sound/[instrumentDir]/E#6.[instrumentExt]" - if("Fb6") soundfile = "sound/[instrumentDir]/Fb6.[instrumentExt]" - if("Fn6") soundfile = "sound/[instrumentDir]/Fn6.[instrumentExt]" - if("F#6") soundfile = "sound/[instrumentDir]/F#6.[instrumentExt]" - if("Gb6") soundfile = "sound/[instrumentDir]/Gb6.[instrumentExt]" - if("Gn6") soundfile = "sound/[instrumentDir]/Gn6.[instrumentExt]" - if("G#6") soundfile = "sound/[instrumentDir]/G#6.[instrumentExt]" - if("Ab6") soundfile = "sound/[instrumentDir]/Ab6.[instrumentExt]" - if("An6") soundfile = "sound/[instrumentDir]/An6.[instrumentExt]" - if("A#6") soundfile = "sound/[instrumentDir]/A#6.[instrumentExt]" - if("Bb6") soundfile = "sound/[instrumentDir]/Bb6.[instrumentExt]" - if("Bn6") soundfile = "sound/[instrumentDir]/Bn6.[instrumentExt]" - if("B#6") soundfile = "sound/[instrumentDir]/B#6.[instrumentExt]" - if("Cb7") soundfile = "sound/[instrumentDir]/Cb7.[instrumentExt]" - if("Cn7") soundfile = "sound/[instrumentDir]/Cn7.[instrumentExt]" - if("C#7") soundfile = "sound/[instrumentDir]/C#7.[instrumentExt]" - if("Db7") soundfile = "sound/[instrumentDir]/Db7.[instrumentExt]" - if("Dn7") soundfile = "sound/[instrumentDir]/Dn7.[instrumentExt]" - if("D#7") soundfile = "sound/[instrumentDir]/D#7.[instrumentExt]" - if("Eb7") soundfile = "sound/[instrumentDir]/Eb7.[instrumentExt]" - if("En7") soundfile = "sound/[instrumentDir]/En7.[instrumentExt]" - if("E#7") soundfile = "sound/[instrumentDir]/E#7.[instrumentExt]" - if("Fb7") soundfile = "sound/[instrumentDir]/Fb7.[instrumentExt]" - if("Fn7") soundfile = "sound/[instrumentDir]/Fn7.[instrumentExt]" - if("F#7") soundfile = "sound/[instrumentDir]/F#7.[instrumentExt]" - if("Gb7") soundfile = "sound/[instrumentDir]/Gb7.[instrumentExt]" - if("Gn7") soundfile = "sound/[instrumentDir]/Gn7.[instrumentExt]" - if("G#7") soundfile = "sound/[instrumentDir]/G#7.[instrumentExt]" - if("Ab7") soundfile = "sound/[instrumentDir]/Ab7.[instrumentExt]" - if("An7") soundfile = "sound/[instrumentDir]/An7.[instrumentExt]" - if("A#7") soundfile = "sound/[instrumentDir]/A#7.[instrumentExt]" - if("Bb7") soundfile = "sound/[instrumentDir]/Bb7.[instrumentExt]" - if("Bn7") soundfile = "sound/[instrumentDir]/Bn7.[instrumentExt]" - if("B#7") soundfile = "sound/[instrumentDir]/B#7.[instrumentExt]" - if("Cb8") soundfile = "sound/[instrumentDir]/Cb8.[instrumentExt]" - if("Cn8") soundfile = "sound/[instrumentDir]/Cn8.[instrumentExt]" - if("C#8") soundfile = "sound/[instrumentDir]/C#8.[instrumentExt]" - if("Db8") soundfile = "sound/[instrumentDir]/Db8.[instrumentExt]" - if("Dn8") soundfile = "sound/[instrumentDir]/Dn8.[instrumentExt]" - if("D#8") soundfile = "sound/[instrumentDir]/D#8.[instrumentExt]" - if("Eb8") soundfile = "sound/[instrumentDir]/Eb8.[instrumentExt]" - if("En8") soundfile = "sound/[instrumentDir]/En8.[instrumentExt]" - if("E#8") soundfile = "sound/[instrumentDir]/E#8.[instrumentExt]" - if("Fb8") soundfile = "sound/[instrumentDir]/Fb8.[instrumentExt]" - if("Fn8") soundfile = "sound/[instrumentDir]/Fn8.[instrumentExt]" - if("F#8") soundfile = "sound/[instrumentDir]/F#8.[instrumentExt]" - if("Gb8") soundfile = "sound/[instrumentDir]/Gb8.[instrumentExt]" - if("Gn8") soundfile = "sound/[instrumentDir]/Gn8.[instrumentExt]" - if("G#8") soundfile = "sound/[instrumentDir]/G#8.[instrumentExt]" - if("Ab8") soundfile = "sound/[instrumentDir]/Ab8.[instrumentExt]" - if("An8") soundfile = "sound/[instrumentDir]/An8.[instrumentExt]" - if("A#8") soundfile = "sound/[instrumentDir]/A#8.[instrumentExt]" - if("Bb8") soundfile = "sound/[instrumentDir]/Bb8.[instrumentExt]" - if("Bn8") soundfile = "sound/[instrumentDir]/Bn8.[instrumentExt]" - if("B#8") soundfile = "sound/[instrumentDir]/B#8.[instrumentExt]" - if("Cb9") soundfile = "sound/[instrumentDir]/Cb9.[instrumentExt]" - if("Cn9") soundfile = "sound/[instrumentDir]/Cn9.[instrumentExt]" - else return +// note is a number from 1-7 for A-G +// acc is either "b", "n", or "#" +// oct is 1-8 (or 9 for C) +/datum/song/proc/playnote(var/note, var/acc as text, var/oct) + // handle accidental -> B<>C of E<>F + if(acc == "b" && (note == 3 || note == 6)) // C or F + if(note == 3) + oct-- + note-- + acc = "n" + else if(acc == "#" && (note == 2 || note == 5)) // B or E + if(note == 2) + oct++ + note++ + acc = "n" + else if(acc == "#") // mass convert all sharps to flats, octave jump already handled + acc = "b" + note++ + // check octave, C is allowed to go to 9 + if(oct < 1 || (note == 3 ? oct > 9 : oct > 8)) + return + + // now generate name + var/soundfile = "sound/[instrumentDir]/[ascii2text(note+64)][acc][oct].[instrumentExt]" + // and play hearers(15, get_turf(instrumentObj)) << sound(soundfile) /datum/song/proc/updateDialog(mob/user as mob) @@ -209,7 +58,7 @@ var/cur_oct[7] var/cur_acc[7] for(var/i = 1 to 7) - cur_oct[i] = "3" + cur_oct[i] = 3 cur_acc[i] = "n" for(var/line in lines) @@ -236,8 +85,8 @@ else if(ni == "s") cur_acc[cur_note] = "#" // so shift is never required else - cur_oct[cur_note] = ni - playnote(uppertext(copytext(note,1,2)) + cur_acc[cur_note] + cur_oct[cur_note]) + cur_oct[cur_note] = text2num(ni) + playnote(cur_note, cur_acc[cur_note], cur_oct[cur_note]) if(notes.len >= 2 && text2num(notes[2])) sleep(tempo / text2num(notes[2])) else diff --git a/sound/piano/A#1.ogg b/sound/piano/A#1.ogg deleted file mode 100644 index b40cc723334..00000000000 Binary files a/sound/piano/A#1.ogg and /dev/null differ diff --git a/sound/piano/A#2.ogg b/sound/piano/A#2.ogg deleted file mode 100644 index 2b0677d44ae..00000000000 Binary files a/sound/piano/A#2.ogg and /dev/null differ diff --git a/sound/piano/A#3.ogg b/sound/piano/A#3.ogg deleted file mode 100644 index e8fc263d8f4..00000000000 Binary files a/sound/piano/A#3.ogg and /dev/null differ diff --git a/sound/piano/A#4.ogg b/sound/piano/A#4.ogg deleted file mode 100644 index 8ba7c40d331..00000000000 Binary files a/sound/piano/A#4.ogg and /dev/null differ diff --git a/sound/piano/A#5.ogg b/sound/piano/A#5.ogg deleted file mode 100644 index 65c14d3320f..00000000000 Binary files a/sound/piano/A#5.ogg and /dev/null differ diff --git a/sound/piano/A#6.ogg b/sound/piano/A#6.ogg deleted file mode 100644 index 88317f7d55c..00000000000 Binary files a/sound/piano/A#6.ogg and /dev/null differ diff --git a/sound/piano/A#7.ogg b/sound/piano/A#7.ogg deleted file mode 100644 index e7354522fee..00000000000 Binary files a/sound/piano/A#7.ogg and /dev/null differ diff --git a/sound/piano/A#8.ogg b/sound/piano/A#8.ogg deleted file mode 100644 index 7d8014c059a..00000000000 Binary files a/sound/piano/A#8.ogg and /dev/null differ diff --git a/sound/piano/B#1.ogg b/sound/piano/B#1.ogg deleted file mode 100644 index b82c6cff8a4..00000000000 Binary files a/sound/piano/B#1.ogg and /dev/null differ diff --git a/sound/piano/B#2.ogg b/sound/piano/B#2.ogg deleted file mode 100644 index e2183806292..00000000000 Binary files a/sound/piano/B#2.ogg and /dev/null differ diff --git a/sound/piano/B#3.ogg b/sound/piano/B#3.ogg deleted file mode 100644 index b4dd559a24e..00000000000 Binary files a/sound/piano/B#3.ogg and /dev/null differ diff --git a/sound/piano/B#4.ogg b/sound/piano/B#4.ogg deleted file mode 100644 index 578c45e452e..00000000000 Binary files a/sound/piano/B#4.ogg and /dev/null differ diff --git a/sound/piano/B#5.ogg b/sound/piano/B#5.ogg deleted file mode 100644 index 6dfd56115ff..00000000000 Binary files a/sound/piano/B#5.ogg and /dev/null differ diff --git a/sound/piano/B#6.ogg b/sound/piano/B#6.ogg deleted file mode 100644 index 32996328c8b..00000000000 Binary files a/sound/piano/B#6.ogg and /dev/null differ diff --git a/sound/piano/B#7.ogg b/sound/piano/B#7.ogg deleted file mode 100644 index 89b771aa375..00000000000 Binary files a/sound/piano/B#7.ogg and /dev/null differ diff --git a/sound/piano/B#8.ogg b/sound/piano/B#8.ogg deleted file mode 100644 index cca99040dec..00000000000 Binary files a/sound/piano/B#8.ogg and /dev/null differ diff --git a/sound/piano/C#1.ogg b/sound/piano/C#1.ogg deleted file mode 100644 index dc3c859caee..00000000000 Binary files a/sound/piano/C#1.ogg and /dev/null differ diff --git a/sound/piano/C#2.ogg b/sound/piano/C#2.ogg deleted file mode 100644 index 5a36e244a76..00000000000 Binary files a/sound/piano/C#2.ogg and /dev/null differ diff --git a/sound/piano/C#3.ogg b/sound/piano/C#3.ogg deleted file mode 100644 index af3e49f21e4..00000000000 Binary files a/sound/piano/C#3.ogg and /dev/null differ diff --git a/sound/piano/C#4.ogg b/sound/piano/C#4.ogg deleted file mode 100644 index 8b18a4ce418..00000000000 Binary files a/sound/piano/C#4.ogg and /dev/null differ diff --git a/sound/piano/C#5.ogg b/sound/piano/C#5.ogg deleted file mode 100644 index 690bd2763e9..00000000000 Binary files a/sound/piano/C#5.ogg and /dev/null differ diff --git a/sound/piano/C#6.ogg b/sound/piano/C#6.ogg deleted file mode 100644 index 3a27950bd3f..00000000000 Binary files a/sound/piano/C#6.ogg and /dev/null differ diff --git a/sound/piano/C#7.ogg b/sound/piano/C#7.ogg deleted file mode 100644 index 9a7bc071ead..00000000000 Binary files a/sound/piano/C#7.ogg and /dev/null differ diff --git a/sound/piano/C#8.ogg b/sound/piano/C#8.ogg deleted file mode 100644 index 9adc2dbbbc5..00000000000 Binary files a/sound/piano/C#8.ogg and /dev/null differ diff --git a/sound/piano/Cb2.ogg b/sound/piano/Cb2.ogg deleted file mode 100644 index 7c36759c95a..00000000000 Binary files a/sound/piano/Cb2.ogg and /dev/null differ diff --git a/sound/piano/Cb3.ogg b/sound/piano/Cb3.ogg deleted file mode 100644 index b8569638545..00000000000 Binary files a/sound/piano/Cb3.ogg and /dev/null differ diff --git a/sound/piano/Cb4.ogg b/sound/piano/Cb4.ogg deleted file mode 100644 index fb693c0cadb..00000000000 Binary files a/sound/piano/Cb4.ogg and /dev/null differ diff --git a/sound/piano/Cb5.ogg b/sound/piano/Cb5.ogg deleted file mode 100644 index b114181e3fc..00000000000 Binary files a/sound/piano/Cb5.ogg and /dev/null differ diff --git a/sound/piano/Cb6.ogg b/sound/piano/Cb6.ogg deleted file mode 100644 index 42470f9f3a3..00000000000 Binary files a/sound/piano/Cb6.ogg and /dev/null differ diff --git a/sound/piano/Cb7.ogg b/sound/piano/Cb7.ogg deleted file mode 100644 index adeb34cacdf..00000000000 Binary files a/sound/piano/Cb7.ogg and /dev/null differ diff --git a/sound/piano/Cb8.ogg b/sound/piano/Cb8.ogg deleted file mode 100644 index 1f2cbb94dd2..00000000000 Binary files a/sound/piano/Cb8.ogg and /dev/null differ diff --git a/sound/piano/Cb9.ogg b/sound/piano/Cb9.ogg deleted file mode 100644 index 25c0d646c3b..00000000000 Binary files a/sound/piano/Cb9.ogg and /dev/null differ diff --git a/sound/piano/D#1.ogg b/sound/piano/D#1.ogg deleted file mode 100644 index bd58c7dd75a..00000000000 Binary files a/sound/piano/D#1.ogg and /dev/null differ diff --git a/sound/piano/D#2.ogg b/sound/piano/D#2.ogg deleted file mode 100644 index fc01076810a..00000000000 Binary files a/sound/piano/D#2.ogg and /dev/null differ diff --git a/sound/piano/D#3.ogg b/sound/piano/D#3.ogg deleted file mode 100644 index e437f444663..00000000000 Binary files a/sound/piano/D#3.ogg and /dev/null differ diff --git a/sound/piano/D#4.ogg b/sound/piano/D#4.ogg deleted file mode 100644 index 0804aa03de0..00000000000 Binary files a/sound/piano/D#4.ogg and /dev/null differ diff --git a/sound/piano/D#5.ogg b/sound/piano/D#5.ogg deleted file mode 100644 index 40889dbae51..00000000000 Binary files a/sound/piano/D#5.ogg and /dev/null differ diff --git a/sound/piano/D#6.ogg b/sound/piano/D#6.ogg deleted file mode 100644 index 616481d2f90..00000000000 Binary files a/sound/piano/D#6.ogg and /dev/null differ diff --git a/sound/piano/D#7.ogg b/sound/piano/D#7.ogg deleted file mode 100644 index 5c191fb7f69..00000000000 Binary files a/sound/piano/D#7.ogg and /dev/null differ diff --git a/sound/piano/D#8.ogg b/sound/piano/D#8.ogg deleted file mode 100644 index 5955ed7f8d0..00000000000 Binary files a/sound/piano/D#8.ogg and /dev/null differ diff --git a/sound/piano/E#1.ogg b/sound/piano/E#1.ogg deleted file mode 100644 index c192032dc0f..00000000000 Binary files a/sound/piano/E#1.ogg and /dev/null differ diff --git a/sound/piano/E#2.ogg b/sound/piano/E#2.ogg deleted file mode 100644 index da09b649798..00000000000 Binary files a/sound/piano/E#2.ogg and /dev/null differ diff --git a/sound/piano/E#3.ogg b/sound/piano/E#3.ogg deleted file mode 100644 index e7a2f935350..00000000000 Binary files a/sound/piano/E#3.ogg and /dev/null differ diff --git a/sound/piano/E#4.ogg b/sound/piano/E#4.ogg deleted file mode 100644 index b3b14b7266d..00000000000 Binary files a/sound/piano/E#4.ogg and /dev/null differ diff --git a/sound/piano/E#5.ogg b/sound/piano/E#5.ogg deleted file mode 100644 index 08bc2cf5a80..00000000000 Binary files a/sound/piano/E#5.ogg and /dev/null differ diff --git a/sound/piano/E#6.ogg b/sound/piano/E#6.ogg deleted file mode 100644 index 6060576f36e..00000000000 Binary files a/sound/piano/E#6.ogg and /dev/null differ diff --git a/sound/piano/E#7.ogg b/sound/piano/E#7.ogg deleted file mode 100644 index 77a81ed5702..00000000000 Binary files a/sound/piano/E#7.ogg and /dev/null differ diff --git a/sound/piano/E#8.ogg b/sound/piano/E#8.ogg deleted file mode 100644 index 5502fedbdac..00000000000 Binary files a/sound/piano/E#8.ogg and /dev/null differ diff --git a/sound/piano/F#1.ogg b/sound/piano/F#1.ogg deleted file mode 100644 index ad9e0a563ce..00000000000 Binary files a/sound/piano/F#1.ogg and /dev/null differ diff --git a/sound/piano/F#2.ogg b/sound/piano/F#2.ogg deleted file mode 100644 index b1e86bfeaa6..00000000000 Binary files a/sound/piano/F#2.ogg and /dev/null differ diff --git a/sound/piano/F#3.ogg b/sound/piano/F#3.ogg deleted file mode 100644 index 53b56c5017d..00000000000 Binary files a/sound/piano/F#3.ogg and /dev/null differ diff --git a/sound/piano/F#4.ogg b/sound/piano/F#4.ogg deleted file mode 100644 index e9d71303a1a..00000000000 Binary files a/sound/piano/F#4.ogg and /dev/null differ diff --git a/sound/piano/F#5.ogg b/sound/piano/F#5.ogg deleted file mode 100644 index c4cc3165ab1..00000000000 Binary files a/sound/piano/F#5.ogg and /dev/null differ diff --git a/sound/piano/F#6.ogg b/sound/piano/F#6.ogg deleted file mode 100644 index 09420951163..00000000000 Binary files a/sound/piano/F#6.ogg and /dev/null differ diff --git a/sound/piano/F#7.ogg b/sound/piano/F#7.ogg deleted file mode 100644 index c37dc8fb37a..00000000000 Binary files a/sound/piano/F#7.ogg and /dev/null differ diff --git a/sound/piano/F#8.ogg b/sound/piano/F#8.ogg deleted file mode 100644 index 0241e9beaba..00000000000 Binary files a/sound/piano/F#8.ogg and /dev/null differ diff --git a/sound/piano/Fb1.ogg b/sound/piano/Fb1.ogg deleted file mode 100644 index fbcb29c2de9..00000000000 Binary files a/sound/piano/Fb1.ogg and /dev/null differ diff --git a/sound/piano/Fb2.ogg b/sound/piano/Fb2.ogg deleted file mode 100644 index 4cece2d9cd0..00000000000 Binary files a/sound/piano/Fb2.ogg and /dev/null differ diff --git a/sound/piano/Fb3.ogg b/sound/piano/Fb3.ogg deleted file mode 100644 index 3675271a157..00000000000 Binary files a/sound/piano/Fb3.ogg and /dev/null differ diff --git a/sound/piano/Fb4.ogg b/sound/piano/Fb4.ogg deleted file mode 100644 index 26087702274..00000000000 Binary files a/sound/piano/Fb4.ogg and /dev/null differ diff --git a/sound/piano/Fb5.ogg b/sound/piano/Fb5.ogg deleted file mode 100644 index f8016a6d247..00000000000 Binary files a/sound/piano/Fb5.ogg and /dev/null differ diff --git a/sound/piano/Fb6.ogg b/sound/piano/Fb6.ogg deleted file mode 100644 index 397714bdaae..00000000000 Binary files a/sound/piano/Fb6.ogg and /dev/null differ diff --git a/sound/piano/Fb7.ogg b/sound/piano/Fb7.ogg deleted file mode 100644 index d9f630f11d8..00000000000 Binary files a/sound/piano/Fb7.ogg and /dev/null differ diff --git a/sound/piano/Fb8.ogg b/sound/piano/Fb8.ogg deleted file mode 100644 index 28ae958d82d..00000000000 Binary files a/sound/piano/Fb8.ogg and /dev/null differ diff --git a/sound/piano/G#1.ogg b/sound/piano/G#1.ogg deleted file mode 100644 index 3ef68c0d87f..00000000000 Binary files a/sound/piano/G#1.ogg and /dev/null differ diff --git a/sound/piano/G#2.ogg b/sound/piano/G#2.ogg deleted file mode 100644 index 4d921693655..00000000000 Binary files a/sound/piano/G#2.ogg and /dev/null differ diff --git a/sound/piano/G#3.ogg b/sound/piano/G#3.ogg deleted file mode 100644 index 21a03c7805c..00000000000 Binary files a/sound/piano/G#3.ogg and /dev/null differ diff --git a/sound/piano/G#4.ogg b/sound/piano/G#4.ogg deleted file mode 100644 index 070ad2b4532..00000000000 Binary files a/sound/piano/G#4.ogg and /dev/null differ diff --git a/sound/piano/G#5.ogg b/sound/piano/G#5.ogg deleted file mode 100644 index 233256500fb..00000000000 Binary files a/sound/piano/G#5.ogg and /dev/null differ diff --git a/sound/piano/G#6.ogg b/sound/piano/G#6.ogg deleted file mode 100644 index 3c387fcfab0..00000000000 Binary files a/sound/piano/G#6.ogg and /dev/null differ diff --git a/sound/piano/G#7.ogg b/sound/piano/G#7.ogg deleted file mode 100644 index 4ba6c8b6581..00000000000 Binary files a/sound/piano/G#7.ogg and /dev/null differ diff --git a/sound/piano/G#8.ogg b/sound/piano/G#8.ogg deleted file mode 100644 index b847ab1c86b..00000000000 Binary files a/sound/piano/G#8.ogg and /dev/null differ diff --git a/sound/violin/A#1.mid b/sound/violin/A#1.mid deleted file mode 100644 index 40da5f3da15..00000000000 Binary files a/sound/violin/A#1.mid and /dev/null differ diff --git a/sound/violin/A#2.mid b/sound/violin/A#2.mid deleted file mode 100644 index 5bab6ccd636..00000000000 Binary files a/sound/violin/A#2.mid and /dev/null differ diff --git a/sound/violin/A#3.mid b/sound/violin/A#3.mid deleted file mode 100644 index dce830448ef..00000000000 Binary files a/sound/violin/A#3.mid and /dev/null differ diff --git a/sound/violin/A#4.mid b/sound/violin/A#4.mid deleted file mode 100644 index fda796e27b9..00000000000 Binary files a/sound/violin/A#4.mid and /dev/null differ diff --git a/sound/violin/A#5.mid b/sound/violin/A#5.mid deleted file mode 100644 index 9e5da684f43..00000000000 Binary files a/sound/violin/A#5.mid and /dev/null differ diff --git a/sound/violin/A#6.mid b/sound/violin/A#6.mid deleted file mode 100644 index 215c56cbe7e..00000000000 Binary files a/sound/violin/A#6.mid and /dev/null differ diff --git a/sound/violin/A#7.mid b/sound/violin/A#7.mid deleted file mode 100644 index 4b55c34691f..00000000000 Binary files a/sound/violin/A#7.mid and /dev/null differ diff --git a/sound/violin/A#8.mid b/sound/violin/A#8.mid deleted file mode 100644 index a422f768f63..00000000000 Binary files a/sound/violin/A#8.mid and /dev/null differ diff --git a/sound/violin/B#1.mid b/sound/violin/B#1.mid deleted file mode 100644 index cddff75625f..00000000000 Binary files a/sound/violin/B#1.mid and /dev/null differ diff --git a/sound/violin/B#2.mid b/sound/violin/B#2.mid deleted file mode 100644 index 8bd7ec2fa9d..00000000000 Binary files a/sound/violin/B#2.mid and /dev/null differ diff --git a/sound/violin/B#3.mid b/sound/violin/B#3.mid deleted file mode 100644 index 4c7ab84b57b..00000000000 Binary files a/sound/violin/B#3.mid and /dev/null differ diff --git a/sound/violin/B#4.mid b/sound/violin/B#4.mid deleted file mode 100644 index d7f990b2d6c..00000000000 Binary files a/sound/violin/B#4.mid and /dev/null differ diff --git a/sound/violin/B#5.mid b/sound/violin/B#5.mid deleted file mode 100644 index e124ccb8e2b..00000000000 Binary files a/sound/violin/B#5.mid and /dev/null differ diff --git a/sound/violin/B#6.mid b/sound/violin/B#6.mid deleted file mode 100644 index 231c9e428db..00000000000 Binary files a/sound/violin/B#6.mid and /dev/null differ diff --git a/sound/violin/B#7.mid b/sound/violin/B#7.mid deleted file mode 100644 index 981943c08f0..00000000000 Binary files a/sound/violin/B#7.mid and /dev/null differ diff --git a/sound/violin/B#8.mid b/sound/violin/B#8.mid deleted file mode 100644 index 62f4eef045a..00000000000 Binary files a/sound/violin/B#8.mid and /dev/null differ diff --git a/sound/violin/C#1.mid b/sound/violin/C#1.mid deleted file mode 100644 index 88dba851452..00000000000 Binary files a/sound/violin/C#1.mid and /dev/null differ diff --git a/sound/violin/C#2.mid b/sound/violin/C#2.mid deleted file mode 100644 index b510926b45f..00000000000 Binary files a/sound/violin/C#2.mid and /dev/null differ diff --git a/sound/violin/C#3.mid b/sound/violin/C#3.mid deleted file mode 100644 index 9954bbe478a..00000000000 Binary files a/sound/violin/C#3.mid and /dev/null differ diff --git a/sound/violin/C#4.mid b/sound/violin/C#4.mid deleted file mode 100644 index 2c5ff74db0a..00000000000 Binary files a/sound/violin/C#4.mid and /dev/null differ diff --git a/sound/violin/C#5.mid b/sound/violin/C#5.mid deleted file mode 100644 index e5850a3fd04..00000000000 Binary files a/sound/violin/C#5.mid and /dev/null differ diff --git a/sound/violin/C#6.mid b/sound/violin/C#6.mid deleted file mode 100644 index 217c0ad014c..00000000000 Binary files a/sound/violin/C#6.mid and /dev/null differ diff --git a/sound/violin/C#7.mid b/sound/violin/C#7.mid deleted file mode 100644 index ec32bdbf904..00000000000 Binary files a/sound/violin/C#7.mid and /dev/null differ diff --git a/sound/violin/C#8.mid b/sound/violin/C#8.mid deleted file mode 100644 index 555bce3db0d..00000000000 Binary files a/sound/violin/C#8.mid and /dev/null differ diff --git a/sound/violin/Cb1.mid b/sound/violin/Cb1.mid deleted file mode 100644 index a00f09dfb08..00000000000 Binary files a/sound/violin/Cb1.mid and /dev/null differ diff --git a/sound/violin/Cb2.mid b/sound/violin/Cb2.mid deleted file mode 100644 index 4085711bf12..00000000000 Binary files a/sound/violin/Cb2.mid and /dev/null differ diff --git a/sound/violin/Cb3.mid b/sound/violin/Cb3.mid deleted file mode 100644 index f647983ef05..00000000000 Binary files a/sound/violin/Cb3.mid and /dev/null differ diff --git a/sound/violin/Cb4.mid b/sound/violin/Cb4.mid deleted file mode 100644 index 24f22f09eec..00000000000 Binary files a/sound/violin/Cb4.mid and /dev/null differ diff --git a/sound/violin/Cb5.mid b/sound/violin/Cb5.mid deleted file mode 100644 index 057e97c5e0d..00000000000 Binary files a/sound/violin/Cb5.mid and /dev/null differ diff --git a/sound/violin/Cb6.mid b/sound/violin/Cb6.mid deleted file mode 100644 index 887e65fc13d..00000000000 Binary files a/sound/violin/Cb6.mid and /dev/null differ diff --git a/sound/violin/Cb7.mid b/sound/violin/Cb7.mid deleted file mode 100644 index 99668bc192c..00000000000 Binary files a/sound/violin/Cb7.mid and /dev/null differ diff --git a/sound/violin/Cb8.mid b/sound/violin/Cb8.mid deleted file mode 100644 index 53ea61d1b25..00000000000 Binary files a/sound/violin/Cb8.mid and /dev/null differ diff --git a/sound/violin/Cb9.mid b/sound/violin/Cb9.mid deleted file mode 100644 index 1e8c3afadf1..00000000000 Binary files a/sound/violin/Cb9.mid and /dev/null differ diff --git a/sound/violin/D#1.mid b/sound/violin/D#1.mid deleted file mode 100644 index 829e6fcf185..00000000000 Binary files a/sound/violin/D#1.mid and /dev/null differ diff --git a/sound/violin/D#2.mid b/sound/violin/D#2.mid deleted file mode 100644 index 66029b340cc..00000000000 Binary files a/sound/violin/D#2.mid and /dev/null differ diff --git a/sound/violin/D#3.mid b/sound/violin/D#3.mid deleted file mode 100644 index c982375941e..00000000000 Binary files a/sound/violin/D#3.mid and /dev/null differ diff --git a/sound/violin/D#4.mid b/sound/violin/D#4.mid deleted file mode 100644 index 016ed4f1edf..00000000000 Binary files a/sound/violin/D#4.mid and /dev/null differ diff --git a/sound/violin/D#5.mid b/sound/violin/D#5.mid deleted file mode 100644 index ddb511795df..00000000000 Binary files a/sound/violin/D#5.mid and /dev/null differ diff --git a/sound/violin/D#6.mid b/sound/violin/D#6.mid deleted file mode 100644 index b7242b9ab99..00000000000 Binary files a/sound/violin/D#6.mid and /dev/null differ diff --git a/sound/violin/D#7.mid b/sound/violin/D#7.mid deleted file mode 100644 index 773538340a5..00000000000 Binary files a/sound/violin/D#7.mid and /dev/null differ diff --git a/sound/violin/D#8.mid b/sound/violin/D#8.mid deleted file mode 100644 index 4ad074e173b..00000000000 Binary files a/sound/violin/D#8.mid and /dev/null differ diff --git a/sound/violin/E#1.mid b/sound/violin/E#1.mid deleted file mode 100644 index 3f130ee126c..00000000000 Binary files a/sound/violin/E#1.mid and /dev/null differ diff --git a/sound/violin/E#2.mid b/sound/violin/E#2.mid deleted file mode 100644 index f67c2d0a267..00000000000 Binary files a/sound/violin/E#2.mid and /dev/null differ diff --git a/sound/violin/E#3.mid b/sound/violin/E#3.mid deleted file mode 100644 index bb393382d6c..00000000000 Binary files a/sound/violin/E#3.mid and /dev/null differ diff --git a/sound/violin/E#4.mid b/sound/violin/E#4.mid deleted file mode 100644 index a96520c595d..00000000000 Binary files a/sound/violin/E#4.mid and /dev/null differ diff --git a/sound/violin/E#5.mid b/sound/violin/E#5.mid deleted file mode 100644 index d1378af1972..00000000000 Binary files a/sound/violin/E#5.mid and /dev/null differ diff --git a/sound/violin/E#6.mid b/sound/violin/E#6.mid deleted file mode 100644 index 7abe40bd824..00000000000 Binary files a/sound/violin/E#6.mid and /dev/null differ diff --git a/sound/violin/E#7.mid b/sound/violin/E#7.mid deleted file mode 100644 index df278c20d6b..00000000000 Binary files a/sound/violin/E#7.mid and /dev/null differ diff --git a/sound/violin/E#8.mid b/sound/violin/E#8.mid deleted file mode 100644 index 35254cd5b25..00000000000 Binary files a/sound/violin/E#8.mid and /dev/null differ diff --git a/sound/violin/F#1.mid b/sound/violin/F#1.mid deleted file mode 100644 index d18668e8911..00000000000 Binary files a/sound/violin/F#1.mid and /dev/null differ diff --git a/sound/violin/F#2.mid b/sound/violin/F#2.mid deleted file mode 100644 index 302f0c6fdc1..00000000000 Binary files a/sound/violin/F#2.mid and /dev/null differ diff --git a/sound/violin/F#3.mid b/sound/violin/F#3.mid deleted file mode 100644 index 1f592fc9039..00000000000 Binary files a/sound/violin/F#3.mid and /dev/null differ diff --git a/sound/violin/F#4.mid b/sound/violin/F#4.mid deleted file mode 100644 index 45854126f98..00000000000 Binary files a/sound/violin/F#4.mid and /dev/null differ diff --git a/sound/violin/F#5.mid b/sound/violin/F#5.mid deleted file mode 100644 index fb1e1da339a..00000000000 Binary files a/sound/violin/F#5.mid and /dev/null differ diff --git a/sound/violin/F#6.mid b/sound/violin/F#6.mid deleted file mode 100644 index bfa896bb784..00000000000 Binary files a/sound/violin/F#6.mid and /dev/null differ diff --git a/sound/violin/F#7.mid b/sound/violin/F#7.mid deleted file mode 100644 index a27763c1d47..00000000000 Binary files a/sound/violin/F#7.mid and /dev/null differ diff --git a/sound/violin/F#8.mid b/sound/violin/F#8.mid deleted file mode 100644 index aaab80a7276..00000000000 Binary files a/sound/violin/F#8.mid and /dev/null differ diff --git a/sound/violin/Fb1.mid b/sound/violin/Fb1.mid deleted file mode 100644 index c89b3f36b43..00000000000 Binary files a/sound/violin/Fb1.mid and /dev/null differ diff --git a/sound/violin/Fb2.mid b/sound/violin/Fb2.mid deleted file mode 100644 index 3db6af1aa45..00000000000 Binary files a/sound/violin/Fb2.mid and /dev/null differ diff --git a/sound/violin/Fb3.mid b/sound/violin/Fb3.mid deleted file mode 100644 index 5f601f3ac42..00000000000 Binary files a/sound/violin/Fb3.mid and /dev/null differ diff --git a/sound/violin/Fb4.mid b/sound/violin/Fb4.mid deleted file mode 100644 index f1abc8109d1..00000000000 Binary files a/sound/violin/Fb4.mid and /dev/null differ diff --git a/sound/violin/Fb5.mid b/sound/violin/Fb5.mid deleted file mode 100644 index 2ec1b2e5128..00000000000 Binary files a/sound/violin/Fb5.mid and /dev/null differ diff --git a/sound/violin/Fb6.mid b/sound/violin/Fb6.mid deleted file mode 100644 index b8bdf7fee07..00000000000 Binary files a/sound/violin/Fb6.mid and /dev/null differ diff --git a/sound/violin/Fb7.mid b/sound/violin/Fb7.mid deleted file mode 100644 index 51f5f1bcdb4..00000000000 Binary files a/sound/violin/Fb7.mid and /dev/null differ diff --git a/sound/violin/Fb8.mid b/sound/violin/Fb8.mid deleted file mode 100644 index 47928f38475..00000000000 Binary files a/sound/violin/Fb8.mid and /dev/null differ diff --git a/sound/violin/G#1.mid b/sound/violin/G#1.mid deleted file mode 100644 index b1b38856858..00000000000 Binary files a/sound/violin/G#1.mid and /dev/null differ diff --git a/sound/violin/G#2.mid b/sound/violin/G#2.mid deleted file mode 100644 index e827cfc635e..00000000000 Binary files a/sound/violin/G#2.mid and /dev/null differ diff --git a/sound/violin/G#3.mid b/sound/violin/G#3.mid deleted file mode 100644 index 57e1f76c976..00000000000 Binary files a/sound/violin/G#3.mid and /dev/null differ diff --git a/sound/violin/G#4.mid b/sound/violin/G#4.mid deleted file mode 100644 index 59e95a6d997..00000000000 Binary files a/sound/violin/G#4.mid and /dev/null differ diff --git a/sound/violin/G#5.mid b/sound/violin/G#5.mid deleted file mode 100644 index 9bd3436287b..00000000000 Binary files a/sound/violin/G#5.mid and /dev/null differ diff --git a/sound/violin/G#6.mid b/sound/violin/G#6.mid deleted file mode 100644 index 3c90af807e2..00000000000 Binary files a/sound/violin/G#6.mid and /dev/null differ diff --git a/sound/violin/G#7.mid b/sound/violin/G#7.mid deleted file mode 100644 index b51afd323c6..00000000000 Binary files a/sound/violin/G#7.mid and /dev/null differ diff --git a/sound/violin/G#8.mid b/sound/violin/G#8.mid deleted file mode 100644 index d3f5c898d47..00000000000 Binary files a/sound/violin/G#8.mid and /dev/null differ