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

Removed the old HIT_MISS_SOUNDS macro in favour of the fancier new one.

Browse source
This commit is contained in:
Lari Nieminen 2007-12-06 13:20:06 +00:00
parent b1597b31fd
commit acf126d2fc
8 changed files with 10 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Descent_Into_Darkness/units/apprentice-mage.cfg
View file

@ -50,13 +50,12 @@
image="projectiles/darkmissile-n.png"
image_diagonal="projectiles/darkmissile-ne.png"
[/missile_frame]
{HIT_MISS_SOUNDS magic-dark.ogg magic-dark-miss.ogg (
{SOUND:HIT_AND_MISS magic-dark.ogg magic-dark-miss.ogg -200}
[frame]
begin=-200
end=-100
image=units/apprentice-mage-magic-1.png
[/frame]
)}
[frame]
begin=-100
end=0
@ -77,13 +76,12 @@
end=-100
image=units/apprentice-mage-sword-1.png
[/frame]
{HIT_MISS_SOUNDS sword-1.ogg {SOUND_LIST:MISS} (
{SOUND:HIT_AND_MISS sword-1.ogg {SOUND_LIST:MISS} -100}
[frame]
begin=-100
end=50
image=units/apprentice-mage-sword-2.png
[/frame]
)}
[frame]
begin=50
end=125

6
data/campaigns/Descent_Into_Darkness/units/apprentice-necromancer.cfg
View file

@ -67,13 +67,12 @@
end=-200
image="units/apprentice-necromancer-magic-1.png"
[/frame]
{HIT_MISS_SOUNDS magic-dark.ogg magic-dark-miss.ogg (
{SOUND:HIT_AND_MISS magic-dark.ogg magic-dark-miss.ogg -200}
[frame]
begin=-200
end=-100
image="units/apprentice-necromancer-magic-2.png"
[/frame]
)}
[frame]
begin=-100
end=0
@ -99,13 +98,12 @@
end=-100
image=apprentice-necromancer-sword-1.png
[/frame]
{HIT_MISS_SOUNDS sword-1.ogg {SOUND_LIST:MISS} (
{SOUND:HIT_AND_MISS sword-1.ogg {SOUND_LIST:MISS} -100}
[frame]
begin=-100
end=100
image=units/apprentice-necromancer-sword-2.png
[/frame]
)}
[frame]
begin=100
end=175

3
data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
View file

@ -43,13 +43,12 @@
end=-50
image="units/heroes/haldric-ii-sword-2.png"
[/frame]
{HIT_MISS_SOUNDS sword-1.ogg {SOUND_LIST:MISS} (
{SOUND:HIT_AND_MISS sword-1.ogg {SOUND_LIST:MISS} -100}
[frame]
begin=-50
end=100
image="units/heroes/haldric-ii-sword-3.png"
[/frame]
)}
[frame]
begin=100
end=175

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

@ -208,31 +208,6 @@
[/unit_filter]
#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.
# Then, if the attack misses, HITSOUND will be played and if it
# misses, MISSSOUND will be played instead.
[if]
hits=yes
{CONTENTS}
[+frame]
sound={HITSOUND}
[/frame]
[/if]
[else]
hits=no
{CONTENTS}
[+frame]
sound={MISSSOUND}
[/frame]
[/else]
#enddef
#define MISSILE_FRAME_WAIL
# Animate a projectile for a wail attack.
[if]

3
data/core/units/humans/Loyalist_Master_at_Arms.cfg
View file

@ -63,13 +63,12 @@ Special Notes:"+{SPECIAL_NOTES_SKIRMISHER}
end=-400
image="units/human-loyalists/master-at-arms-crossbow-2.png"
[/frame]
{HIT_MISS_SOUNDS crossbow.ogg crossbow-miss.ogg (
{SOUND:HIT_AND_MISS crossbow.ogg crossbow-miss.ogg -400}
[frame]
begin=-400
end=-300
image="units/human-loyalists/master-at-arms-crossbow-3.png"
[/frame]
)}
[frame]
begin=-300
end=-100

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

@ -38,14 +38,12 @@
end=-150
image="units/human-outlaws/highwayman.png"
[/frame]
{HIT_MISS_SOUNDS mace.wav {SOUND_LIST:MISS} (
{SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100}
[frame]
begin=-150
end=150
image="units/human-outlaws/highwayman-melee.png"
[/frame]
)}
[frame]
begin=150
end=200

3
data/core/units/merfolk/Priestess.cfg
View file

@ -123,13 +123,12 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_CU
end=-150
image="units/merfolk/priestess.png"
[/frame]
{HIT_MISS_SOUNDS staff.wav {SOUND_LIST:MISS} (
{SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -100}
[frame]
begin=-150
end=100
image="units/merfolk/priestess-staff-attack.png"
[/frame]
)}
[frame]
begin=100
end=175

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

@ -98,13 +98,12 @@ 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 (
{SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -200}
[frame]
begin=-200
end=-100
image="units/orcs/assassin-ranged1.png"
[/frame]
)}
[frame]
begin=-100
end=0
@ -121,13 +120,12 @@ Special Notes:"+{SPECIAL_NOTES_POISON}
end=-150
image="units/orcs/assassin-attack1.png"
[/frame]
{HIT_MISS_SOUNDS dagger-swish.wav {SOUND_LIST:MISS} (
{SOUND:HIT_AND_MISS dagger-swish.wav {SOUND_LIST:MISS} -100}
[frame]
begin=-150
end=100
image="units/orcs/assassin-attack2.png"
[/frame]
)}
[frame]
begin=100
end=200