From e696114971b96e0b52f05716c40de2889424622f Mon Sep 17 00:00:00 2001
From: Jared Stroud <jared@CaptnCrunch.(none)>
Date: Thu, 11 Apr 2013 23:00:55 +0000
Subject: Added a drum kit.

---
diff --git a/TamTamJam.py b/TamTamJam.py
index 7d53df6..7d53df6 100644..100755
--- a/TamTamJam.py
+++ b/TamTamJam.py
diff --git a/common/Resources/Images/fossdrum.png b/common/Resources/Images/fossdrum.png
new file mode 100644
index 0000000..bc3ee48
--- /dev/null
+++ b/common/Resources/Images/fossdrum.png
Binary files differ
diff --git a/common/Resources/Sounds/drum7kit b/common/Resources/Sounds/drum7kit
new file mode 100644
index 0000000..e693353
--- /dev/null
+++ b/common/Resources/Sounds/drum7kit
Binary files differ
diff --git a/common/Resources/Sounds/ticktack1 b/common/Resources/Sounds/ticktack1
new file mode 100644
index 0000000..9303a70
--- /dev/null
+++ b/common/Resources/Sounds/ticktack1
Binary files differ
diff --git a/common/Resources/Sounds/ticktack2 b/common/Resources/Sounds/ticktack2
new file mode 100644
index 0000000..25fc489
--- /dev/null
+++ b/common/Resources/Sounds/ticktack2
Binary files differ
diff --git a/common/Resources/Sounds/ticktack3 b/common/Resources/Sounds/ticktack3
new file mode 100644
index 0000000..01345e5
--- /dev/null
+++ b/common/Resources/Sounds/ticktack3
Binary files differ
diff --git a/common/Resources/Sounds/ticktack4 b/common/Resources/Sounds/ticktack4
new file mode 100644
index 0000000..bb0bada
--- /dev/null
+++ b/common/Resources/Sounds/ticktack4
Binary files differ
diff --git a/common/Resources/Sounds/ticktack5 b/common/Resources/Sounds/ticktack5
new file mode 100644
index 0000000..3e0c6e6
--- /dev/null
+++ b/common/Resources/Sounds/ticktack5
Binary files differ
diff --git a/common/Resources/Sounds/ticktack6 b/common/Resources/Sounds/ticktack6
new file mode 100644
index 0000000..f2038d8
--- /dev/null
+++ b/common/Resources/Sounds/ticktack6
Binary files differ
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
--
cgit v0.9.1