AToTB S01 and S02 mercenary spawn overhaul (#6186)

* Fix for #6183

data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg

@@ -241,7 +241,7 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok
     [event]
         name=turn 10
 
-        {NEED_MERCENARY}
+        {NEED_MERCENARY 38 30}
 
         [message]
             speaker=Arvith

data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg

@@ -342,7 +342,7 @@ Besides... I want my brother back."
         [/capture_village]
 #endif
 
-        {NEED_MERCENARY}
+        {NEED_MERCENARY 1 49}
     [/event]
 
     [event]
@@ -551,8 +551,6 @@ Either way, nothing will be gained by your intrusion into our woods. Now advance
             id=Muff Toras
         [/filter]
 
-        {NEED_MERCENARY}
-
         [message]
             speaker=unit
             message= _ "Hah! You have captured me, but it will avail you nothing. I sent your precious brother the mage north with half my men a day since; he will be safely locked away in our master’s dungeons by now."
@@ -598,6 +596,8 @@ Either way, nothing will be gained by your intrusion into our woods. Now advance
         [/heal_unit]
         {CLEAR_VARIABLE heal_amount}
 
+        {NEED_MERCENARY 1 49}
+
         [message]
             role=Mercenary
             message= _ "Captain, what are we riding into? I thought you wanted nothing to do with Baran any more, not since Toen Caric."

data/campaigns/Two_Brothers/utils/characters.cfg

@@ -45,7 +45,7 @@
     [/event]
 #enddef
 
-#define NEED_MERCENARY
+#define NEED_MERCENARY FROM_X FROM_Y
     [role]
         role=Mercenary
 
@@ -57,13 +57,26 @@
         reassign=no
         [auto_recall][/auto_recall]
         [else]
+            [store_unit]
+                [filter]
+                    id=Arvith
+                [/filter]
+                variable=temp
+            [/store_unit]
+            [move_unit_fake]
+                type=Horseman
+                x={FROM_X},$($temp.x-1)
+                y={FROM_Y},$temp.y
+            [/move_unit_fake]
             [unit]
                 role=Mercenary
                 side=1
                 type=Horseman
-                placement=leader
+                x,y=$($temp.x-1),$temp.y
                 facing=ne
+                animate=no
             [/unit]
+            {CLEAR_VARIABLE temp}
         [/else]
     [/role]
 #enddef