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.

data/terrain-graphics.cfg

@@ -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}

data/terrain.cfg

@@ -99,14 +99,23 @@ char=\
 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
@@ -116,6 +125,14 @@ char=R
 aliasof=g
 [/terrain]
 
+[terrain]
+symbol_image=desert-road
+id=road
+name= _ "Road"
+char=E
+aliasof=g
+[/terrain]
+
 [terrain]
 symbol_image=dirt
 id=dirt
@@ -133,6 +150,14 @@ name= _ "Grassland"
 char=g
 [/terrain]
 
+[terrain]
+symbol_image=savanna
+id=grassland
+name= _ "Grassland"
+char=G
+aliasof=g
+[/terrain]
+
 [terrain]
 symbol_image=village
 id=village
@@ -187,18 +212,39 @@ heals=true
 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
@@ -210,7 +256,7 @@ light=true
 [terrain]
 symbol_image=village-snow
 id=snow village
-name= _ "Village"
+name= _ "Snow Village"
 char=V
 aliasof=tS
 light=true
@@ -227,13 +273,21 @@ char=h
 
 [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
@@ -241,6 +295,14 @@ name= _ "Mountains"
 char=m
 [/terrain]
 
+[terrain]
+symbol_image=desert-mountains
+id=desert mountains
+name= _ "Desert Mountains"
+char=M
+aliasof=m
+[/terrain]
+
 [terrain]
 symbol_image=forest
 id=forest
@@ -250,13 +312,21 @@ char=f
 
 [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