UtBS: Removed the adjacency restriction from the formation ability

Now the ability grants +10% against any enemy, not only against enemies adjacent to both units. Also corrected apostrophes in ability descriptions.
wesnoth · Sep 13, 2017 · f734cb6 · f734cb6
1 parent d1f3b2f
commit f734cb6
Showing 1 changed file with 55 additions and 9 deletions.
diff --git a/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg b/data/campaigns/Under_the_Burning_Suns/utils/abilities.cfg
@@ -99,15 +99,15 @@ _" This unit is capable of healing those around it, slowing dehydration, and cur
     [dummy]
         id=formation
         name= _ "formation"
-        description= _ "This unit gains a +10% bonus to defense when another unit with the same ability is adjacent to it and the enemy. However, this cannot raise the unit's defense above 70%."
+        description= _ "This unit gains a +10% bonus to defense when another unit with the same ability is adjacent to it. However, this cannot raise the unit’s defense above 70%."
     [/dummy]
 #enddef
 
 #define ABILITY_DISENGAGE
     [dummy]
         id=disengage
         name= _ "disengage"
-        description= _ "If this unit doesn't move before attacking, it will retain its movement points after the attack."
+        description= _ "If this unit doesn’t move before attacking, it will retain its movement points after the attack."
     [/dummy]
 #enddef
 
@@ -579,10 +579,6 @@ _"This unit is capable of distracting opponents, allowing allied units to trespa
                                 ability=formation
                                 is_enemy=no
                                 count=1
-
-                                [filter_adjacent]
-                                    id=$unit.id
-                                [/filter_adjacent]
                             [/filter_adjacent]
                         [/filter_opponent]
                     [/chance_to_hit]
@@ -601,10 +597,60 @@ _"This unit is capable of distracting opponents, allowing allied units to trespa
                                 ability=formation
                                 is_enemy=no
                                 count=2
+                            [/filter_adjacent]
+                        [/filter_opponent]
+                    [/chance_to_hit]
+                    [chance_to_hit]
+                        id=formation_enemy_3
+                        name=""
+                        description=""
+                        sub=30
+                        [filter_base_value]
+                            greater_than=50
+                        [/filter_base_value]
+                        [filter_opponent]
+                            ability=formation
+
+                            [filter_adjacent]
+                                ability=formation
+                                is_enemy=no
+                                count=3
+                            [/filter_adjacent]
+                        [/filter_opponent]
+                    [/chance_to_hit]
+                    [chance_to_hit]
+                        id=formation_enemy_4
+                        name=""
+                        description=""
+                        sub=40
+                        [filter_base_value]
+                            greater_than=60
+                        [/filter_base_value]
+                        [filter_opponent]
+                            ability=formation
 
-                                [filter_adjacent]
-                                    id=$unit.id
-                                [/filter_adjacent]
+                            [filter_adjacent]
+                                ability=formation
+                                is_enemy=no
+                                count=4
+                            [/filter_adjacent]
+                        [/filter_opponent]
+                    [/chance_to_hit]
+                    [chance_to_hit]
+                        id=formation_enemy_5
+                        name=""
+                        description=""
+                        sub=50
+                        [filter_base_value]
+                            greater_than=70
+                        [/filter_base_value]
+                        [filter_opponent]
+                            ability=formation
+
+                            [filter_adjacent]
+                                ability=formation
+                                is_enemy=no
+                                count=5
                             [/filter_adjacent]
                         [/filter_opponent]
                     [/chance_to_hit]