Author: zookeeper
Date: Sat Nov 22 19:34:36 2008
New Revision: 30966
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30966&view=rev
Log:
Added the updated teleport animation by beetlenaut.
Added:
trunk/data/core/images/halo/teleport-8.png (with props)
trunk/data/core/images/halo/teleport-9.png (with props)
Removed:
trunk/data/core/images/halo/teleport-shrink-1.png
trunk/data/core/images/halo/teleport-shrink-2.png
Modified:
trunk/data/core/images/halo/teleport-1.png
trunk/data/core/images/halo/teleport-2.png
trunk/data/core/images/halo/teleport-3.png
trunk/data/core/images/halo/teleport-4.png
trunk/data/core/images/halo/teleport-5.png
trunk/data/core/images/halo/teleport-6.png
trunk/data/core/images/halo/teleport-7.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-1.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-2.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-3.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-4.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-5.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-6.png
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-7.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-1.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-2.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-3.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-4.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-5.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-6.png
trunk/data/core/images/units/human-magi/silver-mage-teleport-7.png
trunk/data/core/units/humans/Mage_Silver.cfg
Modified: trunk/data/core/images/halo/teleport-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-1.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/halo/teleport-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-2.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/halo/teleport-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-3.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/halo/teleport-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-4.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/halo/teleport-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-5.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/halo/teleport-6.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-6.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/halo/teleport-7.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-7.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Added: trunk/data/core/images/halo/teleport-8.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-8.png?rev=30966&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/halo/teleport-8.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/halo/teleport-9.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-9.png?rev=30966&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/halo/teleport-9.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/halo/teleport-shrink-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-shrink-1.png?rev=30965&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/halo/teleport-shrink-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/halo/teleport-shrink-2.png?rev=30965&view=auto
==============================================================================
Binary file - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-1.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-2.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-3.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-4.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-5.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-6.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-6.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/data/core/images/units/human-magi/silver-mage+female-teleport-7.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage%2Bfemale-teleport-7.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-1.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-2.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-3.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-4.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-5.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-6.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-6.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/human-magi/silver-mage-teleport-7.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/human-magi/silver-mage-teleport-7.png?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/units/humans/Mage_Silver.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Mage_Silver.cfg?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
--- trunk/data/core/units/humans/Mage_Silver.cfg (original)
+++ trunk/data/core/units/humans/Mage_Silver.cfg Sat Nov 22 19:34:36 2008
@@ -142,36 +142,32 @@
[animation]
apply_to=pre_teleport
start_time=-1200
-
+
teleport_sparkle_1_start_time=-1200
teleport_sparkle_2_start_time=-1000
teleport_sparkle_3_start_time=-800
-
+
[teleport_sparkle_1_frame]
duration=800
-
halo=misc/blank-hex.png:1,halo/teleport-shrink-2.png,halo/teleport-shrink-1.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-shrink-1.png,halo/teleport-shrink-2.png,misc/blank-hex.png:1
+
halo=misc/blank-hex.png:1,halo/teleport-9.png,halo/teleport-8.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-8.png,halo/teleport-9.png,misc/blank-hex.png:1
halo_x=-10
halo_y=30~-30
[/teleport_sparkle_1_frame]
[teleport_sparkle_2_frame]
duration=800
-
halo=misc/blank-hex.png:1,halo/teleport-shrink-2.png,halo/teleport-shrink-1.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-shrink-1.png,halo/teleport-shrink-2.png,misc/blank-hex.png:1
+
halo=misc/blank-hex.png:1,halo/teleport-9.png,halo/teleport-8.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-8.png,halo/teleport-9.png,misc/blank-hex.png:1
halo_x=0
halo_y=40~-40
[/teleport_sparkle_2_frame]
[teleport_sparkle_3_frame]
duration=800
-
halo=misc/blank-hex.png:1,halo/teleport-shrink-2.png,halo/teleport-shrink-1.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-shrink-1.png,halo/teleport-shrink-2.png,misc/blank-hex.png:1
+
halo=misc/blank-hex.png:1,halo/teleport-9.png,halo/teleport-8.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-8.png,halo/teleport-9.png,misc/blank-hex.png:1
halo_x=10
halo_y=30~-30
[/teleport_sparkle_3_frame]
-
+
[frame]
duration=200
- image="units/human-magi/silver-mage.png"
- [/frame]
- [frame]
- duration=100
image="units/human-magi/silver-mage-teleport-1.png"
[/frame]
[frame]
@@ -200,66 +196,74 @@
[/frame]
[frame]
duration=100
+ image="units/human-magi/silver-mage-teleport-8.png"
+ [/frame]
+ [frame]
+ duration=300
image="misc/blank-hex.png"
[/frame]
[/animation]
-
+
[animation]
apply_to=post_teleport
start_time=-1200
-
+
teleport_sparkle_1_start_time=-1200
teleport_sparkle_2_start_time=-1000
teleport_sparkle_3_start_time=-800
-
+
[teleport_sparkle_1_frame]
duration=800
-
halo=misc/blank-hex.png:1,halo/teleport-shrink-2.png,halo/teleport-shrink-1.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-shrink-1.png,halo/teleport-shrink-2.png,misc/blank-hex.png:1
+
halo=misc/blank-hex.png:1,halo/teleport-9.png,halo/teleport-8.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-8.png,halo/teleport-9.png,misc/blank-hex.png:1
halo_x=10
halo_y=-30~30
[/teleport_sparkle_1_frame]
[teleport_sparkle_2_frame]
duration=800
-
halo=misc/blank-hex.png:1,halo/teleport-shrink-2.png,halo/teleport-shrink-1.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-shrink-1.png,halo/teleport-shrink-2.png,misc/blank-hex.png:1
+
halo=misc/blank-hex.png:1,halo/teleport-9.png,halo/teleport-8.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-8.png,halo/teleport-9.png,misc/blank-hex.png:1
halo_x=0
halo_y=-40~40
[/teleport_sparkle_2_frame]
[teleport_sparkle_3_frame]
duration=800
-
halo=misc/blank-hex.png:1,halo/teleport-shrink-2.png,halo/teleport-shrink-1.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-shrink-1.png,halo/teleport-shrink-2.png,misc/blank-hex.png:1
+
halo=misc/blank-hex.png:1,halo/teleport-9.png,halo/teleport-8.png,halo/teleport-1.png,halo/teleport-2.png,halo/teleport-3.png,halo/teleport-4.png,halo/teleport-5.png,halo/teleport-6.png,halo/teleport-7.png,halo/teleport-8.png,halo/teleport-9.png,misc/blank-hex.png:1
halo_x=-10
halo_y=-30~30
[/teleport_sparkle_3_frame]
[frame]
+ duration=300
+ image="misc/blank-hex.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-8.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-7.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-6.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-5.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-4.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-3.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/human-magi/silver-mage-teleport-2.png"
+ [/frame]
+ [frame]
duration=200
- image="misc/blank-hex.png"
- [/frame]
- [frame]
- duration=100
- image="units/human-magi/silver-mage-teleport-7.png"
- [/frame]
- [frame]
- duration=100
- image="units/human-magi/silver-mage-teleport-6.png"
- [/frame]
- [frame]
- duration=100
- image="units/human-magi/silver-mage-teleport-5.png"
- [/frame]
- [frame]
- duration=100
- image="units/human-magi/silver-mage-teleport-4.png"
- [/frame]
- [frame]
- duration=100
- image="units/human-magi/silver-mage-teleport-3.png"
- [/frame]
- [frame]
- duration=100
- image="units/human-magi/silver-mage-teleport-2.png"
- [/frame]
- [frame]
- duration=100
image="units/human-magi/silver-mage-teleport-1.png"
[/frame]
[/animation]
@@ -348,11 +352,18 @@
image="units/human-magi/silver-mage+female-teleport-7.png"
[/frame]
[frame]
+ image="units/human-magi/silver-mage+female-teleport-8.png"
+ [/frame]
+ [frame]
[/frame]
[/animation]
+
[animation]
apply_to=post_teleport
[frame]
+ [/frame]
+ [frame]
+ image="units/human-magi/silver-mage+female-teleport-8.png"
[/frame]
[frame]
image="units/human-magi/silver-mage+female-teleport-7.png"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
