Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/common/Util
diff options
context:
space:
mode:
authorJared Stroud <jared@CaptnCrunch.(none)>2013-04-11 23:00:55 (GMT)
committer Jared Stroud <jared@CaptnCrunch.(none)>2013-04-11 23:00:55 (GMT)
commite696114971b96e0b52f05716c40de2889424622f (patch)
tree44ea407b1645da3a92af8335cd7bef71985c5627 /common/Util
parent2dcce41911f60eb153d70d8d74b4bd60035e979b (diff)
Added a drum kit.
Diffstat (limited to 'common/Util')
-rw-r--r--common/Util/Instruments.py31
1 files changed, 31 insertions, 0 deletions
diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py
index 1386b25..eb0828e 100644
--- a/common/Util/Instruments.py
+++ b/common/Util/Instruments.py
@@ -120,6 +120,10 @@ _addInstrument("drum1chine", INST_SIMP, PUNCH, 'percussions',
0, 0, 0, 1, kitStage=True)
_addInstrument("drum1kick", INST_SIMP, LOW, 'percussions',
0, 0, 0, 1, kitStage=True)
+_addInstrument("drum7kit", INST_SIMP, MID, 'percussions', #FOSS 4/10/2013
+ 0, 0, 0, 1, kitStage=True
+ nameTooltip=_('fossdrum'))
+
_addInstrument('piano', INST_TIED, MID, 'keyboard',
0.8883, 1.420524, .13575, 1,
# TRANS: The sound made by this instrument
@@ -567,6 +571,24 @@ _addInstrument('au_pipes', INST_TIED, MID, 'winds',
# TRANS: The sound of a Solomon Islands pipe, named "'au tahana"
# TRANS: http://www.jstor.org/pss/851365
nameTooltip=_('\'au tahana'))
+#HFOSS 4/10/2013
+_addInstrument('ticktack1', INST_SIMP, LOW, 'percussions',
+ 0, 0, 0, 1, kitStage=True)
+
+_addInstrument('ticktack2', INST_SIMP, LOW, 'percussions',
+ 0, 0, 0, 1, kitStage=True)
+
+_addInstrument('ticktack3', INST_SIMP, LOW, 'percussions',
+ 0, 0, 0, 1, kitStage=True)
+
+_addInstrument('ticktack4', INST_SIMP, LOW, 'percussions',
+ 0, 0, 0, 1, kitStage=True)
+
+_addInstrument('ticktack5', INST_SIMP, LOW, 'percussions',
+ 0, 0, 0, 1, kitStage=True)
+
+_addInstrument('ticktack6', INST_SIMP, LOW, 'percussions',
+ 0, 0, 0, 1, kitStage=True)
if Config.FEATURES_NEWSOUNDS:
try:
@@ -662,6 +684,13 @@ DRUM6KIT = {24: "drum6madal00",
44: "drum6madal10",
46: "drum6madal11",
48: "drum6madal12"}
+#HFOSS
+DRUM7KIT = {24: "ticktack1",
+ 26: "ticktack2",
+ 28: "ticktack3",
+ 30: "ticktack4",
+ 32: "ticktack5",
+ 34: "ticktack6"}
_addInstrument("drum1kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM1KIT,
# TRANS: http://en.wikipedia.org/wiki/Drum_set
@@ -676,5 +705,7 @@ _addInstrument("drum5kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM5KIT,
nameTooltip=_('South American Kit'))
_addInstrument("drum6kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM6KIT,
nameTooltip=_('Nepali'))
+_addInstrument("drum7kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM7KIT,
+ nameTooltip=_('
DRUMCOUNT = 6