From 2a2ebdef1731fd4fe5dde9ba521b696011df995b Mon Sep 17 00:00:00 2001
From: nemaara <nemaara@gmail.com>
Date: Mon, 28 Oct 2019 12:06:03 -0400
Subject: [PATCH] DiD S11: do not set max_moves on player's units

---
 .../scenarios/11_Descent_into_Darkness.cfg    | 47 ++++++++++++++-----
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
index dabac5b3270c..28f555094e75 100644
--- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
@@ -648,6 +648,7 @@
             x,y=15,8
             side=2
             animate=yes
+            max_moves=4
         [/unit]
 
         [message]
@@ -679,7 +680,13 @@
                 [/not]
             [/filter_location]
             [command]
-                {NOTRAIT_UNIT 2 "Ghoul" $loc.x $loc.y} {GUARDIAN}
+                [unit]
+                    type=Ghoul
+                    side=2
+                    x,y=$loc.x,$loc.y
+                    max_moves=4
+                    ai_special=guardian
+                [/unit]
             [/command]
         [/random_placement]
         [random_placement]
@@ -701,13 +708,15 @@
                 [/not]
             [/filter_location]
             [command]
-                {NOTRAIT_UNIT 2 "Walking Corpse" $loc.x $loc.y}
+                [unit]
+                    type=Walking Corpse
+                    side=2
+                    x,y=$loc.x,$loc.y
+                    max_moves=3
+                [/unit]
             [/command]
         [/random_placement]
 
-        {MODIFY_UNIT (type=Ghoul) max_moves 4}
-        {MODIFY_UNIT (type="Walking Corpse") max_moves 3}
-
         [message]
             speaker=narrator
             message= _ "Stepping on runes provides Malin with a temporary buff. He loses any additional abilities he obtains if he steps off the corresponding runestone."
@@ -847,6 +856,7 @@
             type=Skeleton
             x,y=11,7
             side=2
+            max_moves=4
             animate=yes
         [/unit]
 
@@ -879,7 +889,13 @@
                 [/not]
             [/filter_location]
             [command]
-                {NOTRAIT_UNIT 2 "Skeleton" $loc.x $loc.y} {GUARDIAN}
+                [unit]
+                    type=Skeleton
+                    side=2
+                    x,y=$loc.x,$loc.y
+                    max_moves=4
+                    ai_special=guardian
+                [/unit]
             [/command]
         [/random_placement]
         [random_placement]
@@ -901,13 +917,15 @@
                 [/not]
             [/filter_location]
             [command]
-                {NOTRAIT_UNIT 2 "Skeleton Archer" $loc.x $loc.y}
+                [unit]
+                    type=Skeleton Archer
+                    side=2
+                    x,y=$loc.x,$loc.y
+                    max_moves=3
+                [/unit]
             [/command]
         [/random_placement]
 
-        {MODIFY_UNIT (type=Skeleton) max_moves 4}
-        {MODIFY_UNIT (type="Skeleton Archer") max_moves 3}
-
         [random_placement]
             num_items=1
             variable=loc
@@ -1799,12 +1817,15 @@
                 [/not]
             [/filter_location]
             [command]
-                {NOTRAIT_UNIT 3 "Blood Bat" $loc.x $loc.y}
+                [unit]
+                    type=Blood Bat
+                    side=3
+                    x,y=$loc.x,$loc.y
+                    max_moves=4
+                [/unit]
             [/command]
         [/random_placement]
 
-        {MODIFY_UNIT (type=Blood Bat) max_moves 4}
-
         [random_placement]
             num_items={ON_DIFFICULTY 2 3 3}
             variable=loc