upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 10:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

AnimationWML: match hit and miss sound args properly for ATTACK_ANIM_* macros

Browse Source
This commit is contained in:
David Mikos 2013-10-10 15:17:08 +10:30
parent 1bcbb0d95e
commit d6dc00c200
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/core/macros/animation-utils2.cfg
View File

@ -23,13 +23,13 @@
start_time=-450
sound_start_time=-100
[if]
hits=no
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=yes
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
@ -52,13 +52,13 @@
start_time=-450
sound_start_time=-100
[if]
hits=no
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=yes
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
@ -81,13 +81,13 @@
start_time=-500
sound_start_time=-100
[if]
hits=no
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=yes
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
@ -123,13 +123,13 @@
start_time=-600
sound_start_time=-100
[if]
hits=no
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=yes
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]

2
data/core/units/humans/Horseman.cfg
View File

@ -61,6 +61,6 @@
offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
start_time=0
{ATTACK_ANIM_QUAD_DIRECTIONAL_12_FRAME "units/human-loyalists/horseman/horseman" "attack" {SOUND_LIST:MISS} spear.ogg}
{ATTACK_ANIM_QUAD_DIRECTIONAL_12_FRAME "units/human-loyalists/horseman/horseman" "attack" spear.ogg {SOUND_LIST:MISS}}
[/attack_anim]
[/unit_type]

2
data/core/units/saurians/Ambusher.cfg
View File

@ -104,6 +104,6 @@
offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
start_time=0
{ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME "units/saurians/ambusher/ambusher" "melee" spear-miss.ogg spear.ogg}
{ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME "units/saurians/ambusher/ambusher" "melee" spear.ogg spear-miss.ogg}
[/attack_anim]
[/unit_type]

2
data/core/units/saurians/Flanker.cfg
View File

@ -104,6 +104,6 @@
offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
start_time=0
{ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME "units/saurians/flanker/flanker" "melee" spear-miss.ogg spear.ogg}
{ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME "units/saurians/flanker/flanker" "melee" spear.ogg spear-miss.ogg}
[/attack_anim]
[/unit_type]

2
data/core/units/saurians/Skirmisher.cfg
View File

@ -120,6 +120,6 @@ Spears are their preferred weapon, as their powerful hind legs can drive a spear
offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
start_time=0
{ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME "units/saurians/skirmisher/skirmisher" "melee" spear-miss.ogg spear.ogg}
{ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME "units/saurians/skirmisher/skirmisher" "melee" spear.ogg spear-miss.ogg}
[/attack_anim]
[/unit_type]

2
data/core/units/undead/Skeleton.cfg
View File

@ -77,6 +77,6 @@
[filter_attack]
name=axe
[/filter_attack]
{ATTACK_ANIM_DIRECTIONAL_10_FRAME "units/undead-skeletal/skeleton/skeleton" "melee" {SOUND_LIST:MISS} axe.ogg}
{ATTACK_ANIM_DIRECTIONAL_10_FRAME "units/undead-skeletal/skeleton/skeleton" "melee" axe.ogg {SOUND_LIST:MISS}}
[/attack_anim]
[/unit_type]