Added a new village archetype terrain...

...(thus replacing the human village as the terrain all villages
should alias to) and allowed placement of villages (except water and
swamp villages) on any base terrain.

data/core/terrain.cfg

@@ -1175,8 +1175,9 @@
     symbol_image=village/orc-snow-tile
     id=orcish_snow_village
     name= _ "Village"
-    string=Aa^Voa
-    aliasof=Gg^Vh, Aa
+    string=^Voa
+    aliasof=Vi, Aa
+    default_base=Aa
     heals=8
     gives_income=true
     editor_group=village, frozen
@@ -1186,8 +1187,9 @@
     symbol_image=village/orc-tile
     id=orcish_village
     name= _ "Village"
-    string=Gg^Vo
-    aliasof=Gg^Vh
+    string=^Vo
+    aliasof=Vi
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village
@@ -1197,8 +1199,9 @@
     symbol_image=village/orc-snow-hills-tile
     id=orcish_snow_hills_village
     name= _ "Village"
-    string=Ha^Voa
-    aliasof=Gg^Vh, Ha
+    string=^Voa
+    aliasof=Vi, Hh
+    default_base=Ha
     heals=8
     gives_income=true
     editor_group=village, frozen, rough
@@ -1208,8 +1211,9 @@
     symbol_image=village/orc-hills-tile
     id=orcish_hill_village
     name= _ "Village"
-    string=Hh^Vo
-    aliasof=Gg^Vh, Hh
+    string=^Vo
+    aliasof=Vi, Hh
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village, rough
@@ -1221,8 +1225,9 @@
     symbol_image=village/elven-snow-tile
     id=elven_snow_village
     name= _ "Village"
-    string=Aa^Vea
-    aliasof=Gg^Vh, Aa
+    string=^Vea
+    aliasof=Vi, Aa
+    default_base=Aa
     heals=8
     gives_income=true
     editor_group=village, frozen
@@ -1232,8 +1237,9 @@
     symbol_image=village/elven-tile
     id=elven_village
     name= _ "Village"
-    string=Gg^Ve
-    aliasof=Gg^Vh
+    string=^Ve
+    aliasof=Vi
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village
@@ -1245,8 +1251,9 @@
     symbol_image=village/snow-tile
     id=snow_village
     name= _ "Village"
-    string=Aa^Vha
-    aliasof=Gg^Vh, Aa
+    string=^Vha
+    aliasof=Vi, Aa
+    default_base=Aa
     heals=8
     gives_income=true
     editor_group=village, frozen
@@ -1254,9 +1261,11 @@
 
 [terrain_type]
     symbol_image=village/human-tile
-    id=village
+    id=human_village
     name= _ "Village"
-    string=Gg^Vh
+    string=^Vh
+    aliasof=Vi
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village
@@ -1266,8 +1275,9 @@
     symbol_image=village/human-city-tile
     id=city_village
     name= _ "Village"
-    string=Rp^Vhc
-    aliasof=Gg^Vh
+    string=^Vhc
+    aliasof=Vi
+    default_base=Rp
     heals=8
     gives_income=true
     editor_group=village
@@ -1277,8 +1287,9 @@
     symbol_image=village/human-hills-tile
     id=hill_village
     name= _ "Village"
-    string=Hh^Vhh
-    aliasof=Gg^Vh, Hh
+    string=^Vhh
+    aliasof=Vi, Hh
+    default_base=Hh
     heals=8
     gives_income=true
     editor_group=village, rough
@@ -1288,20 +1299,21 @@
     symbol_image=village/human-snow-hills-tile
     id=snow-hill_village
     name= _ "Village"
-    string=Ha^Vhha
-    aliasof=Gg^Vh, Ha
+    string=^Vhha
+    aliasof=Vi, Ha
+    default_base=Ha
     heals=8
     gives_income=true
     editor_group=village, frozen, rough
 [/terrain_type]
 
-#new one
 [terrain_type]
     symbol_image=village/human-snow-mountain-tile
     id=snow-mountain_village
     name= _ "Village"
-    string=Ms^Vhha
-    aliasof=Gg^Vh, Ms
+    string=^Vhha
+    aliasof=Vi, Ms
+    default_base=Ms
     heals=8
     gives_income=true
     editor_group=village, frozen, rough
@@ -1311,8 +1323,9 @@
     symbol_image=village/human-mountain-tile
     id=mountain_village
     name= _ "Village"
-    string=Mm^Vhh
-    aliasof=Gg^Vh, Mm
+    string=^Vhh
+    aliasof=Vi, Mm
+    default_base=Mm
     heals=8
     gives_income=true
     editor_group=village, rough
@@ -1322,8 +1335,9 @@
     symbol_image=village/tropical-tile
     id=tropical_forest_village
     name= _ "Village"
-    string=Gs^Vht
-    aliasof=Gg^Vh
+    string=^Vht
+    aliasof=Vi
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village
@@ -1333,8 +1347,9 @@
     symbol_image=village/camp-tile
     id=camp_village
     name= _ "Village"
-    string=Re^Vct
-    aliasof=Gg^Vh
+    string=^Vct
+    aliasof=Vi
+    default_base=Re
     heals=8
     gives_income=true
     editor_group=village
@@ -1344,8 +1359,9 @@
     symbol_image=village/drake-tile
     id=drake_village
     name= _ "Village"
-    string=Rr^Vd
-    aliasof=Gg^Vh
+    string=^Vd
+    aliasof=Vi
+    default_base=Rr
     heals=8
     gives_income=true
     editor_group=village
@@ -1357,8 +1373,9 @@
     symbol_image=village/cave-tile
     id=underground_village
     name= _ "Village"
-    string=Uu^Vu
-    aliasof=Gg^Vh, Uu
+    string=^Vu
+    aliasof=Vi, Uu
+    default_base=Uu
     heals=8
     gives_income=true
     editor_group=village, cave
@@ -1368,8 +1385,9 @@
     symbol_image=village/dwarven-tile
     id=dwarven_village
     name= _ "Village"
-    string=Uu^Vud
-    aliasof=Gg^Vh, Uu
+    string=^Vud
+    aliasof=Vi, Uu
+    default_base=Uu
     heals=8
     gives_income=true
     editor_group=village, cave
@@ -1379,8 +1397,9 @@
     symbol_image=village/hut-tile
     id=hut_village
     name= _ "Village"
-    string=Gg^Vc
-    aliasof=Gg^Vh
+    string=^Vc
+    aliasof=Vi
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village
@@ -1390,8 +1409,9 @@
     symbol_image=village/hut-snow-tile
     id=hut_snow_village
     name= _ "Village"
-    string=Aa^Vca
-    aliasof=Gg^Vh, Aa
+    string=^Vca
+    aliasof=Vi, Aa
+    default_base=Aa
     heals=8
     gives_income=true
     editor_group=village, frozen
@@ -1401,8 +1421,9 @@
     symbol_image=village/hut-hills-tile
     id=hut_hills_village
     name= _ "Village"
-    string=Hh^Vc
-    aliasof=Gg^Vh, Hh
+    string=^Vc
+    aliasof=Vi, Hh
+    default_base=Hh
     heals=8
     gives_income=true
     editor_group=village
@@ -1412,8 +1433,9 @@
     symbol_image=village/hut-snow-hills-tile
     id=hut_snow_hills_village
     name= _ "Village"
-    string=Ha^Vca
-    aliasof=Gg^Vh, Ha
+    string=^Vca
+    aliasof=Vi, Ha
+    default_base=Ha
     heals=8
     gives_income=true
     editor_group=village, frozen, rough
@@ -1423,8 +1445,9 @@
     symbol_image=village/hut-mountains-tile
     id=hut_mountains_village
     name= _ "Village"
-    string=Mm^Vc
-    aliasof=Gg^Vh, Mm
+    string=^Vc
+    aliasof=Vi, Mm
+    default_base=Mm
     heals=8
     gives_income=true
     editor_group=village, rough
@@ -1434,8 +1457,9 @@
     symbol_image=village/log-cabin-tile
     id=logcabin_village
     name= _ "Village"
-    string=Gg^Vl
-    aliasof=Gg^Vh
+    string=^Vl
+    aliasof=Vi
+    default_base=Gg
     heals=8
     gives_income=true
     editor_group=village
@@ -1445,8 +1469,9 @@
     symbol_image=village/log-cabin-snow-tile
     id=logcabin_snow_village
     name= _ "Village"
-    string=Aa^Vla
-    aliasof=Gg^Vh, Aa
+    string=^Vla
+    aliasof=Vi, Aa
+    default_base=Aa
     heals=8
     gives_income=true
     editor_group=village, frozen
@@ -1474,7 +1499,7 @@
     id=swamp_village
     name= _ "Village"
     string=Ss^Vhs
-    aliasof=Gg^Vh, Ss
+    aliasof=Vi, Ss
     heals=8
     gives_income=true
     editor_group=water, village
@@ -1635,6 +1660,13 @@
     string=At       # wmllint: ignore
     hidden=yes
 [/terrain_type]
+[terrain_type]
+    symbol_image=void
+    id=village
+    name= _ "Village"
+    string=Vi       # wmllint: ignore
+    hidden=yes
+[/terrain_type]
 [terrain_type]
     symbol_image=void
     id=impassable