From d1c6a4ab0c27bf98ec5bbd4f03e65d331a9cf45d Mon Sep 17 00:00:00 2001
From: Gregory A Lundberg <gregory_lundberg@gmx.com>
Date: Sun, 24 Jul 2016 16:06:08 -0500
Subject: [PATCH] DM Fix bug: Kalenz takes over

Kalenz should take over a no_leader side, have his unit brought in as a [unit] tag, and his unit should not have side attributes.

This caused a number of errors in stderr, including dumping the full WML for the scene.
---
 .../scenarios/13_The_Return_of_Trouble.cfg        |  2 ++
 .../Delfadors_Memoirs/scenarios/14_Shadows.cfg    | 12 +++++++++++-
 .../scenarios/20_Prince_of_Wesnoth.cfg            | 15 +++++++++++++--
 .../Delfadors_Memoirs/utils/characters.cfg        |  4 ----
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
index 87739c54ec5..f29ce2fefa6 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
@@ -33,6 +33,8 @@
     # wmllint: recognize Kalenz
     # wmllint: validate-off
     [side]
+        id=Delfador
+        name= _ "Delfador"
         side=1
         no_leader=yes
         controller=human
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
index 7405a0dff3f..ca9fc178f19 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
@@ -24,8 +24,14 @@
 
     #wmllint: validate-off
     [side]
-        {KALENZ}
         # wmllint: recognize Kalenz
+        id=Delfador
+        name= _ "Delfador"
+        side=1
+        no_leader=yes
+        controller=human
+        persistent=yes
+        save_id=Player
         recruit={ELVES}
         fog=yes
         {FLAG_VARIANT wood-elvish}
@@ -109,6 +115,10 @@
     [event]
         name=prestart
 
+        [recall]
+            id=Kalenz
+            x,y=24,8
+        [/recall]
         [recall]
             id=Chantal
         [/recall]
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
index 6350372cea6..f073612ee79 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
@@ -42,11 +42,22 @@
     #### Kalenz's code ####
     #wmllint: validate-off
     [side]
-        {KALENZ}
-        canrecruit=yes
         # wmllint: recognize Kalenz
         recruit={ELVES}
+        id=Delfador
+        name= _ "Delfador"
+        side=1
+        no_leader=yes
+        controller=human
+        save_id=Player
+        persistent=yes
         fog=yes
+        [unit]
+            {KALENZ}
+            x=2
+            y=19
+            canrecruit=yes
+        [/unit]
         {GOLD 130 100 100}
         {FLAG_VARIANT wood-elvish}
     [/side]
diff --git a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
index 85b6b4ef348..d1647b12e16 100644
--- a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
+++ b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
@@ -1,15 +1,11 @@
 #textdomain wesnoth-dm
 #define KALENZ
     id=Kalenz
-    save_id=Player
-    persistent=yes
     name= _"Kalenz"
     unrenamable=yes
     profile="portraits/kalenz.png"
     type=Elvish High Lord
     side=1
-    controller=human
-    team_name=player
     [modifications]
         {TRAIT_STRONG}
         {TRAIT_RESILIENT}