AOI: used 'advisor' as the standard spelling, per Espreon's instructions

wesnoth · Feb 9, 2015 · bf52cfb · bf52cfb
1 parent 9505e55
commit bf52cfb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
@@ -117,7 +117,7 @@ Assassins are hard to hit, and their poison is insidious. Stay close to the vill
             [/gold_carryover]
         [/objectives]
 
-        {RECALL_ADVISER}
+        {RECALL_ADVISOR}
 
         {MODIFY_UNIT (side=1) facing nw}
     [/event]
@@ -126,7 +126,7 @@ Assassins are hard to hit, and their poison is insidious. Stay close to the vill
         name=start
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "The trail leads straight to this place, my lord."
         [/message]
 
@@ -136,7 +136,7 @@ Assassins are hard to hit, and their poison is insidious. Stay close to the vill
         [/message]
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "I... I know not, my lord. For ages there was no one in these lands that could build such a thing save us. I fear we have fallen prey a false sense of security that has injured the vigilance of our scouts."
         [/message]
 
@@ -156,7 +156,7 @@ Assassins are hard to hit, and their poison is insidious. Stay close to the vill
         [/message]
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "Does that demented creature truly believe he can kill us?"
         [/message]
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
@@ -109,7 +109,7 @@ There are no villages in this scenario — you must use healers instead. Use hit
         {VARIABLE camp_gold 300}
         {VARIABLE_OP modulo_factor rand "2..4"}
 
-        {RECALL_ADVISER}
+        {RECALL_ADVISOR}
 
         {MODIFY_UNIT (side=1) facing nw}
     [/event]
@@ -118,7 +118,7 @@ There are no villages in this scenario — you must use healers instead. Use hit
         name=start
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "Lord... I’m... I am filled with grief. This senseless destruction is... overwhelming."
         [/message]
 
@@ -238,11 +238,11 @@ There are no villages in this scenario — you must use healers instead. Use hit
             [not]
                 canrecruit=yes
             [/not]
-            role=Adviser
+            role=advisor
         [/role]
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "It’s done, lord. No-one escaped. No-one tried to escape. I’m... disturbed."
         [/message]
 
@@ -252,7 +252,7 @@ There are no villages in this scenario — you must use healers instead. Use hit
         [/message]
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "No, lord. But trolls were spotted in the hills ahead. Do we really need to cross them to the north?"
         [/message]
 
@@ -268,7 +268,7 @@ There are no villages in this scenario — you must use healers instead. Use hit
             [/variable]
             [then]
                 [message]
-                    role=Adviser
+                    role=advisor
                     message= _ "What about the loot lord? We found supplies worth over a hundred gold in the camp."
                 [/message]
 
@@ -290,7 +290,7 @@ There are no villages in this scenario — you must use healers instead. Use hit
             [/variable]
             [then]
                 [message]
-                    role=Adviser
+                    role=advisor
                     message= _ "We found some supplies when searching the camp, but nothing much. What is to be done with them?"
                 [/message]
 
@@ -344,11 +344,11 @@ There are no villages in this scenario — you must use healers instead. Use hit
             [not]
                 canrecruit=yes
             [/not]
-            role=Adviser
+            role=advisor
         [/role]
 
         [message]
-            role=Adviser
+            role=advisor
             message= _ "We can’t carry on Lord, the men are too tired. We have to fall back."
         [/message]
 

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
@@ -172,7 +172,7 @@ Trolls are poor fighters when not on rugged terrain and fare even worse during t
             [/gold_carryover]
         [/objectives]
 
-        {RECALL_ADVISER}
+        {RECALL_ADVISOR}
 
         {MODIFY_UNIT (side=1) facing nw}
     [/event]

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
@@ -128,7 +128,7 @@ Use Elven Scouts and Linaera’s power of teleportation to mount hit-and-run att
             [/gold_carryover]
         [/objectives]
 
-        {RECALL_ADVISER}
+        {RECALL_ADVISOR}
 
         {MODIFY_UNIT (side=1) facing nw}
     [/event]

diff --git a/data/campaigns/An_Orcish_Incursion/utils/macros.cfg b/data/campaigns/An_Orcish_Incursion/utils/macros.cfg
@@ -1,16 +1,16 @@
 #textdomain wesnoth-aoi
 
-#define RECALL_ADVISER
+#define RECALL_ADVISOR
     [if]
         [have_unit]
             side=1
-            role=Adviser
+            role=advisor
             search_recall_list=yes
         [/have_unit]
         [then]
             # Recall an advisor if we have one to do so
             [recall]
-                role=Adviser
+                role=advisor
             [/recall]
         [/then]
         [elseif]
@@ -29,20 +29,20 @@
                     [not]
                         canrecruit=yes
                     [/not]
-                    role=Adviser
+                    role=advisor
                 [/role]
 
                 [recall]
-                    role=Adviser
+                    role=advisor
                 [/recall]
             [/then]
         [/elseif]
         [else]
-            # If that fails too, make a brand new adviser
+            # If that fails too, make a brand new advisor
             [unit]
                 type=Elvish Fighter
                 side=1
-                role=Adviser
+                role=advisor
                 animate=yes
 				placement=leader
             [/unit]