UtBS: fixed animations, made Kaleh resilient and rebalanced desert mounted units

changelog

@@ -19,6 +19,11 @@ SVN trunk (1.1.2+svn):
      * Fixed map image paths
      * Switched to use of profile key in single unit definitions
      * Minor text cleanups
+   * Under the Burning Suns
+     * Removed Skirmish Ability from Desert Rider and Desert Outrider     
+     * Added Skirmish Ability to Desert Horseman
+     * increased melee damage of Desert Horseman from 4-3 to 5-3
+     * increased HP of the Desert Horseman from 45 to 50
  * graphics
      * impassable mountain terrain
      * troll portrait

data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg

@@ -325,7 +325,7 @@ name=start
 	[message]
 		description=Kaleh
 		image=portraits/zhul.png
-		message= _ "Zhul's funeral was a huge ceremony, like those she told us of from ages ago. I led a procession of our few remaining priestesses and all of the faithful around the entire island, so that she might see all that she had given to us. Being a priestess of the desert sands we buried her in one of the large beaches at the northwest end of the island. At the final battle she was one of the oldest elves left and I suppose I should thank Eloh that she did not die during out journey. She was my guide and my faith and my link to the past. I am sorry that she did not live to see the fruits of her labors, but I hope that she is with Eloh  now, in a better place."
+		message= _ "Zhul's funeral was a huge ceremony, like those she told us about from ages ago. I led a procession of our few remaining priestesses and all of the faithful around the entire island, so that she might see all that she had given to us. Being a priestess of the desert sands we buried her in one of the large beaches at the northwest end of the island. At the final battle she was one of the oldest elves left and I suppose I should thank Eloh that she did not die during out journey. She was my guide and my faith and my link to the past. I am sorry that she did not live to see the fruits of her labors, but I hope that she is with Eloh  now, in a better place."
 	[/message]
 
 	[/then]

data/campaigns/Under_the_Burning_Suns/scenarios/1_Morning_After.cfg

@@ -72,7 +72,7 @@ name=wesnoth-1.ogg
 	type=Kaleh Fighter
 	upkeep=free
 	[modifications]
-		{TRAIT_STRONG}
+		{TRAIT_RESILIENT}
 		{TRAIT_INTELLIGENT}
 	[/modifications]
 	{IS_HERO}

data/campaigns/Under_the_Burning_Suns/units/Desert_Druid.cfg

@@ -52,10 +52,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-druid-attack.png
+				image="newelves/desert-elvish-druid-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-druid-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -72,7 +82,8 @@
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250
@@ -89,15 +100,43 @@
 		number=3
 		range=ranged
 		[animation]
+			hits=no
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/thorns.png
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
 			[/missile_frame]
 			[frame]
 				begin=-250
+				end=-150
+				image="newelves/desert-elvish-druid-ranged.png"
+			[/frame]
+			[frame]
+				sound=miss.wav
+				begin=-150
 				end=0
-				image=newelves/desert-elvish-druid-ranged.png
+				image="newelves/desert-elvish-druid-ranged.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-200
+				end=0
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
+			[/missile_frame]
+			[frame]
+				begin=-250
+				end=-150
+				image="newelves/desert-elvish-druid-ranged.png"
+			[/frame]
+			[frame]
+				sound=dart.wav
+				begin=-150
+				end=0
+				image="newelves/desert-elvish-druid-ranged.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/campaigns/Under_the_Burning_Suns/units/Desert_Hero.cfg

@@ -21,21 +21,6 @@
 			image="newelves/desert-elvish-hero-bow-defend.png"
 		[/frame]
 	[/defend]
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image=
-		[/frame]
-	[/defend]
-	[defend]
-		range=ranged
-		[frame]
-			begin=-150
-			end=150
-			image=
-		[/frame]
-	[/defend]
 	hitpoints=48
 	movement_type=woodland
 #desert elves move fast across the sands, but are not used to forests

data/campaigns/Under_the_Burning_Suns/units/Desert_Horseman.cfg

@@ -18,7 +18,7 @@
 			image="newelves/desert-elvish-horse-archer-moving.png"
 		[/frame]
 	[/movement_anim]
-	hitpoints=45
+	hitpoints=50
 	movement_type=woodland
 #desert elves move fast across the sands, but are not used to forests
 	[movement_costs]
@@ -44,8 +44,11 @@
 	advanceto=null
 	{AMLA_TOUGH 3}
 	cost=34
+	[abilities]
+		{ABILITY_SKIRMISHER}
+	[/abilities]
 	usage=scout
-	unit_description= _ "Trading speed for heavier arms and armament, Elvish Horseman delight in riding into danger instead of away from it. The open sands are much more suited towards mounted combat than their old forests were, and through the generations the Elves have greatly increased their equestrian skills. The mounted speed and agility allows them to get in more strikes than most fighters"
+	unit_description= _ "Trading speed for heavier arms and armament, Elvish Horseman delight in riding into danger instead of away from it. The open sands are much more suited towards mounted combat than their old forests were, and through the generations the Elves have greatly increased their equestrian skills. Quick and agile they are skilled at riding around enemy formations, bypassing enemy Zones of Control."
 	get_hit_sound=groan.wav
 	die_sound=horse-elf-canter.wav
 	# this is a custom elf unit for this campaign
@@ -74,7 +77,7 @@
 		name=bow
 		type=pierce
 		range=ranged
-		damage=4
+		damage=5
 		number=3
 		[animation]
 			hits=no

data/campaigns/Under_the_Burning_Suns/units/Desert_Outrider.cfg

@@ -44,11 +44,8 @@
 	advanceto=null
 	{AMLA_TOUGH 3}
 	cost=43
-	[abilities]
-		{ABILITY_SKIRMISHER}
-	[/abilities]
 	usage=scout
-	unit_description= _ "Riding like the wind, Desert Outriders breeze across the sands to strike at weaker units and exposed flanks. Quick and agile they are trained at riding around enemy formations, bypassing enemy Zones of Control. Skilled in the sword, and trained in the bow, they strike hard before flying off into the sands to evade response."
+	unit_description= _ "Riding like the wind, Desert Outriders breeze across the sands to strike at weaker units and exposed flanks. Skilled in the sword, and trained in the bow, they strike hard before flying off into the sands to evade response."
 	get_hit_sound=groan.wav
 	die_sound=horse-elf-canter.wav
 	# melee attack increased from 7-4 to 8-4

data/campaigns/Under_the_Burning_Suns/units/Desert_Rider.cfg

@@ -43,11 +43,8 @@
 	alignment=lawful
 	advanceto=Desert Outrider
 	cost=28
-	[abilities]
-		{ABILITY_SKIRMISHER}
-	[/abilities]
 	usage=scout
-	unit_description= _ "Swift riders, Desert Riders are fast in the open desert. Quick and agile they are trained at riding around enemy formations, bypassing their Zone of Control. They can use a bow from horseback, but prefer to engage in melee combat when necessary."
+	unit_description= _ "Swift riders, Desert Riders are fast in the open desert. They can use a bow from horseback, but prefer to engage in melee combat when necessary."
 	get_hit_sound=groan.wav
 	die_sound=horse-elf-canter.wav
 	# melee attack increased from 7-3 to 8-3

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman10.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman11.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman2.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman3.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman4.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman5.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman6.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman7.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman8.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman9.cfg

@@ -51,10 +51,20 @@
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-shaman-attack.png
+				image="newelves/desert-elvish-shaman-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-shaman-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -70,7 +80,8 @@
 			[missile_frame]
 				begin=-250
 				end=0
-				image=entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250

data/campaigns/Under_the_Burning_Suns/units/Desert_Shyde.cfg

@@ -57,7 +57,7 @@
 		number=2
 		range=melee
 		icon=attacks/faerie-touch.png
-		[animations]
+		[animation]
 			[frame]
 				begin=-200
 				end=-100
@@ -73,7 +73,7 @@
 				end=100
 				image=newelves/desert-elvish-shyde-ftouch-attack3.png
 			[/frame]
-		[/animations]
+		[/animation]
 	[/attack]
 	[attack]
 		name=ensnare
@@ -83,18 +83,25 @@
 		number=2
 		range=ranged
 		icon=attacks/entangle.png
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-healing.png
-			[/frame]
+		[animation]
 			[missile_frame]
 				begin=-150
 				end=0
-				image=projectiles/entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+			[frame]
+				sound=entangle.wav
+				begin=0
+				end=1
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 	[attack]
 		name=thorns
@@ -103,17 +110,35 @@
 		damage=6
 		number=3
 		range=ranged
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-ranged.png
-			[/frame]
+		[animation]
+			hits=no
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/thorns.png
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				sound=miss.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-200
+				end=0
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
+			[/missile_frame]
+			[frame]
+				begin=-200
+				sound=dart.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 [/unit]

data/campaigns/Under_the_Burning_Suns/units/Desert_Star.cfg

@@ -92,18 +92,25 @@
 		number=2
 		range=ranged
 		icon=attacks/entangle.png
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-healing.png
-			[/frame]
+		[animation]
 			[missile_frame]
 				begin=-150
 				end=0
-				image=projectiles/entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+			[frame]
+				sound=entangle.wav
+				begin=0
+				end=1
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 	[attack]
 		name=thorns
@@ -112,17 +119,35 @@
 		damage=7
 		number=3
 		range=ranged
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-ranged.png
-			[/frame]
+		[animation]
+			hits=no
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/thorns.png
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				sound=miss.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-200
+				end=0
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
+			[/missile_frame]
+			[frame]
+				begin=-200
+				sound=dart.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 [/unit]

data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg

@@ -35,7 +35,7 @@
 	cost=20
 	usage=mixed fighter
 	unit_description= _ "Desert Hunters are trained to scour the sands for prey and enemies. They can quickly entangle others with their bolas and then finish them off with their swords."
-	get_hit_sound=groan.wav
+	get_hit_sound=female-strong-hit.wav
 	die_sound=female-hit.wav
 	[attack]
 		name=sword

data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg

@@ -39,7 +39,7 @@
 	[/abilities]
 	usage=mixed fighter
 	unit_description= _ "Desert Prowlers sneak across the sands, searching out enemies and protecting their people. They are trained to slip past enemies unnoticed and flank them. The combination of their bolas and blades allows them to cripple and kill opponents with alarming ease."
-	get_hit_sound=groan.wav
+	get_hit_sound=female-strong-hit.wav
 	die_sound=female-hit.wav
 	[attack]
 		name=sword

data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg

@@ -38,7 +38,7 @@
 	[/abilities]
 	usage=mixed fighter
 	unit_description= _ "Desert Sentinels patrol the sands; they are trained to  avoid enemies when it is advantageous. They can cripple opponents with their bolas and are deadly with their swords."
-	get_hit_sound=groan.wav
+	get_hit_sound=female-strong-hit.wav
 	die_sound=female-hit.wav
 	[attack]
 		name=sword

data/campaigns/Under_the_Burning_Suns/units/Zhul_Druid.cfg

@@ -43,19 +43,31 @@
 	unit_description= _ "Desert Druids are powerful masters of the sands. Brilliant at ensnaring unwary opponents, they also use the herbs of the forest to heal allies. Druids are excellent supporting units in any Elvish army."
 	get_hit_sound=female-hit.wav
 	die_sound=female-hit.wav
+	# melee attack increased from 4-2 to 5-2
+	# ranged attack decreased from 6-2 to 5-2 and 6-3 to 5-3
 	[attack]
 		name=staff
 		type=impact
 		range=melee
-		damage=4
+		damage=5
 		number=2
 		range=melee
 		icon=attacks/druidstaff.png
 		[animation]
+			hits=no
 			[frame]
 				begin=-100
 				end=100
-				image=newelves/desert-elvish-druid-attack.png
+				image="newelves/desert-elvish-druid-attack.png"
+				sound=miss.wav
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[frame]
+				begin=-100
+				end=100
+				image="newelves/desert-elvish-druid-attack.png"
 				sound=staff.wav
 			[/frame]
 		[/animation]
@@ -64,7 +76,7 @@
 		name=ensnare
 		type=impact
 		special=slow
-		damage=6
+		damage=5
 		number=2
 		range=ranged
 		icon=attacks/entangle.png
@@ -72,7 +84,8 @@
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
 			[frame]
 				begin=-250
@@ -85,19 +98,47 @@
 		name=thorns
 		type=pierce
 		special=magical
-		damage=6
+		damage=5
 		number=3
 		range=ranged
 		[animation]
+			hits=no
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/thorns.png
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
 			[/missile_frame]
 			[frame]
 				begin=-250
+				end=-150
+				image="newelves/desert-elvish-druid-ranged.png"
+			[/frame]
+			[frame]
+				sound=miss.wav
+				begin=-150
 				end=0
-				image=newelves/desert-elvish-druid-ranged.png
+				image="newelves/desert-elvish-druid-ranged.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-200
+				end=0
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
+			[/missile_frame]
+			[frame]
+				begin=-250
+				end=-150
+				image="newelves/desert-elvish-druid-ranged.png"
+			[/frame]
+			[frame]
+				sound=dart.wav
+				begin=-150
+				end=0
+				image="newelves/desert-elvish-druid-ranged.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/campaigns/Under_the_Burning_Suns/units/Zhul_Shyde.cfg

@@ -47,16 +47,18 @@
 	unit_description= _ "Shydes are elves that are devoted to nature and their faerie side. Dragonfly wings sprout from their backs and change them into beautiful creatures. They are capable of gliding unencumbered across almost any terrain. The one exception is deep water, a terrain which the desert elves rarely encounter. Their magical powers have been adapted to a life among the sands, and so it does not work over deep water."
 	get_hit_sound=female-hit.wav
 	die_sound=female-hit.wav
+	# melee attack increased from 4-2 to 5-2
+	# ranged attack decreased from 7-2 to 6-2 and 7-3 to 6-3
 	[attack]
 		name=faerie touch
 		type=impact
 		special=magical
 		range=melee
-		damage=4
+		damage=5
 		number=2
 		range=melee
 		icon=attacks/faerie-touch.png
-		[animations]
+		[animation]
 			[frame]
 				begin=-200
 				end=-100
@@ -72,47 +74,72 @@
 				end=100
 				image=newelves/desert-elvish-shyde-ftouch-attack3.png
 			[/frame]
-		[/animations]
+		[/animation]
 	[/attack]
 	[attack]
 		name=ensnare
 		type=impact
 		special=slow
-		damage=7
+		damage=6
 		number=2
 		range=ranged
 		icon=attacks/entangle.png
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-healing.png
-			[/frame]
+		[animation]
 			[missile_frame]
 				begin=-150
 				end=0
-				image=projectiles/entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+			[frame]
+				sound=entangle.wav
+				begin=0
+				end=1
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 	[attack]
 		name=thorns
 		type=pierce
 		special=magical
-		damage=7
+		damage=6
 		number=3
 		range=ranged
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-ranged.png
-			[/frame]
+		[animation]
+			hits=no
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/thorns.png
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				sound=miss.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-200
+				end=0
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
+			[/missile_frame]
+			[frame]
+				begin=-200
+				sound=dart.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 [/unit]

data/campaigns/Under_the_Burning_Suns/units/Zhul_Star.cfg

@@ -55,16 +55,18 @@
 	unit_description= _ "Desert Stars are Shydes that have becomes so powerful and holy that they shine forth the light of Eloh, even in the darkest places. Like Shydes, they are capable of gliding unencumbered across almost any terrain except deep water. The hex they occupy and all adjacent hexes are illuminated so that the never experience night. As a result, when a unit is adjacent to a Desert Star, it will fight as if it were day when it is dusk, and as if it were dusk when it is night. Eloh's power also reduces the wounds that Desert Stars suffer when attacked. "
 	get_hit_sound=female-hit.wav
 	die_sound=female-hit.wav
+	# The Desert Shyde's magical power is strong enough that they
+	# do not suffer the normal desert elf penalty to ranged attacks
 	[attack]
 		name=faerie touch
 		type=impact
 		special=magical
 		range=melee
-		damage=4
+		damage=5
 		number=2
 		range=melee
 		icon=attacks/faerie-touch.png
-		[animations]
+		[animation]
 			[frame]
 				begin=-200
 				end=-100
@@ -80,7 +82,7 @@
 				end=100
 				image=newelves/desert-elvish-shyde-ftouch-attack3.png
 			[/frame]
-		[/animations]
+		[/animation]
 	[/attack]
 	[attack]
 		name=ensnare
@@ -90,18 +92,25 @@
 		number=2
 		range=ranged
 		icon=attacks/entangle.png
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-healing.png
-			[/frame]
+		[animation]
 			[missile_frame]
 				begin=-150
 				end=0
-				image=projectiles/entangle.png
+				image="projectiles/entangle.png"
+				image_diagonal="projectiles/entangle.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+			[frame]
+				sound=entangle.wav
+				begin=0
+				end=1
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 	[attack]
 		name=thorns
@@ -110,17 +119,35 @@
 		damage=7
 		number=3
 		range=ranged
-		[animations]
-			[frame]
-				begin=-200
-				end=-100
-				image=newelves/desert-elvish-shyde-ranged.png
-			[/frame]
+		[animation]
+			hits=no
 			[missile_frame]
 				begin=-200
 				end=0
-				image=projectiles/thorns.png
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
 			[/missile_frame]
-		[/animations]
+			[frame]
+				begin=-200
+				sound=miss.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-200
+				end=0
+				image="projectiles/thorns.png"
+				image_diagonal="projectiles/thorns-ne.png"
+			[/missile_frame]
+			[frame]
+				begin=-200
+				sound=dart.wav
+				end=-100
+				image="newelves/desert-elvish-shyde-ftouch-attack3.png"
+			[/frame]
+		[/animation]
 	[/attack]
 [/unit]