ANL: disable swamp trick

- by building a house between the swamp and the guardian the restriction
  could have been bypassed. And because attacking a unit next to the swamp
   has higher priority compared to capturing the house it's not very dangerous
- also use the same macro for guardians and leaders movement restrictions

data/multiplayer/scenarios/4p_A_New_Land.cfg

@@ -123,7 +123,7 @@
         name= _ "Mal Sevu"
 #ifdef MULTIPLAYER_A_NEW_LAND_LOAD
         [modifications]
-            {MOVEMENT_RESTRICTION flat shallow_water}
+            {MOVEMENT_RESTRICTION}
         [/modifications]
         [ai]
             aggression=1.0
@@ -154,7 +154,7 @@
         name= _ "Gol Goroth"
 #ifdef MULTIPLAYER_A_NEW_LAND_LOAD
         [modifications]
-            {MOVEMENT_RESTRICTION flat shallow_water}
+            {MOVEMENT_RESTRICTION}
         [/modifications]
         [ai]
             aggression=1.0
@@ -185,7 +185,7 @@
         name= _ "Greg"
 #ifdef MULTIPLAYER_A_NEW_LAND_LOAD
         [modifications]
-            {MOVEMENT_RESTRICTION flat shallow_water}
+            {MOVEMENT_RESTRICTION}
         [/modifications]
         [ai]
             aggression=1.0
@@ -216,7 +216,7 @@
         name= _ "Mal Shiki"
 #ifdef MULTIPLAYER_A_NEW_LAND_LOAD
         [modifications]
-            {MOVEMENT_RESTRICTION flat shallow_water}
+            {MOVEMENT_RESTRICTION}
         [/modifications]
         [ai]
             aggression=1.0

data/multiplayer/scenarios/ANL_utils/ANL_general_macros.cfg

@@ -8,15 +8,19 @@
     [/capture_village]
 #enddef
 
-#define MOVEMENT_RESTRICTION TERR1_NAME TERR2_NAME
+#define MOVEMENT_RESTRICTION
     [object]
+        silent=yes
         duration=forever
         [effect]
             apply_to=movement_costs
             replace=true
             [movement_costs]
-                {TERR1_NAME}={UNREACHABLE}
-                {TERR2_NAME}={UNREACHABLE}
+                flat={UNREACHABLE}
+                sand={UNREACHABLE}
+                shallow_water={UNREACHABLE}
+                swamp_water={UNREACHABLE}
+                deep_water={UNREACHABLE}
             [/movement_costs]
         [/effect]
     [/object]

data/multiplayer/scenarios/ANL_utils/ANL_special_macros.cfg

@@ -258,18 +258,7 @@
         x={X}
         y={Y}
         [modifications]
-            [object]
-                duration=forever
-                [effect]
-                    apply_to=movement_costs
-                    replace=true
-                    [movement_costs]
-                        flat={UNREACHABLE}
-                        sand={UNREACHABLE}
-                        shallow_water={UNREACHABLE}
-                    [/movement_costs]
-                [/effect]
-            [/object]
+            {MOVEMENT_RESTRICTION}
         [/modifications]
     [/unit]
 #enddef