Some major reorganization and fixing of some SotBE units.

data/campaigns/Son_Of_The_Black_Eye/scenarios/End_Of_Peace.cfg

@@ -15,7 +15,7 @@
 
 	next_scenario="Toward_Mountains_of_Haag"
 	{SCENARIO_MUSIC "northerners.ogg"}
-	
+
 	[event]
 	name=prestart
 		[objectives]
@@ -39,18 +39,19 @@
 	[item]
 	x=17
 	y=9
-	image=items/orcish-flag.png 
+	image=items/orcish-flag.png
 	[/item]
 	[item]
 	x=20
 	y=7
-	image=items/orcish-flag.png 
+	image=items/orcish-flag.png
 	[/item]
 
 	[side]
-	type=Kapoue Leader
+	type=Orcish Leader
 	description=Kapou'e
 	user_description= _ "Kapou'e"
+	profile=portraits/kapoue.png
 	side=1
 	canrecruit=1
 	controller=human
@@ -88,19 +89,19 @@
 
 	[story]
 
-	
+
 [part]
 	story= _ "Rahul I, head of the Northern Alliance, concluded peace with orcs during the 4th year of his leadership. He ended a 15-year war with Black-Eye Karun, ruler of the orcs. A peace treaty between the local humans and the orcs defined which lands were devoted to orcs or humans."
 	background=sotbe.png
 [/part]
 
 [part]
-	story= _ "So impressed was Rahul with the intelligence, prowess and leadership of Black-Eye Karun that he invited him to join the Northern Alliance. After  much deliberation Black-Eye Karun decided to accept the offer. However, on the way to the city of Dwarven Doors - the headquarters of the Northern Alliance - Karun and his small group of bodyguards were attacked and slain to the last man. There were no survivors to confirm the incident, but it soon became believed among the orcs that the Northern Alliance had deliberately set up this ambush in order to slay their paramount leader." 
+	story= _ "So impressed was Rahul with the intelligence, prowess and leadership of Black-Eye Karun that he invited him to join the Northern Alliance. After  much deliberation Black-Eye Karun decided to accept the offer. However, on the way to the city of Dwarven Doors - the headquarters of the Northern Alliance - Karun and his small group of bodyguards were attacked and slain to the last man. There were no survivors to confirm the incident, but it soon became believed among the orcs that the Northern Alliance had deliberately set up this ambush in order to slay their paramount leader."
 	background=sotbe.png
 [/part]
 
 [part]
-	story= _ "The peace treaty still held, because with the death of Black-Eye Karun, the unity of the orcs was shattered and they descended into internecine squabbling. Thus the years that followed were relatively peaceful and prosperous - if only for the humans." 
+	story= _ "The peace treaty still held, because with the death of Black-Eye Karun, the unity of the orcs was shattered and they descended into internecine squabbling. Thus the years that followed were relatively peaceful and prosperous - if only for the humans."
 	background=sotbe.png
 [/part]
 
@@ -172,7 +173,7 @@
 		[/filter]
 		variable=name
 		[/store_unit]
-	
+
 
 		[message]
 		role=second
@@ -204,7 +205,7 @@
 		[message]
 		description=Vrag
 		message= _ " *pant* Chief! Chief!"
-		
+
 		[/message]
 
 		[message]
@@ -229,10 +230,10 @@
 		message= _ "Don't be afraid. If any more human-worms come we'll deal with them the way we did the last batch!"
 
 		[/message]
-		
+
 		[message]
 		description=Vrag
-		message= _ "Uh Chief, with all respect that army is *huge*! Not only that, but the bulk of them are well-armed and seasoned veterans. It would be foolish to confront them with the forces we have on hand." 
+		message= _ "Uh Chief, with all respect that army is *huge*! Not only that, but the bulk of them are well-armed and seasoned veterans. It would be foolish to confront them with the forces we have on hand."
 
 		[/message]
 
@@ -243,7 +244,7 @@
 
 		[option]
 		message= _ "If what you say is true, then there is no way our tribe can face such an army alone."
-		
+
 		[command]
 
 		[message]
@@ -305,7 +306,7 @@
 		[/message]
 
 		[/event]
-	
+
 	{@campaigns/Son_Of_The_Black_Eye/scenarios/utils/deaths.cfg}
 
 [/scenario]

data/campaigns/Son_Of_The_Black_Eye/units/Kapoue_Leader.cfg

@@ -1,137 +0,0 @@
-[unit]
-id=Kapoue Leader
-name= _ "Orcish Leader"
-race=orc
-image="orcish-leader.png"
-profile=orcish_leader_portrait.png
-hitpoints=45
-ability=leadership
-movement_type=orcishfoot
-movement=6
-experience=60
-level=1
-alignment=chaotic
-advanceto=Kapoue Ruler
-cost=120
-usage=mixed fighter
-unit_description= _ "Orcish Leaders are the chiefs of their tribe. They make the important decisions and lead their people into battle. They carry a bow out of necessity, but are much more skilled with the sword; all in all, they are powerful fighters. Their natural leadership skills make them very precious in battle: if the Leader is lost, so is the battle."
-get_hit_sound=orc-hit-3.ogg
-die_sound=orc-die-2.ogg
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-leader-defend.png"
-		[/frame]
-	[/defend]
-[attack]
-	name=sword
-	type=blade
-	icon="attacks/sword-orcish.png"
-	range=melee
-	damage=7
-	number=3
-	[animation]
-		hits=yes
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-attack.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader.png"
-		[/frame]
-
-	[/animation]
-	[animation]
-		hits=no
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-attack.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader.png"
-		[/frame]
-	[/animation]
-[/attack]
-
-[attack]
-	name=bow
-	type=pierce
-	range=ranged
-	damage=5
-	number=2
-	
-	[animation]
-		hits=no
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow-miss.ogg
-		[/frame]
-	[/animation]
-		
-	[animation]
-		hits=yes
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow.ogg
-		[/frame]
-	[/animation]
-[/attack]	
-
-[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Kapoue_Ruler.cfg

@@ -1,139 +0,0 @@
-[unit]
-id=Kapoue Ruler
-name= _ "Orcish Ruler"
-race=orc
-image="orcish-ruler.png"
-profile=orcish_leader_portrait.png
-hitpoints=60
-	[abilities]
-		{ABILITY_LEADERSHIP_LEVEL_2}
-	[/abilities]
-movement_type=orcishfoot
-movement=6
-experience=120
-level=2
-alignment=chaotic
-advanceto=Kapoue Sovereign
-cost=120
-usage=mixed fighter
-unit_description= _ "Orcish Rulers are the chiefs of their tribe. They make the important decisions and lead their people into battle. They carry a bow out of necessity, but are much more skilled with the sword; all in all, they are powerful fighters. Their natural leadership skills make them very precious in battle: if the Ruler is lost, so is the battle."
-get_hit_sound=orc-hit-3.ogg
-die_sound=orc-die-2.ogg
-	
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-ruler-defend.png"
-			sound=orc-hit-2.ogg
-		[/frame]
-	[/defend]
-	
-
-[attack]
-	name=sword
-	type=blade
-	icon="attacks/sword-orcish.png"
-	range=melee
-	damage=9
-	number=3
-
-	
-	[animation]
-	
-		[frame]
-		begin=-100
-		end=0
-		image="orcish-ruler-attack.png"
-		[/frame]
-		[frame]
-		time=-250
-		sound=sword-1.ogg
-		image="orcish-ruler-attack.png"
-		[/frame]
-	[/animation]
-[/attack]
-	
-[attack]
-	name=bow
-	type=pierce
-	range=ranged
-	damage=6
-	number=3
-	[animation]
-		hits=yes
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-ruler-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=-100
-		sound=firearrow.wav
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow.ogg
-		[/frame]
-
-		[missile_frame]
-		begin=-100
-		end=0
-		image="projectiles/missile-n.png"
-		image_diagonal="projectiles/missile-ne.png"
-		[/missile_frame]
-	[/animation]	
-	
-	[animation]
-		hits=no
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-ruler-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=-100
-		sound=firearrow.wav
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow-miss.ogg
-		[/frame]
-
-		[missile_frame]
-		begin=-100
-		end=0
-		image="projectiles/missile-n.png"
-		image_diagonal="projectiles/missile-ne.png"
-		[/missile_frame]
-	[/animation]
-[/attack]
-[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Kapoue_Sovereign.cfg

@@ -1,97 +0,0 @@
-[unit]
-id=Kapoue Sovereign
-name= _ "Orcish Sovereign"
-race=orc
-image="orcish-sovereign.png"
-
-profile=orcish_leader_portrait.png
-hitpoints=75
-movement_type=orcishfoot
-movement=6
-experience=100
-level=3
-alignment=chaotic
-advanceto=null
-{AMLA_TOUGH 3}
-cost=120
-usage=mixed fighter
-unit_description= _ "Orcish Sovereigns are the chiefs of their tribe. They make the important decisions and lead their people into battle. They carry a bow out of necessity, but are much more skilled with the sword; all in all, they are powerful fighters. Their natural leadership skills make them very precious in battle: if the Sovereign is lost, so is the battle."
-get_hit_sound=orc-hit-1.ogg
-die_sound=orc-die-1.ogg
-	[abilities]
-		{ABILITY_LEADERSHIP_LEVEL_3}
-	[/abilities]
-	
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-sovereign-defend.png"
-		[/frame]
-	[/defend]
-	
-
-	[attack]
-	name=sword
-	type=blade
-	range=melee
-	damage=10
-	number=4
-		[frame]
-		begin=-150
-		end=-100
-		image="orcish-sovereign-attack1.png"
-		[/frame]
-		[frame]
-		begin=-100
-		end=0
-		image="orcish-sovereign-attack2.png"
-		[/frame]
-		[sound]
-		time=-250
-		sound=sword-1.ogg
-		[/sound]
-	[/attack]
-	[attack]
-	name=bow
-	type=pierce
-	range=ranged
-	damage=9
-	number=3
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-sovereign-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-sovereign-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-sovereign-ranged-1.png"
-		[/frame]
-
-		[sound]
-		time=-100
-		sound=firearrow.wav
-		[/sound]
-
-		[sound]
-		time=0
-		sound=bow.ogg
-		sound_miss=bow-miss.ogg
-		[/sound]
-
-		[missile_frame]
-		begin=-100
-		end=0
-		image="projectiles/missile-n.png"
-		image_diagonal="projectiles/missile-ne.png"
-		[/missile_frame]
-	[/attack]
-[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg

@@ -0,0 +1,86 @@
+[unit]
+	id=Novice Orcish Shaman
+	name= _ "Novice Orcish Shaman"
+	race=orc
+	image="units/orcish-shaman-tan.png"
+	hitpoints=24
+	movement_type=smallfoot
+	[defense]
+		village=30
+	[/defense]
+	movement=5
+	experience=100
+	level=1
+	alignment=chaotic
+	advanceto=null
+	{AMLA_TOUGH 3}
+	cost=21
+	usage=mixed fighter
+	unit_description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Novice Shamans are still young and vigorous, but their spell-casting ability still needs improvement."
+	{DEFENSE_ANIM "units/orcish-shaman-tan-defend.png" "units/orcish-shaman-tan.png" {SOUND_LIST:ORC_HIT} }
+	[attack]
+		name=staff
+		type=impact
+		range=melee
+		damage=6
+		number=1
+		icon=attacks/druidstaff.png
+		[animation]
+			[frame]
+				begin=-200
+				end=-100
+				image="units/orcish-shaman-tan.png"
+			[/frame]
+			[if]
+				hits=yes
+				[frame]
+					begin=-100
+					end=50
+					image="units/orcish-shaman-tan-staff-1.png"
+					sound=staff.wav
+				[/frame]
+			[/if]
+			[else]
+				hits=no
+				[frame]
+					begin=-100
+					end=50
+					image="units/orcish-shaman-tan-staff-1.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/else]
+			[frame]
+				begin=50
+				end=150
+				image="units/orcish-shaman-tan.png"
+			[/frame]
+		[/animation]
+	[/attack]
+	[attack]
+		name=curse
+		type=pierce
+		range=ranged
+		damage=7
+		number=2
+		special=drain
+		icon=attacks/curse.png
+		[animation]
+			[missile_frame]
+				begin=-200
+				end=200
+				halo="halo/elven/druid-healing8.png:50,halo/elven/druid-healing7.png:50,halo/elven/druid-healing6.png:50,halo/elven/druid-healing5.png:50,halo/elven/druid-healing4.png:50,halo/elven/druid-healing3.png:50,halo/elven/druid-healing2.png:50,halo/elven/druid-healing1.png:50"
+				offset=1.0~0.0
+			[/missile_frame]
+			[frame]
+				begin=-200
+				end=0
+				image="units/orcish-shaman-tan-curse-1.png"
+			[/frame]
+			[frame]
+				begin=0
+				end=200
+				image="units/orcish-shaman-tan.png"
+			[/frame]
+		[/animation]
+	[/attack]
+[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Leader.cfg

@@ -1,138 +0,0 @@
-[unit]
-id=Orcish Leader
-name= _ "Orcish Leader"
-race=orc
-image="orcish-leader.png"
-#profile=misc/kapoue.png
-hitpoints=45
-[abilities]
-{ABILITY_LEADERSHIP}
-[/abilities]
-movement_type=orcishfoot
-movement=6
-experience=60
-level=1
-alignment=chaotic
-advanceto=Orcish Ruler
-cost=20
-usage=mixed fighter
-unit_description= _ "Orcish Leaders are the chiefs of their tribe. They make the important decisions and lead their people into battle. They carry a bow out of necessity, but are much more skilled with the sword; all in all, they are powerful fighters. Their natural leadership skills make them very precious in battle: if the Leader is lost, so is the battle."
-get_hit_sound=orc-hit-1.ogg
-die_sound=orc-die-2.ogg
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-leader-defend.png"
-		[/frame]
-	[/defend]
-
-[attack]
-	name=sword
-	type=blade
-	icon="attacks/sword-orcish.png"
-	range=melee
-	damage=7
-	number=3
-		[animation]
-		hits=yes
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-attack.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader.png"
-		[/frame]
-
-	[/animation]
-	[animation]
-		hits=no
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-attack.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader.png"
-		[/frame]
-	[/animation]
-
-[/attack]
-[attack]
-	name=bow
-	type=pierce
-	range=ranged
-	damage=5
-	number=2
-	[animation]
-		hits=no
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow-miss.ogg
-		[/frame]
-	[/animation]
-		
-	[animation]
-		hits=yes
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-leader-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-leader-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow.ogg
-		[/frame]
-	[/animation]
-[/attack]
-[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Ruler.cfg

@@ -1,131 +0,0 @@
-[unit]
-id=Orcish Ruler
-name= _ "Orcish Ruler"
-race=orc
-image="orcish-ruler.png"
-[defend]
-[frame]
-begin=-150
-end=150
-image="orcish-ruler-defend.png"
-[/frame]
-[/defend]
-#profile=misc/kapoue.png
-hitpoints=60
-[abilities]
-{ABILITY_LEADERSHIP}
-[/abilities]
-movement_type=orcishfoot
-movement=6
-experience=120
-level=2
-alignment=chaotic
-advanceto=Orcish Sovereign
-cost=35
-usage=mixed fighter
-unit_description= _ "Orcish Rulers are the chiefs of their tribe. They make the important decisions and lead their people into battle. They carry a bow out of necessity, but are much more skilled with the sword; all in all, they are powerful fighters. Their natural leadership skills make them very precious in battle: if the Ruler is lost, so is the battle."
-get_hit_sound=orc-hit-1.ogg
-[attack]
-	name=sword
-	type=blade
-	icon="attacks/sword-orcish.png"
-	range=melee
-	damage=9
-	number=3
-	[animation]
-
-		[frame]
-		begin=-100
-		end=0
-		image="orcish-ruler-attack.png"
-		[/frame]
-		[frame]
-		time=-250
-		sound=sword-1.ogg
-		image="orcish-ruler-attack.png"
-		[/frame]
-	[/animation]
-[/attack]
-[attack]
-	name=bow
-	type=pierce
-	range=ranged
-	damage=6
-	number=3
-	[animation]
-		hits=yes
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-ruler-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=-100
-		sound=firearrow.wav
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow.ogg
-		[/frame]
-
-		[missile_frame]
-		begin=-100
-		end=0
-		image="projectiles/missile-n.png"
-		image_diagonal="projectiles/missile-ne.png"
-		[/missile_frame]
-	[/animation]	
-	
-	[animation]
-		hits=no
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-ruler-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-ruler-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=-100
-		sound=firearrow.wav
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow-miss.ogg
-		[/frame]
-
-		[missile_frame]
-		begin=-100
-		end=0
-		image="projectiles/missile-n.png"
-		image_diagonal="projectiles/missile-ne.png"
-		[/missile_frame]
-	[/animation]
-[/attack]
-[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg

@@ -1,226 +1,86 @@
 [unit]
-id=Orcish Shaman
-name= _ "Orcish Shaman"
-race=orc
-image="orcish-shaman-red.png"
-
-hitpoints=23
-movement_type=smallfoot
-[defense]
-	village=30
-[/defense]
-movement=5
-experience=100
-level=1
-alignment=chaotic
-advanceto=null
-{AMLA_TOUGH 3}
-cost=21
-usage=mixed fighter
-unit_description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."
-	get_hit_sound=orc-small-hit-1.ogg
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-shaman-red-defend.png"
-		[/frame]
-	[/defend]
-	
-
-[attack]
-	name=staff
-	type=impact
-	range=melee
-	damage=5
-	number=1
-	icon=attacks/druidstaff.png
-	[animation]
-		[frame]
-		begin=-100
-		end=100
-		image="orcish-shaman-red-attack-staff.png"
-		[/frame]
-		[frame]
-		time=-100
-		sound=staff.wav
-		[/frame]
-	[/animation]
-[/attack]
-[attack]
-	name=curse
-	type=pierce
-	range=ranged
-	damage=8
-	number=2
-	special=drain
-	[animation]
-		[frame]
-		begin=-250
-		end=0
-		image="orcish-shaman-red-attack-curse.png"
-		[/frame]
-		[frame]
-		time=-200
-		sound=magicmissile.wav
-		[/frame]
-		[missile_frame]
-		begin=-200
-		end=0
-		image="projectiles/magicmissile-n.png"
-		image_diagonal="projectiles/magicmissile-ne.png"
-		[/missile_frame]
-	[/animation]
-[/attack]
-
-[/unit]
-
-[unit]
-id=Novice Orcish Shaman
-name= _ "Novice Orcish Shaman"
-race=orc
-image="orcish-shaman-tan.png"
-hitpoints=24
-movement_type=smallfoot
-[defense]
-	village=30
-[/defense]
-movement=5
-experience=100
-level=1
-alignment=chaotic
-advanceto=null
-{AMLA_TOUGH 3}
-cost=21
-usage=mixed fighter
-unit_description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Novice Shamans are still young and vigorous, but their spell-casting ability still needs improvement."
-get_hit_sound=orc-hit-1.ogg
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-shaman-tan-defend.png"
-		[/frame]
-	[/defend]
-	
-[attack]
-	name=staff
-	type=impact
-	range=melee
-	damage=6
-	number=1
-	icon=attacks/druidstaff.png
-	[animation]
-		[frame]
-		begin=-100
-		end=100
-		image="orcish-shaman-tan-attack-staff.png"
-		[/frame]
-		[frame]
-		time=-100
-		sound=staff.wav
-		[/frame]
-	[/animation]
-[/attack]
-[attack]
-	name=curse
-	type=pierce
-	range=ranged
-	damage=7
-	number=2
-	special=drain
-	[animation]
-		[frame]
-		begin=-250
-		end=0
-		image="orcish-shaman-tan-attack-curse.png"
-		[/frame]
-		[frame]
-		time=-200
-		sound=magicmissile.wav
-		[/frame]
-		[missile_frame]
-		begin=-200
-		end=0
-		image="projectiles/magicmissile-n.png"
-		image_diagonal="projectiles/magicmissile-ne.png"
-		[/missile_frame]
-	[/animation]
-[/attack]
-[/unit]
-
-[unit]
-id=Gork Orcish Shaman
-name= _ "Old Orcish Shaman"
-race=orc
-image="orcish-shaman-black.png"
-profile=orcish_old_shaman.png
-hitpoints=22
-movement_type=smallfoot
-[defense]
-	village=30
-[/defense]
-movement=5
-experience=100
-level=1
-alignment=chaotic
-advanceto=null
-{AMLA_TOUGH 3}
-cost=21
-usage=mixed fighter
-unit_description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Old Orcish Shamans are shamans that have mastered magic, although their physical strength has declined with age."
-get_hit_sound=orc-hit-1.ogg
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="orcish-shaman-black-defend.png"
-		[/frame]
-	[/defend]
-	
-
-[attack]
-	name=staff
-	type=impact
-	range=melee
-	damage=4
-	number=1
-	icon=attacks/druidstaff.png
-	[animation]
-		[frame]
-		begin=-100
-		end=100
-		image="orcish-shaman-black-attack-staff.png"
-		[/frame]
-		[frame]
-		time=-100
-		sound=staff.wav
-		[/frame]
-	[/animation]
-[/attack]
-[attack]
-	name=curse
-	type=pierce
-	range=ranged
-	damage=9
-	number=2
-	special=drain
-	[animation]
-		[frame]
-		begin=-250
-		end=0
-		image="orcish-shaman-black-attack-curse.png"
-		[/frame]
-		[frame]
-		time=-200
-		sound=magicmissile.wav
-		[/frame]
-		[missile_frame]
-		begin=-200
-		end=0
-		image="projectiles/magicmissile-n.png"
-		image_diagonal="projectiles/magicmissile-ne.png"
-		[/missile_frame]
-	[/animation]
-[/attack]
-[/unit]
+	id=Orcish Shaman
+	name= _ "Orcish Shaman"
+	race=orc
+	image="units/orcish-shaman-red.png"
+	hitpoints=23
+	movement_type=smallfoot
+	[defense]
+		village=30
+	[/defense]
+	movement=5
+	experience=100
+	level=1
+	alignment=chaotic
+	advanceto=null
+	{AMLA_TOUGH 3}
+	cost=21
+	usage=mixed fighter
+	unit_description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."
+	{DEFENSE_ANIM "units/orcish-shaman-red-defend.png" "units/orcish-shaman-red.png" {SOUND_LIST:ORC_HIT} }
+	[attack]
+		name=staff
+		type=impact
+		range=melee
+		damage=5
+		number=1
+		icon=attacks/druidstaff.png
+		[animation]
+			[frame]
+				begin=-200
+				end=-100
+				image="units/orcish-shaman-red.png"
+			[/frame]
+			[if]
+				hits=yes
+				[frame]
+					begin=-100
+					end=50
+					image="units/orcish-shaman-red-staff-1.png"
+					sound=staff.wav
+				[/frame]
+			[/if]
+			[else]
+				hits=no
+				[frame]
+					begin=-100
+					end=50
+					image="units/orcish-shaman-red-staff-1.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/else]
+			[frame]
+				begin=50
+				end=150
+				image="units/orcish-shaman-red.png"
+			[/frame]
+		[/animation]
+	[/attack]
+	[attack]
+		name=curse
+		type=pierce
+		range=ranged
+		damage=8
+		number=2
+		special=drain
+		icon=attacks/curse.png
+		[animation]
+			[missile_frame]
+				begin=-200
+				end=200
+				halo="halo/elven/druid-healing8.png:50,halo/elven/druid-healing7.png:50,halo/elven/druid-healing6.png:50,halo/elven/druid-healing5.png:50,halo/elven/druid-healing4.png:50,halo/elven/druid-healing3.png:50,halo/elven/druid-healing2.png:50,halo/elven/druid-healing1.png:50"
+				offset=1.0~0.0
+			[/missile_frame]
+			[frame]
+				begin=-200
+				end=0
+				image="units/orcish-shaman-red-curse-1.png"
+			[/frame]
+			[frame]
+				begin=0
+				end=200
+				image="units/orcish-shaman-red.png"
+			[/frame]
+		[/animation]
+	[/attack]
+[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman_Gork.cfg

@@ -0,0 +1,87 @@
+[unit]
+	id=Gork Orcish Shaman
+	name= _ "Old Orcish Shaman"
+	race=orc
+	image="units/orcish-shaman-black.png"
+	profile="portraits/orcish_shaman.png"
+	hitpoints=22
+	movement_type=smallfoot
+	[defense]
+		village=30
+	[/defense]
+	movement=5
+	experience=100
+	level=1
+	alignment=chaotic
+	advanceto=null
+	{AMLA_TOUGH 3}
+	cost=21
+	usage=mixed fighter
+	unit_description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for Orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Old Orcish Shamans are shamans that have mastered magic, although their physical strength has declined with age."
+	{DEFENSE_ANIM "units/orcish-shaman-black-defend.png" "units/orcish-shaman-black.png" {SOUND_LIST:ORC_HIT} }
+	[attack]
+		name=staff
+		type=impact
+		range=melee
+		damage=4
+		number=1
+		icon=attacks/druidstaff.png
+		[animation]
+			[frame]
+				begin=-200
+				end=-100
+				image="units/orcish-shaman-black.png"
+			[/frame]
+			[if]
+				hits=yes
+				[frame]
+					begin=-100
+					end=50
+					image="units/orcish-shaman-black-staff-1.png"
+					sound=staff.wav
+				[/frame]
+			[/if]
+			[else]
+				hits=no
+				[frame]
+					begin=-100
+					end=50
+					image="units/orcish-shaman-black-staff-1.png"
+					sound={SOUND_LIST:MISS}
+				[/frame]
+			[/else]
+			[frame]
+				begin=50
+				end=150
+				image="units/orcish-shaman-black.png"
+			[/frame]
+		[/animation]
+	[/attack]
+	[attack]
+		name=curse
+		type=pierce
+		range=ranged
+		damage=9
+		number=2
+		special=drain
+		icon=attacks/curse.png
+		[animation]
+			[missile_frame]
+				begin=-200
+				end=200
+				halo="halo/elven/druid-healing8.png:50,halo/elven/druid-healing7.png:50,halo/elven/druid-healing6.png:50,halo/elven/druid-healing5.png:50,halo/elven/druid-healing4.png:50,halo/elven/druid-healing3.png:50,halo/elven/druid-healing2.png:50,halo/elven/druid-healing1.png:50"
+				offset=1.0~0.0
+			[/missile_frame]
+			[frame]
+				begin=-200
+				end=0
+				image="units/orcish-shaman-black-curse-1.png"
+			[/frame]
+			[frame]
+				begin=0
+				end=200
+				image="units/orcish-shaman-black.png"
+			[/frame]
+		[/animation]
+	[/attack]
+[/unit]

data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Sovereign.cfg

@@ -1,101 +0,0 @@
-[unit]
-id=Orcish Sovereign
-name= _ "Orcish Sovereign"
-race=orc
-image="orcish-sovereign.png"
-
-flag_rgb=130,2,13,77,2,2,104,3,3,109,2,2,130,13,2,137,12,12,132,9,6,205,66,2
-#profile=misc/kapoue.png
-hitpoints=75
-[abilities]
-{ABILITY_LEADERSHIP}
-[/abilities]
-movement_type=orcishfoot
-movement=6
-experience=100
-level=3
-alignment=chaotic
-advanceto=null
-{AMLA_TOUGH 3}
-cost=50
-usage=mixed fighter
-unit_description= _ "Orcish Sovereigns are the chiefs of their tribe. They make the important decisions and lead their people into battle. They carry a bow out of necessity, but are much more skilled with the sword; all in all, they are powerful fighters. Their natural leadership skills make them very precious in battle: if the Sovereign is lost, so is the battle."
-get_hit_sound=orc-hit-1.ogg
-	[defend]
-		[frame]
-		begin=-150
-		end=150
-		image="orcish-sovereign-defend.png"
-		[/frame]
-	[/defend]
-[attack]
-	name=sword
-	type=blade
-	icon="attacks/sword-orcish.png"
-	range=melee
-	damage=10
-	number=4
-
-	[animation]
-		[frame]
-		begin=-150
-		end=-100
-		image="orcish-sovereign-attack1.png"
-		[/frame]
-		[frame]
-		begin=-100
-		end=0
-		image="orcish-sovereign-attack2.png"
-		[/frame]
-		[frame]
-		time=-250
-		sound=sword-1.ogg
-		[/frame]
-	[/animation]
-[/attack]
-[attack]
-	name=bow
-	type=pierce
-	range=ranged
-	damage=9
-	number=3
-	icon=attacks/bow.png
-	[animation]
-		[frame]
-		begin=-400
-		end=-300
-		image="orcish-sovereign-ranged-1.png"
-		[/frame]
-
-		[frame]
-		begin=-300
-		end=0
-		image="orcish-sovereign-ranged-2.png"
-		[/frame]
-
-		[frame]
-		begin=0
-		end=100
-		image="orcish-sovereign-ranged-1.png"
-		[/frame]
-
-		[frame]
-		time=-100
-		sound=firearrow.wav
-		[/frame]
-
-		[frame]
-		time=0
-		sound=bow.ogg
-		sound_miss=bow-miss.ogg
-		[/frame]
-
-		[missile_frame]
-		begin=-100
-		end=0
-		image="projectiles/missile-n.png"
-		image_diagonal="projectiles/missile-ne.png"
-		[/missile_frame]
-	[/animation]
-[/attack]
-[/unit]