From 6d6ec2edc570f2719ee85148deb90f9e87a892ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Timbert?= <benoit.timbert@free.fr>
Date: Fri, 29 Sep 2006 16:13:18 +0000
Subject: [PATCH] Macrofy Faerie Fire missile frames

---
 data/animation-utils.cfg          |  59 +++++++++++++++
 data/units/Elvish_Enchantress.cfg | 117 +-----------------------------
 data/units/Elvish_Sorceress.cfg   | 115 +----------------------------
 data/units/Elvish_Sylph.cfg       | 115 +----------------------------
 4 files changed, 66 insertions(+), 340 deletions(-)

diff --git a/data/animation-utils.cfg b/data/animation-utils.cfg
index 9775f648a0d..e8510e44140 100644
--- a/data/animation-utils.cfg
+++ b/data/animation-utils.cfg
@@ -201,3 +201,62 @@
 		[/missile_frame]
 	[/else]
 #enddef
+
+#define MISSILE_FRAME_FAERIE_FIRE
+	[missile_frame]
+		begin=-500
+		end=-350
+		image="projectiles/icemissile-n-1.png"
+		image_diagonal="projectiles/icemissile-ne-1.png"
+		halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
+		halo_x,halo_y=0,0
+	[/missile_frame]
+	[missile_frame]
+		begin=-350
+		end=-200
+		image="projectiles/icemissile-n-2.png"
+		image_diagonal="projectiles/icemissile-ne-2.png"
+		halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
+		halo_x,halo_y=0,0
+	[/missile_frame]
+	[missile_frame]
+		begin=-200
+		end=-50
+		image="projectiles/icemissile-n-3.png"
+		image_diagonal="projectiles/icemissile-ne-3.png"
+		halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
+		halo_x,halo_y=0,0
+	[/missile_frame]
+	[missile_frame]
+		begin=-50
+		end=0
+		image="projectiles/icemissile-n-4.png"
+		image_diagonal="projectiles/icemissile-ne-4.png"
+		halo=halo/ice-halo6.png
+		halo_x,halo_y=0,0
+	[/missile_frame]
+	[missile_frame]
+		begin=25
+		end=75
+		image="projectiles/icemissile-n-5.png"
+		image_diagonal="projectiles/icemissile-ne-5.png"
+		halo=halo/ice-halo7.png
+		halo_x,halo_y=0,0
+	[/missile_frame]
+	[missile_frame]
+		begin=75
+		end=125
+		image="projectiles/icemissile-n-6.png"
+		image_diagonal="projectiles/icemissile-ne-6.png"
+		halo=halo/ice-halo8.png
+		halo_x,halo_y=0,0
+	[/missile_frame]
+	[missile_frame]
+		begin=125
+		end=175
+		image="projectiles/icemissile-n-7.png"
+		image_diagonal="projectiles/icemissile-ne-7.png"
+		halo=halo/ice-halo9.png
+		halo_x,halo_y=0,0
+	[/missile_frame]
+#enddef
diff --git a/data/units/Elvish_Enchantress.cfg b/data/units/Elvish_Enchantress.cfg
index a9521d2783b..79bee42653d 100644
--- a/data/units/Elvish_Enchantress.cfg
+++ b/data/units/Elvish_Enchantress.cfg
@@ -169,65 +169,9 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
 			{WEAPON_SPECIAL_MAGICAL}
 		[/specials]
 		icon=attacks/faerie-fire.png
-			[animation]
+		[animation]
 			hits=no
-			[missile_frame]
-				begin=-500
-				end=-350
-				image="projectiles/icemissile-n-1.png"
-				image_diagonal="projectiles/icemissile-ne-1.png"
-				halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-350
-				end=-200
-				image="projectiles/icemissile-n-2.png"
-				image_diagonal="projectiles/icemissile-ne-2.png"
-				halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-200
-				end=-50
-				image="projectiles/icemissile-n-3.png"
-				image_diagonal="projectiles/icemissile-ne-3.png"
-				halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-50
-				end=0
-				image="projectiles/icemissile-n-4.png"
-				image_diagonal="projectiles/icemissile-ne-4.png"
-				halo=halo/ice-halo6.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=25
-				end=75
-				image="projectiles/icemissile-n-5.png"
-				image_diagonal="projectiles/icemissile-ne-5.png"
-				halo=halo/ice-halo7.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=75
-				end=125
-				image="projectiles/icemissile-n-6.png"
-				image_diagonal="projectiles/icemissile-ne-6.png"
-				halo=halo/ice-halo8.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=125
-				end=175
-				image="projectiles/icemissile-n-7.png"
-				image_diagonal="projectiles/icemissile-ne-7.png"
-				halo=halo/ice-halo9.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			
+			{MISSILE_FRAME_FAERIE_FIRE}
 			
 			[frame]
 				begin=-450
@@ -284,62 +228,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
 		[/animation]
 		[animation]
 			hits=yes
-			[missile_frame]
-				begin=-500
-				end=-350
-				image="projectiles/icemissile-n-1.png"
-				image_diagonal="projectiles/icemissile-ne-1.png"
-				halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-350
-				end=-200
-				image="projectiles/icemissile-n-2.png"
-				image_diagonal="projectiles/icemissile-ne-2.png"
-				halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-200
-				end=-50
-				image="projectiles/icemissile-n-3.png"
-				image_diagonal="projectiles/icemissile-ne-3.png"
-				halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-50
-				end=0
-				image="projectiles/icemissile-n-4.png"
-				image_diagonal="projectiles/icemissile-ne-4.png"
-				halo=halo/ice-halo6.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=25
-				end=75
-				image="projectiles/icemissile-n-5.png"
-				image_diagonal="projectiles/icemissile-ne-5.png"
-				halo=halo/ice-halo7.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=75
-				end=125
-				image="projectiles/icemissile-n-6.png"
-				image_diagonal="projectiles/icemissile-ne-6.png"
-				halo=halo/ice-halo8.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=125
-				end=175
-				image="projectiles/icemissile-n-7.png"
-				image_diagonal="projectiles/icemissile-ne-7.png"
-				halo=halo/ice-halo9.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
+			{MISSILE_FRAME_FAERIE_FIRE}
 
 			[frame]
 				begin=-450
diff --git a/data/units/Elvish_Sorceress.cfg b/data/units/Elvish_Sorceress.cfg
index 32f42aad7cf..b9d5ef90b75 100644
--- a/data/units/Elvish_Sorceress.cfg
+++ b/data/units/Elvish_Sorceress.cfg
@@ -169,63 +169,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
 		icon=attacks/faerie-fire.png
 		[animation]
 			hits=no
-			[missile_frame]
-				begin=-500
-				end=-350
-				image="projectiles/icemissile-n-1.png"
-				image_diagonal="projectiles/icemissile-ne-1.png"
-				halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-350
-				end=-200
-				image="projectiles/icemissile-n-2.png"
-				image_diagonal="projectiles/icemissile-ne-2.png"
-				halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-200
-				end=-50
-				image="projectiles/icemissile-n-3.png"
-				image_diagonal="projectiles/icemissile-ne-3.png"
-				halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-50
-				end=0
-				image="projectiles/icemissile-n-4.png"
-				image_diagonal="projectiles/icemissile-ne-4.png"
-				halo=halo/ice-halo6.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=25
-				end=75
-				image="projectiles/icemissile-n-5.png"
-				image_diagonal="projectiles/icemissile-ne-5.png"
-				halo=halo/ice-halo7.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=75
-				end=125
-				image="projectiles/icemissile-n-6.png"
-				image_diagonal="projectiles/icemissile-ne-6.png"
-				halo=halo/ice-halo8.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=125
-				end=175
-				image="projectiles/icemissile-n-7.png"
-				image_diagonal="projectiles/icemissile-ne-7.png"
-				halo=halo/ice-halo9.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			
+			{MISSILE_FRAME_FAERIE_FIRE}
 			
 			[frame]
 				begin=-450
@@ -282,62 +226,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
 		[/animation]
 		[animation]
 			hits=yes
-			[missile_frame]
-				begin=-500
-				end=-350
-				image="projectiles/icemissile-n-1.png"
-				image_diagonal="projectiles/icemissile-ne-1.png"
-				halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-350
-				end=-200
-				image="projectiles/icemissile-n-2.png"
-				image_diagonal="projectiles/icemissile-ne-2.png"
-				halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-200
-				end=-50
-				image="projectiles/icemissile-n-3.png"
-				image_diagonal="projectiles/icemissile-ne-3.png"
-				halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-50
-				end=0
-				image="projectiles/icemissile-n-4.png"
-				image_diagonal="projectiles/icemissile-ne-4.png"
-				halo=halo/ice-halo6.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=25
-				end=75
-				image="projectiles/icemissile-n-5.png"
-				image_diagonal="projectiles/icemissile-ne-5.png"
-				halo=halo/ice-halo7.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=75
-				end=125
-				image="projectiles/icemissile-n-6.png"
-				image_diagonal="projectiles/icemissile-ne-6.png"
-				halo=halo/ice-halo8.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=125
-				end=175
-				image="projectiles/icemissile-n-7.png"
-				image_diagonal="projectiles/icemissile-ne-7.png"
-				halo=halo/ice-halo9.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
+			{MISSILE_FRAME_FAERIE_FIRE}
 
 			[frame]
 				begin=-450
diff --git a/data/units/Elvish_Sylph.cfg b/data/units/Elvish_Sylph.cfg
index 2c11e3d2126..8302c757552 100644
--- a/data/units/Elvish_Sylph.cfg
+++ b/data/units/Elvish_Sylph.cfg
@@ -135,63 +135,7 @@ Special Notes:"+{SPECIAL_NOTES_SLOW}
 		icon=attacks/faerie-fire.png
 		[animation]
 			hits=no
-			[missile_frame]
-				begin=-500
-				end=-350
-				image="projectiles/icemissile-n-1.png"
-				image_diagonal="projectiles/icemissile-ne-1.png"
-				halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-350
-				end=-200
-				image="projectiles/icemissile-n-2.png"
-				image_diagonal="projectiles/icemissile-ne-2.png"
-				halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-200
-				end=-50
-				image="projectiles/icemissile-n-3.png"
-				image_diagonal="projectiles/icemissile-ne-3.png"
-				halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-50
-				end=0
-				image="projectiles/icemissile-n-4.png"
-				image_diagonal="projectiles/icemissile-ne-4.png"
-				halo=halo/ice-halo6.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=25
-				end=75
-				image="projectiles/icemissile-n-5.png"
-				image_diagonal="projectiles/icemissile-ne-5.png"
-				halo=halo/ice-halo7.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=75
-				end=125
-				image="projectiles/icemissile-n-6.png"
-				image_diagonal="projectiles/icemissile-ne-6.png"
-				halo=halo/ice-halo8.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=125
-				end=175
-				image="projectiles/icemissile-n-7.png"
-				image_diagonal="projectiles/icemissile-ne-7.png"
-				halo=halo/ice-halo9.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			
+			{MISSILE_FRAME_FAERIE_FIRE}
 			
 			[frame]
 				begin=-450
@@ -248,62 +192,7 @@ Special Notes:"+{SPECIAL_NOTES_SLOW}
 		[/animation]
 		[animation]
 			hits=yes
-			[missile_frame]
-				begin=-500
-				end=-350
-				image="projectiles/icemissile-n-1.png"
-				image_diagonal="projectiles/icemissile-ne-1.png"
-				halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:25
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-350
-				end=-200
-				image="projectiles/icemissile-n-2.png"
-				image_diagonal="projectiles/icemissile-ne-2.png"
-				halo=halo/ice-halo3.png:75,halo/ice-halo4.png:75
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-200
-				end=-50
-				image="projectiles/icemissile-n-3.png"
-				image_diagonal="projectiles/icemissile-ne-3.png"
-				halo=halo/ice-halo5.png:100,halo/ice-halo1.png:100,halo/ice-halo2.png:50
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=-50
-				end=0
-				image="projectiles/icemissile-n-4.png"
-				image_diagonal="projectiles/icemissile-ne-4.png"
-				halo=halo/ice-halo6.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=25
-				end=75
-				image="projectiles/icemissile-n-5.png"
-				image_diagonal="projectiles/icemissile-ne-5.png"
-				halo=halo/ice-halo7.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=75
-				end=125
-				image="projectiles/icemissile-n-6.png"
-				image_diagonal="projectiles/icemissile-ne-6.png"
-				halo=halo/ice-halo8.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
-			[missile_frame]
-				begin=125
-				end=175
-				image="projectiles/icemissile-n-7.png"
-				image_diagonal="projectiles/icemissile-ne-7.png"
-				halo=halo/ice-halo9.png
-				halo_x,halo_y=0,0
-			[/missile_frame]
+			{MISSILE_FRAME_FAERIE_FIRE}
 
 			[frame]
 				begin=-450