Separated villages from background. Adapted rules accoringly.

data/terrain-graphics.cfg

@@ -32,7 +32,6 @@
 #{TERRAIN_BASE C castle}
 #{TERRAIN_BASE n dirt}
 
-{TERRAIN_BASE D flag-cave-neutral}
 {TERRAIN_BASE u cave}
 {TERRAIN_BASE W cavewall}
 {TERRAIN_BASE F snow-forest}
@@ -57,9 +56,6 @@
 {TERRAIN_BASE_PROBABILITY S snow2 30}
 {TERRAIN_BASE_PROBABILITY S snow3 30}
 {TERRAIN_BASE S snow}
-{TERRAIN_BASE V flag-snow-neutral}
-{TERRAIN_BASE v human-village}
-{TERRAIN_BASE t flag-neutral}
 {TERRAIN_BASE_PROBABILITY g grassland-rocks 4}
 {TERRAIN_BASE_PROBABILITY g grassland-flowers 8}
 {TERRAIN_BASE g grassland}
@@ -70,7 +66,6 @@
 {TERRAIN_BASE \ bridge-se-nw}
 {TERRAIN_BASE / bridge-ne-sw}
 {TERRAIN_BASE | bridge-n-s}
-{TERRAIN_BASE Y flag-swampwater-neutral}
 {TERRAIN_BASE_PROBABILITY w swampwater2 30}
 {TERRAIN_BASE_PROBABILITY w swampwater3 30}
 {TERRAIN_BASE w swampwater}
@@ -78,10 +73,27 @@
 {TERRAIN_BASE p pier}
 {TERRAIN_BASE c coast}
 {TERRAIN_BASE s ocean}
-{TERRAIN_BASE Z flag-coast-neutral}
 {TERRAIN_BASE ~ fog}
 {TERRAIN_BASE ( ) void}
 
+#
+# Villages
+#
+
+{TERRAIN_BASE Y swampwater}
+{BUILDING Y village-swampwater}
+{TERRAIN_BASE V snow}
+{BUILDING V village-snow}
+{TERRAIN_BASE Z coast}
+{BUILDING Z village-coast}
+{TERRAIN_BASE v grassland}
+{BUILDING v village-human}
+{TERRAIN_BASE D cave}
+{BUILDING D village-cave}
+{TERRAIN_BASE t grassland}
+{BUILDING t village}
+
+
 #
 # Transition between terrains
 #

data/terrain.cfg

@@ -26,7 +26,7 @@ unit_height_adjust=-4
 [/terrain]
 
 [terrain]
-image=flag-coast-neutral
+image=village-coast
 adjacent_image=coast
 name=mermen village
 char=Z
@@ -67,7 +67,7 @@ unit_height_adjust=-3
 [/terrain]
 
 [terrain]
-image=flag-swampwater-neutral
+image=village-swampwater
 adjacent_image=swampwater
 name=swamp village
 char=Y
@@ -129,7 +129,7 @@ char=g
 [/terrain]
 
 [terrain]
-image=flag-neutral
+image=village
 name=village
 char=t
 
@@ -140,7 +140,7 @@ gives_income=true
 [/terrain]
 
 [terrain]
-image=human-village
+image=village-human
 name=human village
 char=v
 aliasof=t
@@ -158,7 +158,7 @@ light=true
 [/terrain]
 
 [terrain]
-image=flag-snow-neutral
+image=village-snow
 adjacent_image=snow
 name=snow village
 char=V
@@ -215,7 +215,7 @@ char=u
 [/terrain]
 
 [terrain]
-image=flag-cave-neutral
+image=village-cave
 name=underground village
 char=D
 aliasof=tu