From ff432fb69359f2d110fb1abc6003a8752765383d Mon Sep 17 00:00:00 2001
From: sigurdfdragon <jjwcoat@gmail.com>
Date: Tue, 14 Nov 2017 23:53:21 -0500
Subject: [PATCH] DM S08: Use simpler way to keep leader on his keep

He won't attack, but that's not a big deal here.
---
 .../scenarios/08_Ur_Thorodor.cfg              |  4 +--
 .../Delfadors_Memoirs/utils/misc.cfg          | 30 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
index 930060a1aa297..3bc2f194b11e1 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
@@ -52,6 +52,7 @@
         user_team_name= _ "Wose"
         {GOLD 200 250 300}
         [ai]
+            passive_leader=yes #To avoid him being away from keep and next to Delfador
             caution=0.8 # make him use those woses well
             recruitment_pattern=scout,fighter,mixed fighter
         [/ai]
@@ -140,9 +141,6 @@
                 carryover_percentage=80
             [/gold_carryover]
         [/objectives]
-
-        {FREEZE_UNIT Ur-Thorodor} # To avoid the silliness of him
-        # being away from the castle and next to Delfador
     [/event]
 
     ### give the Woses a boost when their leader is first attacked
diff --git a/data/campaigns/Delfadors_Memoirs/utils/misc.cfg b/data/campaigns/Delfadors_Memoirs/utils/misc.cfg
index 927b0d2994d97..0c5a2fdd48bea 100644
--- a/data/campaigns/Delfadors_Memoirs/utils/misc.cfg
+++ b/data/campaigns/Delfadors_Memoirs/utils/misc.cfg
@@ -128,33 +128,3 @@
         blue=0
     [/color_adjust]
 #enddef
-
-#define FREEZE_UNIT ID
-    [object]
-        silent=yes
-        duration=scenario  # So this object will not be in the save files forever.
-        [filter]
-            id={ID}
-        [/filter]
-        [effect]
-            apply_to=movement_costs
-            replace=no  # So this amount is added to the current number.
-            [movement_costs]
-                shallow_water=100
-                reef=100
-                swamp_water=100
-                flat=100
-                sand=100
-                forest=100
-                hills=100
-                mountains=100
-                village=100
-                castle=100
-                cave=100
-                frozen=100
-                unwalkable=100
-                fungus=100
-            [/movement_costs]
-        [/effect]
-    [/object]
-#enddef