New naga sounds.

data/campaigns/Under_the_Burning_Suns/units/Naga_Guardian.cfg

@@ -1,39 +1,48 @@
-[unit]
-#textdomain wesnoth-utbs
-	id=Naga Guardian
-	name= _ "Naga Guardian"
-	race=naga
-	image="naga-guardian.png"
-	hitpoints=38
-	movement_type=naga
-	movement=5
-	[resistance]
-		blade=90
-		pierce=90
-		impact=90
-	[/resistance]
-	experience=35
-	level=1
-	alignment=neutral
-	advanceto=Naga Warden
-	undead_variation=swimmer
-	cost=16
-	usage=fighter
-	unit_description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
-	[attack]
-		name=mace
-		type=impact
-		range=melee
-		damage=7
-		number=3
-		[animation]
-			[frame]
-				sound=mace.wav
-				begin=-100
-				end=-99
-			[/frame]
-		[/animation]
-	[/attack]
-[/unit]
+[unit]
+#textdomain wesnoth-utbs
+	id=Naga Guardian
+	name= _ "Naga Guardian"
+	race=naga
+	image="naga-guardian.png"
+	hitpoints=38
+	movement_type=naga
+	movement=5
+	[resistance]
+		blade=90
+		pierce=90
+		impact=90
+	[/resistance]
+	experience=35
+	level=1
+	alignment=neutral
+	advanceto=Naga Warden
+	undead_variation=swimmer
+	cost=16
+	usage=fighter
+	unit_description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
+	[attack]
+		name=mace
+		type=impact
+		range=melee
+		damage=7
+		number=3
+		[animation]
+			hits=no
+			[frame]
+				sound={SOUND_LIST:MISS}
+				begin=-100
+				end=0
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				sound=mace.wav
+				begin=-100
+				end=0
+			[/frame]
+		[/animation]
+	[/attack]
+[/unit]

data/campaigns/Under_the_Burning_Suns/units/Naga_Hunter.cfg

@@ -16,8 +16,8 @@
 	cost=15
 	usage=archer
 	unit_description= _ "Naga Hunters are Naga who are skilled at hunting with a bow. Since the naga are naturally resistant to poison, they have no qualms about hunting with poisoned arrows. These two foot long shafts, tipped with a potent poison, have been known to slay many kinds of prey."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
 	[attack]
 		name=sword
 		type=blade

data/campaigns/Under_the_Burning_Suns/units/Naga_Sentinel.cfg

@@ -1,40 +1,49 @@
-[unit]
-#textdomain wesnoth-utbs
-	id=Naga Sentinel
-	name= _ "Naga Sentinel"
-	race=naga
-	image="naga-sentinel.png"
-	hitpoints=55
-	movement_type=naga
-	movement=6
-	experience=32
-	[resistance]
-		blade=90
-		pierce=90
-		impact=90
-	[/resistance]
-	level=3
-	alignment=neutral
-	advanceto=null
-	{AMLA_TOUGH 3}
-	undead_variation=swimmer
-	cost=100
-	usage=fighter
-	unit_description= _ "The heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
-	[attack]
-		name=mace
-		type=impact
-		range=melee
-		damage=12
-		number=4
-		[animation]
-			[frame]
-				sound=mace.wav
-				begin=-100
-				end=-99
-			[/frame]
-		[/animation]
-	[/attack]
-[/unit]
+[unit]
+#textdomain wesnoth-utbs
+	id=Naga Sentinel
+	name= _ "Naga Sentinel"
+	race=naga
+	image="naga-sentinel.png"
+	hitpoints=55
+	movement_type=naga
+	movement=6
+	experience=32
+	[resistance]
+		blade=90
+		pierce=90
+		impact=90
+	[/resistance]
+	level=3
+	alignment=neutral
+	advanceto=null
+	{AMLA_TOUGH 3}
+	undead_variation=swimmer
+	cost=100
+	usage=fighter
+	unit_description= _ "The heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
+	[attack]
+		name=mace
+		type=impact
+		range=melee
+		damage=12
+		number=4
+		[animation]
+			hits=no
+			[frame]
+				sound={SOUND_LIST:MISS}
+				begin=-100
+				end=0
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				sound=mace.wav
+				begin=-100
+				end=0
+			[/frame]
+		[/animation]
+	[/attack]
+[/unit]

data/campaigns/Under_the_Burning_Suns/units/Naga_Warden.cfg

@@ -1,39 +1,48 @@
-[unit]
-#textdomain wesnoth-utbs
-	id=Naga Warden
-	name= _ "Naga Warden"
-	race=naga
-	image="naga-warden.png"
-	hitpoints=50
-	movement_type=naga
-	movement=5
-	experience=70
-	[resistance]
-		blade=90
-		pierce=90
-		impact=90
-	[/resistance]
-	level=2
-	alignment=neutral
-	advanceto=Naga Sentinel
-	undead_variation=swimmer
-	cost=48
-	usage=fighter
-	unit_description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
-	[attack]
-		name=mace
-		type=impact
-		range=melee
-		damage=12
-		number=3
-		[animation]
-			[frame]
-				sound=mace.wav
-				begin=-100
-				end=-99
-			[/frame]
-		[/animation]
-	[/attack]
-[/unit]
+[unit]
+#textdomain wesnoth-utbs
+	id=Naga Warden
+	name= _ "Naga Warden"
+	race=naga
+	image="naga-warden.png"
+	hitpoints=50
+	movement_type=naga
+	movement=5
+	experience=70
+	[resistance]
+		blade=90
+		pierce=90
+		impact=90
+	[/resistance]
+	level=2
+	alignment=neutral
+	advanceto=Naga Sentinel
+	undead_variation=swimmer
+	cost=48
+	usage=fighter
+	unit_description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids."
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
+	[attack]
+		name=mace
+		type=impact
+		range=melee
+		damage=12
+		number=3
+		[animation]
+			hits=no
+			[frame]
+				sound={SOUND_LIST:MISS}
+				begin=-100
+				end=0
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				sound=mace.wav
+				begin=-100
+				end=0
+			[/frame]
+		[/animation]
+	[/attack]
+[/unit]

data/sound-utils.cfg

@@ -29,6 +29,9 @@ 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:NAGA_HIT
+naga-hit-1.ogg,naga-hit-2.ogg,naga-hit-3.ogg #enddef
+
 #define SOUND_LIST:ZOMBIE_WEAK_HIT
 zombie-hit-4.ogg,zombie-hit-5.ogg,zombie-hit-6.ogg #enddef
 

data/units/Naga_Fighter.cfg

@@ -16,8 +16,8 @@
 	cost=14
 	usage=fighter
 	unit_description= _ "The serpentine naga are one of the few races capable of any meaningful mobility in water, giving them a whole world forbidden to land dwellers. Still, they are not true creatures of the sea, and their inability to breathe water leaves them in trepidation of the abyss. They are small, and somewhat frail in form, but often much more nimble than their opponents."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
 	[defend]
 		[frame]
 			begin=-150

data/units/Naga_Myrmidon.cfg

@@ -17,8 +17,8 @@
 	cost=48
 	usage=fighter
 	unit_description= _ "The most practiced of the naga blademasters are initiated into the caste of the Myrmidon, masters of their twin-bladed art. They strike as fast as the snakes which they resemble, and dance away from attacks with grace. Not only are they potent enemies on any open terrain, but their ability to swim allows them a deadly mobility."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
 	[defend]
 		[frame]
 			begin=-150

data/units/Naga_Warrior.cfg

@@ -16,8 +16,8 @@
 	cost=27
 	usage=fighter
 	unit_description= _ "Many of the young warriors of the naga aspire for the day when they merit their second blade. Their martial practice of using twin blades is wholly unlike that of the Orcs and other races, for they have begun to learn the art of using their serpentine form to best effect, twisting and turning to dodge from blows. This makes them potent on land, but the friction of water greatly impedes their ability to do this."
-	get_hit_sound=hiss-hit.wav
-	die_sound=hiss-die.wav
+	get_hit_sound={SOUND_LIST:NAGA_HIT}
+	die_sound=naga-die.ogg
 	[defend]
 		[frame]
 			begin=-150
@@ -59,8 +59,6 @@
 		gender=female
 		image="units/nagas/warrior+female.png"
 		profile=portraits/core/Alex_Jarocha-Ernst/nagini-fighter.png
-		get_hit_sound=hiss-hit.wav
-		die_sound=hiss-die.wav
 		[defend]
 			[frame]
 				image="units/nagas/warrior+female-defend.png"