New troll hit and die sounds.

changelog

@@ -23,7 +23,7 @@ Version 1.3.2+svn:
    * The Rise of Wesnoth
      * new Wose Sapling, Warrior King graphics
  * graphics
-   * the leader crown don't hide anymore the top of hp/xp bars (bug #9120) 
+   * the leader crown don't hide anymore the top of hp/xp bars (bug #9120)
    * better flag icons for the status bar
    * taller flags that don't get hidden behind units so easily
    * fixed some drawing glitches in the top row (bug #8739 and #8071)
@@ -31,6 +31,7 @@ Version 1.3.2+svn:
      per hex.
    * hp/xp bars in tiny gui have better proportions
  * sound and music:
+   * new or revised sounds: troll hit & die
    * added a sound when a unit is slowed
    * added a music track containing only silence (for stopping all music instead
      of just changing it)
@@ -44,7 +45,7 @@ Version 1.3.2+svn:
      * decreased the arcane melee attack of the Wraith from 7-4 to 6-4
  * multiplayer:
    * added maps: Xanthe Chaos, Auction-X
-   * revised maps: Castle Hopping Isle, Loris River, Crusaders Fields, 
+   * revised maps: Castle Hopping Isle, Loris River, Crusaders Fields,
      The Manzivan Traps
    * Team Survival: the teams are now set correctly and translatable
  * map editor

data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg

@@ -22,8 +22,7 @@
 	cost=32
 	usage=mixed fighter
 	unit_description= _ "Troll shamans are the mystical leaders of the trolls. Though not as strong or tough as other trolls, their true power lies in their fire magic, which they use to blast enemies with gouts of fire."
-	get_hit_sound=troll-hit.wav
-	die_sound=troll-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 #melee attack should be worse than troll rocklobber,
 #since shaman has suck a better ranged attack
 	[attack]
@@ -69,7 +68,7 @@
 		icon=attacks/fireball.png
 		[animation]
 			{MISSILE_FRAME_FIREBALL}
-			
+
 			[frame]
 				sound=fire.wav
 				begin=-200
@@ -79,5 +78,5 @@
 		[/animation]
 	[/attack]
 
-    {DEFENSE_ANIM "troll-shaman-defend.png" "troll-shaman.png" troll-hit.wav }
+    {DEFENSE_ANIM "troll-shaman-defend.png" "troll-shaman.png" {SOUND_LIST:TROLL_HIT} }
 [/unit]

data/campaigns/Under_the_Burning_Suns/units/Flesh_Golem.cfg

@@ -21,7 +21,8 @@
 	cost=30
 	usage=fighter
 	unit_description= _ "Incredibly strong constructs, flesh golems are created by powerful necromancers from the bodies of fallen warriors. Though these golems dutifully follow every command, and attack their enemies with ceaseless rage, the madness that possesses them has occasionally caused them to turn on their masters."
-	get_hit_sound=groan.wav
+	{DEFENSE_ANIM "flesh-golem.png" "flesh-golem.png" {SOUND_LIST:TROLL_HIT} }
+	die_sound={SOUND_LIST:TROLL_HIT}
 	[attack]
 		name=smashing frenzy
 		description= _"smashing frenzy"

data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg

@@ -22,8 +22,8 @@
 	cost=32
 	usage=mixed fighter
 	unit_description= _ "Troll shamans are the mystical leaders of the trolls. Though not as strong or tough as other trolls, their true power lies in their fire magic, which they use to blast enemies with gouts of fire."
-	{DEFENSE_ANIM "units/trolls/shaman-defend.png" "units/trolls/shaman.png" troll-hit.wav }
-	die_sound=troll-die.wav
+	{DEFENSE_ANIM "units/trolls/shaman-defend.png" "units/trolls/shaman.png" {SOUND_LIST:TROLL_HIT} }
+	die_sound={SOUND_LIST:TROLL_DIE}
 #melee attack should be worse than troll rocklobber,
 #since shaman has suck a better ranged attack
 	[attack]
@@ -69,7 +69,7 @@
 		icon=attacks/fireball.png
 		[animation]
 			{MISSILE_FRAME_FIREBALL}
-			
+
 			[frame]
 				sound=fire.wav
 				begin=-200

data/core/macros/sound-utils.cfg

@@ -201,6 +201,12 @@ orc-small-hit-1.ogg,orc-small-hit-2.ogg,orc-small-hit-3.ogg,orc-small-hit-4.ogg
 #define SOUND_LIST:ORC_SMALL_DIE
 orc-small-die-1.ogg,orc-small-die-2.ogg #enddef
 
+#define SOUND_LIST:TROLL_HIT
+troll-hit-1.wav,troll-hit-2.wav,troll-hit-3.wav,troll-hit-4.wav #enddef
+
+#define SOUND_LIST:TROLL_DIE
+troll-die-1.wav,troll-die-2.wav,troll-die-3.wav #enddef
+
 #define SOUND_LIST:ZOMBIE_WEAK_HIT
 zombie-hit-4.ogg,zombie-hit-5.ogg,zombie-hit-6.ogg #enddef
 

data/core/units/Troll.cfg

@@ -17,7 +17,7 @@
 	unit_description= _ "Trolls have long trouble the thoughts of humanity and dwarf-kind. Sages remain baffled at the origins of these creatures and the driving force behind their unnatural vitality and strength. A fully-grown troll towers above a man, and, even unarmed, would be a great threat in combat. The large clubs typically favored in fighting act as extensions of their arms, used for the same purpose of mauling their prey into submission.
 
 Special Notes:"+{SPECIAL_NOTES_REGENERATES}
-	die_sound=troll-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 	usage=fighter
 	[abilities]
 		{ABILITY_REGENERATES}
@@ -79,5 +79,5 @@ Special Notes:"+{SPECIAL_NOTES_REGENERATES}
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/trolls/grunt-defend.png" "units/trolls/grunt.png" troll-hit.wav }
+	{DEFENSE_ANIM "units/trolls/grunt-defend.png" "units/trolls/grunt.png" {SOUND_LIST:TROLL_HIT} }
 [/unit]

data/core/units/Troll_Great.cfg

@@ -18,7 +18,7 @@
 	unit_description= _ "When a troll, gifted with abnormal strength of life, matches that with age and wisdom, it becomes something extraordinary, a beast remembered for generations. Their feats of strength and cunning are the source of most tales about trolls, and to see the stories made flesh does nothing to diminish their grandeur.
 
 Special Notes:"+{SPECIAL_NOTES_REGENERATES}
-	die_sound=troll-big-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 	usage=fighter
 	[abilities]
 		{ABILITY_REGENERATES}
@@ -85,5 +85,5 @@ Special Notes:"+{SPECIAL_NOTES_REGENERATES}
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/trolls/warrior-defend.png" "units/trolls/warrior.png" troll-big-hit.wav }
+	{DEFENSE_ANIM "units/trolls/warrior-defend.png" "units/trolls/warrior.png" {SOUND_LIST:TROLL_HIT} }
 [/unit]

data/core/units/Troll_Hero.cfg

@@ -17,7 +17,7 @@
 	unit_description= _ "Some trolls are born with an exceptional share of the strength and vitality that characterizes their race. In a society where might makes right, those of their ilk revere them as heroes.
 
 Special Notes:"+{SPECIAL_NOTES_REGENERATES}
-	die_sound=troll-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 	usage=fighter
 	[abilities]
 		{ABILITY_REGENERATES}
@@ -79,5 +79,5 @@ Special Notes:"+{SPECIAL_NOTES_REGENERATES}
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/trolls/grunt-defend.png" "units/trolls/grunt.png" troll-hit.wav }
+	{DEFENSE_ANIM "units/trolls/grunt-defend.png" "units/trolls/grunt.png" {SOUND_LIST:TROLL_HIT} }
 [/unit]

data/core/units/Troll_Rocklobber.cfg

@@ -19,7 +19,7 @@
 	unit_description= _ "The thought of throwing a boulder in combat has certainly occurred to many trolls, and some have taken to them as a weapon of choice. Because such stones are not always easy to find, Rocklobbers have taken to carrying them in sacks slung over their shoulders. The same leather out of which the sack is formed is easily adapted to a crude sling.
 
 Special Notes: though unwieldy, a stone thrown by one of these monsters is much more deadly than any arrow, if it manages to hit."+{SPECIAL_NOTES_REGENERATES}
-	die_sound=troll-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 	[abilities]
 		{ABILITY_REGENERATES}
 	[/abilities]
@@ -114,5 +114,5 @@ Special Notes: though unwieldy, a stone thrown by one of these monsters is much
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/trolls/lobber-defend.png" "units/trolls/lobber.png" troll-hit.wav }
+	{DEFENSE_ANIM "units/trolls/lobber-defend.png" "units/trolls/lobber.png" {SOUND_LIST:TROLL_HIT} }
 [/unit]

data/core/units/Troll_Warrior.cfg

@@ -19,7 +19,7 @@
 	unit_description= _ "Trolls typically neither need nor prefer to use any proper armament in combat, as large 'sticks and stones' serve them all too well. However, trolls have been seen on numerous occasions clad in rough-shod armor and bearing metal hammers. It is speculated that orcish allies are the source and crafters of these; expeditions into several forcibly-vacated troll holes have shown little evidence of tool use, and certainly no metalworking of any kind. Given how dangerous a troll is in combat, the thought of a troll in full armor is entirely unsettling.
 
 Special Notes:"+{SPECIAL_NOTES_REGENERATES}
-	die_sound=troll-big-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 	[abilities]
 		{ABILITY_REGENERATES}
 	[/abilities]
@@ -86,5 +86,5 @@ Special Notes:"+{SPECIAL_NOTES_REGENERATES}
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/trolls/warrior-defend.png" "units/trolls/warrior.png" troll-big-hit.wav }
+	{DEFENSE_ANIM "units/trolls/warrior-defend.png" "units/trolls/warrior.png" {SOUND_LIST:TROLL_HIT} }
 [/unit]

data/core/units/Troll_Whelp.cfg

@@ -18,7 +18,7 @@
 	unit_description= _ "Describing a troll as a whelp is something of an oxymoron, given that their bodies are already much hardier than that of a grown man. They are clumsy and not yet capable of walking properly, forced instead to shamble about on all fours, but any difficulty this causes them is more than made up for by the raw strength of their race.
 
 Special Notes:"+{SPECIAL_NOTES_REGENERATES}
-	die_sound=troll-die.wav
+	die_sound={SOUND_LIST:TROLL_DIE}
 	[abilities]
 		{ABILITY_REGENERATES}
 	[/abilities]
@@ -70,7 +70,7 @@ Special Notes:"+{SPECIAL_NOTES_REGENERATES}
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/trolls/whelp-defend.png" "units/trolls/whelp-defend-2.png" troll-hit.wav }
+	{DEFENSE_ANIM "units/trolls/whelp-defend.png" "units/trolls/whelp-defend-2.png" {SOUND_LIST:TROLL_HIT} }
 	[death]
 		[frame]
 			begin=0

players_changelog

@@ -17,6 +17,7 @@ Version 1.3.2+svn:
       easily.
 
   * Sound and music
+    * New or revised sounds: troll hit & die.
     * Added a sound when a unit is slowed.
     * Made the poison sound be played also when a unit gets poisoned in combat.