Author: zookeeper
Date: Wed Apr 18 09:57:36 2007
New Revision: 16888
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16888&view=rev
Log:
Moved the projectile macros back to animation-utils.cfg and added a macro for
the new hatchet animation (the rest of that coming soon).
Modified:
trunk/data/utils/animation-utils.cfg
trunk/data/utils/deprecated-utils.cfg
Modified: trunk/data/utils/animation-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/animation-utils.cfg?rev=16888&r1=16887&r2=16888&view=diff
==============================================================================
--- trunk/data/utils/animation-utils.cfg (original)
+++ trunk/data/utils/animation-utils.cfg Wed Apr 18 09:57:36 2007
@@ -4,7 +4,7 @@
#define DEFENSE_ANIM REACTION BASEFRAME HITSOUND
# Define a defensive animation moving from a specified BASEFRAME
-# to REACTION, with HITSOUND playing only if a hit occurs.
+# to REACTION, with HITSOUND playing only if a hit occurs.
[defend]
start_time=-126
[frame]
@@ -118,8 +118,8 @@
#define DEFENSE_ANIM_ELVEN_FILTERED REACTION BASEFRAME HITSOUND FILTER
# Define a defensive animation moving from a specified BASEFRAME
-# to REACTION, with HITSOUND playing only if a hit occurs and an
-# elven halo waxing and waning during the animation. This fires
+# to REACTION, with HITSOUND playing only if a hit occurs and an
+# elven halo waxing and waning during the animation. This fires
# only if FILTER is matched.
[defend]
{FILTER}
@@ -171,7 +171,7 @@
end=125
image={REACTION}
halo=halo/elven/elven-shield-halo-80pct.png
- [/frame]
+ [/frame]
[frame]
begin=125
end=150
@@ -193,7 +193,7 @@
[/defend]
#enddef
-# this macro is called on top of every idle animation,
+# this macro is called on top of every idle animation,
# to provide a standard set of conditions to play the idle animation
#define STANDARD_IDLE_FILTER
@@ -209,3 +209,237 @@
[/not]
[/unit_filter]
#enddef
+
+#define MISSILE_FRAME_WAIL
+ [if]
+ direction=n,ne,nw
+
+ [missile_frame]
+ begin=-300
+ end=-230
+ image="projectiles/wailprojectile-n-1.png"
+ image_diagonal="projectiles/wailprojectile-ne-1.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-230
+ end=-160
+ image="projectiles/wailprojectile-n-2.png"
+ image_diagonal="projectiles/wailprojectile-ne-2.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-160
+ end=0
+ image="projectiles/wailprojectile-n-3.png"
+ image_diagonal="projectiles/wailprojectile-ne-3.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=0
+ end=40
+ image="projectiles/wailprojectile-n-4.png"
+ image_diagonal="projectiles/wailprojectile-ne-4.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=40
+ end=80
+ image="projectiles/wailprojectile-n-5.png"
+ image_diagonal="projectiles/wailprojectile-ne-5.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=80
+ end=120
+ image="projectiles/wailprojectile-n-6.png"
+ image_diagonal="projectiles/wailprojectile-ne-6.png"
+ [/missile_frame]
+ [/if]
+ [else]
+ direction=s,se,sw
+ ### The price of asymmetrical projectiles - here, we use a conditional
because the game automatically flips the images for the south frame. We have a
separate set of images for the south part, which are not only flipped
vertically, but also have their angle corrected for the sw direction.
+
+ [missile_frame]
+ begin=-300
+ end=-230
+ image="projectiles/wailprojectile-s-1.png"
+ image_diagonal="projectiles/wailprojectile-se-1.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-230
+ end=-160
+ image="projectiles/wailprojectile-s-2.png"
+ image_diagonal="projectiles/wailprojectile-se-2.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-160
+ end=0
+ image="projectiles/wailprojectile-s-3.png"
+ image_diagonal="projectiles/wailprojectile-se-3.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=0
+ end=40
+ image="projectiles/wailprojectile-s-4.png"
+ image_diagonal="projectiles/wailprojectile-se-4.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=40
+ end=80
+ image="projectiles/wailprojectile-s-5.png"
+ image_diagonal="projectiles/wailprojectile-se-5.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=80
+ end=120
+ image="projectiles/wailprojectile-s-6.png"
+ image_diagonal="projectiles/wailprojectile-se-6.png"
+ [/missile_frame]
+ [/else]
+#enddef
+
+#define MISSILE_FRAME_FIRE_BREATH N_OFFSET S_OFFSET N_DIAGONAL_OFFSET
S_DIAGONAL_OFFSET
+ [if]
+ direction=n
+
+ [missile_frame]
+ begin=-400
+ end=100
+
halo=projectiles/fire-breath-n-1.png:80,projectiles/fire-breath-n-2.png:80,projectiles/fire-breath-n-3.png:80,projectiles/fire-breath-n-4.png:80,projectiles/fire-breath-n-5.png:80
+ halo_x,halo_y={N_OFFSET}
+ [/missile_frame]
+ [/if]
+ [else]
+ direction=s
+
+ [missile_frame]
+ begin=-400
+ end=100
+
halo=projectiles/fire-breath-s-1.png:80,projectiles/fire-breath-s-2.png:80,projectiles/fire-breath-s-3.png:80,projectiles/fire-breath-s-4.png:80,projectiles/fire-breath-s-5.png:80
+ halo_x,halo_y={S_OFFSET}
+ [/missile_frame]
+ [/else]
+ [else]
+ direction=ne,nw
+
+ [missile_frame]
+ begin=-400
+ end=100
+
halo=projectiles/fire-breath-ne-1.png:80,projectiles/fire-breath-ne-2.png:80,projectiles/fire-breath-ne-3.png:80,projectiles/fire-breath-ne-4.png:80,projectiles/fire-breath-ne-5.png:80
+ halo_x,halo_y={N_DIAGONAL_OFFSET}
+ [/missile_frame]
+ [/else]
+ [else]
+ direction=se,sw
+
+ [missile_frame]
+ begin=-400
+ end=100
+
halo=projectiles/fire-breath-se-1.png:80,projectiles/fire-breath-se-2.png:80,projectiles/fire-breath-se-3.png:80,projectiles/fire-breath-se-4.png:80,projectiles/fire-breath-se-5.png:80
+ halo_x,halo_y={S_DIAGONAL_OFFSET}
+ [/missile_frame]
+ [/else]
+#enddef
+
+#define MISSILE_FRAME_FAERIE_FIRE
+ [missile_frame]
+ begin=-500
+ end=-350
+ image="projectiles/icemissile-n-1.png"
+ image_diagonal="projectiles/icemissile-ne-1.png"
+
halo=halo/elven/ice-halo1.png:100,halo/elven/ice-halo2.png:100,halo/elven/ice-halo3.png:25
+ halo_x,halo_y=0,0
+ [/missile_frame]
+ [missile_frame]
+ begin=-350
+ end=-200
+ image="projectiles/icemissile-n-2.png"
+ image_diagonal="projectiles/icemissile-ne-2.png"
+ halo=halo/elven/ice-halo3.png:75,halo/elven/ice-halo4.png:75
+ halo_x,halo_y=0,0
+ [/missile_frame]
+ [missile_frame]
+ begin=-200
+ end=-50
+ image="projectiles/icemissile-n-3.png"
+ image_diagonal="projectiles/icemissile-ne-3.png"
+
halo=halo/elven/ice-halo5.png:100,halo/elven/ice-halo1.png:100,halo/elven/ice-halo2.png:50
+ halo_x,halo_y=0,0
+ [/missile_frame]
+ [missile_frame]
+ begin=-50
+ end=0
+ image="projectiles/icemissile-n-4.png"
+ image_diagonal="projectiles/icemissile-ne-4.png"
+ halo=halo/elven/ice-halo6.png
+ halo_x,halo_y=0,0
+ [/missile_frame]
+ [missile_frame]
+ begin=25
+ end=75
+ image="projectiles/icemissile-n-5.png"
+ image_diagonal="projectiles/icemissile-ne-5.png"
+ halo=halo/elven/ice-halo7.png
+ halo_x,halo_y=0,0
+ [/missile_frame]
+ [missile_frame]
+ begin=75
+ end=125
+ image="projectiles/icemissile-n-6.png"
+ image_diagonal="projectiles/icemissile-ne-6.png"
+ halo=halo/elven/ice-halo8.png
+ halo_x,halo_y=0,0
+ [/missile_frame]
+ [missile_frame]
+ begin=125
+ end=175
+ image="projectiles/icemissile-n-7.png"
+ image_diagonal="projectiles/icemissile-ne-7.png"
+ halo=halo/elven/ice-halo9.png
+ halo_x,halo_y=0,0
+ [/missile_frame]
+#enddef
+
+#define MISSILE_FRAME_FIREBALL
+ [missile_frame]
+ begin=-220
+ end=-100
+ image="projectiles/fireball-n-2.png"
+ image_diagonal="projectiles/fireball-nw-2.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-100
+ end=25
+ image="projectiles/fireball-n.png"
+ image_diagonal="projectiles/fireball-nw.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=25
+ end=80
+ image="projectiles/fireball-n-2.png"
+ image_diagonal="projectiles/fireball-nw-2.png"
+ [/missile_frame]
+#enddef
+
+#define MISSILE_FRAME_HATCHET
+ [missile_frame]
+ begin=-200
+ end=-150
+ image="projectiles/hatchet-2.png"
+ image_diagonal="projectiles/hatchet-2.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-150
+ end=-100
+ image="projectiles/hatchet-3.png"
+ image_diagonal="projectiles/hatchet-3.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-100
+ end=-50
+ image="projectiles/hatchet-4.png"
+ image_diagonal="projectiles/hatchet-4.png"
+ [/missile_frame]
+ [missile_frame]
+ begin=-50
+ end=0
+ image="projectiles/hatchet-1.png"
+ image_diagonal="projectiles/hatchet-1.png"
+ [/missile_frame]
+#enddef
Modified: trunk/data/utils/deprecated-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/utils/deprecated-utils.cfg?rev=16888&r1=16887&r2=16888&view=diff
==============================================================================
--- trunk/data/utils/deprecated-utils.cfg (original)
+++ trunk/data/utils/deprecated-utils.cfg Wed Apr 18 09:57:36 2007
@@ -9,7 +9,7 @@
[deprecated_message]
message="Macro '" + {NAME} + "' is scheduled for removal in
Wesnoth 1.3.4."
[/deprecated_message]
-#enddef
+#enddef
#define ADD_GOLD SIDE AMOUNT
@@ -22,218 +22,3 @@
amount={AMOUNT}
[/gold]
#enddef
-
-# These are included for backwards-compatibility mainly; they aren't and
-# shouldn't be used for mainline units.
-
-#define MISSILE_FRAME_WAIL
- {DEPRECATE_132 MISSILE_FRAME_WAIL}
- [if]
- direction=n,ne,nw
-
- [missile_frame]
- begin=-300
- end=-230
- image="projectiles/wailprojectile-n-1.png"
- image_diagonal="projectiles/wailprojectile-ne-1.png"
- [/missile_frame]
- [missile_frame]
- begin=-230
- end=-160
- image="projectiles/wailprojectile-n-2.png"
- image_diagonal="projectiles/wailprojectile-ne-2.png"
- [/missile_frame]
- [missile_frame]
- begin=-160
- end=0
- image="projectiles/wailprojectile-n-3.png"
- image_diagonal="projectiles/wailprojectile-ne-3.png"
- [/missile_frame]
- [missile_frame]
- begin=0
- end=40
- image="projectiles/wailprojectile-n-4.png"
- image_diagonal="projectiles/wailprojectile-ne-4.png"
- [/missile_frame]
- [missile_frame]
- begin=40
- end=80
- image="projectiles/wailprojectile-n-5.png"
- image_diagonal="projectiles/wailprojectile-ne-5.png"
- [/missile_frame]
- [missile_frame]
- begin=80
- end=120
- image="projectiles/wailprojectile-n-6.png"
- image_diagonal="projectiles/wailprojectile-ne-6.png"
- [/missile_frame]
- [/if]
- [else]
- direction=s,se,sw
- ### The price of asymmetrical projectiles - here, we use a conditional
because the game automatically flips the images for the south frame. We have a
separate set of images for the south part, which are not only flipped
vertically, but also have their angle corrected for the sw direction.
-
- [missile_frame]
- begin=-300
- end=-230
- image="projectiles/wailprojectile-s-1.png"
- image_diagonal="projectiles/wailprojectile-se-1.png"
- [/missile_frame]
- [missile_frame]
- begin=-230
- end=-160
- image="projectiles/wailprojectile-s-2.png"
- image_diagonal="projectiles/wailprojectile-se-2.png"
- [/missile_frame]
- [missile_frame]
- begin=-160
- end=0
- image="projectiles/wailprojectile-s-3.png"
- image_diagonal="projectiles/wailprojectile-se-3.png"
- [/missile_frame]
- [missile_frame]
- begin=0
- end=40
- image="projectiles/wailprojectile-s-4.png"
- image_diagonal="projectiles/wailprojectile-se-4.png"
- [/missile_frame]
- [missile_frame]
- begin=40
- end=80
- image="projectiles/wailprojectile-s-5.png"
- image_diagonal="projectiles/wailprojectile-se-5.png"
- [/missile_frame]
- [missile_frame]
- begin=80
- end=120
- image="projectiles/wailprojectile-s-6.png"
- image_diagonal="projectiles/wailprojectile-se-6.png"
- [/missile_frame]
- [/else]
-#enddef
-
-#define MISSILE_FRAME_FIRE_BREATH N_OFFSET S_OFFSET N_DIAGONAL_OFFSET
S_DIAGONAL_OFFSET
- {DEPRECATE_132 MISSILE_FRAME_FIRE_BREATH}
- [if]
- direction=n
-
- [missile_frame]
- begin=-400
- end=100
-
halo=projectiles/fire-breath-n-1.png:80,projectiles/fire-breath-n-2.png:80,projectiles/fire-breath-n-3.png:80,projectiles/fire-breath-n-4.png:80,projectiles/fire-breath-n-5.png:80
- halo_x,halo_y={N_OFFSET}
- [/missile_frame]
- [/if]
- [else]
- direction=s
-
- [missile_frame]
- begin=-400
- end=100
-
halo=projectiles/fire-breath-s-1.png:80,projectiles/fire-breath-s-2.png:80,projectiles/fire-breath-s-3.png:80,projectiles/fire-breath-s-4.png:80,projectiles/fire-breath-s-5.png:80
- halo_x,halo_y={S_OFFSET}
- [/missile_frame]
- [/else]
- [else]
- direction=ne,nw
-
- [missile_frame]
- begin=-400
- end=100
-
halo=projectiles/fire-breath-ne-1.png:80,projectiles/fire-breath-ne-2.png:80,projectiles/fire-breath-ne-3.png:80,projectiles/fire-breath-ne-4.png:80,projectiles/fire-breath-ne-5.png:80
- halo_x,halo_y={N_DIAGONAL_OFFSET}
- [/missile_frame]
- [/else]
- [else]
- direction=se,sw
-
- [missile_frame]
- begin=-400
- end=100
-
halo=projectiles/fire-breath-se-1.png:80,projectiles/fire-breath-se-2.png:80,projectiles/fire-breath-se-3.png:80,projectiles/fire-breath-se-4.png:80,projectiles/fire-breath-se-5.png:80
- halo_x,halo_y={S_DIAGONAL_OFFSET}
- [/missile_frame]
- [/else]
-#enddef
-
-#define MISSILE_FRAME_FAERIE_FIRE
- {DEPRECATE_132 MISSILE_FRAME_FAERIE_FIRE}
- [missile_frame]
- begin=-500
- end=-350
- image="projectiles/icemissile-n-1.png"
- image_diagonal="projectiles/icemissile-ne-1.png"
-
halo=halo/elven/ice-halo1.png:100,halo/elven/ice-halo2.png:100,halo/elven/ice-halo3.png:25
- halo_x,halo_y=0,0
- [/missile_frame]
- [missile_frame]
- begin=-350
- end=-200
- image="projectiles/icemissile-n-2.png"
- image_diagonal="projectiles/icemissile-ne-2.png"
- halo=halo/elven/ice-halo3.png:75,halo/elven/ice-halo4.png:75
- halo_x,halo_y=0,0
- [/missile_frame]
- [missile_frame]
- begin=-200
- end=-50
- image="projectiles/icemissile-n-3.png"
- image_diagonal="projectiles/icemissile-ne-3.png"
-
halo=halo/elven/ice-halo5.png:100,halo/elven/ice-halo1.png:100,halo/elven/ice-halo2.png:50
- halo_x,halo_y=0,0
- [/missile_frame]
- [missile_frame]
- begin=-50
- end=0
- image="projectiles/icemissile-n-4.png"
- image_diagonal="projectiles/icemissile-ne-4.png"
- halo=halo/elven/ice-halo6.png
- halo_x,halo_y=0,0
- [/missile_frame]
- [missile_frame]
- begin=25
- end=75
- image="projectiles/icemissile-n-5.png"
- image_diagonal="projectiles/icemissile-ne-5.png"
- halo=halo/elven/ice-halo7.png
- halo_x,halo_y=0,0
- [/missile_frame]
- [missile_frame]
- begin=75
- end=125
- image="projectiles/icemissile-n-6.png"
- image_diagonal="projectiles/icemissile-ne-6.png"
- halo=halo/elven/ice-halo8.png
- halo_x,halo_y=0,0
- [/missile_frame]
- [missile_frame]
- begin=125
- end=175
- image="projectiles/icemissile-n-7.png"
- image_diagonal="projectiles/icemissile-ne-7.png"
- halo=halo/elven/ice-halo9.png
- halo_x,halo_y=0,0
- [/missile_frame]
-#enddef
-
-#define MISSILE_FRAME_FIREBALL
- {DEPRECATE_132 MISSILE_FRAME_FIREBALL}
- [missile_frame]
- begin=-220
- end=-100
- image="projectiles/fireball-n-2.png"
- image_diagonal="projectiles/fireball-nw-2.png"
- [/missile_frame]
- [missile_frame]
- begin=-100
- end=25
- image="projectiles/fireball-n.png"
- image_diagonal="projectiles/fireball-nw.png"
- [/missile_frame]
- [missile_frame]
- begin=25
- end=80
- image="projectiles/fireball-n-2.png"
- image_diagonal="projectiles/fireball-nw-2.png"
- [/missile_frame]
-#enddef
-
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
