From 401c9435e512349cd70ddce18fdb5bbd2b1d329c Mon Sep 17 00:00:00 2001
From: sigurdfdragon <jjwcoat@gmail.com>
Date: Sun, 8 Jul 2018 12:52:09 -0400
Subject: [PATCH] DM: Fix #3277

Make heroes have no upkeep, and remove hero status from character that
didn't need it. Minor touch ups.
---
 .../scenarios/01_Overture.cfg                 |  1 -
 .../scenarios/17_A_New_Ally.cfg               | 11 ++++---
 .../Delfadors_Memoirs/utils/characters.cfg    | 32 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
index 3f0cccb32ccc..8859732fc7c8 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
@@ -69,7 +69,6 @@
             facing=nw
             side=1
             x,y=18,15
-            {IS_HERO}
         [/unit]
     [/event]
 
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
index c30de02856d8..c9396b3dd0ba 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
@@ -43,12 +43,13 @@
         {RESTORE_WESNOTHIAN_VETERANS}
         {MODIFY_UNIT (side=1) facing nw}
 
-        {NAMED_UNIT 2 (Dwarvish Fighter) 5 10  "Relgorn" (_"Relgorn") (ai_special=guardian)}
-        {FACING se}
-        [+unit]
-            unrenamable=yes
+        [unit]
+            {RELGORN}
+            facing=se
+            side=2
+            x,y=5,10
+            ai_special=guardian
         [/unit]
-        {MAKE_HERO Relgorn}
         {NAMED_UNIT 2 (Dwarvish Fighter) 9 7 "Udrin" (_"Udrin") (ai_special=guardian)}
         {FACING se}
     [/event]
diff --git a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
index de5a0b5c9956..2ab596e38f41 100644
--- a/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
+++ b/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
@@ -1,4 +1,16 @@
 #textdomain wesnoth-dm
+
+#define OBJECT_LOYAL
+# There are several changes of leader to hero & vice versa during the campaign,
+# so this object is given to any that may have hero status at some point to ensure
+# the unit has no upkeep and to avoid taking up another trait slot
+    [object]
+        [effect]
+            apply_to=loyal
+        [/effect]
+    [/object]
+#enddef
+
 #define KALENZ
     id=Kalenz
     name= _"Kalenz"
@@ -7,6 +19,7 @@
     type=Elvish High Lord
     side=1
     [modifications]
+        {OBJECT_LOYAL}
         {TRAIT_STRONG}
         {TRAIT_RESILIENT}
     [/modifications]
@@ -20,9 +33,9 @@
     canrecruit=yes
     unrenamable=yes
     [modifications]
+        {OBJECT_LOYAL}
         {TRAIT_RESILIENT}
         {TRAIT_INTELLIGENT}
-
         [object]
             [effect]
                 apply_to=profile
@@ -43,6 +56,7 @@
     canrecruit=yes
     unrenamable=yes
     [modifications]
+        {OBJECT_LOYAL}
         {TRAIT_RESILIENT}
         {TRAIT_INTELLIGENT}
     [/modifications]
@@ -59,6 +73,7 @@
     controller=ai
     recruit=Elvish Ranger,Elvish Rider
     [modifications]
+        {OBJECT_LOYAL}
         {TRAIT_INTELLIGENT}
         {TRAIT_RESILIENT}
         [object]
@@ -81,6 +96,7 @@
     profile="portraits/lionel.png"
     {IS_HERO}
     [modifications]
+        {OBJECT_LOYAL}
         {TRAIT_FEARLESS}
         {TRAIT_STRONG}
     [/modifications]
@@ -92,11 +108,25 @@
     name= _ "Ulrek"
     unrenamable=yes
     [modifications]
+        {OBJECT_LOYAL}
         {TRAIT_QUICK}
         {TRAIT_STRONG}
     [/modifications]
 #enddef
 
+#define RELGORN
+    type=Dwarvish Fighter
+    id=Relgorn
+    name= _ "Relgorn"
+    unrenamable=yes # Shows up in HttT S14
+    {IS_HERO}
+    [modifications]
+        {OBJECT_LOYAL}
+        {TRAIT_STRONG}
+        {TRAIT_HEALTHY}
+    [/modifications]
+#enddef
+
 #define METHOR
     id=Methor
     name=_"Methor"