Author: zookeeper
Date: Mon Oct 13 18:52:13 2008
New Revision: 30124

URL: http://svn.gna.org/viewcvs/wesnoth?rev=30124&view=rev
Log:
Updated the fireball miss animation to correspond with the new images.

Modified:
    branches/1.4/data/core/macros/animation-utils.cfg

Modified: branches/1.4/data/core/macros/animation-utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/core/macros/animation-utils.cfg?rev=30124&r1=30123&r2=30124&view=diff
==============================================================================
--- branches/1.4/data/core/macros/animation-utils.cfg (original)
+++ branches/1.4/data/core/macros/animation-utils.cfg Mon Oct 13 18:52:13 2008
@@ -700,376 +700,307 @@
 
     missile_start_time=-350
 
-       [if]
-               direction=n,ne,nw
-               hits=yes
-
-               [missile_frame]
-               duration=40
-               image="projectiles/fireball-n-1.png"
-               image_diagonal="projectiles/fireball-nw-1.png"
-               offset=0.0~0.10
-       [/missile_frame]
-       [missile_frame]
-               duration=100
-               image="projectiles/fireball-n-2.png"
-               image_diagonal="projectiles/fireball-nw-2.png"
-               offset=0.1~0.30
-       [/missile_frame]
-       [missile_frame]
-               duration=125
-               image="projectiles/fireball-n.png"
-               image_diagonal="projectiles/fireball-nw.png"
-               offset=0.3~0.60
-       [/missile_frame]
-       [missile_frame]
-               duration=55
-               image="projectiles/fireball-n-2.png"
-               image_diagonal="projectiles/fireball-nw-2.png"
-               offset=0.7~0.8
-       [/missile_frame]
-       [missile_frame]
-               duration=30
-               image="projectiles/fireball-n-1.png"
-               image_diagonal="projectiles/fireball-nw-1.png"
-               offset=0.8~0.9
-       [/missile_frame]
-
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-1.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-2.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-3.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-4.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-5.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-6.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-7.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-8.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-9.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-10.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-11.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-12.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-13.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-14.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-15.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-16.png"
-                       offset=1.0
-               [/missile_frame]
-       [/if]
-       [else]
-               direction=s,se,sw
-               hits=yes
-
-               [missile_frame]
-               duration=40
-               image="projectiles/fireball-n-1.png"
-               image_diagonal="projectiles/fireball-nw-1.png"
-               offset=0.0~0.10
-       [/missile_frame]
-       [missile_frame]
-               duration=100
-               image="projectiles/fireball-n-2.png"
-               image_diagonal="projectiles/fireball-nw-2.png"
-               offset=0.1~0.30
-       [/missile_frame]
-       [missile_frame]
-               duration=125
-               image="projectiles/fireball-n.png"
-               image_diagonal="projectiles/fireball-nw.png"
-               offset=0.3~0.60
-       [/missile_frame]
-       [missile_frame]
-               duration=55
-               image="projectiles/fireball-n-2.png"
-               image_diagonal="projectiles/fireball-nw-2.png"
-               offset=0.7~0.8
-       [/missile_frame]
-       [missile_frame]
-               duration=30
-               image="projectiles/fireball-n-1.png"
-               image_diagonal="projectiles/fireball-nw-1.png"
-               offset=0.8~0.9
-       [/missile_frame]
-
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-1.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-2.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-3.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-4.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-5.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-6.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-7.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-8.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-9.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-10.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-11.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-12.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-13.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-14.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-15.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=60
-                       halo="projectiles/fireball-impact-16.png~FL(vert)"
-                       offset=1.0
-               [/missile_frame]
-       [/else]
-       [else]
-               direction=n,ne,nw
-               hits=no
-               
-               missile_offset=0.0~0.25,0.25~0.45,0.45~0.60,0.6~0.7
-               missile_alpha=1.0,1.0~0.0
-
-               [missile_frame]
-               duration=40
-               image="projectiles/fireball-n-1.png"
-               image_diagonal="projectiles/fireball-nw-1.png"
-       [/missile_frame]
-       [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-3.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-4.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-5.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-6.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-7.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-8.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-9.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-10.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-11.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-12.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-13.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-14.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-15.png"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-16.png"
-               [/missile_frame]
+    [if]
+        direction=n,ne,nw
+        hits=yes
+
+        [missile_frame]
+            duration=40
+            image="projectiles/fireball-n-1.png"
+            image_diagonal="projectiles/fireball-nw-1.png"
+            offset=0.0~0.10
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            image="projectiles/fireball-n-2.png"
+            image_diagonal="projectiles/fireball-nw-2.png"
+            offset=0.1~0.30
+        [/missile_frame]
+        [missile_frame]
+            duration=125
+            image="projectiles/fireball-n.png"
+            image_diagonal="projectiles/fireball-nw.png"
+            offset=0.3~0.60
+        [/missile_frame]
+        [missile_frame]
+            duration=55
+            image="projectiles/fireball-n-2.png"
+            image_diagonal="projectiles/fireball-nw-2.png"
+            offset=0.7~0.8
+        [/missile_frame]
+        [missile_frame]
+            duration=30
+            image="projectiles/fireball-n-1.png"
+            image_diagonal="projectiles/fireball-nw-1.png"
+            offset=0.8~0.9
+        [/missile_frame]
+
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-1.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-2.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-3.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-4.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-5.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-6.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-7.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-8.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-9.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-10.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-11.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-12.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-13.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-14.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-15.png"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-16.png"
+            offset=1.0
+        [/missile_frame]
+    [/if]
+    [else]
+        direction=s,se,sw
+        hits=yes
+
+        [missile_frame]
+            duration=40
+            image="projectiles/fireball-n-1.png"
+            image_diagonal="projectiles/fireball-nw-1.png"
+            offset=0.0~0.10
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            image="projectiles/fireball-n-2.png"
+            image_diagonal="projectiles/fireball-nw-2.png"
+            offset=0.1~0.30
+        [/missile_frame]
+        [missile_frame]
+            duration=125
+            image="projectiles/fireball-n.png"
+            image_diagonal="projectiles/fireball-nw.png"
+            offset=0.3~0.60
+        [/missile_frame]
+        [missile_frame]
+            duration=55
+            image="projectiles/fireball-n-2.png"
+            image_diagonal="projectiles/fireball-nw-2.png"
+            offset=0.7~0.8
+        [/missile_frame]
+        [missile_frame]
+            duration=30
+            image="projectiles/fireball-n-1.png"
+            image_diagonal="projectiles/fireball-nw-1.png"
+            offset=0.8~0.9
+        [/missile_frame]
+
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-1.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-2.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-3.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-4.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-5.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-6.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-7.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-8.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-9.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-10.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-11.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-12.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-13.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-14.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-15.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
+        [missile_frame]
+            duration=60
+            halo="projectiles/fireball-impact-16.png~FL(vert)"
+            offset=1.0
+        [/missile_frame]
     [/else]
     [else]
-               direction=s,se,sw
-               hits=no
-               
-               missile_offset=0.0~0.25,0.25~0.45,0.45~0.60,0.6~0.7
-               missile_alpha=1.0,1.0~0.0
-
-               [missile_frame]
-               duration=40
-               image="projectiles/fireball-n-1.png"
-               image_diagonal="projectiles/fireball-nw-1.png"
-               offset=0.0~0.1
-       [/missile_frame]
-       [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-3.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-4.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-5.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-6.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-7.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-8.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-9.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-10.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-11.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-12.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-13.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-14.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-15.png~FL(vert)"
-               [/missile_frame]
-               [missile_frame]
-                       duration=40
-                       halo="projectiles/fireball-impact-16.png~FL(vert)"
-               [/missile_frame]
+        direction=n,ne,nw
+        hits=no
+
+        missile_offset=0.0~0.20,0.20~0.35,0.35~0.40,0.4~0.45
+
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-1.png"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-2.png"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-3.png"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-4.png"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-5.png"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-6.png"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-7.png"
+        [/missile_frame]
+    [/else]
+    [else]
+        direction=s,se,sw
+        hits=no
+
+        missile_offset=0.0~0.20,0.20~0.35,0.35~0.40,0.4~0.45
+
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-1.png~FL(vert)"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-2.png~FL(vert)"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-3.png~FL(vert)"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-4.png~FL(vert)"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-5.png~FL(vert)"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-6.png~FL(vert)"
+        [/missile_frame]
+        [missile_frame]
+            duration=100
+            halo="projectiles/fireball-fail-7.png~FL(vert)"
+        [/missile_frame]
     [/else]
 #enddef
 


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

Reply via email to