New, team-colored images for the mermaid initiate.

data/core/units/merfolk/Initiate.cfg

@@ -5,6 +5,7 @@
     race=merman
     gender=female
     image="units/merfolk/initiate.png"
+    {MAGENTA_IS_THE_TEAM_COLOR}
     ellipse="misc/ellipse"
     profile=portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
     hitpoints=27
@@ -21,7 +22,7 @@
 
 Despite their frailty, this makes them quite formidable in combat, as they can call upon the very water about them to smite their enemies."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/initiate-defend.png" "units/merfolk/initiate.png" mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/initiate-defend-2.png" "units/merfolk/initiate-defend-1.png" mermaid-hit.ogg }
     [attack]
         name=staff
         description=_"staff"
@@ -47,79 +48,70 @@ Despite their frailty, this makes them quite formidable in combat, as they can c
         [filter_attack]
             name=water spray
         [/filter_attack]
+		start_time=-420
+
         [missile_frame]
             begin=-165
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
         [/missile_frame]
+		{MERMAID_WATER_BLAST_HALO}
+		{MERMAID_STAFF_FLARE 16 -12}
+		
         [frame]
-            begin=-450
-            end=-400
-            image="units/merfolk/initiate-water-attack1.png"
+            duration=70
+            image="units/merfolk/initiate-magic-1.png"
         [/frame]
         [frame]
-            begin=-400
-            end=-350
-            image="units/merfolk/initiate-water-attack2.png"
+            duration=230
+            image="units/merfolk/initiate-magic-2.png"
         [/frame]
-        [frame]
-            begin=-350
-            end=-300
-            image="units/merfolk/initiate-water-attack3.png"
-        [/frame]
-        [frame]
-            begin=-300
-            end=-225
-            image="units/merfolk/initiate-water-attack4.png"
-        [/frame]
-        [frame]
-            begin=-225
-            end=-140
-            image="units/merfolk/initiate-water-attack5.png"
+		[frame]
+            duration=50
+            image="units/merfolk/initiate-magic-2.png"
             sound=water-blast.wav
         [/frame]
         [frame]
-            begin=-140
-            end=-75
-            image="units/merfolk/initiate-water-attack6.png"
-        [/frame]
-        [frame]
-            begin=-75
-            end=0
-            image="units/merfolk/initiate-water-attack7.png"
+            duration=80
+            image="units/merfolk/initiate-magic-1.png"
         [/frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=staff
         [/filter_attack]
+		start_time=-250
         [frame]
-            begin=-200
-            end=-150
+            duration=50
             image="units/merfolk/initiate.png"
         [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/initiate-staff-attack-1.png"
+        [/frame]
         [if]
             hits=yes
             [frame]
-                begin=-150
-                end=100
-                image="units/merfolk/initiate-staff-attack.png"
+            	duration=200
+                image="units/merfolk/initiate-staff-attack-2.png"
                 sound=staff.wav
             [/frame]
         [/if]
         [else]
             hits=no
             [frame]
-                begin=-150
-                end=100
-                image="units/merfolk/initiate-staff-attack.png"
+            	duration=200
+                image="units/merfolk/initiate-staff-attack-2.png"
                 sound={SOUND_LIST:MISS}
             [/frame]
         [/else]
         [frame]
-            begin=100
-            end=175
+            duration=50
+            image="units/merfolk/initiate-magic-1.png"
+        [/frame]
+        [frame]
+            duration=50
             image="units/merfolk/initiate.png"
         [/frame]
     [/attack_anim]