mail[Wesnoth-commits] r20241 - /trunk/data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg


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

Header


Content

Posted by mythological on September 09, 2007 - 21:02:
Author: mythological
Date: Sun Sep  9 21:01:31 2007
New Revision: 20241

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20241&view=rev
Log:
Fixing an incorrect merge I committed with r20237

Modified:
    trunk/data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg

Modified: 
trunk/data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg?rev=20241&r1=20240&r2=20241&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg Sun 
Sep  9 21:01:31 2007
@@ -147,62 +147,39 @@
         range=melee
         damage=13
         number=2
-    [/attack]
-    {DEFENSE_ANIM "deoran/dismounted-commander-defend.png" 
"deoran/dismounted-commander.png" {SOUND_LIST:HUMAN_HIT} }
-    [attack_anim]
-        [attack_filter]
-            name=lance
-        [/attack_filter]
-        [frame]
-            begin=-200
-            end=-175
-            image=deoran/dismounted-commander.png
-        [/frame]
-        [frame]
-            begin=-175
-            end=-100
-            image=deoran/dismounted-commander-attack1.png
-        [/frame]
-        [if]
-            hits=no
-            [frame]
-                begin=-225
-                end=-200
-                image=deoran/horseman-commander.png
-                sound=horse-canter.wav
-            [/frame]
-            [frame]
-                begin=-200
-                end=-100
-                image=deoran/horseman-commander-moving.png
-            [/frame]
-            [if]
-                hits=no
-                [frame]
-                    begin=-100
-                    end=100
-                    image=deoran/horseman-commander-attack.png
-                    sound={SOUND_LIST:MISS}
-                [/frame]
-            [/if]
-            [else]
-                hits=yes
-                [frame]
-                    begin=-100
-                    end=100
-                    image=deoran/horseman-commander-attack.png
-                    sound=spear.wav
-                [/frame]
-            [/else]
-            [frame]
-                begin=100
-                end=175
-                image=deoran/horseman-commander-moving.png
-            [/frame]
-            [frame]
-                begin=175
-                end=200
-                image=deoran/horseman-commander.png
+        [animation]
+            [frame]
+                begin=-200
+                end=-175
+                image=deoran/dismounted-commander.png
+            [/frame]
+            [frame]
+                begin=-175
+                end=-100
+                image=deoran/dismounted-commander-attack1.png
+            [/frame]
+            [if]
+                hits=no
+                [frame]
+                    begin=-100
+                    end=100
+                    image=deoran/dismounted-commander-attack2.png
+                    sound=spear-miss.ogg
+                [/frame]
+            [/if]
+            [else]
+                hits=yes
+                [frame]
+                    begin=-100
+                    end=100
+                    image=deoran/dismounted-commander-attack2.png
+                    sound=spear.ogg
+                [/frame]
+            [/else]
+            [frame]
+                begin=100
+                end=175
+                image=deoran/dismounted-commander.png
             [/frame]
         [/animation]
     [/attack]
@@ -250,14 +227,10 @@
                 end=-175
                 image=deoran/dismounted-commander.png
             [/frame]
-        [/if]
-        [else]
-            hits=yes
-            [frame]
-                begin=-100
-                end=100
-                image=deoran/dismounted-commander-attack2.png
-                sound=spear.ogg
+            [frame]
+                begin=-175
+                end=-100
+                image=deoran/dismounted-commander-attack1.png
             [/frame]
             [if]
                 hits=no
@@ -293,43 +266,37 @@
         number=2
         [animation]
             [frame]
-                begin=-225
-                end=-200
-                image=deoran/horseman-commander.png
-                sound=horse-canter.wav
-            [/frame]
-            [frame]
-                begin=-200
-                end=-100
-                image=deoran/horseman-commander-moving.png
-            [/frame]
-            [if]
-                hits=no
-                [frame]
-                    begin=-100
-                    end=100
-                    image=deoran/horseman-commander-attack.png
-                    sound={SOUND_LIST:MISS}
-                [/frame]
-            [/if]
-            [else]
-                hits=yes
-                [frame]
-                    begin=-100
-                    end=100
-                    image=deoran/horseman-commander-attack.png
-                    sound=spear.wav
-                [/frame]
-            [/else]
-            [frame]
-                begin=100
-                end=175
-                image=deoran/horseman-commander-moving.png
-            [/frame]
-            [frame]
-                begin=175
-                end=200
-                image=deoran/horseman-commander.png
+                begin=-200
+                end=-175
+                image=deoran/dismounted-commander.png
+            [/frame]
+            [frame]
+                begin=-175
+                end=-100
+                image=deoran/dismounted-commander-attack1.png
+            [/frame]
+            [if]
+                hits=no
+                [frame]
+                    begin=-100
+                    end=100
+                    image=deoran/dismounted-commander-attack2.png
+                    sound=spear-miss.ogg
+                [/frame]
+            [/if]
+            [else]
+                hits=yes
+                [frame]
+                    begin=-100
+                    end=100
+                    image=deoran/dismounted-commander-attack2.png
+                    sound=spear.ogg
+                [/frame]
+            [/else]
+            [frame]
+                begin=100
+                end=175
+                image=deoran/dismounted-commander.png
             [/frame]
         [/animation]
     [/attack]




Related Messages


Powered by MHonArc, Updated Sun Sep 09 22:40:35 2007