Author: esr
Date: Tue Mar  4 04:14:09 2008
New Revision: 24294

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24294&view=rev
Log:
Address bug #11189.

Modified:
    trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
    trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
    trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
    trunk/data/core/macros/abilities.cfg
    trunk/data/core/macros/special-notes.cfg

Modified: 
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg 
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg 
Tue Mar  4 04:14:09 2008
@@ -19,7 +19,7 @@
     experience=80
     advanceto=Dwarvish Loremaster
     {AMLA_DEFAULT}
-    unit_description= _ "Dwarvish Annalists are the historians of this ancient 
and proud race. They are few in number, and their very existence is not 
generally known to the other peoples of the Great Continent.  To the abilities 
of the Witness they add, through the study of herb and mineral lore, the 
ability to cure 
poison."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_LEADERSHIP}+_
 "SPECIAL_NOTES^ This unit can exert leadership on units of his own 
level."+{SPECIAL_NOTES_MAGICAL}
+    unit_description= _ "Dwarvish Annalists are the historians of this ancient 
and proud race. They are few in number, and their very existence is not 
generally known to the other peoples of the Great Continent.  To the abilities 
of the Witness they add, through the study of herb and mineral lore, the 
ability to cure 
poison."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_3}
         {ABILITY_UNPOISON}

Modified: 
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg 
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg 
Tue Mar  4 04:14:09 2008
@@ -17,7 +17,7 @@
     cost=50
     usage=mixed fighter
     {AMLA_DEFAULT}
-    unit_description= _ "Loremasters are the sages of the dwarvish race.  
Their counsel is greatly valued by war-leaders and chieftains, and they are 
viewed with awe by ordinary dwarves, for they alone have plumbed the deepest 
and most closely-held secrets of dwarven knowledge.  It is said that where a 
loremaster stands, there is the soul of the dwarves.  To the abilities of the 
Annalist they add a limited ability to 
heal."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_LEADERSHIP}+_
 "SPECIAL_NOTES^ This unit can exert leadership on units of his own 
level."+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HEALS}
+    unit_description= _ "Loremasters are the sages of the dwarvish race.  
Their counsel is greatly valued by war-leaders and chieftains, and they are 
viewed with awe by ordinary dwarves, for they alone have plumbed the deepest 
and most closely-held secrets of dwarven knowledge.  It is said that where a 
loremaster stands, there is the soul of the dwarves.  To the abilities of the 
Annalist they add a limited ability to 
heal."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_UNPOISON}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_HEALS}
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_4}
         {ABILITY_UNPOISON}

Modified: 
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg 
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg Tue 
Mar  4 04:14:09 2008
@@ -24,7 +24,7 @@
     usage=mixed fighter
     experience=32
     advanceto=Dwarvish Annalist
-    unit_description= _ "A Witness functions as the eyes of the dwarves' 
history, a deep lore that they never share with outsiders.  The presence of a 
Witness inspires dwarvish warriors with the knowledge that their deeds (and 
their deaths) will not go unrecorded.  They learn a fighting style deliberately 
unlike that of their fellows, one designed to turn the vaunted strength of the 
dwarves against itself.  The person of a Witness is considered sacred, and 
Witnesses are often used as envoys between dwarvish 
clans."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+_ "SPECIAL_NOTES^ This unit 
can exert leadership on units of his own 
level."+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
+    unit_description= _ "A Witness functions as the eyes of the dwarves' 
history, a deep lore that they never share with outsiders.  The presence of a 
Witness inspires dwarvish warriors with the knowledge that their deeds (and 
their deaths) will not go unrecorded.  They learn a fighting style deliberately 
unlike that of their fellows, one designed to turn the vaunted strength of the 
dwarves against itself.  The person of a Witness is considered sacred, and 
Witnesses are often used as envoys between dwarvish 
clans."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_SLOW}
     [abilities]
         {ABILITY_LEADERSHIP_LEVEL_2}
     [/abilities]

Modified: trunk/data/core/macros/abilities.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/abilities.cfg?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- trunk/data/core/macros/abilities.cfg (original)
+++ trunk/data/core/macros/abilities.cfg Tue Mar  4 04:14:09 2008
@@ -108,7 +108,7 @@
         description= _ "Leadership:
 This unit can lead friendly units that are next to it, making them fight 
better.
 
-Adjacent friendly units of lower level will do more damage in battle. When a 
unit adjacent to, of a lower level than, and on the same side as a unit with 
Leadership engages in combat, its attacks do 25% more damage times the 
difference in their levels."
+Adjacent friendly units of level 0 will do 25% more damage in battle."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -130,7 +130,7 @@
         description= _ "Leadership:
 This unit can lead friendly units that are next to it, making them fight 
better.
 
-Adjacent friendly units of lower level will do more damage in battle. When a 
unit adjacent to, of a lower level than, and on the same side as a unit with 
Leadership engages in combat, its attacks do 25% more damage times the 
difference in their levels."
+Adjacent friendly units of level 0 will do 50% more damage; level 1 units will 
do 25% more damage."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -164,7 +164,7 @@
         description= _ "Leadership:
 This unit can lead friendly units that are next to it, making them fight 
better.
 
-Adjacent friendly units of lower level will do more damage in battle. When a 
unit adjacent to, of a lower level than, and on the same side as a unit with 
Leadership engages in combat, its attacks do 25% more damage times the 
difference in their levels."
+Adjacent friendly units of level 0 will do 75% more damage; level 1 units will 
do 50% more damage, and level 2 units will do 25% more damage."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -210,7 +210,7 @@
         description= _ "Leadership:
 This unit can lead friendly units that are next to it, making them fight 
better.
 
-Adjacent friendly units of lower level will do more damage in battle. When a 
unit adjacent to, of a lower level than, and on the same side as a unit with 
Leadership engages in combat, its attacks do 25% more damage times the 
difference in their levels."
+Adjacent friendly units of level 0 will do 100% more damage; level 1 units 
will do 75% more damage, level 2 units will do 50% more damage, and level 3 
units will do 25% more damage."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -268,7 +268,7 @@
         description= _ "Leadership:
 This unit can lead friendly units that are next to it, making them fight 
better.
 
-Adjacent friendly units of lower level will do more damage in battle. When a 
unit adjacent to, of a lower level than, and on the same side as a unit with 
Leadership engages in combat, its attacks do 25% more damage times the 
difference in their levels."
+Adjacent friendly units of level 0 will do 125% more damage; level 1 units 
will do 100% more damage, level 2 units will do 75% more damage, level 3 units 
will do 50% more damage, and level 4 units will do 25% more damage."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw

Modified: trunk/data/core/macros/special-notes.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/special-notes.cfg?rev=24294&r1=24293&r2=24294&view=diff
==============================================================================
--- trunk/data/core/macros/special-notes.cfg (original)
+++ trunk/data/core/macros/special-notes.cfg Tue Mar  4 04:14:09 2008
@@ -26,7 +26,7 @@
     _" The steadiness of this unit reduces damage from some attacks, but only 
while defending."#enddef
 
 #define SPECIAL_NOTES_LEADERSHIP
-    _" The leadership of this unit enables friendly units next to it to deal 
more damage in combat, though this only applies to units of lower level."#enddef
+    _" The leadership of this unit enables friendly units next to it to deal 
more damage in combat. The bonus is 25% times the difference between this 
unit's leadership level and the friendly unit's level, and only applies if it 
is positive."#enddef
 
 #define SPECIAL_NOTES_SKIRMISHER
     _" This unit's skill at skirmishing allows it to ignore enemies' zones of 
control and thus move unhindered around them."#enddef


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to