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

AnimationWML: remove now redundant blank-hexes from some halo animations.

Browse source
This commit is contained in:
David Mikos 2013-10-12 00:54:42 +10:30
parent bd4ce5d11c
commit 39ed562bf3
6 changed files with 43 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,23 +31,11 @@
image={HALFWAYS_IMAGE}:1,{FULL_IMAGE}:250,{HALFWAYS_IMAGE}:1
[/frame]
halo_start_time=-120
[halo_frame]
duration=20
halo="" # Deliberate null image ref.
# Intended to keep the next image from persisting onscreen.
halo_x,halo_y={OFFSET_POSITION}
[/halo_frame]
halo_start_time=-100
[halo_frame]
halo="halo/misc/leadership-flare-[1~13].png:20"
halo_x,halo_y={OFFSET_POSITION}
[/halo_frame]
[halo_frame]
duration=40
halo="" # Deliberate null image ref.
# Intended to keep the previous image from persisting onscreen.
halo_x,halo_y={OFFSET_POSITION}
[/halo_frame]
[/leading_anim]
#enddef
@ -585,26 +573,26 @@
[/magic_missile_frame]
[magic_missile_frame]
duration=350
halo=halo/mage-halo[1~5].png,misc/blank-hex.png:1
halo=halo/mage-halo[1~5].png
halo_y=-54~-45,-45~-27,-27~0
offset=-0.5~-0.25,-0.25~0.25,0.25~1.0
[/magic_missile_frame]
[magic_missile_trail_1_frame]
duration=350
halo=misc/blank-hex.png:40,halo/mage-preparation-halo[1~7].png,misc/blank-hex.png:1
halo=misc/blank-hex.png:40,halo/mage-preparation-halo[1~7].png
halo_y=-54:40,-54~-45,-45~-27,-27~0
offset=0.001:40,-0.5~-0.25,-0.25~0.25,0.25~1.0
[/magic_missile_trail_1_frame]
[magic_missile_trail_2_frame]
duration=350
halo=misc/blank-hex.png:80,halo/mage-preparation-halo[1~7].png,misc/blank-hex.png:1
halo=misc/blank-hex.png:80,halo/mage-preparation-halo[1~7].png
halo_y=-54:80,-54~-45,-45~-27,-27~0
offset=0.001:80,-0.5~-0.25,-0.25~0.25,0.25~1.0
[/magic_missile_trail_2_frame]
[magic_missile_trail_3_frame]
duration=350
halo=misc/blank-hex.png:120,halo/mage-preparation-halo[1~7].png,misc/blank-hex.png:1
halo=misc/blank-hex.png:120,halo/mage-preparation-halo[1~7].png
halo_y=-54:120,-54~-45,-45~-27,-27~0
offset=0.001:120,-0.5~-0.25,-0.25~0.25,0.25~1.0
[/magic_missile_trail_3_frame]
@ -615,7 +603,7 @@
[magic_missile_flare_frame]
duration={DURATION_TIME}
halo=halo/mage-preparation-halo[1~7].png,misc/blank-hex.png:1
halo=halo/mage-preparation-halo[1~7].png
halo_x={OFFSET_X}
halo_y={OFFSET_Y}
offset=0
@ -744,10 +732,7 @@
#define MISSILE_FRAME_STONE_HIT OFFSET_X OFFSET_Y
sling_stone_start_time=-201
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
sling_stone_start_time=-200
[sling_stone_frame]
halo="projectiles/stone.png:200"
halo_x={OFFSET_X}~0
@ -755,16 +740,10 @@
y=0~-5,-5~-8,-8~-9,-9~-10,-10~-9,-9~-8,-8~-5,-5~0
offset=0.0~1.0
[/sling_stone_frame]
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
#enddef
#define MISSILE_FRAME_STONE_MISS OFFSET_X OFFSET_Y
sling_stone_start_time=-201
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
sling_stone_start_time=-200
[sling_stone_frame]
halo="projectiles/stone.png:300"
halo_x={OFFSET_X}~0
@ -772,9 +751,6 @@
y=0~-5,-5~-8,-8~-9,-9~-10,-10~-9,-9~-8,-8~-5,-5~0
offset=0.0~1.5
[/sling_stone_frame]
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
#enddef
#define DRAKE_UNWALKABLE_TERRAINS
@ -841,7 +817,7 @@
impact_burst_start_time=-160
[impact_burst_frame]
duration=320
halo=misc/blank-hex.png:1,projectiles/fire-burst-small-[1~8].png:[39,40*6,39],misc/blank-hex.png:1
halo=projectiles/fire-burst-small-[1~8].png
offset=1.0
layer=1
[/impact_burst_frame]
@ -853,35 +829,35 @@
flame_trail_5_start_time=-250
[flame_trail_1_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.25:200
[/flame_trail_1_frame]
[flame_trail_2_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.20:200
[/flame_trail_2_frame]
[flame_trail_3_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.15:200
[/flame_trail_3_frame]
[flame_trail_4_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.10:200
[/flame_trail_4_frame]
[flame_trail_5_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.05:200
@ -916,35 +892,35 @@
flame_trail_5_start_time=-250
[flame_trail_1_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.5:200
[/flame_trail_1_frame]
[flame_trail_2_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.4:200
[/flame_trail_2_frame]
[flame_trail_3_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.3:200
[/flame_trail_3_frame]
[flame_trail_4_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.2:200
[/flame_trail_4_frame]
[flame_trail_5_frame]
duration=500
halo=misc/blank-hex.png:1,projectiles/fire-breath-[1~10].png:[49,50*8,49],misc/blank-hex.png:1
halo=projectiles/fire-breath-[1~10].png
halo_x={OFFSET_X}~0:300,0
halo_y={OFFSET_Y}~0:300,0
offset=0.0~1.0:300,1.0~1.1:200

12
data/core/macros/teleport-utils.cfg
View file

@ -57,19 +57,19 @@
[teleport_sparkle_1_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=-10
halo_y=30~-30
[/teleport_sparkle_1_frame]
[teleport_sparkle_2_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=0
halo_y=40~-40
[/teleport_sparkle_2_frame]
[teleport_sparkle_3_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=10
halo_y=30~-30
[/teleport_sparkle_3_frame]
@ -137,19 +137,19 @@
[teleport_sparkle_1_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=10
halo_y=-30~30
[/teleport_sparkle_1_frame]
[teleport_sparkle_2_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=0
halo_y=-40~40
[/teleport_sparkle_2_frame]
[teleport_sparkle_3_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=-10
halo_y=-30~30
[/teleport_sparkle_3_frame]

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

@ -69,7 +69,7 @@
[/filter_attack]
start_time=-1250
sound_start_time=-250
halo_start_time=-251
halo_start_time=-250
[if]
{MISSILE_FRAME_DG_SECOND_MUZZLE_FLARE_HIT_SOUTH 0 -4}
@ -85,9 +85,6 @@
image="units/dwarves/dragonguard/dragonguard.png:200"
[/frame]
[halo_frame]
duration=1
[/halo_frame]
[halo_frame]
halo="halo/dragonguard/dg-muzzle-flash-s-[1~17].png:[80*3,90,100,120*3,100*9]"
auto_vflip=false
@ -126,9 +123,6 @@
image="units/dwarves/dragonguard/dragonguard-ne.png:200"
[/frame]
[halo_frame]
duration=1
[/halo_frame]
[halo_frame]
halo="halo/dragonguard/dg-muzzle-flash-ne-[1~17].png:[80*3,90,100,120*3,100*9]"
auto_vflip=false
@ -167,9 +161,6 @@
image="units/dwarves/dragonguard/dragonguard-ne.png:200"
[/frame]
[halo_frame]
duration=1
[/halo_frame]
[halo_frame]
halo="halo/dragonguard/dg-muzzle-flash-n-[1~17].png:[80*3,90,100,120*3,100*9]"
auto_vflip=false
@ -208,9 +199,6 @@
image="units/dwarves/dragonguard/dragonguard.png:200"
[/frame]
[halo_frame]
duration=1
[/halo_frame]
[halo_frame]
halo="halo/dragonguard/dg-muzzle-flash-se-[1~17].png:[80*3,90,100,120*3,100*9]"
auto_vflip=false

12
data/core/units/humans/Mage_Silver.cfg
View file

@ -111,19 +111,19 @@ Silver magi are often more physically adept than other magi, and their skills ar
[teleport_sparkle_1_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=-10
halo_y=30~-30
[/teleport_sparkle_1_frame]
[teleport_sparkle_2_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=0
halo_y=40~-40
[/teleport_sparkle_2_frame]
[teleport_sparkle_3_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=10
halo_y=30~-30
[/teleport_sparkle_3_frame]
@ -146,19 +146,19 @@ Silver magi are often more physically adept than other magi, and their skills ar
[teleport_sparkle_1_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=10
halo_y=-30~30
[/teleport_sparkle_1_frame]
[teleport_sparkle_2_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=0
halo_y=-40~40
[/teleport_sparkle_2_frame]
[teleport_sparkle_3_frame]
duration=800
halo=misc/blank-hex.png:1,halo/teleport-[9,8,1~9].png,misc/blank-hex.png:1
halo=halo/teleport-[9,8,1~9].png
halo_x=-10
halo_y=-30~30
[/teleport_sparkle_3_frame]

14
data/core/units/trolls/Rocklobber.cfg
View file

@ -59,21 +59,15 @@
start_time=-1000
offset=0
sling_stone_start_time=-801
sling_stone_start_time=-800
[if]
hits=yes
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
[sling_stone_frame]
halo="projectiles/stone-large.png:800"
halo_x=24~0
halo_y=0~-10,-10~-18,-18~-22,-22~-24,-24~-25,-25~-24,-24~-22,-22~-18,-18~-10,-10~-0
offset=0.0~1.0
[/sling_stone_frame]
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
[frame]
image="units/trolls/lobber-attack-ranged1.png:200"
@ -82,18 +76,12 @@
[/if]
[else]
hits=no
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
[sling_stone_frame]
halo="projectiles/stone-large.png:900"
halo_x=24~0
halo_y=0~-10,-10~-16,-16~-20,-20~-22,-22~-20,-20~-16,-16~-10,-10~0,0~-4,-4~0,0~-2,-2~0
offset=0.0~1.5
[/sling_stone_frame]
[sling_stone_frame]
image="misc/blank-hex.png:1"
[/sling_stone_frame]
[frame]
image="units/trolls/lobber-attack-ranged1.png:200"

20
data/core/units/trolls/Troll_Shaman.cfg
View file

@ -84,27 +84,27 @@
direction=se,s,sw
[flame_burst_1_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png~FL(vert):[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png~FL(vert):50
halo_x,halo_y=-22,0
offset=1.0
[/flame_burst_1_frame]
[flame_burst_2_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png~FL(vert):[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png~FL(vert):50
halo_x,halo_y=-14,9
offset=1.0
[/flame_burst_2_frame]
[flame_burst_3_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png~FL(vert):[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png~FL(vert):50
halo_x,halo_y=0,12
offset=1.0
[/flame_burst_3_frame]
[flame_burst_4_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png~FL(vert):[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png~FL(vert):50
halo_x,halo_y=14,9
offset=1.0
[/flame_burst_4_frame]
[flame_burst_5_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png~FL(vert):[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png~FL(vert):50
halo_x,halo_y=22,0
offset=1.0
[/flame_burst_5_frame]
@ -113,27 +113,27 @@
direction=ne,n,nw
[flame_burst_1_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png:[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png:50
halo_x,halo_y=-22,0
offset=1.0
[/flame_burst_1_frame]
[flame_burst_2_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png:[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png:50
halo_x,halo_y=-14,9
offset=1.0
[/flame_burst_2_frame]
[flame_burst_3_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png:[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png:50
halo_x,halo_y=0,12
offset=1.0
[/flame_burst_3_frame]
[flame_burst_4_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png:[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png:50
halo_x,halo_y=14,9
offset=1.0
[/flame_burst_4_frame]
[flame_burst_5_frame]
halo=misc/blank-hex.png:1,halo/flame-burst-[1~8].png:[50*7,48],misc/blank-hex.png:1
halo=halo/flame-burst-[1~8].png:50
halo_x,halo_y=22,0
offset=1.0
[/flame_burst_5_frame]