Author: esr
Date: Mon Mar 10 11:38:19 2008
New Revision: 24471
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24471&view=rev
Log:
Move the Troll Shan into core, since both DiD and UtBS use it.
Added:
trunk/data/core/images/units/trolls/shaman-defend.png
- copied unchanged from r24469,
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-defend.png
trunk/data/core/images/units/trolls/shaman-melee.png
- copied unchanged from r24469,
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-melee.png
trunk/data/core/images/units/trolls/shaman-ranged.png
- copied unchanged from r24469,
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-ranged.png
trunk/data/core/images/units/trolls/shaman.png
- copied unchanged from r24469,
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman.png
trunk/data/core/units/Troll_Shaman.cfg
- copied, changed from r24469,
trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg
Removed:
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-defend.png
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-melee.png
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-ranged.png
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman.png
trunk/data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-defend.png
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-melee.png
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-ranged.png
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman.png
trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg
Removed:
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-defend.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed:
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-melee.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-melee.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed:
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-ranged.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman-ranged.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed:
trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/images/units/troll-shaman.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg?rev=24470&view=auto
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg (original)
+++ trunk/data/campaigns/Descent_Into_Darkness/units/troll-shaman.cfg (removed)
@@ -1,87 +1,0 @@
-#textdomain wesnoth-did
-[unit]
- id=Troll Shaman
- name= _ "Troll Shaman"
- race=troll
- image=troll-shaman.png
- {MAGENTA_IS_THE_TEAM_COLOR}
- [abilities]
- {ABILITY_REGENERATES}
- [/abilities]
- hitpoints=50
- movement_type=largefoot
- [resistance]
- pierce=90
- [/resistance]
- movement=5
- experience=150
- level=2
- alignment=chaotic
- advanceto=null
- {AMLA_DEFAULT}
- cost=32
- usage=mixed fighter
- unit_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/troll-shaman-defend.png" "units/troll-shaman.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
- [attack]
- name=fist
- description= _"fist"
- icon=attacks/fist-troll.png
- type=impact
- range=melee
- damage=7
- number=2
- [/attack]
- #with underground bonus, troll actually gets 10-3 attack
- [attack]
- name=flame blast
- description= _"flame blast"
- type=fire
- [specials]
- {WEAPON_SPECIAL_MAGICAL}
- [/specials]
- range=ranged
- damage=7
- number=3
- icon=attacks/fireball.png
- [/attack]
- [attack_anim]
- [attack_filter]
- name=flame blast
- [/attack_filter]
- {MISSILE_FRAME_FIREBALL}
-
- [frame]
- sound=fire.wav
- begin=-200
- end=0
- image=units/troll-shaman-ranged.png
- [/frame]
- [/attack_anim]
- [attack_anim]
- [attack_filter]
- name=fist
- [/attack_filter]
- [if]
- hits=yes
- [frame]
- sound=fist.ogg
- begin=-150
- end=150
- image=units/troll-shaman-melee.png
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- sound={SOUND_LIST:MISS}
- begin=-150
- end=150
- image=units/troll-shaman-melee.png
- [/frame]
- [/else]
- [/attack_anim]
-[/unit]
Removed:
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-defend.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-defend.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed:
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-melee.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-melee.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed:
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-ranged.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman-ranged.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed:
trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/trolls/shaman.png?rev=24470&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg?rev=24470&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg (removed)
@@ -1,87 +1,0 @@
-#textdomain wesnoth-utbs
-[unit]
- id=Troll Shaman
- name= _ "Troll Shaman"
- race=troll
- image=units/trolls/shaman.png
- {MAGENTA_IS_THE_TEAM_COLOR}
- [abilities]
- {ABILITY_REGENERATES}
- [/abilities]
- hitpoints=50
- movement_type=largefoot
- [resistance]
- pierce=90
- [/resistance]
- movement=5
- experience=150
- level=2
- alignment=chaotic
- advanceto=null
- {AMLA_DEFAULT}
- cost=32
- usage=mixed fighter
- unit_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} }
- die_sound={SOUND_LIST:TROLL_DIE}
- #melee attack should be worse than troll rocklobber,
- #since shaman has suck a better ranged attack
- [attack]
- name=fist
- description= _"fist"
- icon=attacks/fist-troll.png
- type=impact
- range=melee
- damage=7
- number=2
- [/attack]
- #with underground bonus, troll actually gets 10-3 attack
- [attack]
- name=flame blast
- description= _"flame blast"
- type=fire
- [specials]
- {WEAPON_SPECIAL_MAGICAL}
- [/specials]
- range=ranged
- damage=7
- number=3
- icon=attacks/fireball.png
- [/attack]
- [attack_anim]
- [attack_filter]
- name=flame blast
- [/attack_filter]
- {MISSILE_FRAME_FIREBALL}
-
- [frame]
- sound=fire.wav
- begin=-200
- end=0
- image=units/trolls/shaman-ranged.png
- [/frame]
- [/attack_anim]
- [attack_anim]
- [attack_filter]
- name=fist
- [/attack_filter]
- [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]
- [/attack_anim]
-[/unit]
Copied: trunk/data/core/units/Troll_Shaman.cfg (from r24469,
trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/Troll_Shaman.cfg?p2=trunk/data/core/units/Troll_Shaman.cfg&p1=trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg&r1=24469&r2=24471&rev=24471&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Troll_Shaman.cfg
(original)
+++ trunk/data/core/units/Troll_Shaman.cfg Mon Mar 10 11:38:19 2008
@@ -1,4 +1,4 @@
-#textdomain wesnoth-utbs
+#textdomain wesnoth
[unit]
id=Troll Shaman
name= _ "Troll Shaman"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
