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

AnimationWML: New MISSILE_FRAME_FIREBALL_XY macro for red mage line.

Browse source
This commit is contained in:
David Mikos 2013-10-13 15:59:54 +10:30
parent 45e9fddf30
commit 8d1b7dafc8
5 changed files with 63 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -134,6 +134,7 @@ Version 1.11.6+dev:
requiring a duration 1 frame workaround.
* Animation WML: Fix halo in additional frame persisting without blank
hex workaround at start and end if a shorter frame.
* New MISSILE_FRAME_FIREBALL_XY macro, used in red mage line
* Fixed crash on delete of last save
Version 1.11.6:

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

@ -420,9 +420,7 @@
#define MISSILE_FRAME_FIREBALL
# Animate a projectile for a fireball attack.
missile_start_time=-350
[if]
direction=n,ne,nw
hits=yes
@ -456,7 +454,6 @@
hits=no
missile_offset=0.0~0.20,0.20~0.35,0.35~0.40,0.4~0.45
[missile_frame]
halo="projectiles/fireball-fail-[1~7].png:100"
[/missile_frame]
@ -466,13 +463,71 @@
hits=no
missile_offset=0.0~0.20,0.20~0.35,0.35~0.40,0.4~0.45
[missile_frame]
halo="projectiles/fireball-fail-[1~7].png~FL(vert):100"
[/missile_frame]
[/else]
#enddef
#define MISSILE_FRAME_FIREBALL_XY OFFSET_X OFFSET_Y
# Animate a projectile for a fireball attack with an X and Y start offset from centre of hex.
missile_start_time=-350
[if]
direction=n,ne,nw
hits=yes
[missile_frame]
image="projectiles/fireball-n-1.png~SCALE(60,60)~O(60%):40,projectiles/fireball-n-2.png~SCALE(80,80)~O(80%):100,projectiles/fireball-[n,n-2,n-1].png:[125,55,30]"
image_diagonal="projectiles/fireball-nw-1.png~SCALE(60,60)~O(60%):40,projectiles/fireball-nw-2.png~SCALE(80,80)~O(80%):100,projectiles/fireball-[nw,nw-2,nw-1].png:[125,55,30]"
offset=0.0~0.1,0.1~0.9
x={OFFSET_X}~0
y={OFFSET_Y}~0
[/missile_frame]
[missile_frame]
halo="projectiles/fireball-impact-[1~16].png:60"
offset=1.0
[/missile_frame]
[/if]
[else]
direction=s,se,sw
hits=yes
[missile_frame]
image="projectiles/fireball-n-1.png~SCALE(60,60)~O(60%):40,projectiles/fireball-n-2.png~SCALE(80,80)~O(80%):100,projectiles/fireball-[n,n-2,n-1].png:[125,55,30]"
image_diagonal="projectiles/fireball-nw-1.png~SCALE(60,60)~O(60%):40,projectiles/fireball-nw-2.png~SCALE(80,80)~O(80%):100,projectiles/fireball-[nw,nw-2,nw-1].png:[125,55,30]"
offset=0.0~0.1,0.1~0.9
x={OFFSET_X}~0
y={OFFSET_Y}~0
[/missile_frame]
[missile_frame]
halo="projectiles/fireball-impact-[1~16].png~FL(vert):60"
offset=1.0
[/missile_frame]
[/else]
[else]
direction=n,ne,nw
hits=no
missile_offset=0.0~0.20,0.20~0.35,0.35~0.40,0.4~0.45
[missile_frame]
halo="projectiles/fireball-fail-[1~7].png:100"
halo_x={OFFSET_X}~0
halo_y={OFFSET_Y}~0
[/missile_frame]
[/else]
[else]
direction=s,se,sw
hits=no
missile_offset=0.0~0.20,0.20~0.35,0.35~0.40,0.4~0.45
[missile_frame]
halo="projectiles/fireball-fail-[1~7].png~FL(vert):100"
halo_x={OFFSET_X}~0
halo_y={OFFSET_Y}~0
[/missile_frame]
[/else]
#enddef
#define HALO_FRAME_SAURIAN
halo_auto_vflip=false
[halo_frame]

2
data/core/units/humans/Mage_Arch.cfg
View file

@ -67,7 +67,7 @@ Though not trained for any sort of combat, if need arises an Arch Mage can unlea
[filter_attack]
name=fireball
[/filter_attack]
{MISSILE_FRAME_FIREBALL}
{MISSILE_FRAME_FIREBALL_XY 17 -22}
start_time=-575
[frame]
image="units/human-magi/arch-mage.png:50"

2
data/core/units/humans/Mage_Great.cfg
View file

@ -61,7 +61,7 @@ Though they are not warriors, by any means, the application of their art to comb
[filter_attack]
name=fireball
[/filter_attack]
{MISSILE_FRAME_FIREBALL}
{MISSILE_FRAME_FIREBALL_XY 18 -27}
start_time=-575
[frame]
image="units/human-magi/great-mage.png:50"

2
data/core/units/humans/Mage_Red.cfg
View file

@ -60,7 +60,7 @@ Though physically frail, and untrained as warriors, the ‘Red Magi’ have a nu
[filter_attack]
name=fireball
[/filter_attack]
{MISSILE_FRAME_FIREBALL}
{MISSILE_FRAME_FIREBALL_XY 11 -20}
start_time=-575
[frame]