New elf hit sounds, but no separate death sounds yet.

Also, these are not wired into UtBS desert elves.

data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg

@@ -15,8 +15,8 @@
 	cost=60
 	usage=fighter
 	unit_description= _ "The leaders of the elves do not fall sallow and frail with age. Rather, it is then that they grow to their true potential. Quiet and contemplative in times of peace, a High Lord in the full of his wrath is an awesome sight indeed."
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[attack]
 		name=sword
 		icon=attacks/sword-elven.png

data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg

@@ -14,8 +14,8 @@
 	cost=36
 	usage=fighter
 	unit_description= _ "The nobility of the elves are possessed of merit to match their standing in society. Elvish Lords are the wisest and strongest of their people, and are fearsome in their command of magic."
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[attack]
 		name=sword
 		icon=attacks/sword-elven.png

data/sound-utils.cfg

@@ -35,6 +35,12 @@ dwarf-hit-1.ogg,dwarf-hit-2.ogg,dwarf-hit-3.ogg,dwarf-hit-4.ogg #enddef
 #define SOUND_LIST:DWARF_DIE
 dwarf-die-1.ogg,dwarf-die-2.ogg #enddef
 
+#define SOUND_LIST:ELF_HIT
+elf-hit-1.ogg,elf-hit-2.ogg,elf-hit-3.ogg,elf-hit-4.ogg,elf-hit-5.ogg #enddef
+
+#define SOUND_LIST:ELF_FEMALE_HIT
+elf-female-hit-1.ogg,elf-female-hit-2.ogg,elf-female-hit-3.ogg,elf-female-hit-4.ogg,elf-female-hit-5.ogg #enddef
+
 #define SOUND_LIST:GOBLIN_HIT
 goblin-hit-1.ogg,goblin-hit-2.ogg,goblin-hit-3.ogg #enddef
 

data/units/Elvish_Archer.cfg

@@ -17,8 +17,8 @@
 	cost=17
 	usage=archer
 	unit_description= _ "Elves have always had a reputation for archery, a skill that, for many reasons, comes naturally to them. Even the frail of body can be deadly with a bow in hand, and in times of war, many will take up this weapon. Though their relative inexperience with combat leaves them somewhat vulnerable, their natural grace ensures that they can best any of humanity's fresh recruits."
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[attack]
 		name=sword
 		icon=attacks/sword-elven.png
@@ -195,8 +195,8 @@
 		name= _ "female^Elvish Archer"
 		gender=female
 		image="units/elves-wood/archer+female.png"
-		get_hit_sound=female-hit.wav
-		die_sound=female-hit.wav
+		get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+		die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 		[death]
 			[frame]
 				image="units/elves-wood/archer+female-die1.png"

data/units/Elvish_Avenger.cfg

@@ -22,8 +22,8 @@
 This has, at times, been interpreted as a form of vengeance for their brethren lost earlier in the battle. Although not so base in design, it is not at all inaccurate.
 
 Special Notes:"+{SPECIAL_NOTES_AMBUSH}
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[movement_costs]
 		shallow_water=2
 		mountains=2
@@ -222,8 +222,8 @@ Special Notes:"+{SPECIAL_NOTES_AMBUSH}
 		name= _ "female^Elvish Avenger"
 		gender=female
 		image="units/elves-wood/avenger+female.png"
-		get_hit_sound=female-strong-hit.wav
-		die_sound=female-strong-hit.wav
+		get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+		die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 		[defend]
 			[frame]
 				image="units/elves-wood/avenger+female-defend.png"

data/units/Elvish_Captain.cfg

@@ -25,8 +25,8 @@
 	unit_description= _ "Elves, unlike many other races, will quickly acknowledge and follow any of their peers who have experience in combat. This is quite at odds with humanity, for whom leadership is often a fickle mess of coercion and intimidation. The combination of their willingness to accept the wisdom of their leaders, and the tendency to choose leaders of merit is one of the quiet strengths of the elves.
 
 Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[defend]
 		range=melee
 		[frame]

data/units/Elvish_Champion.cfg

@@ -16,8 +16,8 @@
 	cost=55
 	usage=fighter
 	unit_description= _ "Those few elves who deliberately hone themselves into weapons of war become something which belies the rather docile reputation of their race. Dedication and skill are matched with purity of form, and the result is a mastery of swordsmanship to which few can compare. Even archery, treated as a secondary pursuit, is executed with a skill that most of humanity can only stare at with wonder."
-	get_hit_sound=groan-strong.wav
-	die_sound=groan-strong.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	image_long="units/elves-wood/champion-bow.png"
 	[attack]
 		name=sword

data/units/Elvish_Druid.cfg

@@ -20,8 +20,8 @@
 Their chief ability lies in healing, and it is for this skill that the elvish druids are revered by their people.
 
 Special Notes:"+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_CURES}
-	get_hit_sound=female-hit.wav
-	die_sound=female-hit.wav
+	get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+	die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 	[abilities]
 		{ABILITY_CURES}
 	[/abilities]

data/units/Elvish_Enchantress.cfg

@@ -16,8 +16,8 @@
 	unit_description= _ "The Elven Enchantresses are masters of offensive magic, striking at their enemies both with blasts of icy wind drawn from the ethereal plane, and magically animating roots with which they bind their enemies in place.
 
 Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
-	get_hit_sound=female-hit.wav
-	die_sound=female-hit.wav
+	get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+	die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 	[resistance]
 		cold=80
 	[/resistance]

data/units/Elvish_Fighter.cfg

@@ -17,8 +17,8 @@
 	cost=14
 	usage=fighter
 	unit_description= _ "Elves are not warlike by nature, but in times of need, their natural grace and agility serve them well, as does their skillful craftsmanship. An elf can grasp the basics of swordsmanship and archery in an uncannily short time, and put them to effective use on the battlefield."
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[attack]
 		name=sword
 		icon=attacks/sword-elven.png
@@ -166,16 +166,16 @@
 	[defend]
 		range=melee
 		[frame]
-			begin=-150
-			end=150
+			begin=-25
+			end=25
 			image="units/elves-wood/fighter-defend.png"
 		[/frame]
 	[/defend]
 	[defend]
 		range=ranged
 		[frame]
-			begin=-150
-			end=150
+			begin=-25
+			end=25
 			image="units/elves-wood/fighter-bow-defend.png"
 		[/frame]
 	[/defend]

data/units/Elvish_Hero.cfg

@@ -16,8 +16,8 @@
 	cost=32
 	usage=fighter
 	unit_description= _ "A relatively small amount of experience will turn an elf from a competent fighter into a master of combat. Those who are honored as heroes are strong with both sword and bow, skills that never fade for lack of practice."
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[attack]
 		name=sword
 		icon=attacks/sword-elven.png

data/units/Elvish_Marksman.cfg

@@ -21,8 +21,8 @@
 This prodigious skill does come with one cost, that being a lack of practice with the sword.
 
 Special Notes:"+{SPECIAL_NOTES_MARKSMAN}
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[death]
 		[frame]
 			begin=0
@@ -222,7 +222,8 @@ Special Notes:"+{SPECIAL_NOTES_MARKSMAN}
 		name= _ "female^Elvish Marksman"
 		gender=female
 		image="units/elves-wood/marksman+female.png"
-		get_hit_sound=female-strong-hit.wav
+		get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+		die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 		[defend]
 			[frame]
 				image="units/elves-wood/marksman+female-defend.png"

data/units/Elvish_Marshal.cfg

@@ -26,8 +26,8 @@
 	unit_description= _ "The longevity and natural intelligence of elves makes for a vicious aptitude for military matters, enough even to counter their general distaste for such things. Elves remember things much more clearly than humankind, and can often intuit what others can only be trained to do. Certainly, on those rare occasions when an elf sets his mind to war, the strategy that results is the work of a master.
 
 Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
-	get_hit_sound=groan-strong.wav
-	die_sound=groan-strong.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[abilities]
 		{ABILITY_LEADERSHIP_LEVEL_3}
 	[/abilities]

data/units/Elvish_Ranger.cfg

@@ -19,8 +19,8 @@
 	unit_description= _ "Though a man might spend years in the forest, he will never shake the feeling that he is a guest in a place he is not truly a part of. With elves, this is quite reversed. Any elf that studies the lore of the woods becomes a fitting master of them, and when combined with a considerable skill at archery and swordsmanship, the result is a powerful tool of war.
 
 Special Notes:"+{SPECIAL_NOTES_AMBUSH}
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[movement_costs]
 		shallow_water=2
 		mountains=2
@@ -219,7 +219,8 @@ Special Notes:"+{SPECIAL_NOTES_AMBUSH}
 		name= _ "female^Elvish Ranger"
 		gender=female
 		image="units/elves-wood/ranger+female.png"
-		get_hit_sound=female-hit.wav
+		get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+		die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 		[defend]
 			[frame]
 				image="units/elves-wood/ranger+female-defend.png"

data/units/Elvish_Shaman.cfg

@@ -68,8 +68,8 @@
 The healing abilities of the elves are also remarkable, and of capital use in battle.
 
 Special Notes:"+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_HEALS}
-	get_hit_sound=female-hit.wav
-	die_sound=female-hit.wav
+	get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+	die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 	[abilities]
 		{ABILITY_HEALS}
 	[/abilities]

data/units/Elvish_Sharpshooter.cfg

@@ -20,8 +20,8 @@
 	unit_description= _ "A story once wandered about, of an elf who stopped an arrow by shooting it out of the air with one of his own. It is a testament to the skill of the elves that such a story could be taken seriously. The sharpshooters of the elves have, quite simply, mastered the art of archery.
 
 Special Notes:"+{SPECIAL_NOTES_MARKSMAN}
-	get_hit_sound=groan.wav
-	die_sound=groan.wav
+	get_hit_sound={SOUND_LIST:ELF_HIT}
+	die_sound={SOUND_LIST:ELF_HIT}
 	[death]
 		[frame]
 			begin=0
@@ -231,8 +231,8 @@ Special Notes:"+{SPECIAL_NOTES_MARKSMAN}
 		name= _ "female^Elvish Sharpshooter"
 		gender=female
 		image="units/elves-wood/sharpshooter+female.png"
-		get_hit_sound=female-strong-hit.wav
-		die_sound=female-strong-hit.wav
+		get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+		die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 		[defend]
 			[frame]
 				image="units/elves-wood/sharpshooter+female-defend.png"

data/units/Elvish_Shyde.cfg

@@ -20,8 +20,8 @@
 	unit_description= _ "Devotion to her faerie side will eventually transform an elf maiden into a creature of both worlds. Guided by a nature which is little understood, these beautiful stewards of the elven forests epitomize the grace and mystery of their people.
 
 Special Notes:"+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_CURES}
-	get_hit_sound=female-hit.wav
-	hit_sound=female-hit.wav
+	get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+	hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
 	[abilities]
 		{ABILITY_CURES}
 	[/abilities]

data/units/Elvish_Sorceress.cfg

@@ -16,8 +16,8 @@
 	unit_description= _ "Eschewing the study of healing in favor of more aggressive uses of magic, Elvish Sorceresses have become quite proficient at ranged combat. Their entangling attack is notably more effective than that of the Elvish Shaman, and they can call upon bursts of chilling ethereal wind to smite those who oppose them.
 
 Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
-	get_hit_sound=female-hit.wav
-	die_sound=female-hit.wav
+	get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+	die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 	[resistance]
 		cold=90
 	[/resistance]

data/units/Elvish_Sylph.cfg

@@ -17,8 +17,8 @@
 	unit_description= _ "Elvish Sylphs are scions of beauty in the mortal plane. Having fully developed their faerie side, they transform into creatures of both worlds, wielding powerful magic against their enemies.
 
 Special Notes:"+{SPECIAL_NOTES_SLOW}
-	get_hit_sound=female-hit.wav
-	die_sound=female-hit.wav
+	get_hit_sound={SOUND_LIST:ELF_FEMALE_HIT}
+	die_sound={SOUND_LIST:ELF_FEMALE_HIT}
 	[resistance]
 		cold=70
 	[/resistance]