Author: jetryl
Date: Sun May 17 23:26:50 2009
New Revision: 35719
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35719&view=rev
Log:
New images for the orc warlord.
Added:
trunk/data/core/images/units/orcs/warlord-attack-sword-5.png (with props)
trunk/data/core/images/units/orcs/warlord-attack-sword-6.png (with props)
trunk/data/core/images/units/orcs/warlord-bow-attack-1.png (with props)
trunk/data/core/images/units/orcs/warlord-bow-attack-2.png (with props)
trunk/data/core/images/units/orcs/warlord-bow-attack-3.png (with props)
trunk/data/core/images/units/orcs/warlord-bow-attack-4.png (with props)
trunk/data/core/images/units/orcs/warlord-bow.png (with props)
Removed:
trunk/data/core/images/units/orcs/warlord-bow-1.png
trunk/data/core/images/units/orcs/warlord-bow-2.png
trunk/data/core/images/units/orcs/warlord-bow-3.png
trunk/data/core/images/units/orcs/warlord-bow-4.png
Modified:
trunk/data/core/images/units/elves-wood/archer.png
trunk/data/core/images/units/orcs/warlord-attack-sword-1.png
trunk/data/core/images/units/orcs/warlord-attack-sword-2.png
trunk/data/core/images/units/orcs/warlord-attack-sword-3.png
trunk/data/core/images/units/orcs/warlord-attack-sword-4.png
trunk/data/core/images/units/orcs/warlord-bow-defend.png
trunk/data/core/images/units/orcs/warlord-defend-1.png
trunk/data/core/images/units/orcs/warlord-defend-2.png
trunk/data/core/images/units/orcs/warlord.png
trunk/data/core/units/elves/Archer.cfg
trunk/data/core/units/orcs/Warlord.cfg
Modified: trunk/data/core/images/units/elves-wood/archer.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/elves-wood/archer.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/orcs/warlord-attack-sword-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-attack-sword-1.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/orcs/warlord-attack-sword-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-attack-sword-2.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/orcs/warlord-attack-sword-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-attack-sword-3.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/orcs/warlord-attack-sword-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-attack-sword-4.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Added: trunk/data/core/images/units/orcs/warlord-attack-sword-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-attack-sword-5.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-attack-sword-5.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/warlord-attack-sword-6.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-attack-sword-6.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-attack-sword-6.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/orcs/warlord-bow-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-1.png?rev=35718&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/units/orcs/warlord-bow-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-2.png?rev=35718&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/units/orcs/warlord-bow-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-3.png?rev=35718&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/units/orcs/warlord-bow-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-4.png?rev=35718&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/units/orcs/warlord-bow-attack-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-attack-1.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-bow-attack-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/warlord-bow-attack-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-attack-2.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-bow-attack-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/warlord-bow-attack-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-attack-3.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-bow-attack-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/warlord-bow-attack-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-attack-4.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-bow-attack-4.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/data/core/images/units/orcs/warlord-bow-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow-defend.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Added: trunk/data/core/images/units/orcs/warlord-bow.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-bow.png?rev=35719&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/warlord-bow.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/data/core/images/units/orcs/warlord-defend-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-defend-1.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/orcs/warlord-defend-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord-defend-2.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/units/orcs/warlord.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/warlord.png?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/units/elves/Archer.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/elves/Archer.cfg?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
--- trunk/data/core/units/elves/Archer.cfg (original)
+++ trunk/data/core/units/elves/Archer.cfg Sun May 17 23:26:50 2009
@@ -50,7 +50,7 @@
damage=5
number=4
[/attack]
- {DEFENSE_ANIM_RANGE "units/elves-wood/archer-sword-defend.png"
"units/elves-wood/archer-sword.png" {SOUND_LIST:ELF_HIT} melee }
+ {DEFENSE_ANIM_RANGE "units/elves-wood/archer-melee-defend.png"
"units/elves-wood/archer-melee-defend.png" {SOUND_LIST:ELF_HIT} melee }
{DEFENSE_ANIM_RANGE "units/elves-wood/archer-bow-defend.png"
"units/elves-wood/archer-bow.png" {SOUND_LIST:ELF_HIT} ranged }
#ifdef __UNUSED
# FIXME: Commented out because these images are in 1.2 size and style
@@ -135,50 +135,49 @@
[filter_attack]
name=sword
[/filter_attack]
- [frame]
- begin=-200
- end=-175
- image="units/elves-wood/archer-sword.png"
- [/frame]
- [frame]
- begin=-175
- end=-75
- image="units/elves-wood/archer-sword-1.png"
+ offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
+ start_time=-250
+ [frame]
+ duration=50
+ image="units/elves-wood/archer-melee.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/elves-wood/archer-melee-attack-1.png"
[/frame]
[if]
- hits=no
- [frame]
- begin=-75
- end=75
- image="units/elves-wood/archer-sword-2.png"
- sound={SOUND_LIST:MISS}
+ hits=yes
+ [frame]
+ duration=100
+ image="units/elves-wood/archer-melee-attack-2.png"
+ sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/if]
[else]
- hits=yes
- [frame]
- begin=-75
- end=75
- image="units/elves-wood/archer-sword-2.png"
- sound={SOUND_LIST:SWORD_SWISH}
+ hits=no
+ [frame]
+ duration=100
+ image="units/elves-wood/archer-melee-attack-2.png"
+ sound={SOUND_LIST:MISS}
[/frame]
[/else]
[frame]
- begin=75
- end=125
- image="units/elves-wood/archer-sword-3.png"
- [/frame]
- [frame]
- begin=125
- end=175
- image="units/elves-wood/archer-sword-4.png"
- [/frame]
- [frame]
- begin=175
- end=200
- image="units/elves-wood/archer-sword.png"
- [/frame]
- [/attack_anim]
+ duration=100
+ image="units/elves-wood/archer-melee-attack-3.png"
+ [/frame]
+ [frame]
+ duration=90
+ image="units/elves-wood/archer-melee-attack-4.png"
+ [/frame]
+ [frame]
+ duration=80
+ image="units/elves-wood/archer-melee-attack-5.png"
+ [/frame]
+ [frame]
+ duration=50
+ image="units/elves-wood/archer-melee.png"
+ [/frame]
+ [/attack_anim]
[female]
name= _ "female^Elvish Archer"
gender=female
Modified: trunk/data/core/units/orcs/Warlord.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/orcs/Warlord.cfg?rev=35719&r1=35718&r2=35719&view=diff
==============================================================================
--- trunk/data/core/units/orcs/Warlord.cfg (original)
+++ trunk/data/core/units/orcs/Warlord.cfg Sun May 17 23:26:50 2009
@@ -19,7 +19,7 @@
description= _ "Only orcs with both great cunning and unsurpassed strength
can become Warlords. Masters of the sword, and even possessing some skill with
the bow, these beast-warriors lead their brethren with an iron hand."
die_sound={SOUND_LIST:ORC_DIE}
{DEFENSE_ANIM_RANGE "units/orcs/warlord-defend-2.png"
"units/orcs/warlord-defend-1.png" {SOUND_LIST:ORC_HIT} melee}
- {DEFENSE_ANIM_RANGE "units/orcs/warlord-bow-defend.png"
"units/orcs/warlord-bow-1.png" {SOUND_LIST:ORC_HIT} ranged}
+ {DEFENSE_ANIM_RANGE "units/orcs/warlord-bow-defend.png"
"units/orcs/warlord-bow.png" {SOUND_LIST:ORC_HIT} ranged}
[attack]
name=greatsword
description=_"greatsword"
@@ -42,96 +42,99 @@
[filter_attack]
name=bow
[/filter_attack]
+ start_time=-445
[missile_frame]
begin=-150
end=0
image="projectiles/missile-n.png"
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
+ [frame]
+ duration=65
+ image="units/orcs/warlord-bow.png"
+ [/frame]
+ [frame]
+ duration=75
+ image="units/orcs/warlord-bow-attack-1.png"
+ [/frame]
+ [frame]
+ duration=75
+ image="units/orcs/warlord-bow-attack-2.png"
+ [/frame]
[if]
- hits=yes
+ hits=no
[frame]
- begin=-380
- end=-305
- image="units/orcs/warlord-bow-1.png"
- sound=bow.ogg
+ duration=100
+ image="units/orcs/warlord-bow-attack-3.png"
+ sound=bow-miss.ogg
[/frame]
[/if]
[else]
- hits=no
+ hits=yes
[frame]
- begin=-380
- end=-305
- image="units/orcs/warlord-bow-1.png"
- sound=bow-miss.ogg
+ duration=100
+ image="units/orcs/warlord-bow-attack-3.png"
+ sound=bow.ogg
[/frame]
[/else]
[frame]
- begin=-305
- end=-230
- image="units/orcs/warlord-bow-2.png"
+ duration=130
+ image="units/orcs/warlord-bow-attack-4.png"
[/frame]
[frame]
- begin=-230
- end=-130
- image="units/orcs/warlord-bow-3.png"
- [/frame]
- [frame]
- begin=-130
- end=0
- image="units/orcs/warlord-bow-4.png"
- [/frame]
- [frame]
- begin=0
- end=65
- image="units/orcs/warlord-bow-2.png"
+ duration=65
+ image="units/orcs/warlord-bow-attack-1.png"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
name=greatsword
[/filter_attack]
+
+ offset=0.0~0.3,0.3~0.45,0.45~0.3,0.3~0.0
+ start_time=-300
[frame]
- begin=-225
- end=-175
+ duration=50
image="units/orcs/warlord.png"
[/frame]
[frame]
- begin=-175
- end=-100
+ duration=100
image="units/orcs/warlord-attack-sword-1.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/orcs/warlord-attack-sword-2.png"
[/frame]
[if]
hits=yes
[frame]
- begin=-100
- end=50
- image="units/orcs/warlord-attack-sword-2.png"
+ duration=75
+ image="units/orcs/warlord-attack-sword-3.png"
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/if]
[else]
hits=no
[frame]
- begin=-100
- end=50
- image="units/orcs/warlord-attack-sword-2.png"
+ duration=75
+ image="units/orcs/warlord-attack-sword-3.png"
sound={SOUND_LIST:MISS}
[/frame]
[/else]
[frame]
- begin=50
- end=125
- image="units/orcs/warlord-attack-sword-3.png"
- [/frame]
- [frame]
- begin=125
- end=200
+ duration=100
image="units/orcs/warlord-attack-sword-4.png"
[/frame]
[frame]
- begin=200
- end=225
+ duration=100
+ image="units/orcs/warlord-attack-sword-5.png"
+ [/frame]
+ [frame]
+ duration=75
+ image="units/orcs/warlord-attack-sword-6.png"
+ [/frame]
+ [frame]
+ duration=50
image="units/orcs/warlord.png"
[/frame]
[/attack_anim]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
