Author: jetryl
Date: Mon May 18 02:03:27 2009
New Revision: 35728
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35728&view=rev
Log:
Visual overhaul for the orc ruler.
Added:
trunk/data/core/images/units/orcs/ruler-attack-sword-1.png (with props)
trunk/data/core/images/units/orcs/ruler-attack-sword-2.png (with props)
trunk/data/core/images/units/orcs/ruler-attack-sword-3.png (with props)
trunk/data/core/images/units/orcs/ruler-attack-sword-4.png (with props)
trunk/data/core/images/units/orcs/ruler-attack-sword-5.png (with props)
trunk/data/core/images/units/orcs/ruler-attack-sword-6.png (with props)
trunk/data/core/images/units/orcs/ruler-defend-1.png (with props)
trunk/data/core/images/units/orcs/ruler-defend-2.png (with props)
trunk/data/core/images/units/orcs/ruler-lead-1.png (with props)
trunk/data/core/images/units/orcs/ruler-lead-2.png (with props)
trunk/data/core/images/units/orcs/ruler-ranged-attack-1.png (with props)
trunk/data/core/images/units/orcs/ruler-ranged-attack-2.png (with props)
trunk/data/core/images/units/orcs/ruler-ranged-defend.png (with props)
trunk/data/core/images/units/orcs/ruler-ranged.png (with props)
Removed:
trunk/data/core/images/units/orcs/ruler-attack.png
trunk/data/core/images/units/orcs/ruler-bow-defend.png
trunk/data/core/images/units/orcs/ruler-defend.png
trunk/data/core/images/units/orcs/ruler-leading.png
trunk/data/core/images/units/orcs/ruler-ranged-1.png
trunk/data/core/images/units/orcs/ruler-ranged-2.png
Modified:
trunk/data/core/images/units/orcs/ruler.png
trunk/data/core/units/orcs/Ruler.cfg
Added: trunk/data/core/images/units/orcs/ruler-attack-sword-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack-sword-1.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-attack-sword-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-attack-sword-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack-sword-2.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-attack-sword-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-attack-sword-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack-sword-3.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-attack-sword-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-attack-sword-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack-sword-4.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-attack-sword-4.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-attack-sword-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack-sword-5.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-attack-sword-5.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-attack-sword-6.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack-sword-6.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-attack-sword-6.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/orcs/ruler-attack.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-attack.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/units/orcs/ruler-bow-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-bow-defend.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/units/orcs/ruler-defend-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-defend-1.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-defend-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-defend-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-defend-2.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-defend-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/orcs/ruler-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-defend.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/units/orcs/ruler-lead-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-lead-1.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-lead-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-lead-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-lead-2.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-lead-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/orcs/ruler-leading.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-leading.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/units/orcs/ruler-ranged-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-ranged-1.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/units/orcs/ruler-ranged-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-ranged-2.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/units/orcs/ruler-ranged-attack-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-ranged-attack-1.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-ranged-attack-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-ranged-attack-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-ranged-attack-2.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-ranged-attack-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-ranged-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-ranged-defend.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-ranged-defend.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/ruler-ranged.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler-ranged.png?rev=35728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/ruler-ranged.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/data/core/images/units/orcs/ruler.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/ruler.png?rev=35728&r1=35727&r2=35728&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/units/orcs/Ruler.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/orcs/Ruler.cfg?rev=35728&r1=35727&r2=35728&view=diff
==============================================================================
--- trunk/data/core/units/orcs/Ruler.cfg (original)
+++ trunk/data/core/units/orcs/Ruler.cfg Mon May 18 02:03:27 2009
@@ -4,13 +4,7 @@
name= _ "Orcish Ruler"
race=orc
image="units/orcs/ruler.png"
- [leading_anim]
- [frame]
- begin=-150
- end=150
- image="units/orcs/ruler-leading.png"
- [/frame]
- [/leading_anim]
+ {LEADING_ANIM "units/orcs/ruler-lead-2.png" "units/orcs/ruler-lead-1.png"}
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=60
movement_type=orcishfoot
@@ -23,8 +17,8 @@
usage=mixed fighter
description= _ "Any orc who can keep a large tribe from feuding and
in-fighting is often unusually intelligent and commanding, and is inevitably
very strong as well. They are skilled with both sword and bow, but their real
talent lies in their rare ability to rally other orcs to battle, to give orders
that are followed not out of fear, but
loyalty."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:ORC_DIE}
- {DEFENSE_ANIM_RANGE "units/orcs/ruler-defend.png" "units/orcs/ruler.png"
{SOUND_LIST:ORC_HIT} melee}
- {DEFENSE_ANIM_RANGE "units/orcs/ruler-bow-defend.png"
"units/orcs/ruler-ranged-2.png" {SOUND_LIST:ORC_HIT} ranged}
+ {DEFENSE_ANIM_RANGE "units/orcs/ruler-defend-2.png"
"units/orcs/ruler-defend-1.png" {SOUND_LIST:ORC_HIT} melee}
+ {DEFENSE_ANIM_RANGE "units/orcs/ruler-ranged-defend.png"
"units/orcs/ruler-ranged.png" {SOUND_LIST:ORC_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
[/abilities]
@@ -38,9 +32,9 @@
number=3
[/attack]
[attack]
- name=bow
- description=_"bow"
- icon=attacks/bow-orcish.png
+ name=crossbow
+ description=_"crossbow"
+ icon=attacks/crossbow-orcish.png
type=pierce
range=ranged
damage=6
@@ -48,7 +42,7 @@
[/attack]
[attack_anim]
[filter_attack]
- name=bow
+ name=crossbow
[/filter_attack]
[missile_frame]
begin=-150
@@ -59,62 +53,76 @@
[if]
hits=yes
[frame]
- begin=-400
- end=-300
- image="units/orcs/ruler-ranged-2.png"
- sound=bow.ogg
+ begin=-300
+ end=-150
+ image="units/orcs/ruler-ranged-attack-1.png"
+ sound=crossbow.ogg
[/frame]
[/if]
[else]
hits=no
[frame]
- begin=-400
- end=-300
- image="units/orcs/ruler-ranged-2.png"
- sound=bow-miss.ogg
+ begin=-300
+ end=-150
+ image="units/orcs/ruler-ranged-attack-1.png"
+ sound=crossbow-miss.ogg
[/frame]
[/else]
[frame]
- begin=-300
- end=-50
- image="units/orcs/ruler-ranged-1.png"
- [/frame]
- [frame]
- begin=-50
- end=200
- image="units/orcs/ruler-ranged-2.png"
+ begin=-150
+ end=0
+ image="units/orcs/ruler-ranged-attack-2.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=-200
- end=-100
+ duration=50
image="units/orcs/ruler.png"
[/frame]
+ [frame]
+ duration=100
+ image="units/orcs/ruler-attack-sword-1.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/orcs/ruler-attack-sword-2.png"
+ [/frame]
[if]
- hits=no
+ hits=yes
[frame]
- begin=-100
- end=100
- image="units/orcs/ruler-attack.png"
- sound={SOUND_LIST:MISS}
+ duration=75
+ image="units/orcs/ruler-attack-sword-3.png"
+ sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/if]
[else]
- hits=yes
+ hits=no
[frame]
- begin=-100
- end=100
- image="units/orcs/ruler-attack.png"
- sound={SOUND_LIST:SWORD_SWISH}
+ duration=75
+ image="units/orcs/ruler-attack-sword-3.png"
+ sound={SOUND_LIST:MISS}
[/frame]
[/else]
[frame]
- begin=100
- end=200
+ duration=100
+ image="units/orcs/ruler-attack-sword-4.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/orcs/ruler-attack-sword-5.png"
+ [/frame]
+ [frame]
+ duration=75
+ image="units/orcs/ruler-attack-sword-6.png"
+ [/frame]
+ [frame]
+ duration=50
image="units/orcs/ruler.png"
[/frame]
[/attack_anim]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
