Merge pull request #488 from CelticMinstrel/backstab

wesnoth · Sep 19, 2015 · e74c119 · e74c119
2 parents 6dd554c + 7ca65c8
commit e74c119
Show file tree

Hide file tree

Showing 55 changed files with 308 additions and 273 deletions.
diff --git a/changelog b/changelog
@@ -91,6 +91,19 @@ Version 1.13.1+dev:
    * Ability to patch movetypes to account for custom terrains or damage types
    * Removed y offset by -1 from [message]'s scroll-to-unit logic.
    * Add [found_item] ConditionalWML to check if an [object]id= ActionWML has been taken
+   * New auto-stored WML variable $other_unit usable in the following contexts:
+     * [filter_adjacent] - $other_unit refers to the $this_unit of the enclosing filter
+       (In weapon specials and unit abilities, the unit owning the ability.)
+     * [filter_self/opponent/attacker/defender] (weapon specials)
+       $other_unit refers to the other unit in the attack
+       (eg in [filter_self], it's the opponent)
+     * [affect_adjacent][filter] (unit abilities)
+       $other_unit refers to the unit owning the ability
+   * New rotate operators for directions: dir:cw and dir:ccw
+     (This is useful mostly in conjunction with variable substitution.)
+     These operators are applied after the existing '-' operator that takes the
+     opposite direction.
+   * Adjacency filters in abilities and weapon specials now support count= and is_enemy=
  * Editor:
    * Added Category field and color sliders to the Edit Label panel.
  * Miscellaneous and bug fixes:

diff --git a/data/campaigns/Dead_Water/units/Soldier_King.cfg b/data/campaigns/Dead_Water/units/Soldier_King.cfg
@@ -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

diff --git a/data/campaigns/Dead_Water/units/Warrior_King.cfg b/data/campaigns/Dead_Water/units/Warrior_King.cfg
@@ -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

diff --git a/data/campaigns/Dead_Water/units/Young_King.cfg b/data/campaigns/Dead_Water/units/Young_King.cfg
@@ -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

diff --git a/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg b/data/campaigns/Delfadors_Memoirs/units/King_of_Wesnoth.cfg
@@ -7,7 +7,7 @@
     name=_"King of Wesnoth"
     hitpoints=68
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_5}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     experience=250
     level=5

diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Commander.cfg
@@ -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

diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Leader.cfg
@@ -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

diff --git a/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg b/data/campaigns/Delfadors_Memoirs/units/Mage_Magister.cfg
@@ -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

diff --git a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
@@ -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

diff --git a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg
@@ -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

diff --git a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg
@@ -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

diff --git a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg
@@ -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

diff --git a/data/campaigns/Liberty/units/Death_Squire.cfg b/data/campaigns/Liberty/units/Death_Squire.cfg
@@ -20,7 +20,7 @@
     advances_to=Death Knight
     cost=36
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_2}
+        {ABILITY_LEADERSHIP}
         {ABILITY_SUBMERGE}
     [/abilities]
     usage=fighter

diff --git a/data/campaigns/Liberty/units/Shadow_Lord.cfg b/data/campaigns/Liberty/units/Shadow_Lord.cfg
@@ -9,7 +9,7 @@
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=53
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_3}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     movement_type=smallfoot
     movement=6

diff --git a/data/campaigns/Liberty/units/Shadow_Mage.cfg b/data/campaigns/Liberty/units/Shadow_Mage.cfg
@@ -9,7 +9,7 @@
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=42
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_2}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     movement_type=smallfoot
     movement=6

diff --git a/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg b/data/campaigns/Sceptre_of_Fire/units/Haldric_II.cfg
@@ -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}

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg
@@ -7,7 +7,7 @@
     image="units/noble-commander.png"
     hitpoints=48
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_2}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     movement_type=smallfoot
     movement=6

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg
@@ -7,7 +7,7 @@
     image="units/noble-lord.png"
     hitpoints=64
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_3}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     movement_type=smallfoot
     movement=6

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg
@@ -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

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg
@@ -8,7 +8,7 @@
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=46
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_2}
+        {ABILITY_LEADERSHIP}
         {ABILITY_DISTRACT}
     [/abilities]
     movement_type=elusivefoot

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
@@ -8,7 +8,7 @@
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=62
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_3}
+        {ABILITY_LEADERSHIP}
         {ABILITY_DISTRACT}
     [/abilities]
     movement_type=elusivefoot

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
@@ -9,7 +9,7 @@
     hitpoints=33
     [abilities]
         {ABILITY_DISTRACT}
-        {ABILITY_LEADERSHIP_LEVEL_1}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     movement_type=elusivefoot
     movement=7

diff --git a/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg b/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg
@@ -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

diff --git a/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg b/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg
@@ -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}

diff --git a/data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg b/data/campaigns/The_South_Guard/units/Infantry_Lieutenant.cfg
@@ -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}

diff --git a/data/campaigns/The_South_Guard/units/Junior_Commander.cfg b/data/campaigns/The_South_Guard/units/Junior_Commander.cfg
@@ -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

diff --git a/data/campaigns/The_South_Guard/units/Mounted_General.cfg b/data/campaigns/The_South_Guard/units/Mounted_General.cfg
@@ -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

diff --git a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Captain.cfg
@@ -13,7 +13,7 @@
     [/leading_anim]
     hitpoints=47
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_2}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     movement_type=desert_elf
     movement=5

diff --git a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Marshal.cfg
@@ -7,7 +7,7 @@
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=62
     [abilities]
-        {ABILITY_LEADERSHIP_LEVEL_3}
+        {ABILITY_LEADERSHIP}
     [/abilities]
     [leading_anim]
         start_time=-150

diff --git a/data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg b/data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
@@ -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}}

diff --git a/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg b/data/campaigns/Under_the_Burning_Suns/units/humans/Human_Commander.cfg
@@ -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}