mail[Wesnoth-commits] r28372 - in /trunk/data/campaigns/Descent_Into_Darkness: images/units/ units/


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

Header


Content

Posted by lari . nieminen on August 08, 2008 - 06:12:
Author: zookeeper
Date: Thu Aug  7 23:44:06 2008
New Revision: 28372

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28372&view=rev
Log:
Upgraded and fixed Malin's graphics and animations.

Added:
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-1.png 
  (with props)
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-2.png 
  (with props)
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-3.png 
  (with props)
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-1.png 
  (with props)
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-2.png 
  (with props)
Removed:
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic1.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic2.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic3.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword1.png
Modified:
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-defend.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-1.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-2.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-3.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-sword-1.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-sword-2.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer.png
    
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-defend.png
    trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png
    
trunk/data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg
    trunk/data/campaigns/Descent_Into_Darkness/units/dark-mage.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-defend.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-defend.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-1.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-2.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-magic-3.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-sword-1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-sword-1.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-sword-2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer-sword-2.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/apprentice-necromancer.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-defend.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-defend.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Added: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-1.png?rev=28372&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-2.png?rev=28372&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-2.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-3.png?rev=28372&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic-3.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Removed: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic1.png?rev=28371&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic2.png?rev=28371&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-magic3.png?rev=28371&view=auto
==============================================================================
Binary file - no diff available.

Added: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-1.png?rev=28372&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-2.png?rev=28372&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword-2.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Removed: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage-sword1.png?rev=28371&view=auto
==============================================================================
Binary file - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg 
Thu Aug  7 23:44:06 2008
@@ -53,34 +53,78 @@
     [/attack]
     [attack_anim]
         [filter_attack]
-            name=chill wave
+            range=ranged
         [/filter_attack]
         [missile_frame]
-            begin=-200
-            end=0
+            begin=-100
+            end=100
             image="projectiles/darkmissile-n.png"
             image_diagonal="projectiles/darkmissile-ne.png"
         [/missile_frame]
 
         [frame]
             begin=-300
-            end=-200
+            end=-225
             image="units/apprentice-necromancer-magic-1.png"
         [/frame]
-        {SOUND:HIT_AND_MISS magic-dark.ogg magic-dark-miss.ogg -200}
         [frame]
-            begin=-200
-            end=-100
+            begin=-225
+            end=-150
             image="units/apprentice-necromancer-magic-2.png"
         [/frame]
         [frame]
-            begin=-100
-            end=0
+            begin=-150
+            end=-75
             image="units/apprentice-necromancer-magic-3.png"
+            halo=halo/undead/black-magic-1.png
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-75
+                end=0
+                image="units/apprentice-necromancer-magic-3.png"
+                sound=magic-dark.ogg
+                halo=halo/undead/black-magic-2.png
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-75
+                end=0
+                image="units/apprentice-necromancer-magic-3.png"
+                sound=magic-dark-miss.ogg
+                halo=halo/undead/black-magic-2.png
+            [/frame]
+        [/else]
+        [frame]
+            begin=0
+            end=75
+            image="units/apprentice-necromancer-magic-3.png"
+            halo=halo/undead/black-magic-3.png
         [/frame]
         [frame]
-            begin=0
-            end=100
+            begin=75
+            end=150
+            image="units/apprentice-necromancer-magic-3.png"
+            halo=halo/undead/black-magic-4.png
+        [/frame]
+
+        [frame]
+            begin=150
+            end=200
+            image="units/apprentice-necromancer-magic-3.png"
+            halo=halo/undead/black-magic-5.png
+        [/frame]
+        [frame]
+            begin=200
+            end=250
+            image="units/apprentice-necromancer-magic-2.png"
+        [/frame]
+        [frame]
+            begin=250
+            end=300
             image="units/apprentice-necromancer-magic-1.png"
         [/frame]
     [/attack_anim]
@@ -89,25 +133,37 @@
             name=short sword
         [/filter_attack]
         [frame]
-            begin=-200
-            end=-175
-            image=units/apprentice-necromancer.png
+            begin=-250
+            end=-200
+            image="units/apprentice-necromancer-magic-1.png"
         [/frame]
         [frame]
-            begin=-175
+            begin=-200
             end=-100
-            image=apprentice-necromancer-sword-1.png
+            image="units/apprentice-necromancer-sword-1.png"
         [/frame]
-        {SOUND:HIT_AND_MISS sword-1.ogg {SOUND_LIST:MISS} -100}
+        [if]
+            hits=yes
+            [frame]
+                begin=-100
+                end=175
+                image="units/apprentice-necromancer-sword-2.png"
+                sound={SOUND_LIST:SWORD_SWISH}
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-100
+                end=175
+                image="units/apprentice-necromancer-sword-2.png"
+                sound={SOUND_LIST:MISS}
+            [/frame]
+        [/else]
         [frame]
-            begin=-100
-            end=100
-            image=units/apprentice-necromancer-sword-2.png
-        [/frame]
-        [frame]
-            begin=100
-            end=175
-            image=units/apprentice-necromancer-defend.png
+            begin=175
+            end=250
+            image="units/apprentice-necromancer.png"
         [/frame]
     [/attack_anim]
 [/unit_type]

Modified: trunk/data/campaigns/Descent_Into_Darkness/units/dark-mage.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/units/dark-mage.cfg?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/units/dark-mage.cfg (original)
+++ trunk/data/campaigns/Descent_Into_Darkness/units/dark-mage.cfg Thu Aug  7 
23:44:06 2008
@@ -63,68 +63,79 @@
     [/attack]
     [attack_anim]
         [filter_attack]
-            name=chill wave
+            range=ranged
         [/filter_attack]
-        hits=no
         [missile_frame]
-            begin=-200
-            end=0
+            begin=-100
+            end=100
             image="projectiles/darkmissile-n.png"
             image_diagonal="projectiles/darkmissile-ne.png"
         [/missile_frame]
+
         [frame]
             begin=-300
-            end=-200
-            image="units/dark-mage-magic1.png"
+            end=-225
+            image="units/dark-mage-magic-1.png"
         [/frame]
         [frame]
-            begin=-200
-            end=-100
-            image="units/dark-mage-magic2.png"
-            sound=magic-dark-big-miss.ogg
+            begin=-225
+            end=-150
+            image="units/dark-mage-magic-2.png"
         [/frame]
         [frame]
-            begin=-100
-            end=0
-            image="units/dark-mage-magic3.png"
+            begin=-150
+            end=-75
+            image="units/dark-mage-magic-3.png"
+            halo=halo/undead/black-magic-1.png
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-75
+                end=0
+                image="units/dark-mage-magic-3.png"
+                sound=magic-dark.ogg
+                halo=halo/undead/black-magic-2.png
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-75
+                end=0
+                image="units/dark-mage-magic-3.png"
+                sound=magic-dark-miss.ogg
+                halo=halo/undead/black-magic-2.png
+            [/frame]
+        [/else]
+        [frame]
+            begin=0
+            end=75
+            image="units/dark-mage-magic-3.png"
+            halo=halo/undead/black-magic-3.png
         [/frame]
         [frame]
-            begin=0
-            end=100
-            image="units/dark-mage-magic1.png"
+            begin=75
+            end=150
+            image="units/dark-mage-magic-3.png"
+            halo=halo/undead/black-magic-4.png
         [/frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=chill wave
-        [/filter_attack]
-        hits=yes
-        [missile_frame]
-            begin=-200
-            end=0
-            image="projectiles/darkmissile-n.png"
-            image_diagonal="projectiles/darkmissile-ne.png"
-        [/missile_frame]
+
         [frame]
-            begin=-300
-            end=-200
-            image="units/dark-mage-magic1.png"
+            begin=150
+            end=200
+            image="units/dark-mage-magic-3.png"
+            halo=halo/undead/black-magic-5.png
         [/frame]
         [frame]
-            begin=-200
-            end=-100
-            image="units/dark-mage-magic2.png"
-            sound=magic-dark-big.ogg
+            begin=200
+            end=250
+            image="units/dark-mage-magic-2.png"
         [/frame]
         [frame]
-            begin=-100
-            end=0
-            image="units/dark-mage-magic3.png"
-        [/frame]
-        [frame]
-            begin=0
-            end=100
-            image="units/dark-mage-magic1.png"
+            begin=250
+            end=300
+            image="units/dark-mage-magic-1.png"
         [/frame]
     [/attack_anim]
     [attack_anim]
@@ -132,20 +143,37 @@
             name=short sword
         [/filter_attack]
         [frame]
-            begin=-200
-            end=-150
-            image=units/dark-mage.png
+            begin=-250
+            end=-200
+            image="units/dark-mage-magic-1.png"
         [/frame]
         [frame]
-            begin=-150
-            end=0
-            image=units/dark-mage-sword1.png
+            begin=-200
+            end=-100
+            image="units/dark-mage-sword-1.png"
         [/frame]
-        {SOUND:HIT_AND_MISS sword-1.ogg {SOUND_LIST:MISS} -100}
+        [if]
+            hits=yes
+            [frame]
+                begin=-100
+                end=175
+                image="units/dark-mage-sword-2.png"
+                sound={SOUND_LIST:SWORD_SWISH}
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-100
+                end=175
+                image="units/dark-mage-sword-2.png"
+                sound={SOUND_LIST:MISS}
+            [/frame]
+        [/else]
         [frame]
-            begin=0
-            end=200
-            image=units/dark-mage-sword1.png
+            begin=175
+            end=250
+            image="units/dark-mage.png"
         [/frame]
     [/attack_anim]
 [/unit_type]




Related Messages


Powered by MHonArc, Updated Fri Aug 08 10:22:19 2008