Replace most instances of a single-hex [terrain_mask] action with [te…

…rrain] One file is deliberately not converted until we get a dedicated mask test
wesnoth · Oct 7, 2015 · 798c59c · 798c59c
1 parent 2a466bd
commit 798c59c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/data/test/scenarios/feeding.cfg b/data/test/scenarios/feeding.cfg
@@ -36,10 +36,10 @@
 
     {VARIABLE Killer_start_hp $Killer.hitpoints}
 
-    [terrain_mask]
+    [terrain]
         x,y=$victim_x|,$victim_y|
-        mask="Xv"
-    [/terrain_mask]
+        terrain="Xv"
+    [/terrain]
     {UNIT $victim_side| "Elvish Archer" $victim_x| $victim_y| (hitpoints=1)}
     [do_command]
         [attack]

diff --git a/data/test/scenarios/test_relative_dir.cfg b/data/test/scenarios/test_relative_dir.cfg
@@ -16,11 +16,11 @@
             y=$ml.y
         [/destination]
     [/store_rotate_map_location]
-    [terrain_mask]
+    [terrain]
         x=$ml.x
         y=$ml.y
-        mask={terrain}
-    [/terrain_mask]
+        terrain={terrain}
+    [/terrain]
 #enddef
 
 {GENERIC_UNIT_TEST "test_relative_dir" (
@@ -98,11 +98,11 @@
         {VARIABLE ml.x 7}
         {VARIABLE ml.y 5}
 
-        [terrain_mask]
+        [terrain]
             x=$ml.x
             y=$ml.y
-            mask="Hd^Fp"
-        [/terrain_mask]
+            terrain="Hd^Fp"
+        [/terrain]
 
         {VARIABLE ml.x 11}
         {VARIABLE ml.y 5}
@@ -114,10 +114,10 @@
         {VARIABLE ml.x 11}
         {VARIABLE ml.y 5}
 
-        [terrain_mask]
+        [terrain]
             x=$ml.x
             y=$ml.y
-            mask="Md"
-        [/terrain_mask]
+            terrain="Md"
+        [/terrain]
     [/event]
 )}
diff --git a/data/test/scenarios/test_unit_map.cfg b/data/test/scenarios/test_unit_map.cfg
@@ -97,10 +97,10 @@
             kill = no
         [/harm_unit]
         {ASSERT_YES_9_5}
-        [terrain_mask]
+        [terrain]
             x,y=9,5
-            mask="Xv"
-        [/terrain_mask]
+            terrain="Xv"
+        [/terrain]
         {ASSERT_YES_9_5}
         [do_command]
             [move]