Author: alarantalara
Date: Fri Mar 23 00:32:35 2012
New Revision: 53614

URL: http://svn.gna.org/viewcvs/wesnoth?rev=53614&view=rev
Log:
backport r53612, r53613 to 1.10; fixes bug #19577 there

Modified:
    branches/1.10/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg

Modified: branches/1.10/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg?rev=53614&r1=53613&r2=53614&view=diff
==============================================================================
--- branches/1.10/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg 
(original)
+++ branches/1.10/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg Fri Mar 
23 00:32:35 2012
@@ -61,24 +61,24 @@
 
             #human Village
             [rule]
-                old=Gg^Vh
+                old=G*^Vh
                 new=Aa
                 terrain=Aa^Vha
             [/rule]
             [rule]
-                old=Gg^Vl
+                old=G*^Vl
                 new=Aa
                 terrain=Aa^Vla
             [/rule]
 
             #Orc Village
             [rule]
-                old=Gg^Vo
+                old=G*^Vo
                 new=Aa
                 terrain=Aa^Voa
             [/rule]
             [rule]
-                old=Hh^Vo
+                old=H*^Vo
                 new=Aa
                 terrain=Ha^Voa
             [/rule]
@@ -104,37 +104,37 @@
 
             #dwarf Village
             [rule]
-                old=Hh^Vhh
+                old=H*^Vhh
                 new=Aa
                 terrain=Ha^Vhha
             [/rule]
             [rule]
-                old=Mm^Vhh
+                old=M*^Vhh
                 new=Aa
                 terrain=Ms^Vhha
             [/rule]
 
             #elvish Village
             [rule]
-                old=Gg^Ve
+                old=G*^Ve
                 new=Aa
                 terrain=Aa^Vea
             [/rule]
             #flat hut Village
             [rule]
-                old=Gg^Vc
+                old=G*^Vc
                 new=Aa
                 terrain=Aa^Vca
             [/rule]
             #hill hut Village
             [rule]
-                old=Hh^Vc
+                old=H*^Vc
                 new=Aa
                 terrain=Ha^Vca
             [/rule]
             #forest
             [rule]
-                old=Gs^Fp
+                old=G*^Fp
                 new=Aa
                 terrain=Aa^Fpa
             [/rule]
@@ -146,13 +146,13 @@
             [/rule]
             #forested hills
             [rule]
-                old=Hh^Fp
+                old=H*^Fp
                 new=Aa
                 terrain=Ha^Fpa
             [/rule]
             #deciduous forest
             [rule]
-                old=Gs^Fds
+                old=G*^Fds
                 new=Aa
                 terrain=Aa^Fda
             [/rule]
@@ -165,16 +165,10 @@
 
             #water
             [rule]
-                old=Ww
+                old=Ww*^*
                 new=Aa
                 terrain=Ai
-            [/rule]
-
-            #River Ford --> ice
-            [rule]
-                old=Wwf
-                new=Aa
-                terrain=Ai
+                layer=base
             [/rule]
 
             # that would brake the balance of S19
@@ -200,21 +194,14 @@
             [/rule]
             #mountain village
             [rule]
-                old=Mm^Vhh
+                old=M*^Vhh
                 new=Aa
                 terrain=Ms^Vhha
             [/rule]
 
-            #forest on dry grass
-            [rule]
-                old=Gd^Fds
-                new=Aa
-                terrain=Aa^Fda
-            [/rule]
-
             #Grass
             [rule]
-                old=G*,Re,G*^Efm,Re^Gvs
+                old=G*,Re,Rd,G*^Efm,Re^Gvs,G*^Em
                 new=Aa
                 #don't specify terrain and it just uses the new terrain
             [/rule]
@@ -223,19 +210,6 @@
                 old=G*^Es
                 new=Aa
                 terrain=Aa^Es
-            [/rule]
-
-            #Savannah
-            [rule]
-                old=Gs
-                new=Aa
-                terrain=Aa
-            [/rule]
-
-            [rule]
-                old=Rd
-                new=Aa
-                terrain=Aa
             [/rule]
 
             #Mushroom lichtung


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

Reply via email to