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

Remove the macros and all remaining uses of FRAME_ON_SLOW and FRAME_ON_POISON.

Browse source
This commit is contained in:
Lari Nieminen 2007-12-05 23:44:13 +00:00
parent 00a45887c5
commit dfa08f2835
14 changed files with 22 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Under_the_Burning_Suns/units/Dark_Assassin1.cfg
View file

@ -67,14 +67,12 @@
sound=throwing-knife-miss.ogg
[/frame]
[/else]
{FRAME_ON_POISON (
[frame]
begin=-100
end=0
image=units/orcs/nightstalker-ranged-2.png
sound=poison.ogg
[/frame]
)}
{SOUND:POISON}
[/attack_anim]
[attack_anim]
[attack_filter]

11
data/campaigns/Under_the_Burning_Suns/units/Desert_Druid.cfg
View file

@ -157,20 +157,13 @@ Special Notes: A druid's entangling attack slows enemies down, halving their mov
image="projectiles/entangle.png"
image_diagonal="projectiles/entangle.png"
[/missile_frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=-50
image=units/elves-desert/druid-ranged.png
sound=slowed.wav
[/frame]
)}
[frame]
begin=-50
begin=-150
end=0
image=units/elves-desert/druid-ranged.png
sound=entangle.wav
[/frame]
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Hunter.cfg
View file

@ -85,14 +85,12 @@
end=-100
image=units/elves-desert/hunter-ranged-2.png
[/frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=0
image=units/elves-desert/hunter-ranged-3.png
sound=slowed.wav
[/frame]
)}
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Prowler.cfg
View file

@ -100,14 +100,12 @@ Special Notes: The skirmish ability allows the rogue to ignore enemy units' zone
end=-100
image=units/elves-desert/prowler-ranged4.png
[/frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=0
image=units/elves-desert/prowler-ranged4.png
sound=slowed.wav
[/frame]
)}
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

4
data/campaigns/Under_the_Burning_Suns/units/Desert_Sentinel.cfg
View file

@ -88,14 +88,12 @@ The skirmish ability allows the rogue to ignore enemy units' zones of control an
end=-100
image=units/elves-desert/sentinel-ranged-2.png
[/frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=0
image=units/elves-desert/sentinel-ranged-2.png
sound=slowed.wav
[/frame]
)}
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

11
data/campaigns/Under_the_Burning_Suns/units/Desert_Shaman.cfg
View file

@ -114,20 +114,13 @@
image="projectiles/entangle.png"
image_diagonal="projectiles/entangle.png"
[/missile_frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=-50
image=units/elves-desert/shaman-attack2.png
sound=slowed.wav
[/frame]
)}
[frame]
begin=-50
begin=-150
end=0
image=units/elves-desert/shaman-attack2.png
sound=entangle.wav
[/frame]
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

13
data/campaigns/Under_the_Burning_Suns/units/Desert_Shyde.cfg
View file

@ -179,20 +179,13 @@ Special Notes: A Desert Shyde's entangling attack slows enemies down, halving th
image="projectiles/entangle.png"
image_diagonal="projectiles/entangle.png"
[/missile_frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=-50
image="units/elves-desert/shyde-ftouch-attack3.png"
sound=slowed.wav
[/frame]
)}
[frame]
sound=entangle.wav
begin=-50
begin=-150
end=0
image="units/elves-desert/shyde-ftouch-attack3.png"
sound=entangle.wav
[/frame]
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

13
data/campaigns/Under_the_Burning_Suns/units/Desert_Star.cfg
View file

@ -188,20 +188,13 @@ Special Notes: A Desert Star's entangling attack slows enemies down, halving the
image="projectiles/entangle.png"
image_diagonal="projectiles/entangle.png"
[/missile_frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=-50
image="units/elves-desert/shyde-ftouch-attack3.png"
sound=slowed.wav
[/frame]
)}
[frame]
sound=entangle.wav
begin=-50
begin=-150
end=0
image="units/elves-desert/shyde-ftouch-attack3.png"
sound=entangle.wav
[/frame]
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

4
data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg
View file

@ -84,14 +84,12 @@
end=-100
image=units/elves-desert/nym-ranged-2.png
[/frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=0
image=units/elves-desert/nym-ranged-3.png
sound=slowed.wav
[/frame]
)}
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

4
data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg
View file

@ -88,14 +88,12 @@
end=-100
image=units/elves-desert/nym-ranged-2.png
[/frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=0
image=units/elves-desert/nym-ranged-3.png
sound=slowed.wav
[/frame]
)}
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

4
data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg
View file

@ -87,14 +87,12 @@
end=-100
image=units/elves-desert/nym-ranged-2.png
[/frame]
{FRAME_ON_SLOW (
[frame]
begin=-100
end=0
image=units/elves-desert/nym-ranged-3.png
sound=slowed.wav
[/frame]
)}
{SOUND:SLOW}
[/attack_anim]
[attack_anim]
[attack_filter]

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

@ -208,98 +208,6 @@
[/unit_filter]
#enddef
#define FRAME_ON_SLOW CONTENTS
# When a unit is slowed, the slowed sound (slowed.wav) should be
# played by the attack animation. Wrap the [frame] containing
# the sound= key inside this macro, and the sound will not get
# played if the attack misses or the target already is slowed.
[if]
hits=yes
[secondary_unit_filter]
[not]
[wml_filter]
[status]
slowed="yes"
[/status]
[/wml_filter]
[/not]
[/secondary_unit_filter]
{CONTENTS}
[/if]
[else]
hits=yes
[secondary_unit_filter]
[wml_filter]
[status]
slowed="yes"
[/status]
[/wml_filter]
[/secondary_unit_filter]
{CONTENTS}
[+frame]
sound=
[/frame]
[/else]
[else]
hits=no
{CONTENTS}
[+frame]
sound=
[/frame]
[/else]
#enddef
#define FRAME_ON_POISON CONTENTS
# When a unit is poisoned, the poison sound (poison.ogg) should
# be played by the attack animation. Wrap the [frame] containing
# the sound= key inside this macro, and the sound will not get
# played if the attack misses or the target already is poisoned.
[if]
hits=yes
[secondary_unit_filter]
[not]
[wml_filter]
[status]
poisoned="yes"
[/status]
[/wml_filter]
[/not]
[/secondary_unit_filter]
{CONTENTS}
[/if]
[else]
hits=yes
[secondary_unit_filter]
[wml_filter]
[status]
poisoned="yes"
[/status]
[/wml_filter]
[/secondary_unit_filter]
{CONTENTS}
[+frame]
sound=
[/frame]
[/else]
[else]
hits=no
{CONTENTS}
[+frame]
sound=
[/frame]
[/else]
#enddef
#define HIT_MISS_SOUNDS HITSOUND MISSSOUND CONTENTS
# A more convenient way of wiring in hit and miss sounds to an
# attack animation. Use by wrapping a [frame] inside this macro.

4
data/core/units/monsters/Cuttle_Fish.cfg
View file

@ -86,14 +86,12 @@ Special Notes:"+{SPECIAL_NOTES_POISON}+{SPECIAL_NOTES_SWARM}
sound=squishy-miss.wav
[/frame]
[/else]
{FRAME_ON_POISON (
[frame]
begin=-100
end=0
image="units/monsters/cuttlefish.png"
sound=poison.ogg
[/frame]
)}
{SOUND:POISON}
[/attack_anim]
[attack_anim]
[attack_filter]

6
data/core/units/orcs/Assassin.cfg
View file

@ -98,12 +98,13 @@ Special Notes:"+{SPECIAL_NOTES_POISON}
image="projectiles/dagger-n.png"
image_diagonal="projectiles/dagger-ne.png"
[/missile_frame]
{HIT_MISS_SOUNDS throwing-knife.ogg throwing-knife-miss.ogg -200}
{HIT_MISS_SOUNDS throwing-knife.ogg throwing-knife-miss.ogg (
[frame]
begin=-200
end=-100
image="units/orcs/assassin-ranged1.png"
[/frame]
)}
[frame]
begin=-100
end=0
@ -120,12 +121,13 @@ Special Notes:"+{SPECIAL_NOTES_POISON}
end=-150
image="units/orcs/assassin-attack1.png"
[/frame]
{HIT_MISS_SOUNDS dagger-swish.wav {SOUND_LIST:MISS} -100}
{HIT_MISS_SOUNDS dagger-swish.wav {SOUND_LIST:MISS} (
[frame]
begin=-150
end=100
image="units/orcs/assassin-attack2.png"
[/frame]
)}
[frame]
begin=100
end=200