Merge 2006-10-02T14:57:54Z!haskjold@pvv.org from trunk

data/terrain-graphics.cfg

@@ -48,6 +48,59 @@
 
 {FORESTADJ ] csmJMwvabtXWl 100 mushrooms-castle}
 
+#define SWAMPADJSINGLE FID ID NID PROB TILE
+[terrain_graphics]
+      map="
+  1
+3   3
+  2
+3   3
+  3"
+
+         [tile]
+                 pos=1
+                 type={ID}
+         [/tile]
+
+         [tile]
+                 pos=2
+                 type={FID}
+                 no_flag="overlay"
+                 set_flag="overlay"
+         [/tile]
+ 
+         [tile]
+                 pos=3
+                 type={NID}
+         [/tile]
+
+         probability={PROB}
+         rotations=n,ne,se,s,sw,nw
+
+         [image]
+                 name={TILE}-@R0
+                 position=vertical
+                 base=90,144
+         [/image]
+
+
+[/terrain_graphics]
+#enddef
+
+{SWAMPADJSINGLE Yw CnQoKNhaHAmb& !CnQoKNhaHAmb& 100 reed-castle}
+{SWAMPADJSINGLE q !q q 100 reed-castle}
+
+{FORESTADJ Yw CnQoKNhaHAmb& 8 reed1-small}
+{FORESTADJ Yw CnQoKNhaHAmb& 13 reed2-small}
+{FORESTADJ Yw CnQoKNhaHAmb& 21 reed3-small}
+{FORESTADJ Yw CnQoKNhaHAmb& 100 reed4-small}
+{FORESTADJ q !q 8 reed1-small}
+{FORESTADJ q !q 13 reed2-small}
+{FORESTADJ q !q 21 reed3-small}
+{FORESTADJ q !q 100 reed4-small}
+
+
+
 # Mountains
 # macros found in terrain-graphics/mountains.cfg
 
@@ -134,6 +187,14 @@
 {SHEX ' overlay 33 cave-beam2}
 {SHEX ' overlay 100 cave-beam1}
 
+
+{SHEX Ywq overlay 10 reed3}
+{SHEX Ywq overlay 20 reed1}
+{SHEX Ywq overlay 25 reed2}
+{SHEX Ywq overlay 33 reed4}
+{SHEX Ywq overlay 50 reed5}
+{SHEX Ywq overlay 100 reed6}
+
 #Macro for clouds
 #define CLOUDS TYPE NAME1 NAME2 NAME3 FLAG PROB
 [terrain_graphics]
@@ -217,7 +278,8 @@
 {SHEX p village 100 village-dwarven}
 
 #Single hex swamp village
-{SHEX Y village 100 village-swampwater}
+{SHEX Y village 50 village-swampwater}
+{SHEX Y village 100 village-swampwater2}
 
 #Single hex coastal village
 {SHEX Z village 100 village-coast}
@@ -583,6 +645,7 @@
 {TERRAIN_ADJACENT_CUSTOM   -150    mb&              HSJpkscZ\|/wY       mountains transition2}
 {TERRAIN_ADJACENT_CUSTOM   -151    mb&              !mbXhCKNnoQW        mountains transition2}
 {TERRAIN_ADJACENT          -160    M                !MX                 desert-mountains}
+
                                                                        
 {TERRAIN_ADJACENT          -170    HA               kscZ\|/wY           snow-hills-to-water}
 {TERRAIN_ADJACENT          -171    HA               h                   snow-hills-to-hills}
@@ -599,12 +662,14 @@
 {TERRAIN_ADJACENT          -250    i                !iX                 ice}
 {TERRAIN_ADJACENT          -260    TGL              kscZ\|/             savanna-to-water}
 
+{TERRAIN_ADJACENT          -250    Ywq              !YwqhaHAmb&                swampwater}
+
 
 # These two work in conjunction with the mountain and hill transitions to create
 # a smooth coastline between grassland, hills and mountains.
 
 {TERRAIN_ADJACENT          -270    ftgvX?         !ftgvX?mb&hakscZ\|/wY grassland}
-{TERRAIN_ADJACENT          -319    ftgvX?mb&ha      kscZ\|/wY           grassland-to-water}
+{TERRAIN_ADJACENT          -319    ftgvX?mb&ha      kscZ\|/           grassland-to-water}
 
 {TERRAIN_ADJACENT          -280    GTL              !GTLX               savanna}
 {TERRAIN_ADJACENT          -290    R                !R                  road}
@@ -617,10 +682,9 @@
 
 # Water Transitions draw below everything else
 
-{SET_ADJACENT_FLAG         Qq      K                kscZ\|/wY           transition2}
-{TERRAIN_ADJACENT_CUSTOM   -500    CKnNo            kscZ\|/wY           castle-to-water transition2}
+{SET_ADJACENT_FLAG         Qq      K                kscZ\|/Y           transition2}
+{TERRAIN_ADJACENT_CUSTOM   -500    CKnNo            kscZ\|/Y           castle-to-water transition2}
 
-{TERRAIN_ADJACENT          -510    Ywq              !Ywq                swampwater}
 {TERRAIN_ADJACENT          -520    cZ\|/            !cZ\|/m             coast}
 {TERRAIN_ADJACENT          -530    k                !k                  ford}
 {TERRAIN_ADJACENT          -540    s                !s                  ocean}