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

Fixed WML bugs with DEFENSE_ANIM_FILTERED and DEFENSE_ANIM_ELVEN_FILTERED.

Browse source
This commit is contained in:
Lari Nieminen 2007-08-07 12:58:32 +00:00
parent 2ee06f38dc
commit d577ee5237
8 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Under_the_Burning_Suns/units/Naga_Hunter.cfg
View file

@ -36,7 +36,7 @@
[/frame]
[/movement_anim]
{DEFENSE_ANIM "units/nagas/hunter-defend-both.png" "units/nagas/hunter.png" {SOUND_LIST:NAGA_HIT} }
{DEFENSE_ANIM_FILTERED "units/nagas/hunter-defend-melee.png" "units/nagas/hunter.png" {SOUND_LIST:NAGA_HIT} range=melee }
{DEFENSE_ANIM_RANGE "units/nagas/hunter-defend-melee.png" "units/nagas/hunter.png" {SOUND_LIST:NAGA_HIT} melee }
[attack]
name=sword
description= _"sword"

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

@ -114,13 +114,15 @@
[/defend]
#enddef
#define DEFENSE_ANIM_ELVEN_FILTERED REACTION BASEFRAME HITSOUND FILTER
#define DEFENSE_ANIM_ELVEN_RANGE REACTION BASEFRAME HITSOUND RANGE
# Define a defensive animation moving from a specified BASEFRAME
# to REACTION, with HITSOUND playing only if a hit occurs and an
# elven halo waxing and waning during the animation. This fires
# only if FILTER is matched.
# elven halo waxing and waning during the animation. This
# fires only on the class of attacks specified by RANGE.
[defend]
{FILTER}
[attack_filter}
range={RANGE}
[/attack_filter]
[frame]
begin=-175
end=-150

4
data/core/units/elves/Enchantress.cfg
View file

@ -230,6 +230,6 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
[/frame]
[/animation]
[/attack]
{DEFENSE_ANIM_FILTERED "units/elves-wood/enchantress-defend.png" "units/elves-wood/enchantress.png" {SOUND_LIST:ELF_FEMALE_HIT} range=melee }
{DEFENSE_ANIM_ELVEN_FILTERED "units/elves-wood/enchantress-defend.png" "units/elves-wood/enchantress.png" {SOUND_LIST:ELF_FEMALE_HIT} range=ranged }
{DEFENSE_ANIM_RANGE "units/elves-wood/enchantress-defend.png" "units/elves-wood/enchantress.png" {SOUND_LIST:ELF_FEMALE_HIT} melee }
{DEFENSE_ANIM_ELVEN_RANGE "units/elves-wood/enchantress-defend.png" "units/elves-wood/enchantress.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged }
[/unit]

4
data/core/units/elves/Shyde.cfg
View file

@ -228,8 +228,8 @@ Special Notes:"+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_CURES}
[/frame]
[/animation]
[/attack]
{DEFENSE_ANIM_FILTERED "units/elves-wood/shyde-defend.png" "units/elves-wood/shyde.png" {SOUND_LIST:ELF_FEMALE_HIT} range=melee }
{DEFENSE_ANIM_ELVEN_FILTERED "units/elves-wood/shyde-defend.png" "units/elves-wood/shyde.png" {SOUND_LIST:ELF_FEMALE_HIT} range=ranged }
{DEFENSE_ANIM_RANGE "units/elves-wood/shyde-defend.png" "units/elves-wood/shyde.png" {SOUND_LIST:ELF_FEMALE_HIT} melee }
{DEFENSE_ANIM_ELVEN_RANGE "units/elves-wood/shyde-defend.png" "units/elves-wood/shyde.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged }
[healing_anim]
[frame]
begin=-200

4
data/core/units/elves/Sorceress.cfg
View file

@ -238,6 +238,6 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
[/frame]
[/animation]
[/attack]
{DEFENSE_ANIM_FILTERED "units/elves-wood/sorceress-defend.png" "units/elves-wood/sorceress.png" {SOUND_LIST:ELF_FEMALE_HIT} range=melee }
{DEFENSE_ANIM_ELVEN_FILTERED "units/elves-wood/sorceress-defend.png" "units/elves-wood/sorceress.png" {SOUND_LIST:ELF_FEMALE_HIT} range=ranged }
{DEFENSE_ANIM_RANGE "units/elves-wood/sorceress-defend.png" "units/elves-wood/sorceress.png" {SOUND_LIST:ELF_FEMALE_HIT} melee }
{DEFENSE_ANIM_ELVEN_RANGE "units/elves-wood/sorceress-defend.png" "units/elves-wood/sorceress.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged }
[/unit]

4
data/core/units/elves/Sylph.cfg
View file

@ -211,6 +211,6 @@ Special Notes:"+{SPECIAL_NOTES_SLOW}
[/frame]
[/animation]
[/attack]
{DEFENSE_ANIM_FILTERED "units/elves-wood/sylph-defend.png" "units/elves-wood/sylph.png" {SOUND_LIST:ELF_FEMALE_HIT} range=melee }
{DEFENSE_ANIM_ELVEN_FILTERED "units/elves-wood/sylph-defend.png" "units/elves-wood/sylph.png" {SOUND_LIST:ELF_FEMALE_HIT} range=ranged }
{DEFENSE_ANIM_RANGE "units/elves-wood/sylph-defend.png" "units/elves-wood/sylph.png" {SOUND_LIST:ELF_FEMALE_HIT} melee }
{DEFENSE_ANIM_ELVEN_RANGE "units/elves-wood/sylph-defend.png" "units/elves-wood/sylph.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged }
[/unit]

6
data/core/units/humans/Loyalist_General.cfg
View file

@ -30,8 +30,8 @@
Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM_FILTERED "units/human-loyalists/general-defend-2.png" "units/human-loyalists/general-defend-1.png" {SOUND_LIST:HUMAN_HIT} range=melee }
{DEFENSE_ANIM_FILTERED "units/human-loyalists/general-crossbow-defend.png" "units/human-loyalists/general-attack-crossbow.png" {SOUND_LIST:HUMAN_HIT} range=ranged }
{DEFENSE_ANIM_RANGE "units/human-loyalists/general-defend-2.png" "units/human-loyalists/general-defend-1.png" {SOUND_LIST:HUMAN_HIT} melee }
{DEFENSE_ANIM_RANGE "units/human-loyalists/general-crossbow-defend.png" "units/human-loyalists/general-attack-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged }
[resistance]
blade=90
pierce=90
@ -72,7 +72,7 @@ Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
end=-100
image="units/human-loyalists/general-attack-sword1.png"
offset=0.15~0.35
[/frame]
[/frame]
[if]
hits=yes
[frame]

4
data/core/units/humans/Loyalist_Grand_Marshal.cfg
View file

@ -26,8 +26,8 @@
Special Notes:"+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM_FILTERED "units/human-loyalists/marshal-defend.png" "units/human-loyalists/marshal.png" {SOUND_LIST:HUMAN_HIT} range=melee }
{DEFENSE_ANIM_FILTERED "units/human-loyalists/marshal-defend-crossbow.png" "units/human-loyalists/marshal-defend-crossbow.png" {SOUND_LIST:HUMAN_HIT} range=ranged }
{DEFENSE_ANIM_RANGE "units/human-loyalists/marshal-defend.png" "units/human-loyalists/marshal.png" {SOUND_LIST:HUMAN_HIT} melee }
{DEFENSE_ANIM_RANGE "units/human-loyalists/marshal-defend-crossbow.png" "units/human-loyalists/marshal-defend-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged }
[resistance]
blade=80
pierce=80