[Wesnoth-cvs-commits] wesnoth/data/units Mermaid_Siren.cfg

[Richard Kettering]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Richard Kettering <address@hidden>      05/01/23 03:22:12

Modified files:
        data/units     : Mermaid_Siren.cfg 

Log message:
        Added a full set of animations for the mermaid siren.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Siren.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: wesnoth/data/units/Mermaid_Siren.cfg
diff -u wesnoth/data/units/Mermaid_Siren.cfg:1.5 
wesnoth/data/units/Mermaid_Siren.cfg:1.6
--- wesnoth/data/units/Mermaid_Siren.cfg:1.5    Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Mermaid_Siren.cfg        Sun Jan 23 03:22:12 2005
@@ -4,12 +4,9 @@
 race=merman
 gender=female
 image=mermaid-siren.png
+image_defensive=mermaid-siren-defend.png
 hitpoints=49
 movement_type=swimmer
-    [resistance]
-    blade=110
-    pierce=110
-    [/resistance]
 movement=7
 experience=500
 level=3
@@ -20,13 +17,49 @@
 unit_description= _ "Skilled creatures of the sea, Mermen are powerful and 
quick in any watery environment, but struggle greatly to move on land."
 get_hit_sound=mermen-hit.wav
        [attack]
-       name=naiad touch
+#note - this "naia" is deliberate, it is not a typo.
+#Mermaids are only partly naiads, but draw their magic from naia.
+#This will be indicated more fully in the description, which was
+#not included yet, to comply with silene's request for a string-freeze.
+       name=naia touch
        type=impact
        range=short
        special=magical
-       damage=6
-       number=3
+       damage=12
+       number=1
        icon=attacks/faerie_touch.png
+               [frame]
+               begin=-200
+               end=-150
+               image=mermaid-siren-naia-touch-attack1.png
+               [/frame]
+               [frame]
+               begin=-150
+               end=-95
+               image=mermaid-siren-naia-touch-attack2.png
+               [/frame]
+               [frame]
+               begin=-95
+               end=-30
+               image=mermaid-siren-naia-touch-attack3.png
+               halo=halo/mermaid-siren-naia-touch-halo.png
+               [/frame]
+               [frame]
+               begin=-30
+               end=65
+               image=mermaid-siren-naia-touch-attack4.png
+               halo=halo/mermaid-siren-naia-touch-halo.png
+               [/frame]
+               [frame]
+               begin=65
+               end=115
+               image=mermaid-siren-naia-touch-attack2.png
+               [/frame]
+               [frame]
+               begin=115
+               end=150
+               image=mermaid-siren-naia-touch-attack1.png
+               [/frame]
        [/attack]
 
        [attack]
@@ -35,13 +68,48 @@
        type=impact
        range=long
        special=magical
-       damage=8
-       number=4
+       damage=15
+       number=3
+               [frame]
+               begin=-450
+               end=-400
+               image=mermaid-siren-water-attack1.png
+               [/frame]
+               [frame]
+               begin=-400
+               end=-350
+               image=mermaid-siren-water-attack2.png
+               [/frame]
+               [frame]
+               begin=-350
+               end=-300
+               image=mermaid-siren-water-attack3.png
+               [/frame]
+               [frame]
+               begin=-300
+               end=-225
+               image=mermaid-siren-water-attack4.png
+               [/frame]
+               [frame]
+               begin=-225
+               end=-140
+               image=mermaid-siren-water-attack5.png
+               [/frame]
                [missile_frame]
-               begin=-150
+               begin=-165
                end=0
                image=projectiles/water-spray.png
                image_diagonal=projectiles/water-spray.png
                [/missile_frame]
+               [frame]
+               begin=-140
+               end=-75
+               image=mermaid-siren-water-attack6.png
+               [/frame]
+               [frame]
+               begin=-75
+               end=0
+               image=mermaid-siren-water-attack7.png
+               [/frame]
        [/attack]
 [/unit]