Add and wire new merman Hunter ranged animation and defence.

Update changelogs, credits.

changelog

@@ -1,6 +1,8 @@
 Version 1.9.0+svn:
  * Language and i18n:
    * Updated translations: French, Indonesian
+ * Graphics
+   * New animations: Merman Hunter ranged animation and defence.
 
 Version 1.9.0:
  * AI:

data/core/about.cfg

@@ -608,6 +608,10 @@
         name = "Santiago Iborra (Quellion)"
         comment = "Portrait artwork"
     [/entry]
+    [entry]
+        name = "Simeon Dear (Trilby)"
+        comment = "Sprite animations"
+    [/entry]
 [/about]
 
 [about]

data/core/units/merfolk/Hunter.cfg

@@ -19,7 +19,8 @@
     usage=mixed fighter
     description= _ "The skills employed by mermen in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mermen of that occupation will volunteer to swell the ranks of their military."
     die_sound=mermen-die.ogg
-    {DEFENSE_ANIM "units/merfolk/hunter.png" "units/merfolk/hunter.png" mermen-hit.wav }
+    {DEFENSE_ANIM_RANGE "units/merfolk/hunter.png" "units/merfolk/hunter.png" mermen-hit.wav melee}
+    {DEFENSE_ANIM_RANGE "units/merfolk/hunter-javelin-defend-2.png" "units/merfolk/hunter-javelin-defend-1.png" mermen-hit.wav ranged}
     [portrait]
         size=400
         side="left"
@@ -48,11 +49,60 @@
         damage=5
         number=3
     [/attack]
+    [draw_weapon_anim]
+        [filter_attack]
+            name=spear
+            range=ranged
+        [/filter_attack]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-javelin-1.png"
+        [/frame]
+        [frame]
+            duration=300
+            image="units/merfolk/hunter-javelin-2.png"
+        [/frame]
+        [frame]
+            duration=140
+            image="units/merfolk/hunter-javelin-3.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-javelin-4.png"
+        [/frame]
+    [/draw_weapon_anim]
+    [sheath_weapon_anim]
+        [filter_attack]
+            name=spear
+            range=ranged
+        [/filter_attack]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-javelin-4.png"
+        [/frame]
+        [frame]
+            duration=300
+            image="units/merfolk/hunter-javelin-5.png"
+        [/frame]
+        [frame]
+            duration=140
+            image="units/merfolk/hunter-javelin-6.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-javelin-7.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-javelin-1.png"
+        [/frame]
+    [/sheath_weapon_anim]
     [attack_anim]
         [filter_attack]
             name=spear
             range=ranged
         [/filter_attack]
+        start_time=-760
         [missile_frame]
             begin=-150
             end=0
@@ -60,28 +110,57 @@
             image_diagonal="projectiles/spear-ne.png"
         [/missile_frame]
         [frame]
-            begin=-200
-            end=-100
-            image="units/merfolk/hunter.png"
+            duration=1
+            image="units/merfolk/hunter-javelin-base.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-throw-1.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-throw-2.png"
+        [/frame]
+        [frame]
+            duration=120
+            image="units/merfolk/hunter-throw-3.png"
+        [/frame]
+        [frame]
+            duration=220
+            image="units/merfolk/hunter-throw-4.png"
+        [/frame]
+        [frame]
+            duration=120
+            image="units/merfolk/hunter-throw-5.png"
             sound={SOUND_LIST:THROW}
         [/frame]
         [if]
             hits=yes
             [frame]
-                begin=-100
-                end=50
-                image="units/merfolk/hunter.png"
+                duration=100
+                image="units/merfolk/hunter-throw-6.png"
                 sound=spear.ogg
             [/frame]
         [/if]
         [else]
             hits=no
             [frame]
-                begin=-100
-                end=50
-                image="units/merfolk/hunter.png"
+                duration=100
+                image="units/merfolk/hunter-throw-6.png"
             [/frame]
         [/else]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-throw-7.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/merfolk/hunter-throw-8.png"
+        [/frame]
+        [frame]
+            duration=1
+            image="units/merfolk/hunter-javelin-base.png"
+        [/frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]

players_changelog

@@ -5,6 +5,8 @@ changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
 Version 1.9.0+svn:
  * Language and i18n:
    * Updated translations: French, Indonesian.
+ * Graphics
+   * New animations: Merman Hunter ranged animation and defence.
 
 
 Version 1.9.0: