Added new holy sounds,

tweaked Delfador's lightnings a bit again and fixed poor naming of a
few elvish archer frames.

data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg

@@ -88,31 +88,18 @@
 			[/frame]
 			[frame]
 				begin=-100
-				end=100
-				image="units/elder-mage-ranged.png"
-				halo=halo/lightning-bolt-{VARIATION}-3.png
-				halo_x,halo_y={HALO_X},{HALO_Y}
-			[/frame]
-			[frame]
-				begin=100
-				end=200
-				image="units/elder-mage-ranged.png"
+				end=0
+				image="units/elder-mage.png"
 				halo=halo/lightning-bolt-{VARIATION}-4.png
 				halo_x,halo_y={HALO_X},{HALO_Y}
 			[/frame]
 			[frame]
-				begin=200
-				end=250
-				image="units/elder-mage-ranged.png"
+				begin=0
+				end=100
+				image="units/elder-mage.png"
 				halo=misc/blank-hex.png
 				halo_x,halo_y={HALO_X},{HALO_Y}
 			[/frame]
-			[missile_frame]
-				begin=-100
-				end=0
-				image="misc/blank-hex.png"
-				image_diagonal="misc/blank-hex.png"
-			[/missile_frame]
 		[/animation]
 		[animation]
 			hits=yes
@@ -153,12 +140,6 @@
 				halo=misc/blank-hex.png
 				halo_x,halo_y={HALO_X},{HALO_Y}
 			[/frame]
-			[missile_frame]
-				begin=-100
-				end=0
-				image="misc/blank-hex.png"
-				image_diagonal="misc/blank-hex.png"
-			[/missile_frame]
 		[/animation]
 #enddef
 # The three variations for the north direction:

data/sound-utils.cfg

@@ -14,6 +14,12 @@
 #             image="units/dwarves/warrior-attack.png"
 #         [/frame]
 
+#define SOUND_LIST:HOLY
+magic-holy-1.ogg,magic-holy-2.ogg,magic-holy-3.ogg,magic-holy-4.ogg #enddef
+
+#define SOUND_LIST:HOLY_MISS
+magic-holy-miss-1.ogg,magic-holy-miss-2.ogg,magic-holy-miss-3.ogg,magic-holy-miss-4.ogg #enddef
+
 #define SOUND_LIST:MISS
 miss-1.ogg,miss-2.ogg,miss-3.ogg #enddef
 

data/units/Elvish_Archer.cfg

@@ -199,16 +199,16 @@
 		die_sound=female-hit.wav
 		[death]
 			[frame]
-				image="units/elves-wood/archer_female-die1.png"
+				image="units/elves-wood/archer+female-die1.png"
 			[/frame]
 			[frame]
-				image="units/elves-wood/archer_female-die2.png"
+				image="units/elves-wood/archer+female-die2.png"
 			[/frame]
 			[frame]
-				image="units/elves-wood/archer_female-die3.png"
+				image="units/elves-wood/archer+female-die3.png"
 			[/frame]
 			[frame]
-				image="units/elves-wood/archer_female-die4.png"
+				image="units/elves-wood/archer+female-die4.png"
 			[/frame]
 		[/death]
 		[attack]

data/units/Human_Mage_White.cfg

@@ -156,6 +156,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 		damage=8
 		number=4
 		[animation]
+			hits=no
 			[missile_frame]
 				begin=-180
 				end=0
@@ -167,7 +168,33 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 				begin=-250
 				end=-150
 				image="units/human-magi/white-mage-magic1.png"
-				sound=holy-1.ogg,holy-2.ogg,holy-3.ogg
+				sound={SOUND_LIST:HOLY_MISS}
+			[/frame]
+			[frame]
+				begin=-150
+				end=0
+				image="units/human-magi/white-mage-magic3.png"
+			[/frame]
+			[frame]
+				begin=0
+				end=150
+				image="units/human-magi/white-mage-magic5.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-180
+				end=0
+				image="projectiles/whitemissile-n.png"
+				image_diagonal="projectiles/whitemissile-ne.png"
+				halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
+			[/missile_frame]
+			[frame]
+				begin=-250
+				end=-150
+				image="units/human-magi/white-mage-magic1.png"
+				sound={SOUND_LIST:HOLY}
 			[/frame]
 			[frame]
 				begin=-150

data/units/Human_Mage_of_Light.cfg

@@ -116,6 +116,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 		damage=10
 		number=4
 		[animation]
+			hits=no
 			[missile_frame]
 				begin=-180
 				end=0
@@ -132,7 +133,33 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 				begin=-150
 				end=0
 				image="units/human-magi/white-cleric-magic3.png"
-				sound=holy-1.ogg,holy-2.ogg,holy-3.ogg
+				sound={SOUND_LIST:HOLY_MISS}
+			[/frame]
+			[frame]
+				begin=0
+				end=150
+				image="units/human-magi/white-cleric-magic5.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-180
+				end=0
+				image="projectiles/whitemissile-n.png"
+				image_diagonal="projectiles/whitemissile-ne.png"
+				halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
+			[/missile_frame]
+			[frame]
+				begin=-250
+				end=-150
+				image="units/human-magi/white-cleric-magic1.png"
+			[/frame]
+			[frame]
+				begin=-150
+				end=0
+				image="units/human-magi/white-cleric-magic3.png"
+				sound={SOUND_LIST:HOLY}
 			[/frame]
 			[frame]
 				begin=0

data/units/Mermaid_Diviner.cfg

@@ -97,6 +97,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 		damage=8
 		number=4
 		[animation]
+			hits=no
 			[missile_frame]
 				begin=-180
 				end=0
@@ -105,19 +106,45 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 				halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
 			[/missile_frame]
 			[frame]
-				begin=-51
-				end=0
+				begin=-250
+				end=-175
 				image="units/merfolk/diviner-magic1.png"
-				sound=holy.wav
+				sound={SOUND_LIST:HOLY_MISS}
 			[/frame]
 			[frame]
-				begin=0
-				end=50
+				begin=-175
+				end=-100
 				image="units/merfolk/diviner-magic3.png"
 			[/frame]
 			[frame]
-				begin=50
-				end=100
+				begin=-100
+				end=0
+				image="units/merfolk/diviner-magic5.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-180
+				end=0
+				image="projectiles/whitemissile-n.png"
+				image_diagonal="projectiles/whitemissile-ne.png"
+				halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
+			[/missile_frame]
+			[frame]
+				begin=-250
+				end=-175
+				image="units/merfolk/diviner-magic1.png"
+				sound={SOUND_LIST:HOLY}
+			[/frame]
+			[frame]
+				begin=-175
+				end=-100
+				image="units/merfolk/diviner-magic3.png"
+			[/frame]
+			[frame]
+				begin=-100
+				end=0
 				image="units/merfolk/diviner-magic5.png"
 			[/frame]
 		[/animation]

data/units/Mermaid_Priestess.cfg

@@ -61,6 +61,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 		damage=6
 		number=4
 		[animation]
+			hits=no
 			[missile_frame]
 				begin=-180
 				end=0
@@ -69,19 +70,45 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HOLY}+{SPECIAL_NOTES_CURE
 				halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
 			[/missile_frame]
 			[frame]
-				begin=-51
-				end=0
+				begin=-250
+				end=-175
 				image="units/merfolk/priestess-magic1.png"
-				sound=holy.wav
+				sound={SOUND_LIST:HOLY_MISS}
 			[/frame]
 			[frame]
-				begin=0
-				end=50
+				begin=-175
+				end=-100
 				image="units/merfolk/priestess-magic3.png"
 			[/frame]
 			[frame]
-				begin=50
-				end=100
+				begin=-100
+				end=0
+				image="units/merfolk/priestess-magic5.png"
+			[/frame]
+		[/animation]
+		[animation]
+			hits=yes
+			[missile_frame]
+				begin=-180
+				end=0
+				image="projectiles/whitemissile-n.png"
+				image_diagonal="projectiles/whitemissile-ne.png"
+				halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
+			[/missile_frame]
+			[frame]
+				begin=-250
+				end=-175
+				image="units/merfolk/priestess-magic1.png"
+				sound={SOUND_LIST:HOLY}
+			[/frame]
+			[frame]
+				begin=-175
+				end=-100
+				image="units/merfolk/priestess-magic3.png"
+			[/frame]
+			[frame]
+				begin=-100
+				end=0
 				image="units/merfolk/priestess-magic5.png"
 			[/frame]
 		[/animation]