DiD S11: do not set max_moves on player's units

wesnoth · Oct 28, 2019 · aa3345b · aa3345b
1 parent 91c4b6c
commit aa3345b
Showing 1 changed file with 34 additions and 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
@@ -646,6 +646,7 @@
             x,y=15,8
             side=2
             animate=yes
+            max_moves=4
         [/unit]
 
         [message]
@@ -677,7 +678,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]
@@ -699,13 +706,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 of the corresponding runestone."
@@ -845,6 +854,7 @@
             type=Skeleton
             x,y=11,7
             side=2
+            max_moves=4
             animate=yes
         [/unit]
 
@@ -877,7 +887,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]
@@ -899,13 +915,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
@@ -1797,12 +1815,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