diff options
22 files changed, 20 insertions, 0 deletions
diff --git a/common/Resources/Sounds/armbone b/common/Resources/Sounds/armbone Binary files differnew file mode 100755 index 0000000..38fc68a --- /dev/null +++ b/common/Resources/Sounds/armbone diff --git a/common/Resources/Sounds/babylaugh b/common/Resources/Sounds/babylaugh Binary files differnew file mode 100755 index 0000000..9c72bd3 --- /dev/null +++ b/common/Resources/Sounds/babylaugh diff --git a/common/Resources/Sounds/babyuhoh b/common/Resources/Sounds/babyuhoh Binary files differnew file mode 100755 index 0000000..705f61a --- /dev/null +++ b/common/Resources/Sounds/babyuhoh diff --git a/common/Resources/Sounds/banjo b/common/Resources/Sounds/banjo Binary files differindex ec431e8..f15278d 100755 --- a/common/Resources/Sounds/banjo +++ b/common/Resources/Sounds/banjo diff --git a/common/Resources/Sounds/basse2 b/common/Resources/Sounds/basse2 Binary files differnew file mode 100755 index 0000000..744d196 --- /dev/null +++ b/common/Resources/Sounds/basse2 diff --git a/common/Resources/Sounds/carhorn b/common/Resources/Sounds/carhorn Binary files differnew file mode 100755 index 0000000..fbbd02b --- /dev/null +++ b/common/Resources/Sounds/carhorn diff --git a/common/Resources/Sounds/chiken b/common/Resources/Sounds/chiken Binary files differnew file mode 100755 index 0000000..736bfd0 --- /dev/null +++ b/common/Resources/Sounds/chiken diff --git a/common/Resources/Sounds/clang2 b/common/Resources/Sounds/clang2 Binary files differnew file mode 100755 index 0000000..cb1fed2 --- /dev/null +++ b/common/Resources/Sounds/clang2 diff --git a/common/Resources/Sounds/clavinet b/common/Resources/Sounds/clavinet Binary files differnew file mode 100755 index 0000000..db88314 --- /dev/null +++ b/common/Resources/Sounds/clavinet diff --git a/common/Resources/Sounds/cow b/common/Resources/Sounds/cow Binary files differnew file mode 100755 index 0000000..5d31cf5 --- /dev/null +++ b/common/Resources/Sounds/cow diff --git a/common/Resources/Sounds/cricket b/common/Resources/Sounds/cricket Binary files differnew file mode 100755 index 0000000..cb3504c --- /dev/null +++ b/common/Resources/Sounds/cricket diff --git a/common/Resources/Sounds/fingercymbals b/common/Resources/Sounds/fingercymbals Binary files differnew file mode 100755 index 0000000..aa1f221 --- /dev/null +++ b/common/Resources/Sounds/fingercymbals diff --git a/common/Resources/Sounds/flugel b/common/Resources/Sounds/flugel Binary files differnew file mode 100755 index 0000000..4367cc2 --- /dev/null +++ b/common/Resources/Sounds/flugel diff --git a/common/Resources/Sounds/foghorn b/common/Resources/Sounds/foghorn Binary files differnew file mode 100755 index 0000000..65549e6 --- /dev/null +++ b/common/Resources/Sounds/foghorn diff --git a/common/Resources/Sounds/frogs b/common/Resources/Sounds/frogs Binary files differnew file mode 100755 index 0000000..9b2831a --- /dev/null +++ b/common/Resources/Sounds/frogs diff --git a/common/Resources/Sounds/guitmute b/common/Resources/Sounds/guitmute Binary files differnew file mode 100755 index 0000000..93026d6 --- /dev/null +++ b/common/Resources/Sounds/guitmute diff --git a/common/Resources/Sounds/guitshort b/common/Resources/Sounds/guitshort Binary files differnew file mode 100755 index 0000000..698364b --- /dev/null +++ b/common/Resources/Sounds/guitshort diff --git a/common/Resources/Sounds/harpsichord b/common/Resources/Sounds/harpsichord Binary files differnew file mode 100755 index 0000000..dac451f --- /dev/null +++ b/common/Resources/Sounds/harpsichord diff --git a/common/Resources/Sounds/hey b/common/Resources/Sounds/hey Binary files differnew file mode 100755 index 0000000..0bd7b20 --- /dev/null +++ b/common/Resources/Sounds/hey diff --git a/common/Resources/Sounds/saxsoprano b/common/Resources/Sounds/saxsoprano Binary files differnew file mode 100755 index 0000000..b9f63e9 --- /dev/null +++ b/common/Resources/Sounds/saxsoprano diff --git a/common/Resources/Sounds/ukulele b/common/Resources/Sounds/ukulele Binary files differnew file mode 100755 index 0000000..bfacc40 --- /dev/null +++ b/common/Resources/Sounds/ukulele diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py index 9382d9e..17a0594 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -32,7 +32,12 @@ _addInstrument( "lab6", INST_SIMP, MID, 'mysounds', 0, 0, 0, 1 ) _addInstrument( "ounk", INST_SIMP, MID, 'animals', 0, 0, 0, 1 ) _addInstrument( "gam", INST_TIED, HIGH, 'percussions', .69388, .7536, .02922, 1 ) _addInstrument( "guit", INST_TIED, MID, 'strings', .08592, .75126, .33571, 1.3 ) +_addInstrument( "guitmute", INST_SIMP, MID, 'strings', 0, 0, 0, 0.7 ) +_addInstrument( "guitshort", INST_SIMP, MID, 'strings', 0, 0, 0, 0.8 ) _addInstrument( "koto", INST_TIED, HIGH, 'strings', .56523, .70075, .05954, 1 ) +_addInstrument( "banjo", INST_TIED, MID, 'strings', .8928046875, 1.6325390625, .0525, 0.6 ) +_addInstrument( "ukulele", INST_TIED, MID, 'strings', .64097090625, 1.0887984375, .17375, 0.5 ) +_addInstrument( "harpsichord", INST_TIED, MID, 'strings', .57529609375, .936075, .2, 0.6 ) _addInstrument( "clarinette", INST_TIED, MID, 'winds', 1.635276375, 2.72956523438, .2, 0.6 ) _addInstrument( "flute", INST_TIED, MID, 'winds', .47169, .53693, .02481, 1 ) _addInstrument( "drum1hatpedal", INST_SIMP, MID, 'percussions', 0, 0, 0, 1 ) @@ -49,7 +54,9 @@ _addInstrument( "drum1chine", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, 1 ) _addInstrument( "drum1kick", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1 ) _addInstrument( "piano", INST_TIED, MID, 'keyboard', 0.8883, 1.420524, .13575, 1 ) _addInstrument( "dog", INST_SIMP, MID, 'animals', 0, 0, 0, 1 ) +_addInstrument( "chiken", INST_TIED, MID, 'animals', .1972125, .8689675781, .02, 0.5 ) _addInstrument( "duck", INST_SIMP, MID, 'animals', 0, 0, 0, 1 ) +_addInstrument( "armbone", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) _addInstrument( "drum2darbukadoom", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1 ) _addInstrument( "drum2darbukapied", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1 ) _addInstrument( "drum2darbukapiedsoft", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1 ) @@ -78,19 +85,30 @@ _addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'percussions', 0, 0, 0, _addInstrument( "harmonica", INST_TIED, MID, 'winds', .1531, .19188, .01792, 1 ) _addInstrument( "alarm", INST_TIED, MID, 'concret', 1.37555859375, 2.0286015625, .0675, 0.5 ) _addInstrument( "bird", INST_TIED, MID, 'animals', .1, 1, .05, 1 ) +_addInstrument( "frogs", INST_TIED, MID, 'animals', 1.954453125, 4.350234375, .2, 0.7 ) _addInstrument( "cat", INST_SIMP, MID, 'animals', 0, 0, 0, 1 ) +_addInstrument( "cow", INST_SIMP, MID, 'animals', 0, 0, 0, 0.7 ) +_addInstrument( "cricket", INST_SIMP, MID, 'animals', 0, 0, 0, 0.5 ) _addInstrument( "duck2", INST_SIMP, MID, 'animals', 0, 0, 0, 1 ) _addInstrument( "bottle", INST_TIED, MID, 'concret', .20532, .41064, .05292, 1 ) _addInstrument( "clang", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) +_addInstrument( "clang2", INST_SIMP, MID, 'concret', 0, 0, 0, 0.7 ) _addInstrument( "ow", INST_SIMP, MID, 'people', 0, 0, 0, 1 ) +_addInstrument( "hey", INST_SIMP, MID, 'people', 0, 0, 0, 0.5 ) _addInstrument( "sheep", INST_SIMP, MID, 'animals', 0, 0, 0, 1 ) _addInstrument( "water", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) _addInstrument( "zap", INST_TIED, MID, 'keyboard', .299, .7323, .09895, 1 ) _addInstrument( "trumpet", INST_TIED, MID, 'winds', .91195, 1.652909375, .05375, 0.5) +_addInstrument( "clavinet", INST_TIED, MID, 'winds', .6398328125, .9401625, .094, 0.4) +_addInstrument( "flugel", INST_TIED, MID, 'winds', 1.291740625, 2.37588007813, .065, 0.4) +_addInstrument( "foghorn", INST_TIED, LOW, 'winds', 2.07005, 3.758775, .2, 0.5) _addInstrument( "bubbles", INST_TIED, MID, 'concret', 0.02, 1.177, 0.02, 1) _addInstrument( "marimba", INST_TIED, MID, 'percussions', .18883789, .343623047, .07625, 0.5) _addInstrument( "triangle", INST_TIED, MID, 'percussions', 2.27261836, 3.2965453, .2, 0.6) +_addInstrument( "fingercymbals", INST_TIED, HIGH, 'percussions', 1.29635195312, 1.92448125, .094, 0.6) _addInstrument( "laugh", INST_SIMP, MID, 'people', 0, 0, 0, 1 ) +_addInstrument( "babylaugh", INST_TIED, MID, 'people', 0.72920078, 1.63253906, 0.01, 0.5) +_addInstrument( "babyuhoh", INST_SIMP, MID, 'people', 0, 0, 0, 0.6 ) _addInstrument( "voix", INST_TIED, MID, 'people', .89608, .96092, .02343, 1 ) _addInstrument( "cling", INST_TIED, MID, 'keyboard', .09096, .7878, .18026, 1 ) _addInstrument( "byke", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) @@ -106,6 +124,7 @@ _addInstrument( "mando", INST_TIED, MID, 'strings', 0.507107031, 0.934144531, 0. _addInstrument( "ocarina", INST_TIED, MID, 'winds', .06612, .19033, .01776, 1 ) _addInstrument( "rhodes", INST_TIED, MID, 'keyboard', 0.58100625, 0.821625, 0.067, 1 ) _addInstrument( "saxo", INST_TIED, MID, 'winds', 1.161051953, 3.001209765, .05, 0.5 ) +_addInstrument( "saxsoprano", INST_TIED, HIGH, 'winds', .90721015625, 1.71199335938, .07675, 0.4 ) _addInstrument( "shenai", INST_TIED, MID, 'winds', .29003, .33072, .00634, 0.7 ) _addInstrument( "sitar", INST_TIED, MID, 'strings', 1.1361625, 1.575134375, .183, 0.4 ) _addInstrument( "tuba", INST_TIED, LOW, 'winds', .51063, .58384, .035, 1 ) @@ -147,6 +166,7 @@ _addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1 ) _addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'percussions', 0, 0, 0, 1 ) _addInstrument( "camera", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) _addInstrument( "car", INST_TIED, MID, 'concret', .67, 1.05761, .01, 0.7 ) +_addInstrument( "carhorn", INST_SIMP, MID, 'concret', 0, 0, 0, 0.4 ) _addInstrument( "cello", INST_TIED, MID, 'strings', 0.4761, 0.92244375, 0.19125, .75 ) _addInstrument( "chimes", INST_TIED, MID, 'percussions', 4.104825, 5.644134375, .02, 1 ) _addInstrument( "crash", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) |