From c4f0d5be2e0c13516c19ca9e2f334e0139fa820a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A4r=20Halberkamp?= <fledaway@gmail.com>
Date: Tue, 24 Mar 2015 17:23:58 +0100
Subject: [PATCH] EI: More updates to S4c

---
 .../scenarios/04c_Mal-Ravanals_Capital.cfg    | 75 ++++++++-----------
 1 file changed, 30 insertions(+), 45 deletions(-)

diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
index 1431c47226ae..f8312281609b 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
@@ -183,6 +183,7 @@
 
             {GENERIC_UNIT 4 Revenant $guard_location.x $guard_location.y}
             [+unit]
+                max_moves=0
                 ai_special=guardian
                 role=prison guard
                 [variables]
@@ -251,58 +252,42 @@
         [/message]
     [/event]
 
-    # this makes sure that the player nor the undead can attack the prisoners,
-    # note that side turn instead of turn refresh is used to prevent the paladin
-    # from healing his guard
+    # To prevent the Paladin from healing you or his guard.
+
     [event]
-        name=side turn
+        name=side 6 turn refresh
         first_time_only=no
 
-        [if]
-            [variable]
-                name=side_number
-                equals=2
-            [/variable]
-
-            [then]
-                [modify_side]
-                    side=6
-                    team_name=undead
-                [/modify_side]
-            [/then]
-        [/if]
-
-        [if]
-            [variable]
-                name=side_number
-                equals=6
-            [/variable]
-
-            [then]
-                [modify_side]
+        [modify_unit]
+            [filter]
+                [filter_adjacent]
                     side=6
-                    team_name=wesnothians
-                [/modify_side]
-            [/then]
-        [/if]
-    [/event]
+                    type=Paladin
+                [/filter_adjacent]
+            [/filter]
 
-    # this makes sure that the prisoners can't attack anyone and that the guards
-    # will not move
-    [event]
-        name=turn refresh
-        first_time_only=no
+            [status]
+                unhealable=yes
+            [/status]
+        [/modify_unit]
 
-        [if]
-            [variable]
-                name=side_number
-                equals=4
-            [/variable]
+        [event]
+            name=turn end
+            first_time_only=no
 
-            [then]
-                {MODIFY_UNIT (role=prison guard) moves 0}
-            [/then]
-        [/if]
+            [modify_unit]
+                [filter]
+                    [filter_adjacent]
+                        side=6
+                        type=Paladin
+                    [/filter_adjacent]
+                [/filter]
+
+                [status]
+                    unhealable=no
+                [/status]
+            [/modify_unit]            
+        [/event]
     [/event]
 
     [event]