Add and wire new defence anim and se attack anim for Merman Warrior.

Update changelogs.

changelog

@@ -2,7 +2,8 @@ Version 1.9.0+svn:
  * Language and i18n:
    * Updated translations: French, Indonesian
  * Graphics
-   * New animations: Merman Hunter ranged animation and defence.
+   * New animations: Merman Hunter ranged animation and defence, Warrior se 
+     attack and defence.
  * Units
    * Added the Ghast unit from DiD to core with new base frame and animations.
 

data/core/units/merfolk/Warrior.cfg

@@ -18,7 +18,7 @@
     usage=fighter
     description= _ "The Mermen Warriors form the core of the mermen armies. Wielding powerful tridents, they are a bane to any who dare enter their waters."
     die_sound=mermen-die.ogg
-    {DEFENSE_ANIM "units/merfolk/warrior.png" "units/merfolk/warrior.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/warrior-defend-2.png" "units/merfolk/warrior-defend-1.png" mermen-hit.wav }
     [portrait]
         size=400
         side="left"
@@ -43,6 +43,62 @@
         [filter_attack]
             name=trident
         [/filter_attack]
+        offset=0~0.3,0.3~0
+        direction=se,sw
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-1.png"
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                duration=100
+                image="units/merfolk/warrior-attack-2.png"
+                sound=spear.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                duration=100
+                image="units/merfolk/warrior-attack-2.png"
+                sound=spear-miss.ogg
+            [/frame]
+        [/else]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-3.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-4.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-5.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-6.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-7.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-8.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/warrior-attack-9.png"
+        [/frame]
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=trident
+        [/filter_attack]
+        direction=n,ne,nw,s
         [frame]
             begin=-200
             end=-150
@@ -72,4 +128,5 @@
             image="units/merfolk/warrior.png"
         [/frame]
     [/attack_anim]
+
 [/unit_type]

players_changelog

@@ -6,7 +6,8 @@ Version 1.9.0+svn:
  * Language and i18n:
    * Updated translations: French, Indonesian.
  * Graphics
-   * New animations: Merman Hunter ranged animation and defence.
+   * New animations: Merman Hunter ranged animation and defence, Warrior se 
+     attack and defence.
  * Units
    * Added the Ghast unit from DiD to core with new base frame and animations.