Author: zookeeper
Date: Thu Nov 27 16:28:46 2008
New Revision: 31126
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31126&view=rev
Log:
New sling projectile animation.
Modified:
trunk/data/campaigns/Descent_Into_Darkness/units/frontier-baroness.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
trunk/data/core/macros/animation-utils.cfg
trunk/data/core/units/humans/Outlaw.cfg
trunk/data/core/units/humans/Outlaw_Footpad.cfg
trunk/data/core/units/humans/Outlaw_Fugitive.cfg
Modified: trunk/data/campaigns/Descent_Into_Darkness/units/frontier-baroness.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/units/frontier-baroness.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/units/frontier-baroness.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/units/frontier-baroness.cfg Thu
Nov 27 16:28:46 2008
@@ -110,17 +110,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/neutral-outlaw-princess-attack-sling1.png"
sound=sling.ogg
[/frame]
@@ -129,13 +125,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/neutral-outlaw-princess-attack-sling1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/neutral-outlaw-princess-attack-sling2.png"
[/frame]
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg Thu Nov 27
16:28:46 2008
@@ -115,17 +115,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-lady-masked-sling-1.png"
sound=sling.ogg
[/frame]
@@ -134,13 +130,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-lady-masked-sling-1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/wesfolk-lady-masked-sling-2.png"
[/frame]
@@ -268,17 +264,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-lady-sling-1.png"
sound=sling.ogg
[/frame]
@@ -287,13 +279,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-lady-sling-1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/wesfolk-lady-sling-2.png"
[/frame]
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg Thu Nov
27 16:28:46 2008
@@ -116,17 +116,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-leader-masked-sling-1.png"
sound=sling.ogg
[/frame]
@@ -135,13 +131,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-leader-masked-sling-1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/wesfolk-leader-masked-sling-2.png"
[/frame]
@@ -269,17 +265,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-leader-sling-1.png"
sound=sling.ogg
[/frame]
@@ -288,13 +280,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-leader-sling-1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/wesfolk-leader-sling-2.png"
[/frame]
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg Thu Nov
27 16:28:46 2008
@@ -115,17 +115,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-outcast-masked-sling-1.png"
sound=sling.ogg
[/frame]
@@ -134,7 +130,7 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-outcast-masked-sling-1.png"
sound=sling-miss.ogg
[/frame]
@@ -268,17 +264,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 21 -8}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-outcast-sling-1.png"
sound=sling.ogg
[/frame]
@@ -287,13 +279,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/wesfolk-outcast-sling-1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/wesfolk-outcast-sling-2.png"
[/frame]
Modified: trunk/data/core/macros/animation-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/animation-utils.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/core/macros/animation-utils.cfg (original)
+++ trunk/data/core/macros/animation-utils.cfg Thu Nov 27 16:28:46 2008
@@ -1590,3 +1590,45 @@
halo="projectiles/muzzle-flash-14.png"
[/missile_frame]
#enddef
+
+#define MISSILE_FRAME_STONE X_OFFSET Y_OFFSET
+ [sling_stone_frame]
+ begin=-201
+ end=-200
+ image="misc/blank-hex.png"
+ [/sling_stone_frame]
+ [if]
+ hits=yes
+ [sling_stone_frame]
+ begin=-200
+ end=0
+ halo="projectiles/stone.png"
+ halo_x={X_OFFSET}~0
+ halo_y={Y_OFFSET}~0
+ y=0~-5,-5~-8,-8~-9,-9~-10,-10~-9,-9~-8,-8~-5,-5~0
+ offset=0.0~1.0
+ [/sling_stone_frame]
+ [sling_stone_frame]
+ begin=0
+ end=1
+ image="misc/blank-hex.png"
+ [/sling_stone_frame]
+ [/if]
+ [else]
+ hits=no
+ [sling_stone_frame]
+ begin=-200
+ end=100
+ halo="projectiles/stone.png"
+ halo_x={X_OFFSET}~0
+ halo_y={Y_OFFSET}~0
+ y=0~-5,-5~-8,-8~-9,-9~-10,-10~-9,-9~-8,-8~-5,-5~0
+ offset=0.0~1.5
+ [/sling_stone_frame]
+ [sling_stone_frame]
+ begin=100
+ end=101
+ image="misc/blank-hex.png"
+ [/sling_stone_frame]
+ [/else]
+#enddef
Modified: trunk/data/core/units/humans/Outlaw.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw.cfg (original)
+++ trunk/data/core/units/humans/Outlaw.cfg Thu Nov 27 16:28:46 2008
@@ -38,17 +38,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 20 -6}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/human-outlaws/outlaw-attack1.png"
sound=sling.ogg
[/frame]
@@ -57,13 +53,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/human-outlaws/outlaw-attack1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/human-outlaws/outlaw-attack2.png"
[/frame]
@@ -112,6 +108,7 @@
[filter_attack]
name=sling
[/filter_attack]
+ {MISSILE_FRAME_STONE 20 -6}
[if]
[frame]
image="units/human-outlaws/outlaw+female-attack1.png"
Modified: trunk/data/core/units/humans/Outlaw_Footpad.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Footpad.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Footpad.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Footpad.cfg Thu Nov 27 16:28:46 2008
@@ -41,17 +41,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 20 -6}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/human-outlaws/footpad-attack1.png"
sound=sling.ogg
[/frame]
@@ -60,13 +56,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/human-outlaws/footpad-attack1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/human-outlaws/footpad-attack2.png"
[/frame]
@@ -173,6 +169,7 @@
[filter_attack]
name=sling
[/filter_attack]
+ {MISSILE_FRAME_STONE 20 -6}
[if]
[frame]
image="units/human-outlaws/footpad+female-attack1.png"
Modified: trunk/data/core/units/humans/Outlaw_Fugitive.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Fugitive.cfg?rev=31126&r1=31125&r2=31126&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Fugitive.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Fugitive.cfg Thu Nov 27 16:28:46 2008
@@ -45,17 +45,13 @@
[filter_attack]
name=sling
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image="projectiles/stone.png"
- image_diagonal="projectiles/stone.png"
- [/missile_frame]
+ {MISSILE_FRAME_STONE 20 -6}
+ offset=0.0
[if]
hits=yes
[frame]
begin=-400
- end=-100
+ end=-150
image="units/human-outlaws/fugitive-ranged-1.png"
sound=sling.ogg
[/frame]
@@ -64,13 +60,13 @@
hits=no
[frame]
begin=-400
- end=-100
+ end=-150
image="units/human-outlaws/fugitive-ranged-1.png"
sound=sling-miss.ogg
[/frame]
[/else]
[frame]
- begin=-100
+ begin=-150
end=50
image="units/human-outlaws/fugitive-ranged-2.png"
[/frame]
@@ -119,6 +115,7 @@
[filter_attack]
name=sling
[/filter_attack]
+ {MISSILE_FRAME_STONE 20 -6}
[if]
[frame]
image="units/human-outlaws/fugitive+female-ranged-1.png"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
