Merge pull request #601 from sigurdfdragon/AOI_Cleanup_2

AOI Cleanup 2
wesnoth · Feb 16, 2016 · 1505c33 · 1505c33
2 parents a7705d3 + e0dc24d
commit 1505c33
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 46 deletions.
diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 
@@ -73,7 +73,7 @@
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
             [/modifications]
-            overlays="misc/loyal-icon.png"
+            {IS_LOYAL}
             facing=ne
         [/unit]
     [/side]

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 
@@ -197,7 +197,7 @@
             #po: and fairies was extremely blurry. In Wesnoth it is
             #po: deliberately unclear whether Faerie is a place that is
             #po: the source of magical power or a label for the inner
-            #po: nonhuman/magical nature of the Elves.  Translate freely.
+            #po: nonhuman/magical nature of the Elves. Translate freely.
             message= _ "Erlornas closed his eyes and brought his hands forward, joined palms forming a cup open to the sky. Soon they began to glow, then to flare like a brazier with the fire of Faerie, casting a cold, blue light all around the elf-lord. A wisp of light emerged from the eerie flames, and at a few murmured words from the elf-lord flew away towards the tower below. Then the light around Erlornas faded and all was seemingly as before."
         [/message]
 
@@ -220,34 +220,14 @@
             animate=yes
         [/teleport]
 
-        {MODIFY_UNIT (side=1) facing se}
-
-        {GENERIC_UNIT 3 Mage 17 17}
-        [+unit]
-            facing=se
-            overlays="misc/loyal-icon.png"
-            [modifications]
-                {TRAIT_LOYAL}
-            [/modifications]
-        [/unit]
-
-        {GENERIC_UNIT 3 Mage 16 18}
-        [+unit]
-            facing=se
-            overlays="misc/loyal-icon.png"
-            [modifications]
-                {TRAIT_LOYAL}
-            [/modifications]
-        [/unit]
-
-        {GENERIC_UNIT 3 Mage 15 17}
-        [+unit]
-            facing=se
-            overlays="misc/loyal-icon.png"
-            [modifications]
-                {TRAIT_LOYAL}
-            [/modifications]
-        [/unit]
+        {LOYAL_UNIT 3 Mage 17 17}
+        {FACING se}
+
+        {LOYAL_UNIT 3 Mage 16 18}
+        {FACING se}
+
+        {LOYAL_UNIT 3 Mage 15 17}
+        {FACING se}
 
         [message]
             speaker=Erlornas

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 
@@ -95,7 +95,10 @@
         [/recall]
 
         [role]
-            type="Red Mage,White Mage,Mage,Arch Mage,Mage of Light,Great Mage"
+            type="Red Mage,White Mage,Mage,Arch Mage,Silver Mage,Mage of Light,Great Mage"
+            [not]
+                canrecruit=yes
+            [/not]
             role=mage
         [/role]
 
@@ -119,7 +122,10 @@
         name=enemies defeated
 
         [role]
-            type="Red Mage,White Mage,Mage,Arch Mage,Mage of Light,Great Mage"
+            type="Red Mage,White Mage,Mage,Arch Mage,Silver Mage,Mage of Light,Great Mage"
+            [not]
+                canrecruit=yes
+            [/not]
             role=mage
         [/role]
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-aoi
 
 # Warning: If you are not a native and literate English speaker, do
-# not try to modify the storyline text.  It is deliberately written
+# not try to modify the storyline text. It is deliberately written
 # in a somewhat archaic and poetic form of English, and some previous
 # attempts to "fix" it inflicted damage that was difficult to undo.
 
@@ -124,7 +124,7 @@
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
             [/modifications]
-            overlays="misc/loyal-icon.png"
+            {IS_LOYAL}
             facing=sw
         [/unit]
 
@@ -144,7 +144,7 @@
             [modifications]
                 {TRAIT_LOYAL}
             [/modifications]
-            overlays="misc/loyal-icon.png"
+            {IS_LOYAL}
             facing=sw
         [/unit]
 
@@ -164,7 +164,7 @@
             [modifications]
                 {TRAIT_LOYAL}
             [/modifications]
-            overlays="misc/loyal-icon.png"
+            {IS_LOYAL}
             facing=sw
         [/unit]
 
@@ -184,7 +184,7 @@
             [modifications]
                 {TRAIT_LOYAL}
             [/modifications]
-            overlays="misc/loyal-icon.png"
+            {IS_LOYAL}
             facing=sw
         [/unit]
 
@@ -204,7 +204,7 @@
             [modifications]
                 {TRAIT_LOYAL}
             [/modifications]
-            overlays="misc/loyal-icon.png"
+            {IS_LOYAL}
             facing=sw
         [/unit]
 
@@ -248,7 +248,10 @@
         [/kill]
 
         [role]
-            type="Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Elvish Outrider,Elvish Rider,Elvish Avenger,Elvish Ranger,Elvish Sharpshooter,Elvish Marksman,Elvish Shyde,Elvish Druid,Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout"
+            race=elf
+            [not]
+                canrecruit=yes
+            [/not]
             role=advisor
         [/role]
 

diff --git a/data/campaigns/An_Orcish_Incursion/utils/macros.cfg b/data/campaigns/An_Orcish_Incursion/utils/macros.cfg
@@ -22,7 +22,7 @@
             [/recall]
         [/then]
         [elseif]
-            # Else, make a new advisor from an elf  unit
+            # Else, make a new advisor from an elf unit
             [have_unit]
                 side=1
                 race=elf