Author: jetryl
Date: Mon Dec 8 04:53:14 2008
New Revision: 31367
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31367&view=rev
Log:
New storm trident that uses the new animations. A known bug in the previous
version and in this version is that the unit disappears when the lightning is
cast.
Modified:
trunk/data/core/macros/items.cfg
Modified: trunk/data/core/macros/items.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/items.cfg?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- trunk/data/core/macros/items.cfg (original)
+++ trunk/data/core/macros/items.cfg Mon Dec 8 04:53:14 2008
@@ -508,26 +508,7 @@
#enddef
#wmllint: markcheck off
-#define OBJ_TRIDENT_STORM X Y ID
- {PICKUPPABLE_ITEM {ID} {X} {Y} race=merman items/storm-trident.png
_"Should $unit.name pick up the trident?" _"Only the mermen can use this item!"
(
- [object]
- name= _ "Storm Trident"
- image=items/storm-trident.png
- duration=forever
- description= _ "This trident allows a merman to shoot electric
bolts at his enemies!"
- [effect]
- apply_to=new_attack
- name="storm trident"
- description= _ "storm trident"
- icon=attacks/lightning.png
- type=fire
- range=ranged
- [specials]
- {WEAPON_SPECIAL_MAGICAL}
- [/specials]
- damage=14
- number=2
- [/effect]
+#define STORM_TRIDENT_LIGHTNING DIRECTION_NUMBER
[effect]
apply_to=new_animation
name="storm trident"
@@ -535,12 +516,7 @@
[filter_attack]
name="storm trident"
[/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image=projectiles/lightning-n.png
- image_diagonal=projectiles/lightning-ne.png
- [/missile_frame]
+ {LIGHTNING_BOLT {DIRECTION_NUMBER} }
[if]
hits=no
[frame]
@@ -559,6 +535,31 @@
[/else]
[/attack_anim]
[/effect]
+#enddef
+#define OBJ_TRIDENT_STORM X Y ID
+ {PICKUPPABLE_ITEM {ID} {X} {Y} race=merman items/storm-trident.png
_"Should $unit.name pick up the trident?" _"Only the mermen can use this item!"
(
+ [object]
+ name= _ "Storm Trident"
+ image=items/storm-trident.png
+ duration=forever
+ description= _ "This trident allows a merman to shoot electric
bolts at his enemies!"
+ [effect]
+ apply_to=new_attack
+ name="storm trident"
+ description= _ "storm trident"
+ icon=attacks/lightning.png
+ type=fire
+ range=ranged
+ [specials]
+ {WEAPON_SPECIAL_MAGICAL}
+ [/specials]
+ damage=14
+ number=2
+ [/effect]
+
+ {STORM_TRIDENT_LIGHTNING 1}
+ {STORM_TRIDENT_LIGHTNING 2}
+ {STORM_TRIDENT_LIGHTNING 3}
[/object]
)}
#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
