mail[Wesnoth-commits] r20690 - in /trunk/data/core: images/halo/holy/ macros/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by lari . nieminen on September 24, 2007 - 18:49:
Author: zookeeper
Date: Mon Sep 24 18:49:04 2007
New Revision: 20690

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20690&view=rev
Log:
Simplify the light beam animation (no need for the vertically mirrored 
duplicate images).

Removed:
    trunk/data/core/images/halo/holy/light-beam-s-1.png
    trunk/data/core/images/halo/holy/light-beam-s-2.png
    trunk/data/core/images/halo/holy/light-beam-s-3.png
    trunk/data/core/images/halo/holy/light-beam-s-4.png
    trunk/data/core/images/halo/holy/light-beam-s-5.png
    trunk/data/core/images/halo/holy/light-beam-s-6.png
    trunk/data/core/images/halo/holy/light-beam-s-7.png
Modified:
    trunk/data/core/macros/animation-utils.cfg

Removed: trunk/data/core/images/halo/holy/light-beam-s-1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-1.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/halo/holy/light-beam-s-2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-2.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/halo/holy/light-beam-s-3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-3.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/halo/holy/light-beam-s-4.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-4.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/halo/holy/light-beam-s-5.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-5.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/halo/holy/light-beam-s-6.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-6.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Removed: trunk/data/core/images/halo/holy/light-beam-s-7.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/holy/light-beam-s-7.png?rev=20689&view=auto
==============================================================================
Binary file - no diff available.

Modified: trunk/data/core/macros/animation-utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/animation-utils.cfg?rev=20690&r1=20689&r2=20690&view=diff
==============================================================================
--- trunk/data/core/macros/animation-utils.cfg (original)
+++ trunk/data/core/macros/animation-utils.cfg Mon Sep 24 18:49:04 2007
@@ -197,7 +197,7 @@
 # to provide a standard set of conditions to play the idle animation
 
 #define STANDARD_IDLE_FILTER
-    # Poisoned units should have no idle animation. 
+    # Poisoned units should have no idle animation.
     [unit_filter]
         [not]
             [wml_filter]
@@ -426,163 +426,136 @@
 
         [missile_frame]
                        duration=30
-                       image="halo/holy/light-beam-1.png"
-                       image_diagonal="halo/holy/light-beam-1.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-2.png"
-                       image_diagonal="halo/holy/light-beam-2.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-3.png"
-                       image_diagonal="halo/holy/light-beam-3.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-4.png"
-                       image_diagonal="halo/holy/light-beam-4.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-5.png"
-                       image_diagonal="halo/holy/light-beam-5.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-6.png"
-                       image_diagonal="halo/holy/light-beam-6.png"
+                       halo="halo/holy/light-beam-1.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-2.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-3.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-4.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-5.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-6.png"
                        offset=1.0
                [/missile_frame]
                [missile_frame]
                        duration=130
-                       image="halo/holy/light-beam-7.png"
-                       image_diagonal="halo/holy/light-beam-7.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-6.png"
-                       image_diagonal="halo/holy/light-beam-6.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-5.png"
-                       image_diagonal="halo/holy/light-beam-5.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-4.png"
-                       image_diagonal="halo/holy/light-beam-4.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-3.png"
-                       image_diagonal="halo/holy/light-beam-3.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-2.png"
-                       image_diagonal="halo/holy/light-beam-2.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-1.png"
-                       image_diagonal="halo/holy/light-beam-1.png"
+                       halo="halo/holy/light-beam-7.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-6.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-5.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-4.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-3.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-2.png"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-1.png"
                        offset=1.0
                [/missile_frame]
     [/if]
     [else]
         direction=s,se,sw
-        ### Once again, an animation which is flipped when facing south is 
unflipped through additional images.
-
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-s-1.png"
-                       image_diagonal="halo/holy/light-beam-s-1.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-s-2.png"
-                       image_diagonal="halo/holy/light-beam-s-2.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-s-3.png"
-                       image_diagonal="halo/holy/light-beam-s-3.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-s-4.png"
-                       image_diagonal="halo/holy/light-beam-s-4.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-s-5.png"
-                       image_diagonal="halo/holy/light-beam-s-5.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=30
-                       image="halo/holy/light-beam-s-6.png"
-                       image_diagonal="halo/holy/light-beam-s-6.png"
+
+        [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-1.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-2.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-3.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-4.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-5.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=30
+                       halo="halo/holy/light-beam-6.png~FL(vert)"
                        offset=1.0
                [/missile_frame]
                [missile_frame]
                        duration=130
-                       image="halo/holy/light-beam-s-7.png"
-                       image_diagonal="halo/holy/light-beam-s-7.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-s-6.png"
-                       image_diagonal="halo/holy/light-beam-s-6.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-s-5.png"
-                       image_diagonal="halo/holy/light-beam-s-5.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-s-4.png"
-                       image_diagonal="halo/holy/light-beam-s-4.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-s-3.png"
-                       image_diagonal="halo/holy/light-beam-s-3.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-s-2.png"
-                       image_diagonal="halo/holy/light-beam-s-2.png"
-                       offset=1.0
-               [/missile_frame]
-               [missile_frame]
-                       duration=70
-                       image="halo/holy/light-beam-s-1.png"
-                       image_diagonal="halo/holy/light-beam-s-1.png"
+                       halo="halo/holy/light-beam-7.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-6.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-5.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-4.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-3.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-2.png~FL(vert)"
+                       offset=1.0
+               [/missile_frame]
+               [missile_frame]
+                       duration=70
+                       halo="halo/holy/light-beam-1.png~FL(vert)"
                        offset=1.0
                [/missile_frame]
     [/else]




Related Messages


Powered by MHonArc, Updated Mon Sep 24 21:20:48 2007