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

Use SOUND:HIT[_AND_MISS] for defend/attack macros

Browse source 
While this could change the time other [sound_frame]s are played,
well-written code shouldn't rely on the internal naming in macros.

[skip ci]
This commit is contained in:
aquileia 2015-01-31 23:30:46 +01:00
parent 500df9282f
commit 01cd01a661
2 changed files with 5 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,7 @@
[frame]
image={BASE_IMAGE}:1,{REACTION_IMAGE}:250,{BASE_IMAGE}:1
[/frame]
# Do not change to SOUND:HIT, this has to remain a hit_sound_frame
[if]
hit_sound_start_time=-25
hits=hit

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

@ -21,19 +21,7 @@
#define ATTACK_ANIM_DIRECTIONAL_9_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-450
sound_start_time=-100
[if]
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
[/else]
{SOUND:HIT_AND_MISS {HIT_SOUND} {MISS_SOUND} -100 }
[if]
direction=s,se,sw
[frame]
@ -50,19 +38,7 @@
#define ATTACK_ANIM_DIRECTIONAL_10_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-450
sound_start_time=-100
[if]
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
[/else]
{SOUND:HIT_AND_MISS {HIT_SOUND} {MISS_SOUND} -100 }
[if]
direction=s,se,sw
[frame]
@ -79,20 +55,7 @@
#define ATTACK_ANIM_QUAD_DIRECTIONAL_10_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-500
sound_start_time=-100
[if]
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
[/else]
{SOUND:HIT_AND_MISS {HIT_SOUND} {MISS_SOUND} -100 }
[if]
direction=se,sw
[frame]
@ -121,20 +84,7 @@
#define ATTACK_ANIM_QUAD_DIRECTIONAL_12_FRAME BASE_IMAGE_NAME TAIL_IMAGE_NAME HIT_SOUND MISS_SOUND
start_time=-600
sound_start_time=-100
[if]
hits=yes
[sound_frame]
sound={HIT_SOUND}
[/sound_frame]
[/if]
[else]
hits=no
[sound_frame]
sound={MISS_SOUND}
[/sound_frame]
[/else]
{SOUND:HIT_AND_MISS {HIT_SOUND} {MISS_SOUND} -100 }
[if]
direction=se,sw
[frame]