Author: zookeeper
Date: Mon Nov 3 13:32:40 2008
New Revision: 30568
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30568&view=rev
Log:
New graphics for the troll shaman.
Added:
trunk/data/core/images/units/trolls/shaman-defend-1.png (with props)
trunk/data/core/images/units/trolls/shaman-defend-2.png (with props)
trunk/data/core/images/units/trolls/shaman-fist-1.png (with props)
trunk/data/core/images/units/trolls/shaman-fist-2.png (with props)
trunk/data/core/images/units/trolls/shaman-fist-3.png (with props)
trunk/data/core/images/units/trolls/shaman-fist-4.png (with props)
trunk/data/core/images/units/trolls/shaman-fist-5.png (with props)
trunk/data/core/images/units/trolls/shaman-ranged-1.png (with props)
trunk/data/core/images/units/trolls/shaman-ranged-2.png (with props)
trunk/data/core/images/units/trolls/shaman-ranged-3.png (with props)
Removed:
trunk/data/core/images/units/trolls/shaman-defend.png
trunk/data/core/images/units/trolls/shaman-melee.png
trunk/data/core/images/units/trolls/shaman-ranged.png
Modified:
trunk/changelog
trunk/data/core/images/units/trolls/shaman.png
trunk/data/core/units/trolls/Troll_Shaman.cfg
trunk/players_changelog
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=30568&r1=30567&r2=30568&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Nov 3 13:32:40 2008
@@ -21,6 +21,8 @@
This fixes an issue with some window managers grabbing the event.
* Added basic mask applying feature
* Added basic mask creation ("diff") feature
+ * Graphics
+ * New or updated unit frames: Troll Shaman.
* Help menu
* ability upgrades for max-level advancements are now listed (bug #10337)
* Language and i18n:
Added: trunk/data/core/images/units/trolls/shaman-defend-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-defend-1.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-defend-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-defend-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-defend-2.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-defend-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/trolls/shaman-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-defend.png?rev=30567&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/units/trolls/shaman-fist-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-fist-1.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-fist-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-fist-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-fist-2.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-fist-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-fist-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-fist-3.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-fist-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-fist-4.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-fist-4.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-fist-4.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-fist-5.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-fist-5.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-fist-5.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/trolls/shaman-melee.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-melee.png?rev=30567&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/units/trolls/shaman-ranged-1.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-ranged-1.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-ranged-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-ranged-2.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-ranged-2.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-ranged-2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/core/images/units/trolls/shaman-ranged-3.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-ranged-3.png?rev=30568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/units/trolls/shaman-ranged-3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Removed: trunk/data/core/images/units/trolls/shaman-ranged.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman-ranged.png?rev=30567&view=auto
==============================================================================
Binary file - no diff available.
Modified: trunk/data/core/images/units/trolls/shaman.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/units/trolls/shaman.png?rev=30568&r1=30567&r2=30568&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/units/trolls/Troll_Shaman.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/trolls/Troll_Shaman.cfg?rev=30568&r1=30567&r2=30568&view=diff
==============================================================================
--- trunk/data/core/units/trolls/Troll_Shaman.cfg (original)
+++ trunk/data/core/units/trolls/Troll_Shaman.cfg Mon Nov 3 13:32:40 2008
@@ -22,7 +22,7 @@
cost=32
usage=mixed fighter
description= _ "Troll shamans are the mystical leaders of the trolls.
Though not as strong or tough as other trolls, their true power lies in their
fire magic, which they use to blast enemies with gouts of
fire."+{SPECIAL_NOTES}+{SPECIAL_NOTES_REGENERATES}+{SPECIAL_NOTES_MAGICAL}
- {DEFENSE_ANIM "units/trolls/shaman-defend.png" "units/trolls/shaman.png"
{SOUND_LIST:TROLL_HIT} }
+ {DEFENSE_ANIM "units/trolls/shaman-defend-2.png"
"units/trolls/shaman-defend-1.png" {SOUND_LIST:TROLL_HIT} }
die_sound={SOUND_LIST:TROLL_DIE}
#melee attack should be worse than troll rocklobber,
#since shaman has suck a better ranged attack
@@ -65,23 +65,32 @@
[filter_attack]
name=fist
[/filter_attack]
- [if]
- hits=yes
- [frame]
- sound=fist.ogg
- begin=-150
- end=150
- image=units/trolls/shaman-melee.png
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- sound={SOUND_LIST:MISS}
- begin=-150
- end=150
- image=units/trolls/shaman-melee.png
- [/frame]
- [/else]
+ offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
+ start_time=-300
+ {SOUND:HIT_AND_MISS fist.ogg {SOUND_LIST:MISS} -100}
+ [frame]
+ duration=100
+ image=units/trolls/shaman-fist-1.png
+ [/frame]
+ [frame]
+ duration=100
+ image=units/trolls/shaman-fist-2.png
+ [/frame]
+ [frame]
+ duration=100
+ image=units/trolls/shaman-fist-3.png
+ [/frame]
+ [frame]
+ duration=100
+ image=units/trolls/shaman-fist-4.png
+ [/frame]
+ [frame]
+ duration=100
+ image=units/trolls/shaman-fist-5.png
+ [/frame]
+ [frame]
+ duration=50
+ image=units/trolls/shaman.png
+ [/frame]
[/attack_anim]
[/unit_type]
Modified: trunk/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=30568&r1=30567&r2=30568&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Mon Nov 3 13:32:40 2008
@@ -35,6 +35,9 @@
* changed the base-terrain key modifier to shift from alt.
* Added basic mask applying feature
* Added basic mask creation ("diff") feature
+
+ * Graphics
+ * New or updated unit frames: Troll Shaman.
* Miscellaneous and bugfixes
* There is a new revision of the main Wesnoth map with more placenames
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
