AToTB Standardize Baran

Use a macro to ensure consistent definition.
wesnoth · Aug 19, 2016 · f351f35 · f351f35
1 parent 955b847
commit f351f35
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 29 deletions.
diff --git a/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg b/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
@@ -98,21 +98,8 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok
 
         facing=nw
 
-        [unit]
-            id=Baran
-            name= _ "Baran"
-            unrenamable=yes
-            type=Red Mage
-            profile=portraits/baran.png
-            side=1
-            {IS_HERO}
-            x,y=31,21
-            facing=se
-            [modifications]
-                {TRAIT_LOYAL}
-                {TRAIT_INTELLIGENT}
-            [/modifications]
-        [/unit]
+        {BARAN (x,y=31,21
+            facing=se)}
 
         # The armed villagers, beware them
         {NAMED_LOYAL_UNIT () Spearman 30 22 Alwyn  (_ "Alwyn")}  {FACING nw}

diff --git a/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
@@ -627,20 +627,7 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
             [/have_location]
         [/filter_condition]
 
-        [unit]
-            side=1
-            id=Baran
-            name= _ "Baran"
-            unrenamable=yes
-            type=Red Mage
-            profile=portraits/baran.png
-            {IS_HERO}
-            x,y=3,3
-            [modifications]
-                {TRAIT_LOYAL}
-                {TRAIT_INTELLIGENT}
-            [/modifications]
-        [/unit]
+        {BARAN (x,y=3,3)}
 
         [redraw]
             side=1

diff --git a/data/campaigns/Two_Brothers/utils/characters.cfg b/data/campaigns/Two_Brothers/utils/characters.cfg
@@ -26,3 +26,20 @@
         [/endlevel]
     [/event]
 #enddef
+
+#define BARAN PLACEMENT
+    [unit]
+        id=Baran
+        name= _ "Baran"
+        unrenamable=yes
+        type=Red Mage
+        profile=portraits/baran.png
+        side=1
+        {IS_HERO}
+        {PLACEMENT}
+        [modifications]
+            {TRAIT_LOYAL}
+            {TRAIT_INTELLIGENT}
+        [/modifications]
+    [/unit]
+#enddef