[Wesnoth-cvs-commits] wesnoth/data/units Merman_Hunter.cfg Spearman.c...

[Richard Kettering]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Richard Kettering <address@hidden>      05/03/28 08:10:56

Modified files:
        data/units     : Merman_Hunter.cfg Spearman.cfg 
                         Merman_Spearman.cfg 

Log message:
        New images for Merman Spearman, timing adjustments for animations.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Hunter.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Spearman.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Spearman.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/data/units/Merman_Hunter.cfg
diff -u wesnoth/data/units/Merman_Hunter.cfg:1.4 
wesnoth/data/units/Merman_Hunter.cfg:1.5
--- wesnoth/data/units/Merman_Hunter.cfg:1.4    Sat Mar 26 11:11:18 2005
+++ wesnoth/data/units/Merman_Hunter.cfg        Mon Mar 28 08:10:56 2005
@@ -2,8 +2,8 @@
 id=Merman Hunter
 name= _ "Merman Hunter"
 race=merman
-image=merman-hunter.png
-image_defensive=merman-hunter-defend.png
+image="merman-hunter.png"
+image_defensive="merman-hunter-defend.png"
 hitpoints=30
 movement_type=swimmer
 movement=6
@@ -26,7 +26,7 @@
                        [frame]
                        begin=-100
                        end=100
-                       image=merman-hunter-attack-se.png
+                       image="merman-hunter-attack-se.png"
                        [/frame]
                [/animation]
                [animation]
@@ -34,7 +34,7 @@
                        [frame]
                        begin=-100
                        end=100
-                       image=merman-hunter-attack-ne.png
+                       image="merman-hunter-attack-ne.png"
                        [/frame]
                [/animation]
                [animation]
@@ -42,7 +42,7 @@
                        [frame]
                        begin=-100
                        end=100
-                       image=merman-hunter-attack-n.png
+                       image="merman-hunter-attack-n.png"
                        [/frame]
                [/animation]
                [animation]
@@ -50,7 +50,7 @@
                        [frame]
                        begin=-100
                        end=100
-                       image=merman-hunter-attack-s.png
+                       image="merman-hunter-attack-s.png"
                        [/frame]
                [/animation]
        [/attack]
@@ -62,18 +62,18 @@
        damage=6
        number=3
                [frame]
-               begin=-200
+               begin=-160
                end=100
-               image=merman-hunter-attack-ranged.png
+               image="merman-hunter-attack-ranged.png"
                [/frame]
                [missile_frame]
-               begin=-100
+               begin=-130
                end=0
-               image=projectiles/spear-n.png
-               image_diagonal=projectiles/spear-ne.png
+               image="projectiles/spear-n.png"
+               image_diagonal="projectiles/spear-ne.png"
                [/missile_frame]
                [sound]
-               time=-150
+               time=-100
                sound=spear.wav
                [/sound]
        [/attack]
Index: wesnoth/data/units/Merman_Spearman.cfg
diff -u wesnoth/data/units/Merman_Spearman.cfg:1.2 
wesnoth/data/units/Merman_Spearman.cfg:1.3
--- wesnoth/data/units/Merman_Spearman.cfg:1.2  Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Merman_Spearman.cfg      Mon Mar 28 08:10:56 2005
@@ -3,6 +3,7 @@
 name= _ "Merman Spearman"
 race=merman
 image="merman-spearman.png"
+image_defensive="merman-spearman-defend.png"
 hitpoints=45
 movement_type=swimmer
 movement=6
@@ -20,6 +21,38 @@
        range=short
        damage=6
        number=3
+               [animation]
+               direction=se,sw
+                       [frame]
+                       begin=-100
+                       end=100
+                       image="merman-spearman-attack-se.png"
+                       [/frame]
+               [/animation]
+               [animation]
+               direction=ne,nw
+                       [frame]
+                       begin=-100
+                       end=100
+                       image="merman-spearman-attack-ne.png"
+                       [/frame]
+               [/animation]
+               [animation]
+               direction=n
+                       [frame]
+                       begin=-100
+                       end=100
+                       image="merman-spearman-attack-n.png"
+                       [/frame]
+               [/animation]
+               [animation]
+               direction=s
+                       [frame]
+                       begin=-100
+                       end=100
+                       image="merman-spearman-attack-s.png"
+                       [/frame]
+               [/animation]
        [/attack]
 
        [attack]
@@ -28,8 +61,13 @@
        range=long
        damage=7
        number=4
+               [frame]
+               begin=-160
+               end=100
+               image="merman-spearman-attack-ranged.png"
+               [/frame]
                [missile_frame]
-               begin=-100
+               begin=-130
                end=0
                image="projectiles/spear-n.png"
                image_diagonal="projectiles/spear-ne.png"
Index: wesnoth/data/units/Spearman.cfg
diff -u wesnoth/data/units/Spearman.cfg:1.18 
wesnoth/data/units/Spearman.cfg:1.19
--- wesnoth/data/units/Spearman.cfg:1.18        Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Spearman.cfg     Mon Mar 28 08:10:56 2005
@@ -91,7 +91,7 @@
        number=1
        icon=attacks/spear.png
                [sound]
-               time=-200
+               time=-160
                sound=spear.wav
                [/sound]
                [frame]
@@ -100,7 +100,7 @@
                image="human-spearman-attack-ranged.png"
                [/frame]
                [missile_frame]
-               begin=-150
+               begin=-130
                end=0
                image="projectiles/spear-n.png"
                image_diagonal="projectiles/spear-ne.png"