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

fix thuderer line animations, please do not port to 1.4

Browse source
This commit is contained in:
Jérémy Rosen 2008-10-13 17:15:25 +00:00
parent da7b24de21
commit e90f0e0412
4 changed files with 276 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1269,11 +1269,8 @@
[/water_frame]
#enddef
#define MISSILE_FRAME_MUZZLE_FLARE
missile_start_time=-250
[if]
hits = no
#define MISSILE_FRAME_MUZZLE_FLARE_MISS
missile_start_time=-250
missile_offset=0.1
[missile_frame]
duration=100
@ -1291,15 +1288,12 @@
duration=100
halo="projectiles/misfire-spark-4.png"
[/missile_frame]
[/if]
[if]
hits = yes
#enddef
#define MISSILE_FRAME_MUZZLE_FLARE_HIT_NORTH START_X START_Y
missile_start_time=-250
missile_offset=0.5~1.1:250,1.1~1.5:200,1.5~1.7:360
[/if]
[else]
direction=n
hits = yes
missile_halo_x={START_X}~0
missile_halo_y={START_Y}~0
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-n-1.png"
@ -1312,59 +1306,6 @@
duration=70
halo="projectiles/muzzle-flash-n-3.png"
[/missile_frame]
[/else]
[else]
direction=ne,nw
hits = yes
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-ne-1.png"
[/missile_frame]
[missile_frame]
duration=80
halo="projectiles/muzzle-flash-ne-2.png"
[/missile_frame]
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-ne-3.png"
[/missile_frame]
[/else]
[else]
direction=se,sw
hits = yes
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-ne-1.png"
[/missile_frame]
[missile_frame]
duration=80
halo="projectiles/muzzle-flash-ne-2.png"
[/missile_frame]
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-ne-3.png"
[/missile_frame]
[/else]
[else]
direction=s
hits = yes
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-s-1.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=80
halo="projectiles/muzzle-flash-s-2.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-s-3.png~FL(vert)"
[/missile_frame]
[/else]
[if]
direction=n,ne,nw
hits = yes
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-4.png"
@ -1409,54 +1350,190 @@
duration=60
halo="projectiles/muzzle-flash-14.png"
[/missile_frame]
[/if]
[else]
direction=s,se,sw
hits = yes
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-4.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-5.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-6.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-7.png~FL(vert)"
offset=1.55
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-8.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-9.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-10.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-11.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-12.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-13.png~FL(vert)"
[/missile_frame]
[missile_frame]
duration=60
halo="projectiles/muzzle-flash-14.png~FL(vert)"
[/missile_frame]
[/else]
#enddef
#define MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH START_X START_Y
missile_start_time=-250
missile_offset=0.5~1.1:250,1.1~1.5:200,1.5~1.7:360
missile_halo_x={START_X}~0
missile_halo_y={START_Y}~0
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-s-1.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=80
halo="projectiles/muzzle-flash-s-2.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-s-3.png~FL(vertical)"
[/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"
[/missile_frame]
#enddef
#define MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_NORTH START_X START_Y
missile_start_time=-250
missile_offset=0.5~1.1:250,1.1~1.5:200,1.5~1.7:360
missile_halo_x={START_X}~0
missile_halo_y={START_Y}~0
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-ne-1.png"
[/missile_frame]
[missile_frame]
duration=80
halo="projectiles/muzzle-flash-ne-2.png"
[/missile_frame]
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-ne-3.png"
[/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"
[/missile_frame]
#enddef
#define MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_SOUTH START_X START_Y
missile_start_time=-250
missile_offset=0.5~1.1:250,1.1~1.5:200,1.5~1.7:360
missile_halo_x={START_X}~0
missile_halo_y={START_Y}~0
[missile_frame]
duration=100
halo="projectiles/muzzle-flash-se-1.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=80
halo="projectiles/muzzle-flash-se-2.png~FL(vertical)"
[/missile_frame]
[missile_frame]
duration=70
halo="projectiles/muzzle-flash-se-3.png~FL(vertical)"
[/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"
[/missile_frame]
#enddef

71
data/core/units/dwarves/Dragonguard.cfg
View file

@ -42,14 +42,14 @@
[filter_attack]
name=dragonstaff
[/filter_attack]
direction=se,sw
{MISSILE_FRAME_MUZZLE_FLARE}
[frame]
begin=-600
end=-400
image="units/dwarves/dragonguard-defend.png"
[/frame]
[if]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_SOUTH 0 0}
direction=se,sw
hits=yes
[frame]
begin=-400
@ -59,6 +59,8 @@
[/frame]
[/if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=se,sw
hits=no
[frame]
begin=-400
@ -67,19 +69,9 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=dragonstaff
[/filter_attack]
direction=ne,nw
{MISSILE_FRAME_MUZZLE_FLARE}
[frame]
begin=-600
end=-400
image="units/dwarves/dragonguard-defend.png"
[/frame]
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_NORTH 0 20}
direction=ne,nw
hits=yes
[frame]
begin=-400
@ -87,8 +79,10 @@
image="units/dwarves/dragonguard-attack-ranged-ne.png"
sound=dragonstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=ne,nw
hits=no
[frame]
begin=-400
@ -97,29 +91,21 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=dragonstaff
[/filter_attack]
direction=n
{MISSILE_FRAME_MUZZLE_FLARE}
[frame]
begin=-600
end=-400
image="units/dwarves/dragonguard-attack-ranged-n.png"
[/frame]
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_NORTH 0 20}
hits=yes
direction=n
[frame]
begin=-400
end=0
image="units/dwarves/dragonguard-attack-ranged-n.png"
sound=dragonstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
hits=no
direction=n
[frame]
begin=-400
end=0
@ -127,19 +113,9 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=dragonstaff
[/filter_attack]
direction=s
{MISSILE_FRAME_MUZZLE_FLARE}
[frame]
begin=-600
end=-400
image="units/dwarves/dragonguard-attack-ranged-s.png"
[/frame]
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH 0 0}
direction=s
hits=yes
[frame]
begin=-400
@ -147,8 +123,10 @@
image="units/dwarves/dragonguard-attack-ranged-s.png"
sound=dragonstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=s
hits=no
[frame]
begin=-400
@ -157,6 +135,11 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[frame]
begin=0
end=1
image="units/dwarves/dragonguard-attack-ranged-se.png"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]

63
data/core/units/dwarves/Thunderer.cfg
View file

@ -57,9 +57,9 @@
[filter_attack]
name=thunderstick
[/filter_attack]
direction=s
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH 0 0}
direction=s
hits=yes
[frame]
begin=-400
@ -69,6 +69,8 @@
[/frame]
[/if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=s
hits=no
[frame]
begin=-400
@ -77,14 +79,9 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=thunderstick
[/filter_attack]
direction=ne,nw
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_NORTH 0 20}
direction=ne,nw
hits=yes
[frame]
begin=-400
@ -92,8 +89,10 @@
image="units/dwarves/thunderer-attack-ne.png"
sound=thunderstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=ne,nw
hits=no
[frame]
begin=-400
@ -102,14 +101,9 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=thunderstick
[/filter_attack]
direction=n
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_NORTH 0 20}
direction=n
hits=yes
[frame]
begin=-400
@ -117,8 +111,10 @@
image="units/dwarves/thunderer-attack-n.png"
sound=thunderstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=n
hits=no
[frame]
begin=-400
@ -127,34 +123,31 @@
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=thunderstick
[/filter_attack]
direction=se,sw
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_SOUTH 0 0}
direction=se,sw
hits=yes
[frame]
begin=-400
end=-300
image="units/dwarves/thunderer.png"
end=0
image="units/dwarves/thunderer-attack-se.png"
sound=thunderstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=se,sw
hits=no
[frame]
begin=-400
end=-300
image="units/dwarves/thunderer.png"
end=0
image="units/dwarves/thunderer-attack-se.png"
sound=thunderstick-miss.ogg
[/frame]
[/else]
[frame]
begin=-300
end=0
begin=0
end=1
image="units/dwarves/thunderer-attack-se.png"
[/frame]
[/attack_anim]

58
data/core/units/dwarves/Thunderguard.cfg
View file

@ -42,9 +42,9 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
[filter_attack]
name=thunderstick
[/filter_attack]
direction=se,sw
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_SOUTH 0 0}
direction=se,sw
hits=yes
[frame]
begin=-400
@ -54,6 +54,8 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
[/frame]
[/if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=se,sw
hits=no
[frame]
begin=-400
@ -62,14 +64,9 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=thunderstick
[/filter_attack]
direction=ne,nw
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_NORTH 0 20}
direction=ne,nw
hits=yes
[frame]
begin=-400
@ -77,8 +74,10 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
image="units/dwarves/thunderguard-attack-ranged-ne.png"
sound=thunderstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=ne,nw
hits=no
[frame]
begin=-400
@ -87,14 +86,9 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=thunderstick
[/filter_attack]
direction=n
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_NORTH 0 20}
direction=n
hits=yes
[frame]
begin=-400
@ -102,8 +96,10 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
image="units/dwarves/thunderguard-attack-ranged-n.png"
sound=thunderstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=n
hits=no
[frame]
begin=-400
@ -112,14 +108,9 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
sound=thunderstick-miss.ogg
[/frame]
[/else]
[/attack_anim]
[attack_anim]
[filter_attack]
name=thunderstick
[/filter_attack]
direction=s
{MISSILE_FRAME_MUZZLE_FLARE}
[if]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH 0 0}
direction=s
hits=yes
[frame]
begin=-400
@ -127,16 +118,23 @@ Though a single shot from these 'thundersticks' can take several minutes to prep
image="units/dwarves/thunderguard-attack-ranged-s.png"
sound=thunderstick.ogg
[/frame]
[/if]
[/else]
[else]
{MISSILE_FRAME_MUZZLE_FLARE_MISS}
direction=s
hits=no
[frame]
begin=400
begin=-400
end=0
image="units/dwarves/thunderguard-attack-ranged-s.png"
sound=thunderstick-miss.ogg
[/frame]
[/else]
[frame]
begin=0
end=1
image="units/dwarves/thunderguard-attack-ranged-se.png"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]