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

Decoupled slow and poison sounds from animations

Browse source
This commit is contained in:
ln-zookeeper 2014-12-07 14:27:05 +02:00
parent d1d0990235
commit 1ff69616bf
2 changed files with 103 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -134,6 +134,8 @@ Version 1.13.0-dev:
for more details.
* Replays:
* Added a button that allows playing a single move in replay mode.
* Sound:
* Fixed issues with slowed and poisoned sounds not always playing correctly.
* Units:
* Increased the experience requirement for the Rami from 32 to 39
* Increased the experience requirement for the Saree from 56 to 64
@ -212,6 +214,8 @@ Version 1.13.0-dev:
* Fixed nested macros emitting incorrect bindings to the default 'wesnoth'
textdomain at the end of a substitution instead of the parent textdomain,
this breaking localization of subsequent strings (bug #22962).
* Sounds for slow and poison are automatically played when slowing/poisoning
a unit, and should no longer be played by the attack animations.
* Miscellaneous and bug fixes:
* replace 'fight_on_without_leader'=yes/no with defeat_condition=no_leader/
no_units/always/never which allows the wml developer to decide when a side

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

@ -910,3 +910,102 @@ zombie-hit-[1~6].ogg #enddef
[/attack_sound_frame]
[/if]
#enddef
[lua]
code=<<
wesnoth.wml_actions.event{
name="attacker hits",
id="attacker hits and slows",
first_time_only=false,
{ "filter_attack", {
special="slow"
}},
{ "filter_second", {
{ "not", {
{ "filter_wml", {
{ "status", {
slowed=true
}}
}}
}}
}},
{ "sound", {
name="slowed.wav"
}}
}
wesnoth.wml_actions.event{
name="defender hits",
id="defender hits and slows",
first_time_only=false,
{ "filter_second_attack", {
special="slow"
}},
{ "filter", {
{ "not", {
{ "filter_wml", {
{ "status", {
slowed=true
}}
}}
}}
}},
{ "sound", {
name="slowed.wav"
}}
}
wesnoth.wml_actions.event{
name="attacker hits",
id="attacker hits and poisons",
first_time_only=false,
{ "filter_attack", {
special="poison"
}},
{ "filter_second", {
{ "not", {
{ "filter_wml", {
{ "status", {
poisoned=true
}}
}}
}}
}},
{ "sound", {
name="poison.ogg"
}}
}
wesnoth.wml_actions.event{
name="defender hits",
id="defender hits and poisons",
first_time_only=false,
{ "filter_second_attack", {
special="poison"
}},
{ "filter", {
{ "not", {
{ "filter_wml", {
{ "status", {
poisoned=true
}}
}}
}}
}},
{ "sound", {
name="poison.ogg"
}}
}
>>
[/lua]