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

AnimationWML: simplify core DEFENSE macro WML

Browse source
This commit is contained in:
David Mikos 2013-11-10 15:47:11 +10:30
parent 62d4e0e266
commit 6409d08243
1 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,27 +84,20 @@
# fires only if FILTER is matched.
[defend]
{FILTER}
direction=sw,s,se
start_time=-126
[frame]
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[if]
hits=hit
base_score=1 #necessary to eliminate duplication if filter contains match also
hit_sound_start_time=-25
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
direction=s,se,sw
[frame]
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[/if]
[/defend]
[defend]
{FILTER}
direction=nw,n,ne
start_time=-126
[frame]
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[else]
direction=n,ne,nw
[frame]
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[/else]
[if]
hits=hit
base_score=1 #necessary to eliminate duplication if filter contains match also
@ -140,25 +133,20 @@
#define DEFENSE_ANIM_DIRECTIONAL REACTION_SE_IMAGE BASE_SE_IMAGE REACTION_NE_IMAGE BASE_NE_IMAGE HIT_SOUND
[defend]
direction=sw,s,se
start_time=-126
[frame]
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[if]
hit_sound_start_time=-25
hits=hit
[hit_sound_frame]
sound={HIT_SOUND}
[/hit_sound_frame]
direction=s,se,sw
[frame]
image={BASE_SE_IMAGE}:1,{REACTION_SE_IMAGE}:250,{BASE_SE_IMAGE}:1
[/frame]
[/if]
[/defend]
[defend]
direction=nw,n,ne
start_time=-126
[frame]
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[else]
direction=n,ne,nw
[frame]
image={BASE_NE_IMAGE}:1,{REACTION_NE_IMAGE}:250,{BASE_NE_IMAGE}:1
[/frame]
[/else]
[if]
hit_sound_start_time=-25
hits=hit