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

AnimationWML: Fix sound timings for drake fire animation macros

Browse source
This commit is contained in:
David Mikos 2014-04-17 06:49:09 +09:30
parent da7463406d
commit b7d22fea3b
2 changed files with 22 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -23,6 +23,8 @@ Version 1.11.12+dev:
* Language and i18n:
* Updated translations: Czech, French, Hungarian, Italian, Slovak
* Added missing translation mark for mp-related idle notification string
* Units:
* Fix sound timings for drake fire animation macros
* Miscellaneous and bug fixes:
* Petrified units are no longer displayed in the "Damage versus" tooltip.
* Fix bug #21759: "timer refreshed too often when time runs out"

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

@ -990,14 +990,11 @@
start_time=-900
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-1.png:100"
sound=flame-big.ogg
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-[2~4,2].png:100"
image="units/drakes/{DRAKE_NAME}-fire-inhale-[1~4,2].png:100"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-{DIRECTION_SUFFIX}-[1~3,2,1].png:100"
sound=flame-big.ogg
[/frame]
[/attack_anim]
@ -1053,14 +1050,11 @@
start_time=-900
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-1.png:100"
sound=flame-big-miss.ogg
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-[2~4,2].png:100"
image="units/drakes/{DRAKE_NAME}-fire-inhale-[1~4,2].png:100"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-{DIRECTION_SUFFIX}-[1~3,2,1].png:100"
sound=flame-big-miss.ogg
[/frame]
[/attack_anim]
#enddef
@ -1077,25 +1071,13 @@
halo_x,halo_y={OFFSET_POSITION}
[/missile_frame]
start_time=-900
[if]
hits=no
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big-miss.ogg
[/frame]
[/if]
[else]
hits=yes
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big.ogg
[/frame]
[/else]
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-[1~4,2].png:100"
[/frame]
{SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -480}
[frame]
image="units/drakes/{DRAKE_NAME}-fire-se-[1~3,2,1].png:100"
[/frame]
@ -1114,25 +1096,13 @@
halo_x,halo_y={OFFSET_POSITION}
[/missile_frame]
start_time=-900
[if]
hits=no
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big-miss.ogg
[/frame]
[/if]
[else]
hits=yes
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big.ogg
[/frame]
[/else]
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-[1~4,2].png:100"
[/frame]
{SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -480}
[frame]
image="units/drakes/{DRAKE_NAME}-fire-se-[1~3,2,1].png:100"
[/frame]
@ -1151,25 +1121,13 @@
halo_x,halo_y={OFFSET_POSITION}
[/missile_frame]
start_time=-900
[if]
hits=no
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big-miss.ogg
[/frame]
[/if]
[else]
hits=yes
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big.ogg
[/frame]
[/else]
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-[1~4,2].png:100"
[/frame]
{SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -480}
[frame]
image="units/drakes/{DRAKE_NAME}-fire-s-[1~3,2,1].png:100"
[/frame]
@ -1188,25 +1146,13 @@
halo_x,halo_y={OFFSET_POSITION}
[/missile_frame]
start_time=-900
[if]
hits=no
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big-miss.ogg
[/frame]
[/if]
[else]
hits=yes
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
sound=flame-big.ogg
[/frame]
[/else]
[frame]
image="units/drakes/{DRAKE_NAME}.png:20"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fire-inhale-[1~4,2].png:100"
[/frame]
{SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -480}
[frame]
image="units/drakes/{DRAKE_NAME}-fire-s-[1~3,2,1].png:100"
[/frame]