Merge branch 'floppy_instrument_samples' into 'master'

floppy_instrument_samples

See merge request veloren/veloren!3664

assets/voxygen/audio/sfx.ron

@@ -549,6 +549,12 @@
             "voxygen.audio.sfx.instrument.bass.bass_a",
             "voxygen.audio.sfx.instrument.bass.bass_e",
             "voxygen.audio.sfx.instrument.bass.bass_c1",
+            "voxygen.audio.sfx.instrument.bass.bass_ac1",
+            "voxygen.audio.sfx.instrument.bass.bass_ag",
+            "voxygen.audio.sfx.instrument.bass.bass_cec",
+            "voxygen.audio.sfx.instrument.bass.bass_de",
+            "voxygen.audio.sfx.instrument.bass.bass_e1c1",
+            "voxygen.audio.sfx.instrument.bass.bass_ge",
             ],
             threshold: 0.5,
             ),
@@ -560,6 +566,12 @@
             "voxygen.audio.sfx.instrument.flute.flute_a",
             "voxygen.audio.sfx.instrument.flute.flute_e",
             "voxygen.audio.sfx.instrument.flute.flute_c1",
+            "voxygen.audio.sfx.instrument.flute.flute_c1a",
+            "voxygen.audio.sfx.instrument.flute.flute_c1ag",
+            "voxygen.audio.sfx.instrument.flute.flute_c1d1c1",
+            "voxygen.audio.sfx.instrument.flute.flute_ceg",
+            "voxygen.audio.sfx.instrument.flute.flute_dac1",
+            "voxygen.audio.sfx.instrument.flute.flute_eg",
             ],
             threshold: 0.5,
             ),
@@ -571,6 +583,12 @@
             "voxygen.audio.sfx.instrument.harp.harp_a",
             "voxygen.audio.sfx.instrument.harp.harp_e",
             "voxygen.audio.sfx.instrument.harp.harp_c1",
+            "voxygen.audio.sfx.instrument.harp.harp_c1ag",
+            "voxygen.audio.sfx.instrument.harp.harp_cde",
+            "voxygen.audio.sfx.instrument.harp.harp_d1c1a",
+            "voxygen.audio.sfx.instrument.harp.harp_d1g",
+            "voxygen.audio.sfx.instrument.harp.harp_ec1",
+            "voxygen.audio.sfx.instrument.harp.harp_ega",
             ],
             threshold: 0.5,
             ),
@@ -582,6 +600,12 @@
             "voxygen.audio.sfx.instrument.kalimba.kalimba_a",
             "voxygen.audio.sfx.instrument.kalimba.kalimba_e",
             "voxygen.audio.sfx.instrument.kalimba.kalimba_c1",
+            "voxygen.audio.sfx.instrument.kalimba.kalimba_c1a",
+            "voxygen.audio.sfx.instrument.kalimba.kalimba_c1d1c1",
+            "voxygen.audio.sfx.instrument.kalimba.kalimba_c1ge",
+            "voxygen.audio.sfx.instrument.kalimba.kalimba_cdc",
+            "voxygen.audio.sfx.instrument.kalimba.kalimba_ceg",
+            "voxygen.audio.sfx.instrument.kalimba.kalimba_da",
             ],
             threshold: 0.5,
             ),
@@ -593,6 +617,12 @@
             "voxygen.audio.sfx.instrument.melodica.melodica_a",
             "voxygen.audio.sfx.instrument.melodica.melodica_e",
             "voxygen.audio.sfx.instrument.melodica.melodica_c1",
+            "voxygen.audio.sfx.instrument.melodica.melodica_ad1c1",
+            "voxygen.audio.sfx.instrument.melodica.melodica_c1a",
+            "voxygen.audio.sfx.instrument.melodica.melodica_d1a",
+            "voxygen.audio.sfx.instrument.melodica.melodica_ec",
+            "voxygen.audio.sfx.instrument.melodica.melodica_ec1g",
+            "voxygen.audio.sfx.instrument.melodica.melodica_ge",
             ],
             threshold: 0.5,
             ),
@@ -604,6 +634,12 @@
             "voxygen.audio.sfx.instrument.lute.lute_a",
             "voxygen.audio.sfx.instrument.lute.lute_e",
             "voxygen.audio.sfx.instrument.lute.lute_c1",
+            "voxygen.audio.sfx.instrument.lute.lute_ac1",
+            "voxygen.audio.sfx.instrument.lute.lute_c1d1c1",
+            "voxygen.audio.sfx.instrument.lute.lute_cdc",
+            "voxygen.audio.sfx.instrument.lute.lute_ege",
+            "voxygen.audio.sfx.instrument.lute.lute_gag",
+            "voxygen.audio.sfx.instrument.lute.lute_ded",
             ],
             threshold: 0.5,
             ),
@@ -615,6 +651,12 @@
             "voxygen.audio.sfx.instrument.sitar.sitar_a",
             "voxygen.audio.sfx.instrument.sitar.sitar_e",
             "voxygen.audio.sfx.instrument.sitar.sitar_c1",
+            "voxygen.audio.sfx.instrument.sitar.sitar_c1ae",
+            "voxygen.audio.sfx.instrument.sitar.sitar_ce",
+            "voxygen.audio.sfx.instrument.sitar.sitar_da",
+            "voxygen.audio.sfx.instrument.sitar.sitar_ec1",
+            "voxygen.audio.sfx.instrument.sitar.sitar_gd1",
+            "voxygen.audio.sfx.instrument.sitar.sitar_gec",
             ],
             threshold: 0.5,
             ),
@@ -643,9 +685,10 @@
             "voxygen.audio.sfx.instrument.perc.perc_d",
             "voxygen.audio.sfx.instrument.perc.perc_d",
             "voxygen.audio.sfx.instrument.perc.perc_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
-            "voxygen.audio.sfx.instrument.perc.perc_d",
+            "voxygen.audio.sfx.instrument.perc.perc_d_d",
+            "voxygen.audio.sfx.instrument.perc.perc_dd",
+            "voxygen.audio.sfx.instrument.perc.perc_d_dd",
+            "voxygen.audio.sfx.instrument.perc.perc_dd_d",
             "voxygen.audio.sfx.instrument.perc.perc_a",
             "voxygen.audio.sfx.instrument.perc.perc_e",
             ],