wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data/units White_Mage.cfg Mage_of_Light...


From: Richard Kettering
Subject: [Wesnoth-cvs-commits] wesnoth/data/units White_Mage.cfg Mage_of_Light...
Date: Tue, 08 Feb 2005 07:20:36 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Richard Kettering <address@hidden>      05/02/08 12:20:36

Modified files:
        data/units     : White_Mage.cfg Mage_of_Light.cfg 
                         Silver_Mage.cfg Mage.cfg Great_Mage.cfg 
                         Red_Mage.cfg Arch_Mage.cfg 

Log message:
        New unit files to script for the new mage animations and images.
        Only stat change is that all knife attacks have become impact staff 
attacks.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/White_Mage.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mage_of_Light.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Silver_Mage.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mage.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Great_Mage.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Red_Mage.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Arch_Mage.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: wesnoth/data/units/Arch_Mage.cfg
diff -u wesnoth/data/units/Arch_Mage.cfg:1.28 
wesnoth/data/units/Arch_Mage.cfg:1.29
--- wesnoth/data/units/Arch_Mage.cfg:1.28       Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Arch_Mage.cfg    Tue Feb  8 12:20:35 2005
@@ -26,12 +26,17 @@
        damage=7
        number=2
                [frame]
-               begin=-100
-               end=100
-               image=arch-mage-attack.png
+               begin=-175
+               end=-50
+               image=arch-mage-staff-1.png
+               [/frame]
+               [frame]
+               begin=-50
+               end=50
+               image=arch-mage-staff-2.png
                [/frame]
                [sound]
-               time=-100
+               time=-60
                sound=staff.wav
                [/sound]
        [/attack]
@@ -42,39 +47,47 @@
        special=magical
        damage=12
        number=4
-               [sound]
-               time=-200
-               sound=fire.wav
-               [/sound]
                [frame]
-               begin=-300
-               end=-200
-               image=arch-mage-attack1.png
-               halo=halo/fireball-big1.png,halo/fireball-big2.png
-               halo_x,halo_y=-19,-16
+               begin=-240
+               end=-180
+               image=arch-mage-fireball-1.png
+               [/frame]
+               [frame]
+               begin=-180
+               end=-120
+               image=arch-mage-fireball-2.png
+               
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
+               halo_x,halo_y=-11,3
                [/frame]
                [frame]
-               begin=-200
-               end=-100
-               image=arch-mage-attack2.png
-               halo=halo/fireball-big3.png,halo/fireball-big4.png
-               halo_x,halo_y=-19,-16
+               begin=-120
+               end=-60
+               image=arch-mage-fireball-3.png
+               
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
+               halo_x,halo_y=-15,1
                [/frame]
                [frame]
-               begin=-100
+               begin=-60
                end=0
-               image=arch-mage-attack1.png
-               halo=halo/fireball-big5.png,halo/fireball-big6.png
-               halo_x,halo_y=12,-13
+               image=arch-mage-fireball-2.png
+               
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
+               halo_x,halo_y=-11,3
                [/frame]
-
+               [frame]
+               begin=0
+               end=60
+               image=arch-mage-fireball-1.png
+               [/frame]
+               [sound]
+               time=-200
+               sound=fire.wav
+               [/sound]
                [missile_frame]
-               begin=-100
-               end=0
-               image=projectiles/fireball.png
-               image_diagonal=projectiles/fireball.png
-               halo=halo/fireball-big7.png
-               halo_x,halo_y=12,-13
+               begin=-250
+               end=50
+               
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2:30.png
+               image=projectiles/fireball-big-n.png
+               image_diagonal=projectiles/fireball-big-nw.png
                [/missile_frame]
        [/attack]
 
@@ -106,12 +119,17 @@
                damage=7
                number=2
                        [frame]
-                       begin=-100
-                       end=100
-                       image=arch-mage+female-attack.png
+                       begin=-175
+                       end=-50
+                       image=arch-mage+female-staff-1.png
+                       [/frame]
+                       [frame]
+                       begin=-50
+                       end=50
+                       image=arch-mage+female-staff-2.png
                        [/frame]
                        [sound]
-                       time=-100
+                       time=-60
                        sound=staff.wav
                        [/sound]
                [/attack]
@@ -122,39 +140,47 @@
                special=magical
                damage=12
                number=4
-                       [sound]
-                       time=-200
-                       sound=fire.wav
-                       [/sound]
                        [frame]
-                       begin=-300
-                       end=-200
-                       image=arch-mage+female-attack1.png
-                       halo=halo/fireball-big1.png,halo/fireball-big2.png
-                       halo_x,halo_y=-19,-16
+                       begin=-240
+                       end=-180
+                       image=arch-mage+female-fireball-1.png
+                       [/frame]
+                       [frame]
+                       begin=-180
+                       end=-120
+                       image=arch-mage+female-fireball-2.png
+                       
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
+                       halo_x,halo_y=-11,3
                        [/frame]
                        [frame]
-                       begin=-200
-                       end=-100
-                       image=arch-mage+female-attack2.png
-                       halo=halo/fireball-big3.png,halo/fireball-big4.png
-                       halo_x,halo_y=-19,-16
+                       begin=-120
+                       end=-60
+                       image=arch-mage+female-fireball-3.png
+                       
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
+                       halo_x,halo_y=-15,1
                        [/frame]
                        [frame]
-                       begin=-100
+                       begin=-60
                        end=0
-                       image=arch-mage+female-attack1.png
-                       halo=halo/fireball-big5.png,halo/fireball-big6.png
-                       halo_x,halo_y=12,-13
+                       image=arch-mage+female-fireball-2.png
+                       
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
+                       halo_x,halo_y=-11,3
                        [/frame]
-
+                       [frame]
+                       begin=0
+                       end=60
+                       image=arch-mage+female-fireball-1.png
+                       [/frame]
+                       [sound]
+                       time=-200
+                       sound=fire.wav
+                       [/sound]
                        [missile_frame]
-                       begin=-100
-                       end=0
-                       image=projectiles/fireball.png
-                       image_diagonal=projectiles/fireball.png
-                       halo=halo/fireball-big7.png
-                       halo_x,halo_y=12,-13
+                       begin=-250
+                       end=50
+                       
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2:30.png
+                       image=projectiles/fireball-big-n.png
+                       image_diagonal=projectiles/fireball-big-nw.png
                        [/missile_frame]
                [/attack]
        [/female]
Index: wesnoth/data/units/Great_Mage.cfg
diff -u wesnoth/data/units/Great_Mage.cfg:1.24 
wesnoth/data/units/Great_Mage.cfg:1.25
--- wesnoth/data/units/Great_Mage.cfg:1.24      Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Great_Mage.cfg   Tue Feb  8 12:20:35 2005
@@ -26,12 +26,17 @@
        damage=9
        number=2
                [frame]
-               begin=-100
-               end=100
-               image=great-mage-attack.png
+               begin=-175
+               end=-50
+               image=great-mage-staff-1.png
+               [/frame]
+               [frame]
+               begin=-50
+               end=50
+               image=great-mage-staff-2.png
                [/frame]
                [sound]
-               time=-100
+               time=-60
                sound=staff.wav
                [/sound]
        [/attack]
@@ -43,35 +48,46 @@
        damage=16
        number=4
                [frame]
-               begin=-300
-               end=-200
-               image=great-mage-attack1.png
-               halo=halo/fireball-big1.png,halo/fireball-big2.png
-               halo_x,halo_y=-19,-16
+               begin=-240
+               end=-180
+               image=great-mage-fireball-1.png
+               [/frame]
+               [frame]
+               begin=-180
+               end=-120
+               image=great-mage-fireball-2.png
+               
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
+               halo_x,halo_y=-11,3
                [/frame]
                [frame]
-               begin=-200
-               end=-100
-               image=great-mage-attack2.png
-               halo=halo/fireball-big3.png,halo/fireball-big4.png
-               halo_x,halo_y=-19,-16
+               begin=-120
+               end=-60
+               image=great-mage-fireball-3.png
+               
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
+               halo_x,halo_y=-15,1
                [/frame]
                [frame]
-               begin=-100
+               begin=-60
                end=0
-               image=great-mage-attack1.png
-               halo=halo/fireball-big5.png,halo/fireball-big6.png
-               halo_x,halo_y=12,-13
+               image=great-mage-fireball-2.png
+               
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
+               halo_x,halo_y=-11,3
+               [/frame]
+               [frame]
+               begin=0
+               end=60
+               image=great-mage-fireball-1.png
                [/frame]
                [sound]
                time=-200
                sound=fire.wav
                [/sound]
                [missile_frame]
-               begin=-100
-               end=0
-               image=projectiles/fireball.png
-               image_diagonal=projectiles/fireball.png
+               begin=-250
+               end=50
+               
halo=halo/fireball-big-halo1.png:30,halo/fireball-big-halo2.png:30,halo/fireball-big-halo3.png:30,halo/fireball-big-halo4.png:30,halo/fireball-big-halo5.png:30,halo/fireball-big-halo6.png:30,halo/fireball-big-halo7.png:30,halo/fireball-big-halo8.png:30,halo/fireball-big-halo1.png:30,halo/fireball-big-halo2:30.png
+               image=projectiles/fireball-huge-n.png
+               image_diagonal=projectiles/fireball-huge-nw.png
                [/missile_frame]
        [/attack]
 
@@ -103,12 +119,17 @@
                damage=9
                number=2
                        [frame]
-                       begin=-100
-                       end=100
-                       image=great-mage+female-attack.png
+                       begin=-175
+                       end=-50
+                       image=great-mage+female-staff-1.png
+                       [/frame]
+                       [frame]
+                       begin=-50
+                       end=50
+                       image=great-mage+female-staff-2.png
                        [/frame]
                        [sound]
-                       time=-100
+                       time=-60
                        sound=staff.wav
                        [/sound]
                [/attack]
@@ -120,35 +141,46 @@
                damage=16
                number=4
                        [frame]
-                       begin=-300
-                       end=-200
-                       image=great-mage+female-attack1.png
-                       halo=halo/fireball-big1.png,halo/fireball-big2.png
-                       halo_x,halo_y=-19,-16
+                       begin=-240
+                       end=-180
+                       image=great-mage+female-fireball-1.png
+                       [/frame]
+                       [frame]
+                       begin=-180
+                       end=-120
+                       image=great-mage+female-fireball-2.png
+                       
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
+                       halo_x,halo_y=-11,3
                        [/frame]
                        [frame]
-                       begin=-200
-                       end=-100
-                       image=great-mage+female-attack2.png
-                       halo=halo/fireball-big3.png,halo/fireball-big4.png
-                       halo_x,halo_y=-19,-16
+                       begin=-120
+                       end=-60
+                       image=great-mage+female-fireball-3.png
+                       
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
+                       halo_x,halo_y=-15,1
                        [/frame]
                        [frame]
-                       begin=-100
+                       begin=-60
                        end=0
-                       image=great-mage+female-attack1.png
-                       halo=halo/fireball-big5.png,halo/fireball-big6.png
-                       halo_x,halo_y=12,-13
+                       image=great-mage+female-fireball-2.png
+                       
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
+                       halo_x,halo_y=-11,3
+                       [/frame]
+                       [frame]
+                       begin=0
+                       end=60
+                       image=great-mage+female-fireball-1.png
                        [/frame]
                        [sound]
                        time=-200
                        sound=fire.wav
                        [/sound]
                        [missile_frame]
-                       begin=-100
-                       end=0
-                       image=projectiles/fireball.png
-                       image_diagonal=projectiles/fireball.png
+                       begin=-250
+                       end=50
+                       
halo=halo/fireball-big-halo1.png:30,halo/fireball-big-halo2.png:30,halo/fireball-big-halo3.png:30,halo/fireball-big-halo4.png:30,halo/fireball-big-halo5.png:30,halo/fireball-big-halo6.png:30,halo/fireball-big-halo7.png:30,halo/fireball-big-halo8.png:30,halo/fireball-big-halo1.png:30,halo/fireball-big-halo2:30.png
+                       image=projectiles/fireball-huge-n.png
+                       image_diagonal=projectiles/fireball-huge-nw.png
                        [/missile_frame]
                [/attack]
        [/female]
Index: wesnoth/data/units/Mage.cfg
diff -u wesnoth/data/units/Mage.cfg:1.27 wesnoth/data/units/Mage.cfg:1.28
--- wesnoth/data/units/Mage.cfg:1.27    Sun Dec  5 00:12:58 2004
+++ wesnoth/data/units/Mage.cfg Tue Feb  8 12:20:35 2005
@@ -17,15 +17,20 @@
 unit_description= _ "Mages are both weak and powerful. Moving slowly, and with 
poor defensive skills, Mages attack with magical missiles that always have a 
high chance of hitting their target. For this reason, Mages are an excellent 
choice for flushing out enemies hiding in difficult terrain."
 get_hit_sound=groan.wav
        [attack]
-       name=dagger
-       type=blade
+       name=staff
+       type=impact
        range=short
        damage=5
        number=1
                [frame]
                begin=-100
+               end=-20
+               image=mage-attack-staff1.png
+               [/frame]
+               [frame]
+               begin=-20
                end=100
-               image=mage-attack.png
+               image=mage-attack-staff2.png
                [/frame]
                [sound]
                time=-100
@@ -44,24 +49,29 @@
                sound=magicmissile.wav
                [/sound]
                [frame]
-               begin=-450
+               begin=-400
+               end=-350
+               image=mage-attack-magic1.png
+               [/frame]
+               [frame]
+               begin=-350
                end=0
-               image=mage-attack1.png
-               
halo=halo/mage-halo1.png,halo/mage-halo2.png,halo/mage-halo3.png,halo/mage-halo4.png,halo/mage-halo5.png,halo/mage-halo6.png,halo/mage-halo7.png,halo/mage-halo8.png,halo/mage-halo9.png
-               halo_x,halo_y=10,-10
+               image=mage-attack-magic2.png
+               
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png,halo
+               halo_x,halo_y=6,-19
                [/frame]
                [frame]
                begin=0
                end=50
-               image=mage-attack1.png
+               image=mage-attack-magic1.png
                [/frame]
                [missile_frame]
                begin=-200
                end=0
                image=projectiles/magicmissile-n.png
                image_diagonal=projectiles/magicmissile-ne.png
-               
halo=halo/mage-halo9.png,halo/mage-halo10.png,halo/mage-halo11.png,halo/mage-halo12.png,halo/mage-halo13.png,
-               halo_x,halo_y=10,-14
+               
halo=halo/mage-halo1.png,halo/mage-halo2.png,halo/mage-halo3.png,halo/mage-halo4.png,halo/mage-halo5.png
+               halo_x,halo_y=7,-17
                [/missile_frame]
        [/attack]
 
@@ -84,18 +94,23 @@
        unit_description= _ "Mages are both weak and powerful. Moving slowly, 
and with poor defensive skills, Mages attack with magical missiles that always 
have a high chance of hitting their target. For this reason, Mages are an 
excellent choice for flushing out enemies hiding in difficult terrain."
        get_hit_sound=female-hit.wav
                [attack]
-               name=dagger
-               type=blade
+               name=staff
+               type=impact
                range=short
                damage=5
                number=1
                        [frame]
                        begin=-100
+                       end=-20
+                       image=mage+female-attack-staff1.png
+                       [/frame]
+                       [frame]
+                       begin=-20
                        end=100
-                       image=mage+female-attack.png
+                       image=mage+female-attack-staff2.png
                        [/frame]
                        [sound]
-                               time=-100
+                       time=-100
                        sound=dagger-swish.wav
                        [/sound]
                [/attack]
@@ -111,24 +126,29 @@
                        sound=magicmissile.wav
                        [/sound]
                        [frame]
-                       begin=-450
+                       begin=-400
+                       end=-350
+                       image=mage+female-attack-magic1.png
+                       [/frame]
+                       [frame]
+                       begin=-350
                        end=0
-                       image=mage+female-attack1.png
-                       
halo=halo/mage-halo1.png,halo/mage-halo2.png,halo/mage-halo3.png,halo/mage-halo4.png,halo/mage-halo5.png,halo/mage-halo6.png,halo/mage-halo7.png,halo/mage-halo8.png,halo/mage-halo9.png
-                       halo_x,halo_y=10,-10
+                       image=mage+female-attack-magic2.png
+                       
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png,halo
+                       halo_x,halo_y=6,-19
                        [/frame]
                        [frame]
                        begin=0
                        end=50
-                       image=mage+female-attack1.png
+                       image=mage-attack-magic1.png
                        [/frame]
                        [missile_frame]
                        begin=-200
                        end=0
                        image=projectiles/magicmissile-n.png
                        image_diagonal=projectiles/magicmissile-ne.png
-                       
halo=halo/mage-halo9.png,halo/mage-halo10.png,halo/mage-halo11.png,halo/mage-halo12.png,halo/mage-halo13.png,
-                       halo_x,halo_y=10,-14
+                       
halo=halo/mage-halo1.png,halo/mage-halo2.png,halo/mage-halo3.png,halo/mage-halo4.png,halo/mage-halo5.png
+                       halo_x,halo_y=7,-17
                        [/missile_frame]
                [/attack]
        [/female]
Index: wesnoth/data/units/Mage_of_Light.cfg
diff -u wesnoth/data/units/Mage_of_Light.cfg:1.23 
wesnoth/data/units/Mage_of_Light.cfg:1.24
--- wesnoth/data/units/Mage_of_Light.cfg:1.23   Wed Oct 20 13:26:32 2004
+++ wesnoth/data/units/Mage_of_Light.cfg        Tue Feb  8 12:20:35 2005
@@ -5,7 +5,8 @@
 gender=male,female
 image=white-cleric.png
 image_defensive=white-cleric-defend.png
-image_healing=white-cleric-attack1.png
+image_healing=white-cleric-magic1.png
+image_halo_healing=white-cleric-magic1.png:100,white-cleric-magic2.png:100,white-cleric-magic3.png:100,white-cleric-magic4.png:100,white-cleric-magic5.png:100,white-cleric-magic6.png:100
 #ifdef CAMPAIGN_EASTERN_INVASION
 profile=portraits/Eastern_Invasion/dacyn.png
 #endif
@@ -38,7 +39,7 @@
                [frame]
                begin=-100
                end=100
-               image=white-cleric-attack.png
+               image=white-cleric-attack-melee.png
                [/frame]
        [/attack]
        [attack]
@@ -49,15 +50,26 @@
        damage=10
        number=4
                [missile_frame]
-               begin=-100
+               begin=-180
                end=0
                image=projectiles/whitemissile-n.png
                image_diagonal=projectiles/whitemissile-ne.png
+               
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
                [/missile_frame]
                [frame]
-               begin=-100
+               begin=-50
+               end=0
+               image=white-cleric-magic1.png
+               [/frame]
+               [frame]
+               begin=0
+               end=50
+               image=white-cleric-magic3.png
+               [/frame]
+               [frame]
+               begin=50
                end=100
-               image=white-cleric-attack1.png
+               image=white-cleric-magic5.png
                [/frame]
        [/attack]
 
@@ -68,7 +80,8 @@
        gender=female
        image=white-cleric+female.png
        image_defensive=white-cleric+female-defend.png
-       image_healing=white-cleric+female-attack1.png
+        image_healing=white-cleric+female-magic1.png
+        
image_halo_healing=white-cleric+female-magic1.png:100,white-cleric+female-magic2.png:100,white-cleric+female-magic3.png:100,white-cleric+female-magic4.png:100,white-cleric+female-magic5.png:100,white-cleric+female-magic6.png:100
        halo=halo/white-cleric-aura.png
        ability=illuminates,cures
        hitpoints=42
@@ -98,7 +111,7 @@
                        [frame]
                        begin=-100
                        end=100
-                       image=white-cleric+female-attack.png
+                       image=white-cleric+female-attack-melee.png
                        [/frame]
                [/attack]
                [attack]
@@ -108,17 +121,28 @@
                special=magical
                damage=10
                number=4
-                       [missile_frame]
-                       begin=-100
-                       end=0
-                       image=projectiles/whitemissile-n.png
-                       image_diagonal=projectiles/whitemissile-ne.png
-                       [/missile_frame]
-                       [frame]
-                       begin=-100
-                       end=100
-                       image=white-cleric+female-attack1.png
-                       [/frame]
+                        [missile_frame]
+                        begin=-180
+                        end=0
+                        image=projectiles/whitemissile-n.png
+                        image_diagonal=projectiles/whitemissile-ne.png
+                        
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
+                        [/missile_frame]
+                        [frame]
+                        begin=-50
+                        end=0
+                        image=white-cleric+female-magic1.png
+                        [/frame]
+                        [frame]
+                        begin=0
+                        end=50
+                        image=white-cleric+female-magic3.png
+                        [/frame]
+                        [frame]
+                        begin=50
+                        end=100
+                        image=white-cleric+female-magic5.png
+                        [/frame]
                [/attack]
        [/female]
 [/unit]
Index: wesnoth/data/units/Red_Mage.cfg
diff -u wesnoth/data/units/Red_Mage.cfg:1.27 
wesnoth/data/units/Red_Mage.cfg:1.28
--- wesnoth/data/units/Red_Mage.cfg:1.27        Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Red_Mage.cfg     Tue Feb  8 12:20:35 2005
@@ -20,15 +20,20 @@
 unit_description= _ "Red Mages attack with powerful magic fireballs that are 
guaranteed a good chance of hitting. Deft of foot, and skilled fighters both 
day and night, Red Mages are therefore valuable in almost all situations."
 get_hit_sound=groan.wav
        [attack]
-       name=dagger
-       type=blade
+       name=staff
+       type=impact
        range=short
        damage=6
        number=2
                [frame]
                begin=-100
+               end=-20
+               image=red-mage-attack-staff1.png
+               [/frame]
+               [frame]
+               begin=-20
                end=100
-               image=red-mage-attack-melee.png
+               image=red-mage-attack-staff2.png
                [/frame]
                [sound]
                time=-100
@@ -43,28 +48,46 @@
        damage=8
        number=4
                [frame]
-               begin=-300
+               begin=-240
+               end=-180
+               image=red-mage-fireball-1.png
+               [/frame]
+               [frame]
+               begin=-180
+               end=-120
+               image=red-mage-fireball-2.png
+               
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
+               halo_x,halo_y=-11,3
+               [/frame]
+               [frame]
+               begin=-120
+               end=-60
+               image=red-mage-fireball-3.png
+               
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
+               halo_x,halo_y=-15,1
+               [/frame]
+               [frame]
+               begin=-60
                end=0
-               image=red-mage-attack1.png
-               
halo=halo/fireball1.png,halo/fireball2.png,halo/fireball3.png,halo/fireball4.png,halo/fireball5.png,halo/fireball6.png
-               halo_x,halo_y=14,-14
+               image=red-mage-fireball-2.png
+               
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
+               halo_x,halo_y=-11,3
                [/frame]
                [frame]
                begin=0
-               end=100
-               image=red-mage-attack-ranged.png
+               end=60
+               image=red-mage-fireball-1.png
                [/frame]
                [sound]
                time=-200
                sound=fire.wav
                [/sound]
                [missile_frame]
-               begin=-100
-               end=0
-               image=projectiles/fireball.png
-               image_diagonal=projectiles/fireball.png
-               halo=halo/fireball7.png
-               halo_x,halo_y=14,-14
+               begin=-250
+               end=50
+               
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2:30.png
+               image=projectiles/fireball-n.png
+               image_diagonal=projectiles/fireball-nw.png
                [/missile_frame]
        [/attack]
 
@@ -90,15 +113,20 @@
        unit_description= _ "Red Mages attack with powerful magic fireballs 
that are guaranteed a good chance of hitting. Deft of foot, and skilled 
fighters both day and night, Red Mages are therefore valuable in almost all 
situations."
        get_hit_sound=female-hit.wav
                [attack]
-               name=dagger
-               type=blade
+               name=staff
+               type=impact
                range=short
                damage=6
                number=2
                        [frame]
                        begin=-100
+                       end=-20
+                       image=red-mage+female-attack-staff1.png
+                       [/frame]
+                       [frame]
+                       begin=-20
                        end=100
-                       image=red-mage+female-attack-melee.png
+                       image=red-mage+female-attack-staff2.png
                        [/frame]
                        [sound]
                        time=-100
@@ -113,28 +141,46 @@
                damage=8
                number=4
                        [frame]
-                       begin=-300
+                       begin=-240
+                       end=-180
+                       image=red-mage+female-fireball-1.png
+                       [/frame]
+                       [frame]
+                       begin=-180
+                       end=-120
+                       image=red-mage+female-fireball-2.png
+                       
halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
+                       halo_x,halo_y=-11,3
+                       [/frame]
+                       [frame]
+                       begin=-120
+                       end=-60
+                       image=red-mage+female-fireball-3.png
+                       
halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
+                       halo_x,halo_y=-15,1
+                       [/frame]
+                       [frame]
+                       begin=-60
                        end=0
-                       image=red-mage+female-attack1.png
-                       
halo=halo/fireball1.png,halo/fireball2.png,halo/fireball3.png,halo/fireball4.png,halo/fireball5.png,halo/fireball6.png
-                       halo_x,halo_y=14,-14
+                       image=red-mage+female-fireball-2.png
+                       
halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
+                       halo_x,halo_y=-11,3
                        [/frame]
                        [frame]
                        begin=0
-                       end=100
-                       image=red-mage+female-attack1.png
+                       end=60
+                       image=red-mage+female-fireball-1.png
                        [/frame]
                        [sound]
                        time=-200
                        sound=fire.wav
                        [/sound]
                        [missile_frame]
-                       begin=-100
-                       end=0
-                       image=projectiles/fireball.png
-                       image_diagonal=projectiles/fireball.png
-                       halo=halo/fireball7.png
-                       halo_x,halo_y=14,-14
+                       begin=-250
+                       end=50
+                       
halo=halo/fireball-halo1.png:30,halo/fireball-halo2.png:30,halo/fireball-halo3.png:30,halo/fireball-halo4.png:30,halo/fireball-halo5.png:30,halo/fireball-halo6.png:30,halo/fireball-halo7.png:30,halo/fireball-halo8.png:30,halo/fireball-halo1.png:30,halo/fireball-halo2:30.png
+                       image=projectiles/fireball-n.png
+                       image_diagonal=projectiles/fireball-nw.png
                        [/missile_frame]
                [/attack]
        [/female]
Index: wesnoth/data/units/Silver_Mage.cfg
diff -u wesnoth/data/units/Silver_Mage.cfg:1.11 
wesnoth/data/units/Silver_Mage.cfg:1.12
--- wesnoth/data/units/Silver_Mage.cfg:1.11     Sun Dec 19 22:20:54 2004
+++ wesnoth/data/units/Silver_Mage.cfg  Tue Feb  8 12:20:35 2005
@@ -82,7 +82,7 @@
                [frame]
                begin=-100
                end=100
-               image=silver-mage-melee.png
+               image=silver-mage-attack-melee.png
                [/frame]
                [sound]
                time=-100
@@ -90,51 +90,40 @@
                [/sound]
        [/attack]
        [attack]
-       name=fireball
+       name=missile
        type=fire
        range=long
        special=magical
        damage=9
        number=4
-               [frame]
-               begin=-550
-               end=-400
-               image=silver-mage-attack1.png
-               
halo=halo/silver-mage-halo1.png,halo/silver-mage-halo2.png,halo/silver-mage-halo3.png
-               halo_x,halo_y=13,-19
-               [/frame]
+               [sound]
+               time=-200
+               sound=magicmissile.wav
+               [/sound]
                [frame]
                begin=-400
-               end=-200
-               image=silver-mage-attack2.png
-               
halo=halo/silver-mage-halo4.png,halo/silver-mage-halo5.png,halo/silver-mage-halo6.png,halo/silver-mage-halo7.png
-               halo_x,halo_y=14,-19
+               end=-350
+               image=silver-mage-attack-magic1.png
                [/frame]
                [frame]
-               begin=-200
+               begin=-350
                end=0
-               image=silver-mage-attack3.png
-               
halo=halo/silver-mage-halo8.png,halo/silver-mage-halo9.png,halo/silver-mage-halo10.png,halo/silver-mage-halo11.png
-               halo_x,halo_y=14,-19
+               image=silver-mage-attack-magic1.png
+               
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png,halo
+               halo_x,halo_y=19,-15
                [/frame]
                [frame]
                begin=0
-               end=100
-               halo=halo/silver-mage-halo1.png
-               image=silver-mage-attack3.png
-               halo_x,halo_y=14,-19
+               end=50
+               image=silver-mage-attack-magic1.png
                [/frame]
-               [sound]
-               time=-200
-               sound=fire.wav
-               [/sound]
                [missile_frame]
-               begin=-100
-               end=0
-               image=projectiles/fireball.png
-               image_diagonal=projectiles/fireball.png
-               halo=halo/silver-mage-halo11.png,halo/silver-mage-halo12.png
-               halo_x,halo_y=14,-19
+               begin=-200
+               end=50
+               image=projectiles/magicmissile-n.png
+               image_diagonal=projectiles/magicmissile-ne.png
+               
halo=halo/mage-halo1.png,halo/mage-halo2-big.png,halo/mage-halo3-big.png,halo/mage-halo4-big.png,halo/mage-halo5-big.png,halo/mage-halo6-big.png
+               halo_x,halo_y=19,-15
                [/missile_frame]
        [/attack]
 
@@ -161,6 +150,58 @@
        ability=teleport
        unit_description= _ "Silver Mages are the most deft of foot and elusive 
of all mages. They can teleport from any friendly village to another, 
translating themselves in an instant. They are also highly resistant to most 
forms of magical attack."
        get_hit_sound=female-hit.wav
+               [teleport_anim]
+                       [frame]
+                       begin=-500
+                       end=-400
+                       image=silver-mage+female-teleport1.png
+                       [/frame]
+                       [frame]
+                       begin=-400
+                       end=-300
+                       image=silver-mage+female-teleport2.png
+                       [/frame]
+                       [frame]
+                       begin=-300
+                       end=-200
+                       image=silver-mage+female-teleport3.png
+                       [/frame]
+                       [frame]
+                       begin=-200
+                       end=-100
+                       image=silver-mage+female-teleport4.png
+                       [/frame]
+                       [frame]
+                       begin=-100
+                       end=0
+                       image=silver-mage+female-teleport5.png
+                       [/frame]
+                       [frame]
+                       begin=0
+                       end=100
+                       image=silver-mage+female-teleport6.png
+                       [/frame]
+                       [frame]
+                       begin=100
+                       end=200
+                       image=silver-mage+female-teleport7.png
+                       [/frame]
+                       [frame]
+                       begin=200
+                       end=300
+                       image=silver-mage+female-teleport8.png
+                       [/frame]
+                       [frame]
+                       begin=300
+                       end=400
+                       image=silver-mage+female-teleport9.png
+                       [/frame]
+                       [frame]
+                       begin=400
+                       end=500
+                       image=silver-mage+female-teleport10.png
+                       [/frame]
+               [/teleport_anim]
                [attack]
                name=staff
                type=impact
@@ -170,7 +211,7 @@
                        [frame]
                        begin=-100
                        end=100
-                       image=silver-mage+female-melee.png
+                       image=silver-mage+female-attack-melee.png
                        [/frame]
                        [sound]
                        time=-100
@@ -178,51 +219,40 @@
                        [/sound]
                [/attack]
                [attack]
-               name=fireball
+               name=missile
                type=fire
                range=long
                special=magical
                damage=9
                number=4
-                       [frame]
-                       begin=-550
-                       end=-400
-                       image=silver-mage+female-attack1.png
-                       
halo=halo/silver-mage-halo1.png,halo/silver-mage-halo2.png,halo/silver-mage-halo3.png
-                       halo_x,halo_y=13,-19
-                       [/frame]
+                       [sound]
+                       time=-200
+                       sound=magicmissile.wav
+                       [/sound]
                        [frame]
                        begin=-400
-                       end=-200
-                       image=silver-mage+female-attack2.png
-                       
halo=halo/silver-mage-halo4.png,halo/silver-mage-halo5.png,halo/silver-mage-halo6.png,halo/silver-mage-halo7.png
-                       halo_x,halo_y=14,-19
+                       end=-350
+                       image=silver-mage+female-attack-magic1.png
                        [/frame]
                        [frame]
-                       begin=-200
+                       begin=-350
                        end=0
-                       image=silver-mage+female-attack3.png
-                       
halo=halo/silver-mage-halo8.png,halo/silver-mage-halo9.png,halo/silver-mage-halo10.png,halo/silver-mage-halo11.png
-                       halo_x,halo_y=14,-19
+                       image=silver-mage+female-attack-magic1.png
+                       
halo=halo/mage-preparation-halo1.png,halo/mage-preparation-halo2.png,halo/mage-preparation-halo3.png,halo/mage-preparation-halo4.png,halo/mage-preparation-halo5.png,halo/mage-preparation-halo6.png,halo/mage-preparation-halo7.png,halo
+                       halo_x,halo_y=19,-15
                        [/frame]
                        [frame]
                        begin=0
-                       end=100
-                       halo=halo/silver+female-mage-halo1.png
-                       image=silver-mage-attack3.png
-                       halo_x,halo_y=14,-19
+                       end=50
+                       image=silver-mage-attack-magic1.png
                        [/frame]
-                       [sound]
-                       time=-200
-                       sound=fire.wav
-                       [/sound]
                        [missile_frame]
-                       begin=-100
-                       end=0
-                       image=projectiles/fireball.png
-                       image_diagonal=projectiles/fireball.png
-                       
halo=halo/silver-mage-halo11.png,halo/silver-mage-halo12.png
-                       halo_x,halo_y=14,-19
+                       begin=-200
+                       end=50
+                       image=projectiles/magicmissile-n.png
+                       image_diagonal=projectiles/magicmissile-ne.png
+                       
halo=halo/mage-halo1.png,halo/mage-halo2-big.png,halo/mage-halo3-big.png,halo/mage-halo4-big.png,halo/mage-halo5-big.png,halo/mage-halo6-big.png
+                       halo_x,halo_y=19,-15
                        [/missile_frame]
                [/attack]
        [/female]
Index: wesnoth/data/units/White_Mage.cfg
diff -u wesnoth/data/units/White_Mage.cfg:1.18 
wesnoth/data/units/White_Mage.cfg:1.19
--- wesnoth/data/units/White_Mage.cfg:1.18      Wed Oct 20 13:26:32 2004
+++ wesnoth/data/units/White_Mage.cfg   Tue Feb  8 12:20:35 2005
@@ -5,7 +5,8 @@
 gender=male,female
 image=white-mage.png
 image_defensive=white-mage-defend.png
-image_healing=white-mage-attack1.png
+image_healing=white-mage-magic1.png
+image_halo_healing=white-mage-magic1.png:100,white-mage-magic2.png:100,white-mage-magic3.png:100,white-mage-magic4.png:100,white-mage-magic5.png:100,white-mage-magic6.png:100
 #ifdef CAMPAIGN_EASTERN_INVASION
 profile=portraits/Eastern_Invasion/dacyn.png
 #endif
@@ -25,15 +26,15 @@
 unit_description= _ "White Mages are weak in combat, but expert in the ways of 
healing. Units placed adjacent to a White Mage will heal as though they were 
resting in a village. White Mages are potent in battle against the undead, 
which suffer high damage from their light beam"
 get_hit_sound=groan.wav
        [attack]
-       name=dagger
-       type=blade
+       name=staff
+       type=impact
        range=short
        damage=6
        number=1
                [frame]
                begin=-100
                end=100
-               image=white-mage-attack.png
+               image=white-mage-attack-melee.png
                [/frame]
                [sound]
                time=-100
@@ -48,15 +49,26 @@
        damage=8
        number=4
                [missile_frame]
-               begin=-150
+               begin=-180
                end=0
                image=projectiles/whitemissile-n.png
                image_diagonal=projectiles/whitemissile-ne.png
+               
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
                [/missile_frame]
                [frame]
-               begin=-30
+               begin=-50
+               end=0
+               image=white-mage-magic1.png
+               [/frame]
+               [frame]
+               begin=0
+               end=50
+               image=white-mage-magic3.png
+               [/frame]
+               [frame]
+               begin=50
                end=100
-               image=white-mage-attack1.png
+               image=white-mage-magic5.png
                [/frame]
        [/attack]
 
@@ -67,7 +79,8 @@
        gender=female
        image=white-mage+female.png
        image_defensive=white-mage+female-defend.png
-       image_healing=white-mage+female-attack1.png
+        image_healing=white-mage+female-magic1.png
+        
image_halo_healing=white-mage+female-magic1.png:100,white-mage+female-magic2.png:100,white-mage+female-magic3.png:100,white-mage+female-magic4.png:100,white-mage+female-magic5.png:100,white-mage+female-magic6.png:100
        ability=cures
        hitpoints=32
        movement_type=smallfoot
@@ -84,15 +97,15 @@
        unit_description= _ "White Mages are weak in combat, but expert in the 
ways of healing. Units placed adjacent to a White Mage will heal as though they 
were resting in a village. White Mages are potent in battle against the undead, 
which suffer high damage from their light beam"
        get_hit_sound=female-hit.wav
                [attack]
-               name=dagger
-               type=blade
+               name=staff
+               type=impact
                range=short
                damage=6
                number=1
                        [frame]
                        begin=-100
                        end=100
-                       image=white-mage+female-attack.png
+                       image=white-mage+female-attack-melee.png
                        [/frame]
                        [sound]
                        time=-100
@@ -100,23 +113,34 @@
                        [/sound]
                [/attack]
                [attack]
-               name=lightbeam
-               type=holy
-               range=long
-               special=magical
-               damage=8
-               number=4
-                       [missile_frame]
-                       begin=-150
-                       end=0
-                       image=projectiles/whitemissile-n.png
-                       image_diagonal=projectiles/whitemissile-ne.png
-                       [/missile_frame]
-                       [frame]
-                       begin=-30
-                       end=100
-                       image=white-mage+female-attack1.png
-                       [/frame]
+                        name=lightbeam
+                        type=holy
+                        range=long
+                        special=magical
+                        damage=8
+                        number=4
+                                [missile_frame]
+                                begin=-180
+                                end=0
+                                image=projectiles/whitemissile-n.png
+                                image_diagonal=projectiles/whitemissile-ne.png
+                                
halo=halo/white-mage-halo1.png,halo/white-mage-halo2.png,halo/white-mage-halo3.png,halo/white-mage-halo4.png
+                                [/missile_frame]
+                                [frame]
+                                begin=-50
+                                end=0
+                                image=white-mage+female-magic1.png
+                                [/frame]
+                                [frame]
+                                begin=0
+                                end=50
+                                image=white-mage+female-magic3.png
+                                [/frame]
+                                [frame]
+                                begin=50
+                                end=100
+                                image=white-mage+female-magic5.png
+                                [/frame]
                [/attack]
        [/female]
 [/unit]




reply via email to

[Prev in Thread] Current Thread [Next in Thread]