Combat animation fixes for a number of units.

data/units/Dwarvish_Dragonguard.cfg

@@ -16,7 +16,8 @@
 	usage=archer
 	unit_description= _ "It is not clear why the Dragonguards are called what they are, a name given by their dwarven brethren. Some speculate that the name comes from their weapon of choice, these strange staves that belch fire and death. Others have surmised that it is because such weapons would be a threat against even a true Dragon, should such a thing be seen again in the known world. Whatever the case, it is for these weapons that the guardians of the great Dwarven citadels are both renowned and feared; weapons that have broken the mightiest of warriors in a single blow."
 	die_sound={SOUND_LIST:DWARF_DIE}
-	{DEFENSE_ANIM "units/dwarves/dragonguard-defend.png" "units/dwarves/dragonguard.png" {SOUND_LIST:DWARF_HIT} }
+	{DEFENSE_ANIM_RANGE "units/dwarves/dragonguard-defend.png" "units/dwarves/dragonguard-melee1.png" {SOUND_LIST:DWARF_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/dwarves/dragonguard-defend.png" "units/dwarves/dragonguard.png" {SOUND_LIST:DWARF_HIT} ranged}
 	[attack]
 		name=dagger
 		icon=attacks/dagger-human.png

data/units/Human_Loyalist_Bowman.cfg

@@ -27,61 +27,33 @@
 		damage=6
 		number=2
 		[animation]
-			hits=yes
 			[frame]
-				begin=-250
-				end=-175
-				image="units/human-loyalists/bowman.png"
+				begin=-200
+				end=-100
+				image="units/human-loyalists/bowman-sword.png"
 			[/frame]
+			[if]
+				hits=no
+				[frame]
+					begin=-100
+					end=100
+					image="units/human-loyalists/bowman-sword-1.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/if]
+			[else]
+				hits=yes
+				[frame]
+					begin=-100
+					end=100
+					image="units/human-loyalists/bowman-sword-1.png"
+					sound={SOUND_LIST:SWORD_SWISH}
+				[/frame]
+			[/else]
 			[frame]
-				begin=-175
-				end=-125
-				image="units/human-loyalists/bowman-ranged-4.png"
-			[/frame]
-			[frame]
-				begin=-125
-				end=75
-				image="units/human-loyalists/bowman-attack-sword.png"
-				sound={SOUND_LIST:SWORD_SWISH}
-			[/frame]
-			[frame]
-				begin=75
-				end=125
-				image="units/human-loyalists/bowman-ranged-4.png"
-			[/frame]
-			[frame]
-				begin=125
+				begin=100
 				end=175
-				image="units/human-loyalists/bowman.png"
-			[/frame]
-		[/animation]
-		[animation]
-			hits=no
-			[frame]
-				begin=-250
-				end=-175
-				image="units/human-loyalists/bowman.png"
-			[/frame]
-			[frame]
-				begin=-175
-				end=-125
-				image="units/human-loyalists/bowman-ranged-4.png"
-			[/frame]
-			[frame]
-				begin=-125
-				end=75
-				image="units/human-loyalists/bowman-attack-sword.png"
-				sound={SOUND_LIST:MISS}
-			[/frame]
-			[frame]
-				begin=75
-				end=125
-				image="units/human-loyalists/bowman-ranged-4.png"
-			[/frame]
-			[frame]
-				begin=125
-				end=175
-				image="units/human-loyalists/bowman.png"
+				image="units/human-loyalists/bowman-sword.png"
 			[/frame]
 		[/animation]
 	[/attack]
@@ -202,5 +174,6 @@
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/human-loyalists/bowman-defend.png" "units/human-loyalists/bowman.png" {SOUND_LIST:HUMAN_HIT} }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/bowman-sword-defend.png" "units/human-loyalists/bowman-sword.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/bowman-ranged-defend.png" "units/human-loyalists/bowman.png" {SOUND_LIST:HUMAN_HIT} ranged}
 [/unit]

data/units/Human_Loyalist_General.cfg

@@ -29,7 +29,8 @@
 
 Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 	die_sound={SOUND_LIST:HUMAN_DIE}
-	{DEFENSE_ANIM "units/human-loyalists/general-defend.png" "units/human-loyalists/general.png" {SOUND_LIST:HUMAN_HIT} }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/general-defend.png" "units/human-loyalists/general.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/general-crossbow-defend.png" "units/human-loyalists/general-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[resistance]
 		blade=90
 		pierce=90

data/units/Human_Loyalist_Grand_Marshal.cfg

@@ -25,7 +25,8 @@
 
 Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 	die_sound={SOUND_LIST:HUMAN_DIE}
-	{DEFENSE_ANIM "units/human-loyalists/marshal-defend.png" "units/human-loyalists/marshal.png" {SOUND_LIST:HUMAN_HIT} }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/marshal-defend.png" "units/human-loyalists/marshal.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/marshal-crossbow.png" "units/human-loyalists/marshal-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[resistance]
 		blade=80
 		pierce=80
@@ -108,7 +109,7 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-350
 				end=50
-				image="units/human-loyalists/marshal-attack-crossbow.png"
+				image="units/human-loyalists/marshal-crossbow.png"
 				sound=crossbow-miss.ogg
 			[/frame]
 		[/animation]
@@ -123,7 +124,7 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-350
 				end=50
-				image="units/human-loyalists/marshal-attack-crossbow.png"
+				image="units/human-loyalists/marshal-crossbow.png"
 				sound=crossbow.ogg
 			[/frame]
 		[/animation]

data/units/Human_Loyalist_Lieutenant.cfg

@@ -24,7 +24,8 @@
 
 Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 	die_sound={SOUND_LIST:HUMAN_DIE}
-	{DEFENSE_ANIM "units/human-loyalists/lieutenant-defend.png" "units/human-loyalists/lieutenant.png" {SOUND_LIST:HUMAN_HIT} }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-defend.png" "units/human-loyalists/lieutenant.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-crossbow.png" "units/human-loyalists/lieutenant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[abilities]
 		{ABILITY_LEADERSHIP_LEVEL_2}
 	[/abilities]
@@ -102,7 +103,7 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-350
 				end=50
-				image="units/human-loyalists/lieutenant-attack-crossbow.png"
+				image="units/human-loyalists/lieutenant-crossbow.png"
 				sound=crossbow-miss.ogg
 			[/frame]
 		[/animation]
@@ -117,7 +118,7 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-350
 				end=50
-				image="units/human-loyalists/lieutenant-attack-crossbow.png"
+				image="units/human-loyalists/lieutenant-crossbow.png"
 				sound=crossbow.ogg
 			[/frame]
 		[/animation]

data/units/Human_Loyalist_Longbowman.cfg

@@ -19,8 +19,8 @@
 	unit_description= _ "Longbows are forbidden to beginning archers simply by merit of physical law. It takes great strength to draw one, and the added range and power are useless unless one has good aim with the weapon, a gift that beginners certainly lack. Longbowmen carry their weaponry as a badge of pride, and most bowmen look forward to the day they can begin using one."
 	get_hit_sound={SOUND_LIST:HUMAN_HIT}
 	die_sound={SOUND_LIST:HUMAN_DIE}
-	{DEFENSE_ANIM_RANGE "units/human-loyalists/longbowman-defend.png" "units/human-loyalists/longbowman.png" {SOUND_LIST:HUMAN_HIT} melee }
-	{DEFENSE_ANIM_RANGE "units/human-loyalists/longbowman-bow-defend.png" "units/human-loyalists/longbowman-bow.png" {SOUND_LIST:HUMAN_HIT} ranged }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/longbowman-sword-defend.png" "units/human-loyalists/longbowman-sword.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/longbowman-bow-defend.png" "units/human-loyalists/longbowman-bow.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[attack]
 		name=sword
 		icon=attacks/sword-human.png
@@ -29,61 +29,33 @@
 		damage=8
 		number=2
 		[animation]
-			hits=no
-			[frame]
-				begin=-250
-				end=-200
-				image="units/human-loyalists/longbowman.png"
-			[/frame]
 			[frame]
 				begin=-200
-				end=-125
-				image="units/human-loyalists/longbowman-melee-1.png"
+				end=-100
+				image="units/human-loyalists/longbowman-sword.png"
 			[/frame]
+			[if]
+				hits=no
+				[frame]
+					begin=-100
+					end=100
+					image="units/human-loyalists/longbowman-sword-1.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/if]
+			[else]
+				hits=yes
+				[frame]
+					begin=-100
+					end=100
+					image="units/human-loyalists/longbowman-sword-1.png"
+					sound={SOUND_LIST:SWORD_SWISH}
+				[/frame]
+			[/else]
 			[frame]
-				begin=-125
-				end=75
-				image="units/human-loyalists/longbowman-melee-2.png"
-				sound={SOUND_LIST:MISS}
-			[/frame]
-			[frame]
-				begin=75
-				end=125
-				image="units/human-loyalists/longbowman-melee-1.png"
-			[/frame]
-			[frame]
-				begin=125
+				begin=100
 				end=175
-				image="units/human-loyalists/longbowman.png"
-			[/frame]
-		[/animation]
-		[animation]
-			hits=yes
-			[frame]
-				begin=-250
-				end=-200
-				image="units/human-loyalists/longbowman.png"
-			[/frame]
-			[frame]
-				begin=-200
-				end=-125
-				image="units/human-loyalists/longbowman-melee-1.png"
-			[/frame]
-			[frame]
-				begin=-125
-				end=75
-				image="units/human-loyalists/longbowman-melee-2.png"
-				sound={SOUND_LIST:SWORD_SWISH}
-			[/frame]
-			[frame]
-				begin=75
-				end=125
-				image="units/human-loyalists/longbowman-melee-1.png"
-			[/frame]
-			[frame]
-				begin=125
-				end=175
-				image="units/human-loyalists/longbowman.png"
+				image="units/human-loyalists/longbowman-sword.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/units/Human_Loyalist_Master_Bowman.cfg

@@ -18,8 +18,8 @@
 	usage=archer
 	unit_description= _ "Master bowmen have reached the zenith of their art, inasmuch as any man is capable. Armed with both a sword, and a great yew bow, these warriors crown battalions of archers with their presence, bringing down many a foe with their well-aimed shots. Their skill with the sword is also not to be discounted; they are easily as good with it as any novice swordsman. Of the many races in the world, only the elves surpass humanity in archery, and their human counterparts have speculated, perhaps in envy, that this is only by dint of age."
 	die_sound={SOUND_LIST:HUMAN_DIE}
-	{DEFENSE_ANIM_RANGE "units/human-loyalists/masterbowman-melee-1.png" "units/human-loyalists/masterbowman.png" {SOUND_LIST:HUMAN_HIT} melee }
-	{DEFENSE_ANIM_RANGE "units/human-loyalists/masterbowman-bow-defend.png" "units/human-loyalists/masterbowman-bow.png" {SOUND_LIST:HUMAN_HIT} ranged }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/masterbowman-sword-defend.png" "units/human-loyalists/masterbowman-sword.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/masterbowman-bow-defend.png" "units/human-loyalists/masterbowman-bow.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[attack]
 		name=sword
 		icon=attacks/sword-human.png
@@ -28,43 +28,33 @@
 		damage=8
 		number=3
 		[animation]
-			[frame]
-				begin=-250
-				end=-200
-				image="units/human-loyalists/masterbowman.png"
-			[/frame]
 			[frame]
 				begin=-200
-				end=-125
-				image="units/human-loyalists/masterbowman-melee-1.png"
+				end=-100
+				image="units/human-loyalists/masterbowman-sword.png"
 			[/frame]
 			[if]
 				hits=no
 				[frame]
-					begin=-125
-					end=75
-					image="units/human-loyalists/masterbowman-melee-2.png"
+					begin=-100
+					end=100
+					image="units/human-loyalists/masterbowman-sword-1.png"
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/if]
 			[else]
 				hits=yes
 				[frame]
-					begin=-125
-					end=75
-					image="units/human-loyalists/masterbowman-melee-2.png"
+					begin=-100
+					end=100
+					image="units/human-loyalists/masterbowman-sword-1.png"
 					sound={SOUND_LIST:SWORD_SWISH}
 				[/frame]
 			[/else]
 			[frame]
-				begin=75
-				end=125
-				image="units/human-loyalists/masterbowman-melee-1.png"
-			[/frame]
-			[frame]
-				begin=125
+				begin=100
 				end=175
-				image="units/human-loyalists/masterbowman.png"
+				image="units/human-loyalists/masterbowman-sword.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/units/Human_Loyalist_Sergeant.cfg

@@ -23,7 +23,8 @@
 	usage=fighter
 	unit_description= _ "The Sergeant is an officer in the ranks of the Royal Army. Though academically trained, he will need some experience in the field before his leadership is sound and acknowledged."
 	die_sound={SOUND_LIST:HUMAN_DIE}
-	{DEFENSE_ANIM "units/human-loyalists/sergeant-defend.png" "units/human-loyalists/sergeant.png" {SOUND_LIST:HUMAN_HIT} }
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-defend.png" "units/human-loyalists/sergeant.png" {SOUND_LIST:HUMAN_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-crossbow.png" "units/human-loyalists/sergeant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[abilities]
 		{ABILITY_LEADERSHIP_LEVEL_1}
 	[/abilities]
@@ -111,7 +112,7 @@
 			[frame]
 				begin=-350
 				end=50
-				image="units/human-loyalists/sergeant-attack-crossbow.png"
+				image="units/human-loyalists/sergeant-crossbow.png"
 				sound=crossbow-miss.ogg
 			[/frame]
 		[/animation]
@@ -126,7 +127,7 @@
 			[frame]
 				begin=-350
 				end=50
-				image="units/human-loyalists/sergeant-attack-crossbow.png"
+				image="units/human-loyalists/sergeant-crossbow.png"
 				sound=crossbow.ogg
 			[/frame]
 		[/animation]

data/units/Orcish_Archer.cfg

@@ -73,12 +73,10 @@
 		damage=3
 		number=2
 		[animation]
-			hits=no
 			[frame]
 				begin=-200
 				end=-175
 				image="units/orcs/archer-melee-01.png"
-				sound={SOUND_LIST:MISS}
 			[/frame]
 			[frame]
 				begin=-175
@@ -100,100 +98,24 @@
 				end=-75
 				image="units/orcs/archer-melee-05.png"
 			[/frame]
-			[frame]
-				begin=-75
-				end=-50
-				image="units/orcs/archer-melee-06.png"
-			[/frame]
-			[frame]
-				begin=-50
-				end=-25
-				image="units/orcs/archer-melee-07.png"
-			[/frame]
-			[frame]
-				begin=-25
-				end=0
-				image="units/orcs/archer-melee-08.png"
-			[/frame]
-			[frame]
-				begin=0
-				end=25
-				image="units/orcs/archer-melee-09.png"
-			[/frame]
-			[frame]
-				begin=25
-				end=50
-				image="units/orcs/archer-melee-10.png"
-			[/frame]
-			[frame]
-				begin=50
-				end=75
-				image="units/orcs/archer-melee-11.png"
-			[/frame]
-			[frame]
-				begin=75
-				end=100
-				image="units/orcs/archer-melee-12.png"
-			[/frame]
-			[frame]
-				begin=100
-				end=125
-				image="units/orcs/archer-melee-13.png"
-			[/frame]
-			[frame]
-				begin=125
-				end=150
-				image="units/orcs/archer-melee-14.png"
-			[/frame]
-			[frame]
-				begin=150
-				end=175
-				image="units/orcs/archer-melee-15.png"
-			[/frame]
-			[frame]
-				begin=175
-				end=200
-				image="units/orcs/archer-melee-16.png"
-			[/frame]
-			[frame]
-				begin=200
-				end=225
-				image="units/orcs/archer-melee-17.png"
-			[/frame]
-		[/animation]
-		[animation]
-			hits=no
-			[frame]
-				begin=-200
-				end=-175
-				image="units/orcs/archer-melee-01.png"
-				sound=dagger-swish.wav
-			[/frame]
-			[frame]
-				begin=-175
-				end=-150
-				image="units/orcs/archer-melee-02.png"
-			[/frame]
-			[frame]
-				begin=-150
-				end=-125
-				image="units/orcs/archer-melee-03.png"
-			[/frame]
-			[frame]
-				begin=-125
-				end=-100
-				image="units/orcs/archer-melee-04.png"
-			[/frame]
-			[frame]
-				begin=-100
-				end=-75
-				image="units/orcs/archer-melee-05.png"
-			[/frame]
-			[frame]
-				begin=-75
-				end=-50
-				image="units/orcs/archer-melee-06.png"
-			[/frame]
+			[if]
+				hits=no
+				[frame]
+					begin=-75
+					end=-50
+					image="units/orcs/archer-melee-06.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/if]
+			[else]
+				hits=yes
+				[frame]
+					begin=-75
+					end=-50
+					image="units/orcs/archer-melee-06.png"
+					sound=dagger-swish.wav
+				[/frame]
+			[/else]
 			[frame]
 				begin=-50
 				end=-25

data/units/Orcish_Crossbowman.cfg

@@ -16,7 +16,8 @@
 	usage=archer
 	unit_description= _ "Orcish Crossbowmen try to compensate for their lack of skill with the raw power of their weapon. While they are not as effective as the Elvish Marksmen in long-range combat, they are sturdier and can handle themselves a little better than the Elves in close combat."
 	die_sound={SOUND_LIST:ORC_DIE}
-	{DEFENSE_ANIM "units/orcs/xbowman-defend.png" "units/orcs/xbowman.png" {SOUND_LIST:ORC_HIT} }
+	{DEFENSE_ANIM_RANGE "units/orcs/xbowman-sword-defend.png" "units/orcs/xbowman-sword.png" {SOUND_LIST:ORC_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/orcs/xbowman-defend.png" "units/orcs/xbowman.png" {SOUND_LIST:ORC_HIT} ranged}
 	[attack]
 		name=short sword
 		icon=attacks/sword-orcish.png
@@ -25,41 +26,33 @@
 		damage=4
 		number=3
 		[animation]
-			hits=no
 			[frame]
 				begin=-200
-				end=-150
-				image="units/orcs/xbowman.png"
-			[/frame]
-			[frame]
-				begin=-150
-				end=100
-				image="units/orcs/xbowman-attack.png"
-				sound={SOUND_LIST:MISS}
+				end=-100
+				image="units/orcs/xbowman-sword.png"
 			[/frame]
+			[if]
+				hits=no
+				[frame]
+					begin=-100
+					end=100
+					image="units/orcs/xbowman-sword-1.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/if]
+			[else]
+				hits=yes
+				[frame]
+					begin=-100
+					end=100
+					image="units/orcs/xbowman-sword-1.png"
+					sound={SOUND_LIST:SWORD_SWISH}
+				[/frame]
+			[/else]
 			[frame]
 				begin=100
 				end=200
-				image="units/orcs/xbowman.png"
-			[/frame]
-		[/animation]
-		[animation]
-			hits=yes
-			[frame]
-				begin=-200
-				end=-150
-				image="units/orcs/xbowman.png"
-			[/frame]
-			[frame]
-				begin=-150
-				end=100
-				image="units/orcs/xbowman-attack.png"
-				sound={SOUND_LIST:SWORD_SWISH}
-			[/frame]
-			[frame]
-				begin=100
-				end=200
-				image="units/orcs/xbowman.png"
+				image="units/orcs/xbowman-sword.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/units/Orcish_Leader.cfg

@@ -19,7 +19,8 @@
 
 Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 	die_sound={SOUND_LIST:ORC_DIE}
-	{DEFENSE_ANIM "units/orcs/leader-defend.png" "units/orcs/leader.png" {SOUND_LIST:ORC_HIT} }
+	{DEFENSE_ANIM_RANGE "units/orcs/leader-defend.png" "units/orcs/leader.png" {SOUND_LIST:ORC_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/orcs/leader-bow-defend.png" "units/orcs/leader-bow.png" {SOUND_LIST:ORC_HIT} ranged}
 	[abilities]
 		{ABILITY_LEADERSHIP_LEVEL_1}
 	[/abilities]
@@ -87,18 +88,18 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-400
 				end=-300
-				image="units/orcs/leader-defend.png"
+				image="units/orcs/leader-bow.png"
 				sound=bow-miss.ogg
 			[/frame]
 			[frame]
 				begin=-300
 				end=-50
-				image="units/orcs/leader-ranged-2.png"
+				image="units/orcs/leader-bow-1.png"
 			[/frame]
 			[frame]
 				begin=-50
 				end=50
-				image="units/orcs/leader-ranged-1.png"
+				image="units/orcs/leader-bow.png"
 			[/frame]
 		[/animation]
 		[animation]
@@ -112,18 +113,18 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-400
 				end=-300
-				image="units/orcs/leader-defend.png"
+				image="units/orcs/leader-bow.png"
 				sound=bow.ogg
 			[/frame]
 			[frame]
 				begin=-300
 				end=-50
-				image="units/orcs/leader-ranged-2.png"
+				image="units/orcs/leader-bow-1.png"
 			[/frame]
 			[frame]
 				begin=-50
 				end=50
-				image="units/orcs/leader-ranged-1.png"
+				image="units/orcs/leader-bow.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/units/Orcish_Warlord.cfg

@@ -17,7 +17,8 @@
 	usage=fighter
 	unit_description= _ "Only orcs with both great cunning and unsurpassed strength can become Warlords. Masters of the sword, and even possessing some skill with the bow, these beast-warriors lead their brethren with an iron hand."
 	die_sound={SOUND_LIST:ORC_DIE}
-	{DEFENSE_ANIM "units/orcs/warlord-defend.png" "units/orcs/warlord.png" {SOUND_LIST:ORC_HIT} }
+	{DEFENSE_ANIM_RANGE "units/orcs/warlord-defend.png" "units/orcs/warlord.png" {SOUND_LIST:ORC_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/orcs/warlord-bow-defend.png" "units/orcs/warlord-bow-1.png" {SOUND_LIST:ORC_HIT} ranged}
 	[attack]
 		name=greatsword
 		icon=attacks/greatsword-orcish.png
@@ -112,28 +113,28 @@
 			[frame]
 				begin=-380
 				end=-305
-				image="units/orcs/warlord-ranged-1.png"
+				image="units/orcs/warlord-bow-1.png"
 				sound=bow-miss.ogg
 			[/frame]
 			[frame]
 				begin=-305
 				end=-230
-				image="units/orcs/warlord-ranged-2.png"
+				image="units/orcs/warlord-bow-2.png"
 			[/frame]
 			[frame]
 				begin=-230
 				end=-130
-				image="units/orcs/warlord-ranged-3.png"
+				image="units/orcs/warlord-bow-3.png"
 			[/frame]
 			[frame]
 				begin=-130
 				end=0
-				image="units/orcs/warlord-ranged-4.png"
+				image="units/orcs/warlord-bow-4.png"
 			[/frame]
 			[frame]
 				begin=0
 				end=65
-				image="units/orcs/warlord-ranged-2.png"
+				image="units/orcs/warlord-bow-2.png"
 			[/frame]
 		[/animation]
 		[animation]
@@ -147,28 +148,28 @@
 			[frame]
 				begin=-380
 				end=-305
-				image="units/orcs/warlord-ranged-1.png"
+				image="units/orcs/warlord-bow-1.png"
 				sound=bow.ogg
 			[/frame]
 			[frame]
 				begin=-305
 				end=-230
-				image="units/orcs/warlord-ranged-2.png"
+				image="units/orcs/warlord-bow-2.png"
 			[/frame]
 			[frame]
 				begin=-230
 				end=-130
-				image="units/orcs/warlord-ranged-3.png"
+				image="units/orcs/warlord-bow-3.png"
 			[/frame]
 			[frame]
 				begin=-130
 				end=0
-				image="units/orcs/warlord-ranged-4.png"
+				image="units/orcs/warlord-bow-4.png"
 			[/frame]
 			[frame]
 				begin=0
 				end=65
-				image="units/orcs/warlord-ranged-2.png"
+				image="units/orcs/warlord-bow-2.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/units/Undead_Skele_Death_Knight.cfg

@@ -114,18 +114,18 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-350
 				end=-300
-				image="units/undead-skeletal/deathknight-attack-crossbow-1.png"
+				image="units/undead-skeletal/deathknight-crossbow.png"
 			[/frame]
 			[frame]
 				begin=-300
-				end=-250
-				image="units/undead-skeletal/deathknight-attack-crossbow-1.png"
+				end=-100
+				image="units/undead-skeletal/deathknight-crossbow.png"
 				sound=crossbow-miss.ogg
 			[/frame]
 			[frame]
-				begin=-250
+				begin=-100
 				end=0
-				image="units/undead-skeletal/deathknight-attack-crossbow-2.png"
+				image="units/undead-skeletal/deathknight-crossbow-1.png"
 			[/frame]
 		[/animation]
 		[animation]
@@ -139,20 +139,21 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
 			[frame]
 				begin=-350
 				end=-300
-				image="units/undead-skeletal/deathknight-attack-crossbow-1.png"
+				image="units/undead-skeletal/deathknight-crossbow.png"
 			[/frame]
 			[frame]
 				begin=-300
-				end=-250
-				image="units/undead-skeletal/deathknight-attack-crossbow-1.png"
+				end=-100
+				image="units/undead-skeletal/deathknight-crossbow.png"
 				sound=crossbow.ogg
 			[/frame]
 			[frame]
-				begin=-250
+				begin=-100
 				end=0
-				image="units/undead-skeletal/deathknight-attack-crossbow-2.png"
+				image="units/undead-skeletal/deathknight-crossbow-1.png"
 			[/frame]
 		[/animation]
 	[/attack]
-	{DEFENSE_ANIM "units/undead-skeletal/deathknight-defend.png" "units/undead-skeletal/deathknight.png" {SOUND_LIST:LICH_HIT} }
+	{DEFENSE_ANIM_RANGE "units/undead-skeletal/deathknight-defend.png" "units/undead-skeletal/deathknight.png" {SOUND_LIST:LICH_HIT} melee}
+	{DEFENSE_ANIM_RANGE "units/undead-skeletal/deathknight-crossbow-defend.png" "units/undead-skeletal/deathknight-crossbow.png" {SOUND_LIST:LICH_HIT} ranged}
 [/unit]