Author: zookeeper
Date: Mon Apr 16 15:11:52 2007
New Revision: 16867
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16867&view=rev
Log:
New melee animations (both for hammer and axe) for the dwarvish fighter.
Added:
trunk/images/units/dwarves/fighter-axe-1.png (with props)
trunk/images/units/dwarves/fighter-axe-2.png (with props)
trunk/images/units/dwarves/fighter-axe-3.png (with props)
trunk/images/units/dwarves/fighter-axe-4.png (with props)
trunk/images/units/dwarves/fighter-axe-5.png (with props)
trunk/images/units/dwarves/fighter-hammer-1.png (with props)
trunk/images/units/dwarves/fighter-hammer-2.png (with props)
trunk/images/units/dwarves/fighter-hammer-3.png (with props)
trunk/images/units/dwarves/fighter-hammer-defend.png (with props)
trunk/images/units/dwarves/fighter-hammer.png (with props)
Modified:
trunk/data/units/Dwarvish_Fighter.cfg
Modified: trunk/data/units/Dwarvish_Fighter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/units/Dwarvish_Fighter.cfg?rev=16867&r1=16866&r2=16867&view=diff
==============================================================================
--- trunk/data/units/Dwarvish_Fighter.cfg (original)
+++ trunk/data/units/Dwarvish_Fighter.cfg Mon Apr 16 15:11:52 2007
@@ -4,11 +4,8 @@
race=dwarf
image="units/dwarves/fighter.png"
profile="portraits/Tristan_Millner/dwarven-fighter.png"
-{MAGENTA_IS_THE_TEAM_COLOR}
+ {MAGENTA_IS_THE_TEAM_COLOR}
ellipse="misc/ellipse"
-#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
- profile=portraits/burin.png
-#endif
hitpoints=38
movement_type=dwarvishfoot
movement=4
@@ -21,7 +18,16 @@
usage=fighter
unit_description= _ "Dwarvish Fighters wield mighty battle axes and
hammers, which make them feared opponents in close range combat. They are
excellent in mountainous terrain or underground. Though not swift, their power
and endurance more than compensate."
die_sound={SOUND_LIST:DWARF_DIE}
- {DEFENSE_ANIM "units/dwarves/fighter-defend.png"
"units/dwarves/fighter.png" {SOUND_LIST:DWARF_HIT} }
+ {DEFENSE_ANIM_FILTERED "units/dwarves/fighter-defend.png"
"units/dwarves/fighter.png" {SOUND_LIST:DWARF_HIT} (
+ [attack_filter]
+ name=axe
+ [/attack_filter]
+ )}
+ {DEFENSE_ANIM_FILTERED "units/dwarves/fighter-hammer-defend.png"
"units/dwarves/fighter-hammer.png" {SOUND_LIST:DWARF_HIT} (
+ [attack_filter]
+ name=hammer
+ [/attack_filter]
+ )}
[attack]
name=axe
type=blade
@@ -30,16 +36,21 @@
number=3
[animation]
[frame]
- begin=-250
+ begin=-200
+ end=-175
+ image="units/dwarves/fighter-axe-5.png"
+ [/frame]
+ [frame]
+ begin=-175
end=-100
- image="units/dwarves/fighter.png"
+ image="units/dwarves/fighter-axe-1.png"
[/frame]
[if]
hits=yes
[frame]
begin=-100
end=50
- image="units/dwarves/fighter-attack.png"
+ image="units/dwarves/fighter-axe-2.png"
sound=axe.ogg
[/frame]
[/if]
@@ -48,14 +59,24 @@
[frame]
begin=-100
end=50
- image="units/dwarves/fighter-attack.png"
+ image="units/dwarves/fighter-axe-2.png"
sound={SOUND_LIST:MISS}
[/frame]
[/else]
[frame]
begin=50
+ end=100
+ image="units/dwarves/fighter-axe-3.png"
+ [/frame]
+ [frame]
+ begin=100
end=150
- image="units/dwarves/fighter.png"
+ image="units/dwarves/fighter-axe-4.png"
+ [/frame]
+ [frame]
+ begin=150
+ end=200
+ image="units/dwarves/fighter-axe-5.png"
[/frame]
[/animation]
[/attack]
@@ -67,16 +88,21 @@
number=2
[animation]
[frame]
- begin=-250
+ begin=-200
+ end=-150
+ image="units/dwarves/fighter-hammer.png"
+ [/frame]
+ [frame]
+ begin=-150
end=-100
- image="units/dwarves/fighter.png"
+ image="units/dwarves/fighter-hammer-1.png"
[/frame]
[if]
hits=yes
[frame]
begin=-100
- end=50
-
image="units/dwarves/fighter-attack-mace.png"
+ end=100
+
image="units/dwarves/fighter-hammer-2.png"
sound=mace.wav
[/frame]
[/if]
@@ -84,15 +110,20 @@
hits=no
[frame]
begin=-100
- end=50
-
image="units/dwarves/fighter-attack-mace.png"
+ end=100
+
image="units/dwarves/fighter-hammer-2.png"
sound={SOUND_LIST:MISS}
[/frame]
[/else]
[frame]
- begin=50
- end=150
- image="units/dwarves/fighter.png"
+ begin=100
+ end=175
+ image="units/dwarves/fighter-hammer-3.png"
+ [/frame]
+ [frame]
+ begin=175
+ end=200
+ image="units/dwarves/fighter-hammer.png"
[/frame]
[/animation]
[/attack]
Added: trunk/images/units/dwarves/fighter-axe-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-axe-1.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-axe-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-axe-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-axe-2.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-axe-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-axe-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-axe-3.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-axe-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-axe-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-axe-4.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-axe-4.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-axe-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-axe-5.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-axe-5.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-hammer-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-hammer-1.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-hammer-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-hammer-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-hammer-2.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-hammer-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-hammer-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-hammer-3.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-hammer-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-hammer-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-hammer-defend.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-hammer-defend.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/images/units/dwarves/fighter-hammer.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/images/units/dwarves/fighter-hammer.png?rev=16867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/images/units/dwarves/fighter-hammer.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
