Author: zookeeper
Date: Fri Jul  4 12:41:31 2008
New Revision: 27716

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27716&view=rev
Log:
Fixed ruler and sovereign bow animations.

Added:
    trunk/data/core/images/units/orcs/ruler-bow-defend.png   (with props)
    trunk/data/core/images/units/orcs/sovereign-bow-defend.png   (with props)
Modified:
    trunk/data/core/units/orcs/Ruler.cfg
    trunk/data/core/units/orcs/Sovereign.cfg

Added: trunk/data/core/images/units/orcs/ruler-bow-defend.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-bow-defend.png?rev=27716&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/units/orcs/ruler-bow-defend.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/orcs/sovereign-bow-defend.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/sovereign-bow-defend.png?rev=27716&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/units/orcs/sovereign-bow-defend.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: trunk/data/core/units/orcs/Ruler.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/orcs/Ruler.cfg?rev=27716&r1=27715&r2=27716&view=diff
==============================================================================
--- trunk/data/core/units/orcs/Ruler.cfg (original)
+++ trunk/data/core/units/orcs/Ruler.cfg Fri Jul  4 12:41:31 2008
@@ -23,7 +23,8 @@
     usage=mixed fighter
     description= _ "Any orc who can keep a large tribe from feuding and 
in-fighting is often unusually intelligent and commanding, and is inevitably 
very strong as well. They are skilled with both sword and bow, but their real 
talent lies in their rare ability to rally other orcs to battle, to give orders 
that are followed not out of fear, but 
loyalty."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
     die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcs/ruler-defend.png" "units/orcs/ruler.png" 
{SOUND_LIST:ORC_HIT} }
+    {DEFENSE_ANIM_RANGE "units/orcs/ruler-defend.png" "units/orcs/ruler.png" 
{SOUND_LIST:ORC_HIT} melee}
+    {DEFENSE_ANIM_RANGE "units/orcs/ruler-bow-defend.png" 
"units/orcs/ruler-ranged-2.png" {SOUND_LIST:ORC_HIT} ranged}
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_2}
     [/abilities]
@@ -60,7 +61,7 @@
             [frame]
                 begin=-400
                 end=-300
-                image="units/orcs/ruler-defend.png"
+                image="units/orcs/ruler-ranged-2.png"
                 sound=bow.ogg
             [/frame]
         [/if]
@@ -69,7 +70,7 @@
             [frame]
                 begin=-400
                 end=-300
-                image="units/orcs/ruler-defend.png"
+                image="units/orcs/ruler-ranged-2.png"
                 sound=bow-miss.ogg
             [/frame]
         [/else]
@@ -80,7 +81,7 @@
         [/frame]
         [frame]
             begin=-50
-            end=50
+            end=200
             image="units/orcs/ruler-ranged-2.png"
         [/frame]
     [/attack_anim]

Modified: trunk/data/core/units/orcs/Sovereign.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/orcs/Sovereign.cfg?rev=27716&r1=27715&r2=27716&view=diff
==============================================================================
--- trunk/data/core/units/orcs/Sovereign.cfg (original)
+++ trunk/data/core/units/orcs/Sovereign.cfg Fri Jul  4 12:41:31 2008
@@ -24,7 +24,8 @@
     usage=mixed fighter
     description= _ "From time to time, an orc will arise who has a natural 
charisma and command over his ilk. If they are also strong and cunning, they 
will inevitably find themselves leading a great horde of warriors, and they 
will also inevitably cause a great deal of trouble for the civilized races of 
the world. The surest way to disperse such a host is to slay this rare orc who 
can hold it together."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
     die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcs/sovereign-defend.png" "units/orcs/sovereign.png" 
{SOUND_LIST:ORC_HIT} }
+    {DEFENSE_ANIM_RANGE "units/orcs/sovereign-defend.png" 
"units/orcs/sovereign.png" {SOUND_LIST:ORC_HIT} melee}
+    {DEFENSE_ANIM_RANGE "units/orcs/sovereign-bow-defend.png" 
"units/orcs/sovereign-ranged-2.png" {SOUND_LIST:ORC_HIT} ranged}
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_3}
     [/abilities]
@@ -56,22 +57,12 @@
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-        [frame]
-            begin=-600
-            end=-500
-            image="units/orcs/sovereign-attack1.png"
-        [/frame]
-        [frame]
-            begin=-500
-            end=-400
-            image="units/orcs/sovereign-defend.png"
-        [/frame]
         [if]
             hits=yes
             [frame]
                 begin=-400
-                end=-50
-                image="units/orcs/sovereign-ranged-1.png"
+                end=-300
+                image="units/orcs/sovereign-ranged-2.png"
                 sound=bow.ogg
             [/frame]
         [/if]
@@ -79,25 +70,20 @@
             hits=no
             [frame]
                 begin=-400
-                end=-50
-                image="units/orcs/sovereign-ranged-1.png"
+                end=-300
+                image="units/orcs/sovereign-ranged-2.png"
                 sound=bow-miss.ogg
             [/frame]
         [/else]
         [frame]
-            begin=-50
-            end=100
-            image="units/orcs/sovereign-ranged-2.png"
+            begin=-300
+            end=-50
+            image="units/orcs/sovereign-ranged-1.png"
         [/frame]
         [frame]
-            begin=100
+            begin=-50
             end=200
-            image="units/orcs/sovereign-defend.png"
-        [/frame]
-        [frame]
-            begin=200
-            end=300
-            image="units/orcs/sovereign-attack1.png"
+            image="units/orcs/sovereign-ranged-2.png"
         [/frame]
     [/attack_anim]
     [attack_anim]


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

Reply via email to