merged the last files of data except terrain-graphics.cfg...

...since it has to much conflicts

data/abilities.cfg

@@ -349,7 +349,8 @@ Enemy units cannot see or attack this unit when it is in forest, except for any
 		affect_self=yes
 		[filter_self]
 			[filter_location]
-				terrain=f,T,F
+				terrain_format=1
+				terrain=Ff,Ft,Fa
 			[/filter_location]
 		[/filter_self]
 	[/hides]
@@ -393,7 +394,8 @@ Enemy units cannot see or attack this unit when it is in deep water, except for
 		affect_self=yes
 		[filter_self]
 			[filter_location]
-				terrain=s
+				terrain_format=1
+				terrain=Wo
 			[/filter_location]
 		[/filter_self]
 	[/hides]

data/scenario-test.cfg

@@ -4,8 +4,8 @@
 mmmmggggggggggggggggggggggggggggggggg
 mgggggCCCCggggggggggggggggggggggggggg
 mgggggC1Cgggggggggfffffgggggggggggggg
-mgggggCCCgggggggggfffffgggccccggggggg
-mgggggCCCgggggggggfffffgggcchhggggggg
+mgggggCCCgggggggggfffffggvccccggggggg
+mgggggCCCgggggggggfffffvggcchhggggggg
 mgggggtgtgggggggggggggggggccccggggggg
 ggggggggggggggggggggggggggggggggggggg
 ggggggggggggggggggggggggggggggggggggg
@@ -373,5 +373,63 @@ name=moveto
 	x,y=15,15
 	text="This is not a forest"
 	[/label]
+
+
+	[label]
+	x,y = 25,6
+	text = "Let it snow"
+	[/label]
+
+	[event]
+#when moving the the specified coordinates the 
+#area will be transformed to a snow landscape
+#but the water area should remain as is
+		name="moveto"
+		first_time_only=yes
+		[filter]
+			x,y=25,6
+		[/filter]
+
+		[terrain_mask]
+			x,y=20,1
+			mask="
+~~~~SS~~~~
+~~~SSSS~~~
+~~SSSSSS~~
+~SSSSSSSS~
+SSSSSSSSSS
+SSSSSSSSSS
+~SSSSSSSS~
+~~SSSSSS~~
+~~~SSSS~~~
+~~~~SS~~~~
+"
+			[rule]
+				old=v
+				new=S
+				terrain=V
+			[/rule]
+			[rule]
+				old=f
+				new=S
+				terrain=F
+			[/rule]
+			[rule]
+				old=h
+				new=S
+				terrain=H
+			[/rule]
+			[rule]
+				old=gr
+				new=S
+				#don't specify terrain and it just uses the new terrain
+			[/rule]
+#			#default: Will match everything, since 'old' and 'new' aren't
+#			#specified. Set 'use_old=yes' to signal no change.
+			[rule]
+				use_old=yes
+			[/rule]
+		[/terrain_mask]
+	[/event]
 [/test]