0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrite leadership ability as a single macro using $other_unit

Browse source 
Note: It's no longer supported to use the macro in a unit with a non-matching level,
for example giving a 2nd-level unit 4th-level leadership.
This commit is contained in:
Celtic Minstrel 2015-09-19 02:08:02 -04:00
parent 9940ee4036
commit f54d6b5d28
47 changed files with 80 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Dead_Water/units/Soldier_King.cfg
View file

@ -22,7 +22,7 @@
cost=36
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "A king who is skilled at combat commands great respect — especially among soldiers. His strength allows him to wield powerful weapons and move quickly, even with heavy armor. His leadership abilities inspire his troops."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=mermen-die.ogg

2
data/campaigns/Dead_Water/units/Warrior_King.cfg
View file

@ -22,7 +22,7 @@
cost=60
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "Warrior kings often become legendary in their own time. Their skill and strength allows them to be truly formidable in battle. They are also fast despite their heavy armor. Even skilled soldiers look upon them with awe."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=mermen-die.ogg

2
data/campaigns/Dead_Water/units/Young_King.cfg
View file

@ -22,7 +22,7 @@
cost=15
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_1}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "A young king with some battle experience will be treated with some respect. Common citizens will be inspired to do their utmost when the king is nearby, but battle-hardened veterens will be less impressed."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=mermen-die.ogg

2
data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
View file

@ -7,7 +7,7 @@
name=_"King of Wesnoth"
hitpoints=68
[abilities]
{ABILITY_LEADERSHIP_LEVEL_5}
{ABILITY_LEADERSHIP}
[/abilities]
experience=250
level=5

2
data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
View file

@ -8,7 +8,7 @@
hitpoints=57 # A little tougher
[abilities]
{ABILITY_HEALS}
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
movement=6 # A little faster
advances_to=Mage Magister

2
data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
View file

@ -6,7 +6,7 @@
id=Mage Leader
name=_"Mage Leader"
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
movement=6 # A little faster
experience=100 # Same as base unit

2
data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
View file

@ -8,7 +8,7 @@
hitpoints=57 # A little tougher
[abilities]
{ABILITY_HEALS}
{ABILITY_LEADERSHIP_LEVEL_4}
{ABILITY_LEADERSHIP}
[/abilities]
[resistance]
fire=60 # Add fire resistance

4
data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
View file

@ -22,7 +22,7 @@
{AMLA_DEFAULT}
cost=60
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
{ABILITY_INITIATIVE}
[/abilities]
usage=fighter
@ -78,7 +78,7 @@
{AMLA_DEFAULT}
cost=110
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
{ABILITY_INITIATIVE}
[/abilities]
usage=fighter

2
data/campaigns/Heir_To_The_Throne/units/Commander.cfg
View file

@ -7,7 +7,7 @@
image="units/konrad-commander{AFFIX}.png"
hitpoints=45
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=smallfoot
movement=6

2
data/campaigns/Heir_To_The_Throne/units/Lord.cfg
View file

@ -7,7 +7,7 @@
image="units/konrad-lord{AFFIX}.png"
hitpoints=68
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=smallfoot
movement=6

4
data/campaigns/Heir_To_The_Throne/units/Princess.cfg
View file

@ -26,7 +26,7 @@
advances_to=Battle Princess
cost=39
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
{ABILITY_INITIATIVE}
[/abilities]
usage=fighter
@ -87,7 +87,7 @@
advances_to=Battle Princess
cost=110
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
{ABILITY_INITIATIVE}
[/abilities]
usage=fighter

2
data/campaigns/Liberty/units/Death_Squire.cfg
View file

@ -20,7 +20,7 @@
advances_to=Death Knight
cost=36
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
{ABILITY_SUBMERGE}
[/abilities]
usage=fighter

2
data/campaigns/Liberty/units/Shadow_Lord.cfg
View file

@ -9,7 +9,7 @@
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=53
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=smallfoot
movement=6

2
data/campaigns/Liberty/units/Shadow_Mage.cfg
View file

@ -9,7 +9,7 @@
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=42
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=smallfoot
movement=6

2
data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
View file

@ -15,7 +15,7 @@
cost=19
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
hide_help=true
description= _ "King of Wesnoth."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}

2
data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
View file

@ -7,7 +7,7 @@
image="units/noble-commander.png"
hitpoints=48
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=smallfoot
movement=6

2
data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
View file

@ -7,7 +7,7 @@
image="units/noble-lord.png"
hitpoints=64
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=smallfoot
movement=6

2
data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg
View file

@ -6,7 +6,7 @@
[/base_unit]
name= _ "Warrior King"
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "As the leaders of the human Kingdoms, Kings are responsible for ruling and protecting their subjects. Kings can coordinate the attacks of level 1 and 2 units, thereby increasing their fighting efficiency."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
# This is a somewhat elderly royal warrior

2
data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
View file

@ -8,7 +8,7 @@
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=46
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
{ABILITY_DISTRACT}
[/abilities]
movement_type=elusivefoot

2
data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
View file

@ -8,7 +8,7 @@
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=62
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
{ABILITY_DISTRACT}
[/abilities]
movement_type=elusivefoot

2
data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
View file

@ -9,7 +9,7 @@
hitpoints=33
[abilities]
{ABILITY_DISTRACT}
{ABILITY_LEADERSHIP_LEVEL_1}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=elusivefoot
movement=7

2
data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
View file

@ -21,7 +21,7 @@
experience=80
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "Leaders of the border guards, mounted commanders are trained not only to ride and fight, but to lead. They command the garrisons that keep peace in the provinces of Wesnoth."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_CHARGE}
die_sound=horse-die.ogg

2
data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
View file

@ -21,7 +21,7 @@
{AMLA_DEFAULT}
experience=150
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
usage=fighter
description= _ "Veteran commanders have faced battle many times and led their men with steady hands and calm determination."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SLOW}

2
data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg
View file

@ -20,7 +20,7 @@
experience=75
advances_to=Infantry Commander
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
usage=fighter
description= _ "Commanders of the infantry of Wesnoth are responsible for the garrison and defense of the border towns and villages. They are drawn from the ranks of veteran soldiers, not nobility, and all have shown leadership and courage in battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}

2
data/campaigns/The_South_Guard/units/Junior_Commander.cfg
View file

@ -21,7 +21,7 @@
advances_to=Horseman Commander
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_1}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "Scarcely 17 or 18 years old, the sons of knights and lords were given mounts and swords and told to become leaders of men. Those whose mettle was strong enough for the task became the commanders of the armies of Wesnoth."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=horse-die.ogg

2
data/campaigns/The_South_Guard/units/Mounted_General.cfg
View file

@ -23,7 +23,7 @@
experience=150
usage=fighter
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
description= _ "Being the most able leaders of the border guards, Mounted Generals are trained not only to ride and fight, but to lead. They command the garrisons that keep peace in the provinces of Wesnoth."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_CHARGE}
die_sound=horse-die.ogg

2
data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
View file

@ -13,7 +13,7 @@
[/leading_anim]
hitpoints=47
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
movement_type=desert_elf
movement=5

2
data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
View file

@ -7,7 +7,7 @@
{MAGENTA_IS_THE_TEAM_COLOR}
hitpoints=62
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
[leading_anim]
start_time=-150

14
data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
View file

@ -38,20 +38,8 @@
image=units/elves-desert/kaleh-leading.png
[effect]
apply_to=new_ability
[filter]
level=2
[/filter]
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
[/abilities]
[/effect]
[effect]
apply_to=new_ability
[filter]
level=3
[/filter]
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
[/effect]
) {VARIANT_NAME}}

2
data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
View file

@ -30,7 +30,7 @@
advances_to=null
cost=60
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
usage=fighter
description= _ "In this new harsh world, might often makes right and these commanders are strong enough to rise to positions of leadership. Leading small groups of warriors, commanders rally their troops around them and show no mercy to their enemies, striking fiercely with both sword and bow."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}

165
data/core/macros/abilities.cfg
View file

@ -96,159 +96,10 @@ A poisoned unit cannot be cured of its poison by a healer, and must seek the car
[/resistance]
#enddef
#define ABILITY_LEADERSHIP_LEVEL_1
# Canned definition of the Leadership (level 1) ability to be included in an
# [abilities] clause.
[leadership]
id=leadership
value=25
cumulative=no
name= _ "leadership"
female_name= _ "female^leadership"
description= _ "This unit can lead our own units that are next to it, making them fight better.
Adjacent own 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]
[filter]
level=0
[/filter]
[/affect_adjacent]
[/leadership]
#enddef
#define ABILITY_LEADERSHIP_LEVEL_2
# Canned definition of the Leadership (level 2) ability to be included in an
# [abilities] clause.
[leadership]
id=leadership
value=50
cumulative=no
name= _ "leadership"
female_name= _ "female^leadership"
description= _ "This unit can lead our own units that are next to it, making them fight better.
Adjacent own 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]
[filter]
level=0
[/filter]
[/affect_adjacent]
[/leadership]
[leadership]
id=leadership
value=25
cumulative=no
affect_self=no
[affect_adjacent]
[filter]
level=1
[/filter]
[/affect_adjacent]
[/leadership]
#enddef
#define ABILITY_LEADERSHIP_LEVEL_3
# Canned definition of the Leadership (level 3) ability to be included in an
# [abilities] clause.
[leadership]
id=leadership
value=75
cumulative=no
name= _ "leadership"
female_name= _ "female^leadership"
description= _ "This unit can lead our own units that are next to it, making them fight better.
Adjacent own 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]
[filter]
level=0
[/filter]
[/affect_adjacent]
[/leadership]
[leadership]
id=leadership
value=50
cumulative=no
affect_self=no
[affect_adjacent]
[filter]
level=1
[/filter]
[/affect_adjacent]
[/leadership]
[leadership]
id=leadership
value=25
cumulative=no
affect_self=no
[affect_adjacent]
[filter]
level=2
[/filter]
[/affect_adjacent]
[/leadership]
#enddef
#define ABILITY_LEADERSHIP_LEVEL_4
# Canned definition of the Leadership (level 4) ability to be included in an
# [abilities] clause.
[leadership]
id=leadership
value=100
cumulative=no
name= _ "leadership"
female_name= _ "female^leadership"
description= _ "This unit can lead our own units that are next to it, making them fight better.
Adjacent own 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]
[filter]
level=0
[/filter]
[/affect_adjacent]
[/leadership]
[leadership]
id=leadership
value=75
cumulative=no
affect_self=no
[affect_adjacent]
[filter]
level=1
[/filter]
[/affect_adjacent]
[/leadership]
[leadership]
id=leadership
value=50
cumulative=no
affect_self=no
[affect_adjacent]
[filter]
level=2
[/filter]
[/affect_adjacent]
[/leadership]
[leadership]
id=leadership
value=25
cumulative=no
affect_self=no
[affect_adjacent]
[filter]
level=3
[/filter]
[/affect_adjacent]
[/leadership]
#enddef
#define ABILITY_LEADERSHIP_LEVEL_5
# Canned definition of the Leadership (level 5) ability to be included in an
#define ABILITY_LEADERSHIP
# Canned definition of the Leadership ability to be included in an
# [abilities] clause.
# Note: Works only on units of level 1-5
[leadership]
id=leadership
value=125
@ -261,7 +112,7 @@ Adjacent own units of lower level will do more damage in battle. When a unit adj
affect_self=no
[affect_adjacent]
[filter]
level=0
level=$($other_unit.level - 5)
[/filter]
[/affect_adjacent]
[/leadership]
@ -272,7 +123,7 @@ Adjacent own units of lower level will do more damage in battle. When a unit adj
affect_self=no
[affect_adjacent]
[filter]
level=1
level=$($other_unit.level - 4)
[/filter]
[/affect_adjacent]
[/leadership]
@ -283,7 +134,7 @@ Adjacent own units of lower level will do more damage in battle. When a unit adj
affect_self=no
[affect_adjacent]
[filter]
level=2
level=$($other_unit.level - 3)
[/filter]
[/affect_adjacent]
[/leadership]
@ -294,7 +145,7 @@ Adjacent own units of lower level will do more damage in battle. When a unit adj
affect_self=no
[affect_adjacent]
[filter]
level=3
level=$($other_unit.level - 2)
[/filter]
[/affect_adjacent]
[/leadership]
@ -305,7 +156,7 @@ Adjacent own units of lower level will do more damage in battle. When a unit adj
affect_self=no
[affect_adjacent]
[filter]
level=4
level=$($other_unit.level - 1)
[/filter]
[/affect_adjacent]
[/leadership]

20
data/core/macros/deprecated-utils.cfg
View file

@ -12,6 +12,26 @@
#enddef
#wmllint: markcheck on
#define ABILITY_LEADERSHIP_LEVEL_1
{ABILITY_LEADERSHIP}
#enddef
#define ABILITY_LEADERSHIP_LEVEL_2
{ABILITY_LEADERSHIP}
#enddef
#define ABILITY_LEADERSHIP_LEVEL_3
{ABILITY_LEADERSHIP}
#enddef
#define ABILITY_LEADERSHIP_LEVEL_4
{ABILITY_LEADERSHIP}
#enddef
#define ABILITY_LEADERSHIP_LEVEL_5
{ABILITY_LEADERSHIP}
#enddef
#define EARLY_FINISH_BONUS_CAPTION
# Deprecated; use the below EARLY_FINISH_BONUS_FOOTNOTE instead
_"<small>(early finish bonus)</small>"#enddef

2
data/core/units/drakes/Flameheart.cfg
View file

@ -21,7 +21,7 @@
{LEADING_ANIM "units/drakes/flameheart-lead-2.png" "units/drakes/flameheart-lead-1.png" 39,-29}
{DEFENSE_ANIM "units/drakes/flameheart-defend-2.png" "units/drakes/flameheart-defend-1.png" {SOUND_LIST:DRAKE_HIT} }
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=war blade

2
data/core/units/drakes/Flare.cfg
View file

@ -20,7 +20,7 @@
{LEADING_ANIM "units/drakes/flare-lead-2.png" "units/drakes/flare-lead-1.png" 37,-19}
{DEFENSE_ANIM "units/drakes/flare-defend-2.png" "units/drakes/flare-defend-1.png" {SOUND_LIST:DRAKE_HIT} }
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=war blade

2
data/core/units/elves/Captain.cfg
View file

@ -27,7 +27,7 @@
{DEFENSE_ANIM_RANGE "units/elves-wood/captain-defend.png" "units/elves-wood/captain.png" {SOUND_LIST:ELF_HIT} melee}
{DEFENSE_ANIM_RANGE "units/elves-wood/captain-bow-defend.png" "units/elves-wood/captain-bow.png" {SOUND_LIST:ELF_HIT} ranged }
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/elves/Marshal.cfg
View file

@ -26,7 +26,7 @@
description= _ "The longevity and natural intelligence of elves make them apt for military matters, enough even to counter their general distaste for war. Elves remember things much more clearly than humankind, and can often intuit what others can only be trained to do. Certainly, on those rare occasions when an elf sets his mind to war, the strategy that results is often the work of a master."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound={SOUND_LIST:ELF_HIT}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/goblins/Rouser.cfg
View file

@ -24,7 +24,7 @@
{STANDING_ANIM_DIRECTIONAL "units/goblins/rouser.png" "units/goblins/rouser-ne.png"}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_1}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=spear

2
data/core/units/humans/Loyalist_General.cfg
View file

@ -37,7 +37,7 @@
impact=90
[/resistance]
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/humans/Loyalist_Grand_Marshal.cfg
View file

@ -32,7 +32,7 @@
impact=80
[/resistance]
[abilities]
{ABILITY_LEADERSHIP_LEVEL_4}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/humans/Loyalist_Lieutenant.cfg
View file

@ -21,7 +21,7 @@
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-defend.png" "units/human-loyalists/lieutenant.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-crossbow-defend.png" "units/human-loyalists/lieutenant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/humans/Loyalist_Sergeant.cfg
View file

@ -21,7 +21,7 @@
{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-defend.png" "units/human-loyalists/sergeant.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-crossbow-defend.png" "units/human-loyalists/sergeant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_1}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/monsters/Fire_Dragon.cfg
View file

@ -6,7 +6,7 @@
image="units/monsters/fire-dragon.png"
{DEFENSE_ANIM_RANGE "units/monsters/fire-dragon.png" "units/monsters/fire-dragon.png" {SOUND_LIST:DRAKE_HIT} melee}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_5}
{ABILITY_LEADERSHIP}
[/abilities]
hitpoints=101
movement_type=drakefly

2
data/core/units/orcs/Leader.cfg
View file

@ -21,7 +21,7 @@
{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}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=sword

2
data/core/units/orcs/Ruler.cfg
View file

@ -21,7 +21,7 @@
{DEFENSE_ANIM_RANGE "units/orcs/ruler-defend-2.png" "units/orcs/ruler-defend-1.png" {SOUND_LIST:ORC_HIT} melee}
{DEFENSE_ANIM_RANGE "units/orcs/ruler-ranged-defend.png" "units/orcs/ruler-ranged.png" {SOUND_LIST:ORC_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_2}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=greatsword

2
data/core/units/orcs/Sovereign.cfg
View file

@ -22,7 +22,7 @@
{DEFENSE_ANIM_RANGE "units/orcs/sovereign-defend-2.png" "units/orcs/sovereign-defend-1.png" {SOUND_LIST:ORC_HIT} melee}
{DEFENSE_ANIM_RANGE "units/orcs/sovereign-ranged-defend.png" "units/orcs/sovereign-ranged.png" {SOUND_LIST:ORC_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
[/abilities]
[attack]
name=greatsword

2
data/core/units/undead/Skele_Death_Knight.cfg
View file

@ -31,7 +31,7 @@
description= _ "Tales are told of the mightiest warriors and generals, who, cursed with hate and stung by betrayal, have come back to this world as Death Knights. Wielding the same weapons as in life, they command the Undead in their quest for revenge."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_SUBMERGE}
die_sound=lich-die.ogg
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
{ABILITY_LEADERSHIP}
{ABILITY_SUBMERGE}
[/abilities]
[attack]

7
data/tools/wmllint
View file

@ -634,6 +634,11 @@ linechanges = (
# Changed in 1.13.2.
("[advance]","[advancement]"),
("[/advance]","[/advancement]"),
("{ABILITY_LEADERSHIP_LEVEL_1}", "{ABILITY_LEADERSHIP}"),
("{ABILITY_LEADERSHIP_LEVEL_2}", "{ABILITY_LEADERSHIP}"),
("{ABILITY_LEADERSHIP_LEVEL_3}", "{ABILITY_LEADERSHIP}"),
("{ABILITY_LEADERSHIP_LEVEL_4}", "{ABILITY_LEADERSHIP}"),
("{ABILITY_LEADERSHIP_LEVEL_5}", "{ABILITY_LEADERSHIP}"),
("misc/icon-amla-tough.png","icons/amla-default.png")
)
@ -748,7 +753,7 @@ notepairs = [
("{ABILITY_CURES}", "{SPECIAL_NOTES_CURES}"),
("{ABILITY_REGENERATES}", "{SPECIAL_NOTES_REGENERATES}"),
("{ABILITY_STEADFAST}", "{SPECIAL_NOTES_STEADFAST}"),
("{ABILITY_LEADERSHIP_LEVEL_", "{SPECIAL_NOTES_LEADERSHIP}"), # No } deliberately
("{ABILITY_LEADERSHIP}", "{SPECIAL_NOTES_LEADERSHIP}"),
("{ABILITY_SKIRMISHER}", "{SPECIAL_NOTES_SKIRMISHER}"),
("{ABILITY_ILLUMINATES}", "{SPECIAL_NOTES_ILLUMINATES}"),
("{ABILITY_TELEPORT}", "{SPECIAL_NOTES_TELEPORT}"),