Author: boucman
Date: Sun Nov 22 14:22:12 2009
New Revision: 39878

URL: http://svn.gna.org/viewcvs/wesnoth?rev=39878&view=rev
Log:
upgrade drake fighter anim WML, partly fixes bug 14727

Modified:
    trunk/data/core/units/drakes/Fighter.cfg

Modified: trunk/data/core/units/drakes/Fighter.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/drakes/Fighter.cfg?rev=39878&r1=39877&r2=39878&view=diff
==============================================================================
--- trunk/data/core/units/drakes/Fighter.cfg (original)
+++ trunk/data/core/units/drakes/Fighter.cfg Sun Nov 22 14:22:12 2009
@@ -32,125 +32,8 @@
         mirror="true"
         image="portraits/drakes/transparent/fighter.png"
     [/portrait]
-# default standing anim
-    [standing_anim]
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-    [/standing_anim]
-# flying terrain anims
-    [standing_anim]
-        terrain_type=Wo,Ww,Ww^Vm,Chs,Chw,Ss
-        start_time=0
-        layer=60
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-5.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-3-upstroke.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-2-upstroke.png"
-        [/frame]
-    [/standing_anim]
-    [pre_movement_anim]
-       #take off, only do it when we start moving on land
-        terrain_type=!,Wo,Ww,Ww^Vm,Chs,Chw,Ss
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-4.png"
-        [/frame]
-    [/pre_movement_anim]
-    [post_movement_anim]
-       #landing, only do it when we stop moving on land
-        terrain_type=!,Wo,Ww,Ww^Vm,Chs,Chw,Ss
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-1.png"
-        [/frame]
-    [/post_movement_anim]
-    [movement_anim]
-        start_time=0
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-5.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-3-upstroke.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fly-2-upstroke.png"
-        [/frame]
-    [/movement_anim]
+    {DRAKE_STANDING_ANIM fighter}
+    {DRAKE_WEAPON_ANIM fighter}
     [attack]
         name=war blade
         description=_"war blade"
@@ -169,334 +52,11 @@
         damage=3
         number=3
     [/attack]
-    [draw_weapon_anim]
-       #landing, only do it when we're not already flying
-        terrain_type=Wo,Ww,Ww^Vm,Chs,Chw,Ss
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-1.png"
-        [/frame]
-    [/draw_weapon_anim]
-    [sheath_weapon_anim]
-       #landing, only do it when we're not already flying
-        terrain_type=Wo,Ww,Ww^Vm,Chs,Chw,Ss
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-takeoff-4.png"
-        [/frame]
-    [/sheath_weapon_anim]
-    [attack_anim]
-        [filter_attack]
-            name=fire breath
-        [/filter_attack]
-        direction=se,sw
-        {MISSILE_FRAME_FIRE_BREATH_S_DIAGONAL 35,40}
-        start_time=-900
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-        [if]
-            hits=no
+    {DRAKE_FIRE_ANIM_S_DIAGONAL fighter 35,40}
+    {DRAKE_FIRE_ANIM_N_DIAGONAL_CURRENT fighter 35,-20}
+    {DRAKE_FIRE_ANIM_S fighter 8,50}
+    {DRAKE_FIRE_ANIM_N_CURRENT fighter 8,-50}
 
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big.ogg
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-1.png"
-        [/frame]
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=fire breath
-        [/filter_attack]
-        direction=ne,nw
-        {MISSILE_FRAME_FIRE_BREATH_N_DIAGONAL 35,-20}
-        start_time=-900
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-        [if]
-            hits=no
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big.ogg
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-se-1.png"
-        [/frame]
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=fire breath
-        [/filter_attack]
-        direction=s
-        {MISSILE_FRAME_FIRE_BREATH_S 8,50}
-        start_time=-900
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-        [if]
-            hits=no
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big.ogg
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-1.png"
-        [/frame]
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=fire breath
-        [/filter_attack]
-        direction=n
-        {MISSILE_FRAME_FIRE_BREATH_N 8,-50}
-        start_time=-900
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-        [if]
-            hits=no
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-
-            [frame]
-                duration=20
-                image="units/drakes/fighter.png"
-                sound=flame-big.ogg
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-4.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-inhale-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/drakes/fighter-fire-s-1.png"
-        [/frame]
-        [frame]
-           image="units/drakes/fighter.png"
-        [/frame]
-    [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=war blade


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to