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

Animation WML: fix unit/macro WML for sound start time in additional frames without duration 1 work around.

Browse source
This commit is contained in:
David Mikos 2013-10-08 19:31:31 +10:30
parent e994f92fa3
commit 971dde985a
21 changed files with 39 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,11 +60,8 @@
image={BASE_IMAGE}:1,{REACTION_IMAGE}:250,{BASE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -83,11 +80,8 @@
image={BASE_IMAGE}:1,{REACTION_IMAGE}:250,{BASE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -107,11 +101,8 @@
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -125,11 +116,8 @@
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -150,11 +138,8 @@
image={BASE_IMAGE}:1,{REACTION_IMAGE}:250,{BASE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -170,11 +155,8 @@
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -187,11 +169,8 @@
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -210,11 +189,8 @@
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -230,11 +206,8 @@
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
@ -259,11 +232,8 @@
[/frame]
# wmlscope: stop ignoring
[if]
hit_sound_start_time=-26
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
duration=1
[/hit_sound_frame]
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]

20
data/core/macros/animation-utils2.cfg
View file

@ -21,10 +21,7 @@
#define ATTACK_ANIM_DIRECTIONAL_9_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-450
sound_start_time=-101
[sound_frame]
duration=1
[/sound_frame]
sound_start_time=-100
[if]
hits=no
[sound_frame]
@ -53,10 +50,7 @@
#define ATTACK_ANIM_DIRECTIONAL_10_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-450
sound_start_time=-101
[sound_frame]
duration=1
[/sound_frame]
sound_start_time=-100
[if]
hits=no
[sound_frame]
@ -85,10 +79,7 @@
#define ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-500
sound_start_time=-101
[sound_frame]
duration=1
[/sound_frame]
sound_start_time=-100
[if]
hits=no
[sound_frame]
@ -130,10 +121,7 @@
#define ATTACK_ANIM_QUAD_DIRECTIONAL_12_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-600
sound_start_time=-101
[sound_frame]
duration=1
[/sound_frame]
sound_start_time=-100
[if]
hits=no
[sound_frame]

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

@ -841,10 +841,7 @@ zombie-hit-[1~6].ogg #enddef
[/not]
[/filter_second]
slowed_sound_start_time=-101
[slowed_sound_frame]
duration=1
[/slowed_sound_frame]
slowed_sound_start_time=-100
[slowed_sound_frame]
sound=slowed.wav
[/slowed_sound_frame]
@ -873,10 +870,7 @@ zombie-hit-[1~6].ogg #enddef
[/not]
[/filter_second]
poisoned_sound_start_time=-101
[poisoned_sound_frame]
duration=1
[/poisoned_sound_frame]
poisoned_sound_start_time=-100
[poisoned_sound_frame]
sound=poison.ogg
[/poisoned_sound_frame]
@ -889,9 +883,6 @@ zombie-hit-[1~6].ogg #enddef
# when they should trigger.
attack_sound_start_time={TIME}
[attack_sound_frame]
duration=1
[/attack_sound_frame]
[if]
hits=yes
[attack_sound_frame]
@ -914,9 +905,6 @@ zombie-hit-[1~6].ogg #enddef
[if]
hits=yes
attack_sound_start_time={TIME}
[attack_sound_frame]
duration=1
[/attack_sound_frame]
[attack_sound_frame]
sound={HITSOUND}
[/attack_sound_frame]

26
data/core/units/dwarves/Dragonguard.cfg
View file

@ -68,7 +68,7 @@
name=dragonstaff
[/filter_attack]
start_time=-1250
sound_start_time=-251
sound_start_time=-250
halo_start_time=-251
[if]
@ -93,9 +93,6 @@
auto_vflip=false
[/halo_frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=dragonstick.ogg
[/sound_frame]
@ -114,9 +111,6 @@
image="units/dwarves/dragonguard/dragonguard.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -140,9 +134,6 @@
auto_vflip=false
[/halo_frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=dragonstick.ogg
[/sound_frame]
@ -158,9 +149,6 @@
image="units/dwarves/dragonguard/dragonguard-ne.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -187,9 +175,6 @@
auto_vflip=false
[/halo_frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=dragonstick.ogg
[/sound_frame]
@ -208,9 +193,6 @@
image="units/dwarves/dragonguard/dragonguard-ne.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -234,9 +216,6 @@
auto_vflip=false
[/halo_frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=dragonstick.ogg
[/sound_frame]
@ -252,9 +231,6 @@
image="units/dwarves/dragonguard/dragonguard.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]

26
data/core/units/dwarves/Thunderer.cfg
View file

@ -83,7 +83,7 @@
name=thunderstick
[/filter_attack]
start_time=-750
sound_start_time=-251
sound_start_time=-250
[if]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH -6 -5}
@ -96,9 +96,6 @@
image="units/dwarves/thunderer/thunderer.png:280"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -114,9 +111,6 @@
image="units/dwarves/thunderer/thunderer.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -132,9 +126,6 @@
image="units/dwarves/thunderer/thunderer-ne.png:280"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -150,9 +141,6 @@
image="units/dwarves/thunderer/thunderer-ne.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -168,9 +156,6 @@
image="units/dwarves/thunderer/thunderer-ne.png:280"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -186,9 +171,6 @@
image="units/dwarves/thunderer/thunderer-ne.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -204,9 +186,6 @@
image="units/dwarves/thunderer/thunderer.png:280"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -222,9 +201,6 @@
image="units/dwarves/thunderer/thunderer.png:20"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]

26
data/core/units/dwarves/Thunderguard.cfg
View file

@ -69,7 +69,7 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
name=thunderstick
[/filter_attack]
start_time=-750
sound_start_time=-251
sound_start_time=-250
[if]
{MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH 2 1}
@ -82,9 +82,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -100,9 +97,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -118,9 +112,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard-ne.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -136,9 +127,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard-ne.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -154,9 +142,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard-ne.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -172,9 +157,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard-ne.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]
@ -190,9 +172,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick.ogg
[/sound_frame]
@ -208,9 +187,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to
image="units/dwarves/thunderguard/thunderguard.png:10"
[/frame]
[sound_frame]
duration=1
[/sound_frame]
[sound_frame]
sound=thunderstick-miss.ogg
[/sound_frame]

5
data/core/units/elves/Druid.cfg
View file

@ -111,10 +111,7 @@ The chief ability of Druids lies in healing, and it is for this skill that they
halo="halo/elven/nature-halo[1~8].png"
halo_x,halo_y=0,-12
[/frame]
attack_sound_start_time=-76
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-75
[attack_sound_frame]
sound=entangle.wav
[/attack_sound_frame]

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

@ -99,10 +99,7 @@
halo=halo/elven/nature-halo[1~8].png
halo_x,halo_y=0,-28
[/frame]
attack_sound_start_time=-76
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-75
[attack_sound_frame]
sound=entangle.wav
[/attack_sound_frame]

5
data/core/units/elves/High_Lord.cfg
View file

@ -46,10 +46,7 @@
[/frame]
[if]
hits=hit
hit_sound_start_time=-51
[hit_sound_frame]
duration=1
[/hit_sound_frame]
hit_sound_start_time=-50
[hit_sound_frame]
sound={SOUND_LIST:ELF_HIT}
[/hit_sound_frame]

5
data/core/units/elves/Shaman.cfg
View file

@ -87,10 +87,7 @@ The healing abilities of the elves are also remarkable, and of capital use in ba
halo=halo/elven/nature-halo[1~6].png:75,halo/elven/nature-halo[7~8].png:50
halo_x,halo_y=0,-12
[/frame]
attack_sound_start_time=-76
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-75
[attack_sound_frame]
sound=entangle.wav
[/attack_sound_frame]

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

@ -115,10 +115,7 @@
halo=halo/elven/nature-halo[1~8].png:75
halo_x,halo_y=0,-12
[/frame]
attack_sound_start_time=-76
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-75
[attack_sound_frame]
sound=entangle.wav
[/attack_sound_frame]

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

@ -102,10 +102,7 @@ Those able to do so are roughly titled as ‘sorceresses’ by other races; and
halo=halo/elven/nature-halo[1~8].png:75
halo_x,halo_y=0,-28
[/frame]
attack_sound_start_time=-76
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-75
[attack_sound_frame]
sound=entangle.wav
[/attack_sound_frame]

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

@ -104,10 +104,7 @@
halo=halo/elven/faerie-fire-halo[1~7].png:75
halo_x,halo_y=0,-28
[/frame]
attack_sound_start_time=-76
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-75
[attack_sound_frame]
sound=entangle.wav
[/attack_sound_frame]

5
data/core/units/humans/Loyalist_Javelineer.cfg
View file

@ -69,10 +69,7 @@
[frame]
image="units/human-loyalists/javelineer-attack-ranged-[1~4].png:[100*3,50]"
[/frame]
attack_sound_start_time=-51
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-50
[attack_sound_frame]
duration=100
sound={SOUND_LIST:THROW}

5
data/core/units/merfolk/Hunter.cfg
View file

@ -84,10 +84,7 @@
image="units/merfolk/hunter-throw-[1~8].png:[100*2,120,220,120,100*3]"
[/frame]
attack_sound_start_time=-221
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-220
[attack_sound_frame]
duration=120
sound={SOUND_LIST:THROW}

10
data/core/units/saurians/Ambusher.cfg
View file

@ -70,19 +70,13 @@
[/missile_frame]
start_time=-450
throw_sound_start_time=-151
sound_start_time=-101
throw_sound_start_time=-150
sound_start_time=-100
[throw_sound_frame]
duration=1
[/throw_sound_frame]
[throw_sound_frame]
sound={SOUND_LIST:THROW}
[/throw_sound_frame]
[sound_frame]
duration=1
[/sound_frame]
[if]
hits=yes
[sound_frame]

10
data/core/units/saurians/Flanker.cfg
View file

@ -70,19 +70,13 @@
[/missile_frame]
start_time=-450
throw_sound_start_time=-151
sound_start_time=-101
throw_sound_start_time=-150
sound_start_time=-100
[throw_sound_frame]
duration=1
[/throw_sound_frame]
[throw_sound_frame]
sound={SOUND_LIST:THROW}
[/throw_sound_frame]
[sound_frame]
duration=1
[/sound_frame]
[if]
hits=yes
[sound_frame]

10
data/core/units/saurians/Skirmisher.cfg
View file

@ -86,19 +86,13 @@ Spears are their preferred weapon, as their powerful hind legs can drive a spear
[/missile_frame]
start_time=-450
throw_sound_start_time=-151
sound_start_time=-101
throw_sound_start_time=-150
sound_start_time=-100
[throw_sound_frame]
duration=1
[/throw_sound_frame]
[throw_sound_frame]
sound={SOUND_LIST:THROW}
[/throw_sound_frame]
[sound_frame]
duration=1
[/sound_frame]
[if]
hits=yes
[sound_frame]

10
data/core/units/undead/Spirit_Ghost.cfg
View file

@ -36,10 +36,7 @@
offset=0.0~-0.05:126,-0.05~0.0:126
alpha=0.8~0.5:126,0.5~0.8:126
hit_sound_start_time=-26
[hit_sound_frame]
duration=1
[/hit_sound_frame]
hit_sound_start_time=-25
[hit_sound_frame]
sound=wail-sml.wav
[/hit_sound_frame]
@ -116,10 +113,7 @@
image="units/undead/ghost-n-attack-[1,2,1].png:[75,150,75]"
[/frame]
[/else]
attack_sound_start_time=-101
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-100
[attack_sound_frame]
sound=wail-sml.wav
[/attack_sound_frame]

10
data/core/units/undead/Spirit_Shadow.cfg
View file

@ -41,10 +41,7 @@ That is a question which is easily answered by a necromancer."+{SPECIAL_NOTES}+{
hits=hit
offset=0.0~-0.05:126,-0.05~0.0:126
alpha=0.8~0.5:126,0.5~0.8:126
hit_sound_start_time=-26
[hit_sound_frame]
duration=1
[/hit_sound_frame]
hit_sound_start_time=-25
[hit_sound_frame]
sound=wail-sml.wav
[/hit_sound_frame]
@ -118,10 +115,7 @@ That is a question which is easily answered by a necromancer."+{SPECIAL_NOTES}+{
image="units/undead/shadow-s-2.png:25"
[/frame]
[/else]
attack_sound_start_time=-326
[attack_sound_frame]
duration=1
[/attack_sound_frame]
attack_sound_start_time=-325
[attack_sound_frame]
duration=50
sound=wail-sml.wav

5
data/core/units/undead/Spirit_Wraith.cfg
View file

@ -62,10 +62,7 @@
offset=0.0~-0.05:126,-0.05~0.0:126
alpha=0.8~0.5:126,0.5~0.8:126
hit_sound_start_time=-26
[hit_sound_frame]
duration=1
[/hit_sound_frame]
hit_sound_start_time=-25
[hit_sound_frame]
sound=wail-sml.wav
[/hit_sound_frame]