Author: grickit
Date: Sat Oct 15 16:04:07 2011
New Revision: 51486

URL: http://svn.gna.org/viewcvs/wesnoth?rev=51486&view=rev
Log:
Merfolk villages can now be placed on arbitrary base terrains like all the 
other villages.

Modified:
    trunk/data/core/terrain.cfg

Modified: trunk/data/core/terrain.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain.cfg?rev=51486&r1=51485&r2=51486&view=diff
==============================================================================
--- trunk/data/core/terrain.cfg (original)
+++ trunk/data/core/terrain.cfg Sat Oct 15 16:04:07 2011
@@ -1601,22 +1601,9 @@
     symbol_image=village/coast-tile
     id=mermen_village
     name= _ "Village"
-    editor_name= _ "Shallow Merfolk Village"
-    string=Ww^Vm
-    aliasof=Ww
-    submerge=0.4
-    heals=8
-    gives_income=true
-    editor_group=water, village
-[/terrain_type]
-
-[terrain_type]
-    symbol_image=village/swamp-merfolk-tile
-    id=swamp_merfolk-village
-    name= _ "Village"
-    editor_name= _ "Swamp Merfolk Village"
-    string=Ss^Vm
-    aliasof=Ss
+    editor_name= _ "Merfolk Village"
+    string=^Vm
+    aliasof=_bas, Vi
     submerge=0.4
     heals=8
     gives_income=true


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to