mail[Wesnoth-commits] r44721 - in /trunk: ./ data/core/images/units/human-loyalists/ data/core/units/humans/


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

Header


Content

Posted by barberphil on July 26, 2010 - 19:19:
Author: thespaceinvader
Date: Mon Jul 26 19:19:34 2010
New Revision: 44721

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44721&view=rev
Log:
Add and wire new Spearman se attack anim by Major.  Remove a deprecated 
image.  Update changelogs.

Added:
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-1.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-10.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-11.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-12.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-2.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-3.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-4.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-5.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-6.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-7.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-8.png   
(with props)
    trunk/data/core/images/units/human-loyalists/spearman-attack-se-9.png   
(with props)
Removed:
    trunk/data/core/images/units/human-loyalists/spearman-attack.png
Modified:
    trunk/changelog
    trunk/data/core/units/humans/Loyalist_Spearman.cfg
    trunk/players_changelog

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=44721&r1=44720&r2=44721&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Jul 26 19:19:34 2010
@@ -30,7 +30,7 @@
      and Sovereign.
    * New animations (not yet including leading animations) for Drake Flare
      and Flameheart, Dwarf Lord ranged attack, Dwarf guard melee attack, 
Dwarf
-     Pathfinder idle, Ruffian attack and defend.
+     Pathfinder idle, Ruffian attack and defend, Spearman se attack.
    * New base frame and animations for Armageddon Drake.
    * Items & scenery: New anvil, and revised trash and lighthouse
    * Two new flag styles.

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-1.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-10.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-10.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-10.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-11.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-11.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-11.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-12.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-12.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-12.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-2.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-2.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-3.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-3.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-4.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-4.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-4.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-5.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-5.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-5.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-6.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-6.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-6.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-7.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-7.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-7.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-8.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-8.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-8.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/units/human-loyalists/spearman-attack-se-9.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack-se-9.png?rev=44721&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/core/images/units/human-loyalists/spearman-attack-se-9.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Removed: trunk/data/core/images/units/human-loyalists/spearman-attack.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-loyalists/spearman-attack.png?rev=44720&view=auto
==============================================================================
Binary file - no diff available.

Modified: trunk/data/core/units/humans/Loyalist_Spearman.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Loyalist_Spearman.cfg?rev=44721&r1=44720&r2=44721&view=diff
==============================================================================
--- trunk/data/core/units/humans/Loyalist_Spearman.cfg (original)
+++ trunk/data/core/units/humans/Loyalist_Spearman.cfg Mon Jul 26 19:19:34 
2010
@@ -31,35 +31,7 @@
         mirror="true"
         image="portraits/humans/transparent/spearman.png"
     [/portrait]
-    [idle_anim]
-        {STANDARD_IDLE_FILTER}
-               start_time=0
-               [frame]
-                       duration=300
-                       image="units/human-loyalists/spearman-idle1.png"
-               [/frame]
-               [frame]
-                       duration=100
-                       image="units/human-loyalists/spearman-idle2.png"
-               [/frame]
-               [frame]
-                       duration=100
-                       image="units/human-loyalists/spearman-idle3.png"
-               [/frame]
-               [frame]
-                       duration=1000
-                       image="units/human-loyalists/spearman-idle4.png"
-               [/frame]
-               [frame]
-                       duration=100
-                       image="units/human-loyalists/spearman-idle3.png"
-               [/frame]
-               [frame]
-                       duration=100
-                       image="units/human-loyalists/spearman-idle2.png"
-               [/frame]
-       [/idle_anim]
-   [death]
+    [death]
         [frame]
             begin=0
             end=125
@@ -152,6 +124,7 @@
             name=spear
         [/filter_attack]
         direction=s
+        start_time=-550
         [frame]
             begin=-200
             end=-150
@@ -259,33 +232,62 @@
             name=spear
         [/filter_attack]
         direction=se,sw
-        [frame]
-            begin=-200
-            end=-100
-            image="units/human-loyalists/spearman.png"
-        [/frame]
-        [if]
-            hits=yes
-            [frame]
-                begin=-100
-                end=100
-                image="units/human-loyalists/spearman-attack.png"
-                sound=spear.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                begin=-100
-                end=100
-                image="units/human-loyalists/spearman-attack.png"
-                sound=spear-miss.ogg
-            [/frame]
-        [/else]
-        [frame]
-            begin=100
-            end=150
-            image="units/human-loyalists/spearman.png"
+        offset="0~0.4,0.4~0"
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-1.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-2.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-3.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-4.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-5.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-6.png"
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                duration=100
+                image="units/human-loyalists/spearman-attack-se-7.png"
+                sound=spear.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                duration=100
+                image="units/human-loyalists/spearman-attack-se-7.png"
+                sound=spear-miss.ogg
+            [/frame]
+        [/else]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-8.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-9.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-10.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/human-loyalists/spearman-attack-se-11.png"
         [/frame]
     [/attack_anim]
 [/unit_type]

Modified: trunk/players_changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=44721&r1=44720&r2=44721&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Mon Jul 26 19:19:34 2010
@@ -35,7 +35,7 @@
      Giant Mudcrawler, Orc Leader/Ruler, an alternate Leader and Sovereign.
    * New Animations: Drake Flare and Flameheart (leading animation still
      missing), Dwarf Lord ranged attack, Dwarf Guard melee attack, Dwarf
-     Pathfinder idle, Ruffian attack and defend.
+     Pathfinder idle, Ruffian attack and defend, Spearman se attack.
    * New base frame and animations for Armageddon Drake.
    * Two new flag styles.
    * Animate terrain in editor




Related Messages


Powered by MHonArc, Updated Mon Jul 26 23:40:14 2010