From c1c17076beca3aa52f4df075bb02c032e208b8d1 Mon Sep 17 00:00:00 2001
From: Dan Fuhry <dan@fuhry.us>
Date: Tue, 23 Apr 2013 23:45:58 +0000
Subject: Added Jared's new drum kits

---
(limited to 'common/Util/Instruments.py')

diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py
index eb0828e..2eff521 100644
--- a/common/Util/Instruments.py
+++ b/common/Util/Instruments.py
@@ -100,7 +100,6 @@ _addInstrument("drum1hatpedal", INST_SIMP, MID, 'percussions',
         0, 0, 0, 1, kitStage=True)
 _addInstrument("drum1hatshoulder", INST_SIMP, HIGH, 'percussions',
         0, 0, 0, 1, kitStage=True)
-_addInstrument("drum1hardride", INST_SIMP, MID, 'percussions',
         0, 0, 0, 1, kitStage=True)
 _addInstrument("drum1ridebell", INST_SIMP, HIGH, 'percussions',
         0, 0, 0, 1, kitStage=True)
@@ -120,9 +119,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("drum7kit", INST_SIMP, MID, 'percussions', #FOSS 4/10/2013
+#		0, 0, 0, 1, kitStage=True
+	#nameTooltip=_('FOSSDrum')) not needed?
+_addInstrument("drum1hardride", INST_SIMP, MID, 'percussions',
 		
 _addInstrument('piano', INST_TIED, MID, 'keyboard',
         0.8883, 1.420524, .13575, 1,
@@ -571,24 +571,25 @@ _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('ticktack1', INST_SIMP, LOW, 'percussions',
+#		0, 0, 0, 1, kitStage=True)
 
-_addInstrument('ticktack2', 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('ticktack3', INST_SIMP, LOW, 'percussions',
+	#	0, 0, 0, 1, kitStage=True)
 
-_addInstrument('ticktack4', 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('ticktack5', INST_SIMP, LOW, 'percussions',
+#3		0, 0, 0, 1, kitStage=True)
 
-_addInstrument('ticktack6', 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:
@@ -685,12 +686,12 @@ DRUM6KIT = {24: "drum6madal00",
                  46: "drum6madal11",
                  48: "drum6madal12"}
 #HFOSS                 
-DRUM7KIT = {24: "ticktack1",
-				26: "ticktack2",
-				28: "ticktack3",
-				30: "ticktack4",
-				32: "ticktack5",
-				34: "ticktack6"}
+#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
@@ -705,7 +706,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=_('
+#_addInstrument("drum7kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM7KIT,
+#		nameTooltip=_('FossKit'))
 
 DRUMCOUNT = 6
--
cgit v0.9.1