Author: zookeeper
Date: Wed Mar 26 11:46:29 2008
New Revision: 25139

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25139&view=rev
Log:
Reverted core leadership back to its normal form. The THoT loremaster line 
still needs to adjust accordingly.

Modified:
    trunk/data/core/macros/abilities.cfg
    trunk/data/core/macros/special-notes.cfg

Modified: trunk/data/core/macros/abilities.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/abilities.cfg?rev=25139&r1=25138&r2=25139&view=diff
==============================================================================
--- trunk/data/core/macros/abilities.cfg (original)
+++ trunk/data/core/macros/abilities.cfg Wed Mar 26 11:46:29 2008
@@ -101,12 +101,14 @@
     # Canned definition of the Leadership (level 1) ability to be included in 
an
     # [abilities] clause.
     [leadership]
-        id=leadership1
+        id=leadership
         value=25
         cumulative=no
-        name= _ "leadership 1"
-        description= _ "Leadership 1:
-This unit can lead friendly level zero units that are next to it, making them 
fight better. Adjacent friendly units of level zero will do 25% more damage in 
battle."
+        name= _ "leadership"
+        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."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -121,12 +123,14 @@
     # Canned definition of the Leadership (level 2) ability to be included in 
an
     # [abilities] clause.
     [leadership]
-        id=leadership2
+        id=leadership
         value=50
         cumulative=no
-        name= _ "leadership 2"
-        description= _ "Leadership 2:
-This unit can lead friendly L0 or L1 units that are next to it, making them 
fight better. Adjacent friendly units of L1 will do 25% more damage; L0 units 
will do 50% more."
+        name= _ "leadership"
+        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."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -136,7 +140,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership2
+        id=leadership
         value=25
         cumulative=no
         affect_self=no
@@ -153,12 +157,14 @@
     # Canned definition of the Leadership (level 3) ability to be included in 
an
     # [abilities] clause.
     [leadership]
-        id=leadership3
+        id=leadership
         value=75
         cumulative=no
-        name= _ "leadership 3"
-        description= _ "Leadership 3:
-This unit can lead friendly L0, L1, or L2 units that are next to it, making 
them fight better. Adjacent friendly units of L2 will do more 25% more damage; 
L1 units will do 50% more, and L0 will do 75% more."
+        name= _ "leadership"
+        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."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -168,7 +174,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership3
+        id=leadership
         value=50
         cumulative=no
         affect_self=no
@@ -180,7 +186,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership3
+        id=leadership
         value=25
         cumulative=no
         affect_self=no
@@ -197,12 +203,14 @@
     # Canned definition of the Leadership (level 4) ability to be included in 
an
     # [abilities] clause.
     [leadership]
-        id=leadership4
+        id=leadership
         value=100
         cumulative=no
-        name= _ "leadership 4"
-        description= _ "Leadership 4:
-This unit can lead friendly L0, L1, L2, or L3 units that are next to it, 
making them fight better. Adjacent friendly units of L3 will do more 25% more 
damage; L2 units will do 50% more, L1 will do 75% more, and L0 units will do 
100% more."
+        name= _ "leadership"
+        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."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -212,7 +220,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership4
+        id=leadership
         value=75
         cumulative=no
         affect_self=no
@@ -224,7 +232,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership4
+        id=leadership
         value=50
         cumulative=no
         affect_self=no
@@ -236,7 +244,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership4
+        id=leadership
         value=25
         cumulative=no
         affect_self=no
@@ -253,12 +261,14 @@
     # Canned definition of the Leadership (level 5) ability to be included in 
an
     # [abilities] clause.
     [leadership]
-        id=leadership5
+        id=leadership
         value=125
         cumulative=no
-        name= _ "leadership 5"
-        description= _ "Leadership 5:
-This unit can lead friendly L0, L1, L2, L3, or L4 units that are next to it, 
making them fight better. Adjacent friendly units of L4 will do more 25% more 
damage; L3 units will do 50% more, L2 will do 75% more, L1 units will do 100% 
more, and L0 will do 125% more."
+        name= _ "leadership"
+        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."
         affect_self=no
         [affect_adjacent]
             adjacent=n,ne,se,s,sw,nw
@@ -268,7 +278,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership5
+        id=leadership
         value=100
         cumulative=no
         affect_self=no
@@ -280,7 +290,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership5
+        id=leadership
         value=75
         cumulative=no
         affect_self=no
@@ -292,7 +302,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership5
+        id=leadership
         value=50
         cumulative=no
         affect_self=no
@@ -304,7 +314,7 @@
         [/affect_adjacent]
     [/leadership]
     [leadership]
-        id=leadership5
+        id=leadership
         value=25
         cumulative=no
         affect_self=no

Modified: trunk/data/core/macros/special-notes.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/special-notes.cfg?rev=25139&r1=25138&r2=25139&view=diff
==============================================================================
--- trunk/data/core/macros/special-notes.cfg (original)
+++ trunk/data/core/macros/special-notes.cfg Wed Mar 26 11:46:29 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 below the 
leadership level."#enddef
+    _" 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
 
 #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