0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #76 from bumbadadabum/tmp

Browse source 
Updated the Dragonguard halos to the new syntax
This commit is contained in:
Alexander van Gessel 2013-09-12 08:16:22 -07:00
commit 210a45f2cc
2 changed files with 10 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

184
data/core/macros/animation-utils.cfg
View file

@ -726,52 +726,10 @@
missile_halo_x={START_X}
missile_halo_y={START_Y}
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-n-3.png"
halo="projectiles/muzzle-flash-n-3.png:70"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-4.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-5.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-6.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-7.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-8.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-9.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-10.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-11.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-12.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-13.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-14.png"
halo="projectiles/muzzle-flash-[4~14].png:60"
[/missile_frame]
#enddef
@ -781,52 +739,10 @@
missile_halo_x={START_X}
missile_halo_y={START_Y}
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-s-3.png~FL(vertical)"
halo="projectiles/muzzle-flash-s-3.png~FL(vertical):70"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-4.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-5.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-6.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-7.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-8.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-9.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-10.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-11.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-12.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-13.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-14.png~FL(vertical)"
halo="projectiles/muzzle-flash-[4~14].png~FL(vertical):60"
[/missile_frame]
#enddef
@ -836,52 +752,10 @@
missile_halo_x={START_X}
missile_halo_y={START_Y}
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-ne-3.png"
halo="projectiles/muzzle-flash-ne-3.png:70"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-4.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-5.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-6.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-7.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-8.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-9.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-10.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-11.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-12.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-13.png"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-14.png"
halo="projectiles/muzzle-flash-[4~14].png:60"
[/missile_frame]
#enddef
@ -891,52 +765,10 @@
missile_halo_x={START_X}
missile_halo_y={START_Y}
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-se-3.png~FL(vertical)"
halo="projectiles/muzzle-flash-se-3.png~FL(vertical):70"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-4.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-5.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-6.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-7.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-8.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-9.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-10.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-11.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-12.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-13.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-14.png~FL(vertical)"
halo="projectiles/muzzle-flash-[4~14].png~FL(vertical):60"
[/missile_frame]
#enddef

5
data/core/macros/sound-utils.cfg
View file

@ -699,12 +699,11 @@
#
#! [animation]
#! hits=no
#! start_time=-200
#!
#! [frame]
#! begin=-200
#! end=0
#! sound={SOUND_LIST:MISS}
#! image="units/dwarves/warrior-attack.png"
#! image="units/dwarves/warrior-attack.png:200"
#! [/frame]
#define SOUND_LIST:HOLY