Author: jetryl
Date: Mon May 18 01:59:24 2009
New Revision: 35727
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35727&view=rev
Log:
Visual overhaul for the orc leader, and added a new leadership anim macro.
Added:
trunk/data/core/images/units/orcs/leader-attack-1.png (with props)
trunk/data/core/images/units/orcs/leader-attack-2.png (with props)
trunk/data/core/images/units/orcs/leader-attack-3.png (with props)
trunk/data/core/images/units/orcs/leader-attack-4.png (with props)
trunk/data/core/images/units/orcs/leader-attack-5.png (with props)
trunk/data/core/images/units/orcs/leader-defend-1.png (with props)
trunk/data/core/images/units/orcs/leader-defend-2.png (with props)
trunk/data/core/images/units/orcs/leader-lead-1.png (with props)
trunk/data/core/images/units/orcs/leader-lead-2.png (with props)
trunk/data/core/images/units/orcs/leader-ranged-attack-1.png (with props)
trunk/data/core/images/units/orcs/leader-ranged-attack-2.png (with props)
trunk/data/core/images/units/orcs/leader-ranged-defend.png (with props)
trunk/data/core/images/units/orcs/leader-ranged.png (with props)
Modified:
trunk/data/core/macros/animation-utils.cfg
trunk/data/core/units/orcs/Leader.cfg
Added: trunk/data/core/images/units/orcs/leader-attack-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-attack-1.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-attack-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-attack-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-attack-2.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-attack-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-attack-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-attack-3.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-attack-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-attack-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-attack-4.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-attack-4.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-attack-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-attack-5.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-attack-5.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-defend-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-defend-1.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-defend-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-defend-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-defend-2.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-defend-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-lead-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-lead-1.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-lead-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-lead-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-lead-2.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-lead-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-ranged-attack-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-ranged-attack-1.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-ranged-attack-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-ranged-attack-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-ranged-attack-2.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-ranged-attack-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-ranged-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-ranged-defend.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-ranged-defend.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/orcs/leader-ranged.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/orcs/leader-ranged.png?rev=35727&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/orcs/leader-ranged.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/data/core/macros/animation-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/animation-utils.cfg?rev=35727&r1=35726&r2=35727&view=diff
==============================================================================
--- trunk/data/core/macros/animation-utils.cfg (original)
+++ trunk/data/core/macros/animation-utils.cfg Mon May 18 01:59:24 2009
@@ -23,6 +23,31 @@
[/else]
[/standing_anim]
#enddef
+
+#define LEADING_ANIM FULL_IMAGE HALFWAYS_IMAGE
+ # Define a defensive animation moving from a specified BASE_IMAGE
+ # to REACTION_IMAGE, with HIT_SOUND playing only if a hit occurs.
+ [leading_anim]
+ start_time=-126
+ [frame]
+ duration=1
+ image={HALFWAYS_IMAGE}
+ [/frame]
+ [frame]
+ duration=100
+ image={FULL_IMAGE}
+ [/frame]
+ [frame]
+ duration=150
+ image={FULL_IMAGE}
+ [/frame]
+ [frame]
+ duration=1
+ image={HALFWAYS_IMAGE}
+ [/frame]
+ [/leading_anim]
+#enddef
+
#define DEFENSE_ANIM REACTION_IMAGE BASE_IMAGE HIT_SOUND
# Define a defensive animation moving from a specified BASE_IMAGE
Modified: trunk/data/core/units/orcs/Leader.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/orcs/Leader.cfg?rev=35727&r1=35726&r2=35727&view=diff
==============================================================================
--- trunk/data/core/units/orcs/Leader.cfg (original)
+++ trunk/data/core/units/orcs/Leader.cfg Mon May 18 01:59:24 2009
@@ -4,13 +4,7 @@
name= _ "Orcish Leader"
race=orc
image="units/orcs/leader.png"
- [leading_anim]
- [frame]
- begin=-150
- end=150
- image="units/orcs/leader-leading.png"
- [/frame]
- [/leading_anim]
+ {LEADING_ANIM "units/orcs/leader-lead-2.png"
"units/orcs/leader-lead-1.png"}
ellipse="misc/ellipse"
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=45
@@ -24,8 +18,8 @@
usage=mixed fighter
description= _ "Unusually cunning orcs tend to find themselves as the
leaders of warrior bands. They carry a bow out of necessity, but are much more
skilled with the sword. These orcs are powerful fighters, but they also have a
certain rapport with their kin, especially goblins, and can inspire them to
fight with uncharacteristic
boldness."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:ORC_DIE}
- {DEFENSE_ANIM_RANGE "units/orcs/leader-defend.png" "units/orcs/leader.png"
{SOUND_LIST:ORC_HIT} melee}
- {DEFENSE_ANIM_RANGE "units/orcs/leader-bow-defend.png"
"units/orcs/leader-bow.png" {SOUND_LIST:ORC_HIT} ranged}
+ {DEFENSE_ANIM_RANGE "units/orcs/leader-defend-2.png"
"units/orcs/leader-defend-1.png" {SOUND_LIST:ORC_HIT} melee}
+ {DEFENSE_ANIM_RANGE "units/orcs/leader-ranged-defend.png"
"units/orcs/leader-ranged.png" {SOUND_LIST:ORC_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_1}
[/abilities]
@@ -39,9 +33,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=5
@@ -49,7 +43,7 @@
[/attack]
[attack_anim]
[filter_attack]
- name=bow
+ name=crossbow
[/filter_attack]
[missile_frame]
begin=-150
@@ -60,62 +54,79 @@
[if]
hits=yes
[frame]
- begin=-400
- end=-300
- image="units/orcs/leader-bow.png"
- sound=bow.ogg
+ begin=-300
+ end=-150
+ image="units/orcs/leader-ranged-attack-1.png"
+ sound=crossbow.ogg
[/frame]
[/if]
[else]
hits=no
[frame]
- begin=-400
- end=-300
- image="units/orcs/leader-bow.png"
- sound=bow-miss.ogg
+ begin=-300
+ end=-150
+ image="units/orcs/leader-ranged-attack-1.png"
+ sound=crossbow-miss.ogg
[/frame]
[/else]
[frame]
- begin=-300
- end=-50
- image="units/orcs/leader-bow-1.png"
- [/frame]
- [frame]
- begin=-50
- end=50
- image="units/orcs/leader-bow.png"
+ begin=-150
+ end=0
+ image="units/orcs/leader-ranged-attack-2.png"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
name=sword
[/filter_attack]
+
offset=0.0~0.15:100,0.15~0.35:100,0.35~0.45:75,0.45~0.5:100,0.5:20,0.5~0.4:30,0.4~0.2:75,0.2~0.0:75
+ start_time=-300
[frame]
- begin=-200
- end=-100
+ duration=50
image="units/orcs/leader.png"
[/frame]
+ [frame]
+ duration=50
+ image="units/orcs/leader-defend-1.png"
+ [/frame]
+ [frame]
+ duration=100
+ image="units/orcs/leader-attack-1.png"
+ [/frame]
[if]
- hits=no
+ hits=yes
[frame]
- begin=-100
- end=100
- image="units/orcs/leader-attack.png"
- sound={SOUND_LIST:MISS}
+ duration=75
+ image="units/orcs/leader-attack-2.png"
+ sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/if]
[else]
- hits=yes
+ hits=no
[frame]
- begin=-100
- end=100
- image="units/orcs/leader-attack.png"
- sound={SOUND_LIST:SWORD_SWISH}
+ duration=75
+ image="units/orcs/leader-attack-2.png"
+ sound={SOUND_LIST:MISS}
[/frame]
[/else]
[frame]
- begin=100
- end=200
+ duration=100
+ image="units/orcs/leader-attack-3.png"
+ [/frame]
+ [frame]
+ duration=20
+ image="units/orcs/leader-attack-4.png"
+ [/frame]
+ [frame]
+ duration=30
+ image="units/orcs/leader-attack-4.png"
+ [/frame]
+ [frame]
+ duration=75
+ image="units/orcs/leader-attack-5.png"
+ [/frame]
+ [frame]
+ duration=75
image="units/orcs/leader.png"
[/frame]
[/attack_anim]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
