Add Bardic Fiddle. Bump version to 2.4.1.

digero · Apr 18, 2018 · 9bed83e · 9bed83e
1 parent 691ff51
commit 9bed83e
Show file tree

Hide file tree

Showing 45 changed files with 510 additions and 9 deletions.
diff --git a/audio/LotroInstruments/LotroInstruments.txt b/audio/LotroInstruments/LotroInstruments.txt
diff --git a/audio/LotroInstruments/bardic_fiddle_36.wav b/audio/LotroInstruments/bardic_fiddle_36.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_37.wav b/audio/LotroInstruments/bardic_fiddle_37.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_38.wav b/audio/LotroInstruments/bardic_fiddle_38.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_39.wav b/audio/LotroInstruments/bardic_fiddle_39.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_40.wav b/audio/LotroInstruments/bardic_fiddle_40.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_41.wav b/audio/LotroInstruments/bardic_fiddle_41.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_42.wav b/audio/LotroInstruments/bardic_fiddle_42.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_43.wav b/audio/LotroInstruments/bardic_fiddle_43.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_44.wav b/audio/LotroInstruments/bardic_fiddle_44.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_45.wav b/audio/LotroInstruments/bardic_fiddle_45.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_46.wav b/audio/LotroInstruments/bardic_fiddle_46.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_47.wav b/audio/LotroInstruments/bardic_fiddle_47.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_48.wav b/audio/LotroInstruments/bardic_fiddle_48.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_49.wav b/audio/LotroInstruments/bardic_fiddle_49.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_50.wav b/audio/LotroInstruments/bardic_fiddle_50.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_51.wav b/audio/LotroInstruments/bardic_fiddle_51.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_52.wav b/audio/LotroInstruments/bardic_fiddle_52.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_53.wav b/audio/LotroInstruments/bardic_fiddle_53.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_54.wav b/audio/LotroInstruments/bardic_fiddle_54.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_55.wav b/audio/LotroInstruments/bardic_fiddle_55.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_56.wav b/audio/LotroInstruments/bardic_fiddle_56.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_57.wav b/audio/LotroInstruments/bardic_fiddle_57.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_58.wav b/audio/LotroInstruments/bardic_fiddle_58.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_59.wav b/audio/LotroInstruments/bardic_fiddle_59.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_60.wav b/audio/LotroInstruments/bardic_fiddle_60.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_61.wav b/audio/LotroInstruments/bardic_fiddle_61.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_62.wav b/audio/LotroInstruments/bardic_fiddle_62.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_63.wav b/audio/LotroInstruments/bardic_fiddle_63.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_64.wav b/audio/LotroInstruments/bardic_fiddle_64.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_65.wav b/audio/LotroInstruments/bardic_fiddle_65.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_66.wav b/audio/LotroInstruments/bardic_fiddle_66.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_67.wav b/audio/LotroInstruments/bardic_fiddle_67.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_68.wav b/audio/LotroInstruments/bardic_fiddle_68.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_69.wav b/audio/LotroInstruments/bardic_fiddle_69.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_70.wav b/audio/LotroInstruments/bardic_fiddle_70.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_71.wav b/audio/LotroInstruments/bardic_fiddle_71.wav
diff --git a/audio/LotroInstruments/bardic_fiddle_72.wav b/audio/LotroInstruments/bardic_fiddle_72.wav
diff --git a/src/com/digero/abcplayer/version.txt b/src/com/digero/abcplayer/version.txt
@@ -1 +1 @@
-version.AbcPlayer=2.4.0
+version.AbcPlayer=2.4.1
diff --git a/src/com/digero/common/abc/LotroInstrument.java b/src/com/digero/common/abc/LotroInstrument.java
@@ -38,10 +38,11 @@ public enum LotroInstrument
 	BASIC_LUTE               ( "Basic Lute",                false,   25,      0,      false,   -19.0f),
 	HARP                     ( "Harp",                      false,   46,      0,      false,     6.0f),
 	MISTY_MOUNTAIN_HARP      ( "Misty Mountain Harp",       false,   27,      0,      false,   -12.5f),
-	BASIC_FIDDLE             ( "Basic Fiddle",               true,   40,      1,      false,     0.0f),
+	BARDIC_FIDDLE            ( "Bardic Fiddle",              true,   40,      1,      false,     0.0f),
+	BASIC_FIDDLE             ( "Basic Fiddle",               true,   41,      1,      false,     0.0f),
 	LONELY_MOUNTAIN_FIDDLE   ( "Lonely Mountain Fiddle",     true,   51,      1,      false,     0.0f),
 	SPRIGHTLY_FIDDLE         ( "Sprightly Fiddle",          false,  110,      1,      false,     0.0f),
-	STUDENT_FIDDLE           ( "Student's Fiddle",           true,   41,      1,      false,     0.0f),
+	STUDENT_FIDDLE           ( "Student's Fiddle",           true,  120,      1,      false,     0.0f),
 	TRAVELLERS_TRUSTY_FIDDLE ( "Traveller's Trusty Fiddle", false,   45,      1,      false,     0.0f),
 	THEORBO                  ( "Theorbo",                   false,   32,     -1,      false,   -12.0f), // -12.2f
 	FLUTE                    ( "Flute",                      true,   73,      2,      false,    -0.5f), //  -4.2f
@@ -55,7 +56,7 @@ public enum LotroInstrument
 // @formatter:on
 
 	public static final LotroInstrument DEFAULT_LUTE = LUTE_OF_AGES;
-	public static final LotroInstrument DEFAULT_FIDDLE = BASIC_FIDDLE;
+	public static final LotroInstrument DEFAULT_FIDDLE = BARDIC_FIDDLE;
 	public static final LotroInstrument DEFAULT_INSTRUMENT = LUTE_OF_AGES;
 
 	public final Note lowestPlayable;
@@ -157,7 +158,8 @@ public static LotroInstrument findInstrumentName(String str, LotroInstrument def
 			addNicknames(LotroInstrument.LUTE_OF_AGES, "Lute of Ages", "Age Lute", "LuteA", "LOA", "Guitar");
 			addNicknames(LotroInstrument.DEFAULT_LUTE, "Lute");
 			addNicknames(LotroInstrument.MISTY_MOUNTAIN_HARP, "Misty Mountain Harp", "Misty Harp", "MM Harp", "MMH");
-			addNicknames(LotroInstrument.BASIC_FIDDLE, "Basic Fiddle", "B Fiddle", "Violin");
+			addNicknames(LotroInstrument.BASIC_FIDDLE, "Basic Fiddle");
+			addNicknames(LotroInstrument.BARDIC_FIDDLE, "Bardic Fiddle", "B Fiddle", "Violin");
 			addNicknames(LotroInstrument.LONELY_MOUNTAIN_FIDDLE, "Lonely (Mountain)? Fiddle", "LM Fiddle");
 			addNicknames(LotroInstrument.SPRIGHTLY_FIDDLE, "Sprightly Fiddle");
 			addNicknames(LotroInstrument.STUDENT_FIDDLE, "Student'?s? Fiddle");

diff --git a/src/com/digero/common/midi/PanGenerator.java b/src/com/digero/common/midi/PanGenerator.java
@@ -57,6 +57,7 @@ public int get(LotroInstrument instrument)
 				break;
 			case STUDENT_FIDDLE:
 			case LONELY_MOUNTAIN_FIDDLE:
+			case BARDIC_FIDDLE:
 				instrument = LotroInstrument.BASIC_FIDDLE;
 				break;
 			//$CASES-OMITTED$
@@ -82,6 +83,7 @@ public int get(LotroInstrument instrument)
 
 		switch (instrument)
 		{
+			case BARDIC_FIDDLE:
 			case BASIC_FIDDLE:
 			case LONELY_MOUNTAIN_FIDDLE:
 			case STUDENT_FIDDLE:

diff --git a/src/com/digero/maestro/abc/PartAutoNumberer.java b/src/com/digero/maestro/abc/PartAutoNumberer.java
@@ -45,6 +45,7 @@ private Settings(Preferences prefs)
 			init(prefs, LotroInstrument.COWBELL, LotroInstrument.DRUMS);
 			init(prefs, LotroInstrument.MOOR_COWBELL, LotroInstrument.DRUMS);
 			init(prefs, LotroInstrument.BASIC_FIDDLE, 9 * x10);
+			init(prefs, LotroInstrument.BARDIC_FIDDLE, LotroInstrument.BASIC_FIDDLE);
 			init(prefs, LotroInstrument.STUDENT_FIDDLE, LotroInstrument.BASIC_FIDDLE);
 			init(prefs, LotroInstrument.LONELY_MOUNTAIN_FIDDLE, LotroInstrument.BASIC_FIDDLE);
 			init(prefs, LotroInstrument.SPRIGHTLY_FIDDLE, LotroInstrument.BASIC_FIDDLE);

diff --git a/src/com/digero/maestro/version.txt b/src/com/digero/maestro/version.txt
@@ -1 +1 @@
-version.Maestro=2.4.0
+version.Maestro=2.4.1
diff --git a/src/com/digero/tools/AudioSorter.java b/src/com/digero/tools/AudioSorter.java
@@ -65,7 +65,7 @@ public static void copyToFinalNamesMain() throws Exception
 		String sourceRoot = "F:\\Games\\LOTRO\\u22\\wav\\instruments_sorted";
 		String targetRoot = sourceRoot;
 
-		copyToFinalNames(sourceRoot, targetRoot, "travellers_fiddle", false);
+		copyToFinalNames(sourceRoot, targetRoot, "bardic_fiddle", false);
 	}
 
 	private static void copyToFinalNames(final String sourceRoot, final String targetRoot, final String instrumentName,

diff --git a/src/com/digero/tools/soundfont/GenerateSoundFontInfo.java b/src/com/digero/tools/soundfont/GenerateSoundFontInfo.java
@@ -36,6 +36,7 @@ private static int getNotesPerSample(LotroInstrument lotroInstrument)
 			case LUTE_OF_AGES:
 			case BASIC_LUTE:
 			case HARP:
+			case BARDIC_FIDDLE:
 				return 1;
 
 			case MISTY_MOUNTAIN_HARP: