wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth data/terrain-graphics.cfg data/terrain....


From: Hogne Hskjold
Subject: [Wesnoth-cvs-commits] wesnoth data/terrain-graphics.cfg data/terrain....
Date: Wed, 19 Jan 2005 14:12:21 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Hogne Håskjold <address@hidden> 05/01/19 19:12:20

Modified files:
        data           : terrain-graphics.cfg terrain.cfg 
        images/terrain : desert-n.png desert-ne.png desert-nw.png 
                         desert-plant.png desert-s.png desert-se.png 
                         desert-sw.png desert.png 
Added files:
        images/terrain : desert-hills-n.png desert-hills-ne.png 
                         desert-hills-nw.png desert-hills-s.png 
                         desert-hills-se.png desert-hills-sw.png 
                         desert-hills.png desert-hills2.png 
                         desert-hills3.png desert-mountain-peak1.png 
                         desert-mountain-peak2.png 
                         desert-mountain-peak3.png 
                         desert-mountains-n.png desert-mountains-ne.png 
                         desert-mountains-nw.png desert-mountains-s.png 
                         desert-mountains-se.png desert-mountains-sw.png 
                         desert-mountains.png desert-n-ne-se.png 
                         desert-n-ne.png desert-ne-se-s.png 
                         desert-ne-se.png desert-nw-n-ne.png 
                         desert-nw-n.png desert-oasis.png 
                         desert-plant2.png desert-plant3.png 
                         desert-road-n-ne-se.png desert-road-n-ne.png 
                         desert-road-n.png desert-road-ne-se-s.png 
                         desert-road-ne-se.png desert-road-ne.png 
                         desert-road-nw-n-ne.png desert-road-nw-n.png 
                         desert-road-nw.png desert-road-s-sw-nw.png 
                         desert-road-s-sw.png desert-road-s.png 
                         desert-road-se-s-sw.png desert-road-se-s.png 
                         desert-road-se.png desert-road-sw-nw-n.png 
                         desert-road-sw-nw.png desert-road-sw.png 
                         desert-road.png desert-s-sw-nw.png 
                         desert-s-sw.png desert-se-s-sw.png 
                         desert-se-s.png desert-sw-nw-n.png 
                         desert-sw-nw.png desert2.png desert3.png 
                         desert4.png desert5.png desert6.png desert7.png 
                         savanna-n-ne-se.png savanna-n-ne.png 
                         savanna-n.png savanna-ne-se-s.png 
                         savanna-ne-se.png savanna-ne.png 
                         savanna-nw-n-ne.png savanna-nw-n.png 
                         savanna-nw.png savanna-s-sw-nw.png 
                         savanna-s-sw.png savanna-s.png 
                         savanna-se-s-sw.png savanna-se-s.png 
                         savanna-se.png savanna-sw-nw-n.png 
                         savanna-sw-nw.png savanna-sw.png 
                         savanna-to-water-n-ne-se.png 
                         savanna-to-water-n-ne.png 
                         savanna-to-water-n.png 
                         savanna-to-water-ne-se-s.png 
                         savanna-to-water-ne-se.png 
                         savanna-to-water-ne.png 
                         savanna-to-water-nw-n-ne.png 
                         savanna-to-water-nw-n.png 
                         savanna-to-water-nw.png 
                         savanna-to-water-s-sw-nw.png 
                         savanna-to-water-s-sw.png 
                         savanna-to-water-s.png 
                         savanna-to-water-se-s-sw.png 
                         savanna-to-water-se-s.png 
                         savanna-to-water-se.png 
                         savanna-to-water-sw-nw-n.png 
                         savanna-to-water-sw-nw.png 
                         savanna-to-water-sw.png savanna.png 
                         tropical-forest-n.png tropical-forest-ne.png 
                         tropical-forest-nw.png tropical-forest-s.png 
                         tropical-forest-se.png tropical-forest-sw.png 
                         tropical-forest.png tropical-forest2.png 
                         tropical-forest3.png tropical-forest4.png 
                         village-desert-shadow.png village-desert.png 
                         village-desert2.png 

Log message:
        Added new terrain:
        
        Desert
        Desert hills
        Desert mountains
        Desert road
        Desert villages (2 types)
        Oasis
        Savanna
        Tropical forest
        
        Old desert*.png's are now sand*.png's, same letter.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain.cfg.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-hills3.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountain-peak1.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountain-peak2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountain-peak3.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-mountains.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-n-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-ne-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-nw-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-oasis.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-plant2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-plant3.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-n-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-ne-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-nw-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-s-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-se-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-sw-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-road.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-s-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-se-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-sw-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert3.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert4.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert5.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert6.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert7.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-n-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-ne-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-nw-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-s-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-se-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-sw-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-n-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-ne-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-ne-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-nw-n-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-s-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-se-s-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-se-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-sw-nw-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-sw-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna-to-water-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/savanna.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest3.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/tropical-forest4.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/village-desert-shadow.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/village-desert.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/village-desert2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-n.png.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-ne.png.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-nw.png.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-plant.png.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-s.png.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-se.png.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert-sw.png.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/desert.png.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.49 
wesnoth/data/terrain-graphics.cfg:1.50
--- wesnoth/data/terrain-graphics.cfg:1.49      Mon Dec 13 18:40:07 2004
+++ wesnoth/data/terrain-graphics.cfg   Wed Jan 19 19:12:18 2005
@@ -12,6 +12,19 @@
 # Use the following layers:
 # -1000                : terrain base graphics
 
+#Multi-hex: shadow for desert village
+[terrain_graphics]
+      map="
+.   
+   B
+*"
+      [image]
+          name=village-desert-shadow
+          position=vertical
+          base=45,82
+      [/image]
+[/terrain_graphics]
+
 # Loads the macros used in the file
 {terrain-graphics}
 
@@ -70,13 +83,12 @@
 {TERRAIN_BASE                 gf grassland-r4}
 {TERRAIN_BASE                 r dirt}
 {TERRAIN_BASE                 R road}
-{TERRAIN_BASE_PROB            d desert-plant        10}
-{TERRAIN_BASE                 d desert}
+{TERRAIN_BASE_PROB            d sand-plant        10}
+{TERRAIN_BASE                 d sand}
 {TERRAIN_BASE                 i ice}
 {TERRAIN_BASE_PROB            w swampwater2         30}
 {TERRAIN_BASE_PROB            w swampwater3         30}
 {TERRAIN_BASE                 w swampwater}
-{TERRAIN_BASE                 p pier}
 {TERRAIN_BASE_PROB            c\|/ coast3        30}
 {TERRAIN_BASE_PROB            c\|/ coast2        30}
 {TERRAIN_BASE                 c\|/ coast}
@@ -84,6 +96,31 @@
 {TERRAIN_BASE_PROB            s ocean2         30}
 {TERRAIN_BASE                 s ocean}
 {TERRAIN_BASE                 ~ fog}
+{TERRAIN_BASE_PROB            d desert-plant   2}
+{TERRAIN_BASE_PROB            d desert-plant2  2}
+{TERRAIN_BASE_PROB            d desert-plant3  2}
+{TERRAIN_BASE_PROB            d desert2        25}
+{TERRAIN_BASE_PROB            d desert3        25}
+{TERRAIN_BASE_PROB            d desert4        5}
+{TERRAIN_BASE_PROB            d desert5        5}
+{TERRAIN_BASE_PROB            d desert6        5}
+{TERRAIN_BASE_PROB            d desert7        5}
+{TERRAIN_BASE                 I desert}
+{TERRAIN_BASE_PROB            J desert-hills2  33}
+{TERRAIN_BASE_PROB            J desert-hills3  33}
+{TERRAIN_BASE                 J desert-hills}
+{TERRAIN_BASE_PROB            M desert-mountains-peak1     25}
+{TERRAIN_BASE_PROB            M desert-mountains-peak2     25}
+{TERRAIN_BASE_PROB            M desert-mountains-peak3     25}
+{TERRAIN_BASE                 M desert-mountains}
+{TERRAIN_BASE_PROB_OV         T tropical-forest2 25}
+{TERRAIN_BASE_PROB_OV         T tropical-forest3 25}
+{TERRAIN_BASE_PROB_OV         T tropical-forest4 25}
+{TERRAIN_BASE_OV              T tropical-forest}
+{TERRAIN_BASE                 GT savanna}
+{TERRAIN_BASE                 E desert-road}
+{TERRAIN_BASE                 P desert-oasis}
+
 
 {CANYON X canyon}
 {BRIDGE \ | / cs CKfF bridge}
@@ -101,7 +138,7 @@
 {TERRAIN_BASE a hills}
 {TERRAIN_BASE A snow-hills}
 {TERRAIN_BASE b mountains}
-{TERRAIN_BASE B desert}
+{TERRAIN_BASE BU desert}
 
 {BUILDING Y ({VIMG       36,40 village-swampwater })}
 {BUILDING V ({VIMG       36,40 village-snow       })}
@@ -113,7 +150,8 @@
 {BUILDING a ({VIMG       36,40 village-human      })}
 {BUILDING A ({VIMG       36,40 village-snow     })}
 {BUILDING b ({VIMG       36,40 village-human      })}
-{BUILDING B ({VIMG       36,40 village-human      })}
+{BUILDING B ({VIMG       36,40 village-desert     })}
+{BUILDING U ({VIMG       36,40 village-desert2    })}
 
 
 #
@@ -196,20 +234,29 @@
 {BUILDING_FLAG K ({VIMG 36,40 dwarven-keep}) keep-of-o}
 
 # {TERRAIN_ADJACENT_OV       -78         F      !F      snow-forest}
+{TERRAIN_ADJACENT_VERTICAL             T      !T      tropical-forest}
 {TERRAIN_ADJACENT_VERTICAL             F      !F      snow-forest}
 {TERRAIN_ADJACENT_VERTICAL             f      !f      forest}
-{TERRAIN_ADJACENT          -187        mb     !mb     mountains}
-{TERRAIN_ADJACENT          -188        HA     !HA     snow-hills}
-{TERRAIN_ADJACENT          -189        ha     !ha     hills}
-{TERRAIN_ADJACENT          -190        uD     !uD     cave-floor}
-{TERRAIN_ADJACENT          -191        SVF    !SVF    snow}
-{TERRAIN_ADJACENT          -192        i      !i      ice}
-{TERRAIN_ADJACENT          -193        ftgvX  cZp\|/  grassland-to-water}
-{TERRAIN_ADJACENT          -193        ftgvX  s       grassland-to-water}
-#{TERRAIN_ADJACENT          -193        ftgvX  cZp\|/s cliff}
-{TERRAIN_ADJACENT          -194        ftgvX  !ftgvX  grassland}
-{TERRAIN_ADJACENT          -195        dB      !dB      desert}
-{TERRAIN_ADJACENT          -196        r      !r      dirt}
+{TERRAIN_ADJACENT          -178        M     !M       desert-mountains}
+{TERRAIN_ADJACENT          -179        mb     !mb     mountains}
+{TERRAIN_ADJACENT          -180        HA     !HA     snow-hills}
+{TERRAIN_ADJACENT          -181        J      !J      desert-hills}
+{TERRAIN_ADJACENT          -182        ha     !ha     hills}
+{TERRAIN_ADJACENT          -183        uD     !uD     cave-floor}
+{TERRAIN_ADJACENT          -184        SVF    !SVF    snow}
+{TERRAIN_ADJACENT          -185        i      !i      ice}
+{TERRAIN_ADJACENT          -186        TG     cZp\|/  savanna-to-water}
+{TERRAIN_ADJACENT          -187        TG     s       savanna-to-water}
+{TERRAIN_ADJACENT          -188        ftgvX  cZp\|/  grassland-to-water}
+{TERRAIN_ADJACENT          -189        ftgvX  s       grassland-to-water}
+#{TERRAIN_ADJACENT          -190        ftgvX  cZp\|/s cliff}
+{TERRAIN_ADJACENT          -190        GT     !GT     savanna}
+{TERRAIN_ADJACENT          -191        ftgvX  !ftgvX  grassland}
+{TERRAIN_ADJACENT          -192        PIB    !PIB    desert-oasis}
+{TERRAIN_ADJACENT          -193        IBP    !IBP    desert}
+{TERRAIN_ADJACENT          -194        d      !d      sand}
+{TERRAIN_ADJACENT          -195        r      !r      dirt}
+{TERRAIN_ADJACENT          -196        E      !E      desert-road}
 {TERRAIN_ADJACENT          -197        R      !R      road}
 {TERRAIN_ADJACENT          -198        Yw     !Yw     swampwater}
 {TERRAIN_ADJACENT          -199        cZp\|/ !cZp\|/ coast}
Index: wesnoth/data/terrain.cfg
diff -u wesnoth/data/terrain.cfg:1.50 wesnoth/data/terrain.cfg:1.51
--- wesnoth/data/terrain.cfg:1.50       Thu Nov 18 13:07:34 2004
+++ wesnoth/data/terrain.cfg    Wed Jan 19 19:12:18 2005
@@ -99,14 +99,23 @@
 aliasof=gc
 [/terrain]
 
+#Old desert
 [terrain]
-symbol_image=desert
+symbol_image=sand
 id=sand
 name= _ "Sand"
 char=d
 light=true
 [/terrain]
 
+#New desert
+[terrain]
+symbol_image=desert
+id=sand
+name= _ "Sand"
+char=I
+light=true
+[/terrain]
 
 [terrain]
 symbol_image=road
@@ -117,6 +126,14 @@
 [/terrain]
 
 [terrain]
+symbol_image=desert-road
+id=road
+name= _ "Road"
+char=E
+aliasof=g
+[/terrain]
+
+[terrain]
 symbol_image=dirt
 id=dirt
 name= _ "Dirt"
@@ -134,6 +151,14 @@
 [/terrain]
 
 [terrain]
+symbol_image=savanna
+id=grassland
+name= _ "Grassland"
+char=G
+aliasof=g
+[/terrain]
+
+[terrain]
 symbol_image=village
 id=village
 name= _ "Village"
@@ -187,19 +212,40 @@
 gives_income=true
 [/terrain]
 
-#temporary symbol_image until a desert village graphic emerges
 [terrain]
-symbol_image=village-human
+symbol_image=village-desert
 id=desert village
-name= _ "Village"
+name= _ "Desert Village"
 char=B
-aliasof=td
+aliasof=tI
 heals=true
 gives_income=true
 light=true
 [/terrain]
 
 [terrain]
+symbol_image=village-desert2
+id=desert village
+name= _ "Desert Village"
+char=U
+aliasof=tI
+heals=true
+gives_income=true
+light=true
+[/terrain]
+
+[terrain]
+symbol_image=desert-oasis
+id=oasis
+name= _ "Oasis"
+char=P
+aliasof=I
+heals=true
+#gives_income=true
+light=true
+[/terrain]
+
+[terrain]
 symbol_image=snow
 id=tundra
 name= _ "Snow"
@@ -210,7 +256,7 @@
 [terrain]
 symbol_image=village-snow
 id=snow village
-name= _ "Village"
+name= _ "Snow Village"
 char=V
 aliasof=tS
 light=true
@@ -227,14 +273,22 @@
 
 [terrain]
 symbol_image=snow-hills
-id=hills
-name= _ "Hills"
+id=snow hills
+name= _ "Desert Hills"
 light=true
 char=H
 aliasof=h
 [/terrain]
 
 [terrain]
+symbol_image=desert-hills
+id=desert hills
+name= _ "Desert Hills"
+char=J
+aliasof=h
+[/terrain]
+
+[terrain]
 symbol_image=mountains
 id=mountains
 name= _ "Mountains"
@@ -242,6 +296,14 @@
 [/terrain]
 
 [terrain]
+symbol_image=desert-mountains
+id=desert mountains
+name= _ "Desert Mountains"
+char=M
+aliasof=m
+[/terrain]
+
+[terrain]
 symbol_image=forest
 id=forest
 name= _ "Forest"
@@ -250,14 +312,22 @@
 
 [terrain]
 symbol_image=snow-forest
-id=forest
+id=snow forest
 light=true
-name= _ "Forest"
+name= _ "Snow Forest"
 aliasof=f
 char=F
 [/terrain]
 
 [terrain]
+symbol_image=tropical-forest
+id=tropical forest
+name= _ "Tropical Forest"
+aliasof=f
+char=T
+[/terrain]
+
+[terrain]
 symbol_image=cavewall
 id=cavewall
 name= _ "Cave wall"
Index: wesnoth/images/terrain/desert-n.png
Index: wesnoth/images/terrain/desert-ne.png
Index: wesnoth/images/terrain/desert-nw.png
Index: wesnoth/images/terrain/desert-plant.png
Index: wesnoth/images/terrain/desert-s.png
Index: wesnoth/images/terrain/desert-se.png
Index: wesnoth/images/terrain/desert-sw.png
Index: wesnoth/images/terrain/desert.png




reply via email to

[Prev in Thread] Current Thread [Next in Thread]