Added farmland terrain by Eleazar

changelog

@@ -35,6 +35,7 @@ Version 1.3-svn:
    * terrain
      * added peaks to the impassable mountains
      * added bridges crossing swamp and deep water
+     * added farmland
    * unit art
      * added a recruit animation for Skeleton
      * added death animations for Orcish Assassin and Grunt, and Undead Ghoul

data/terrain-graphics.cfg

@@ -21,39 +21,39 @@
 # Macro's moved to terrain-graphics/forestcastle.cfg
 #-----------------------------------------------------------------
 
-{FORESTADJCASTLEA Ff (C*,K*,_K,Xu,Ql,Qxu) 100 forest-castle}
-{FORESTADJCASTLEA Fa (C*,K*,_K,Xu,Ql,Qxu) 100 snow-forest-castle}
-{FORESTADJCASTLEA Ft (C*,K*,_K,Xu,Ql,Qxu) 100 tropical-forest-castle}
-{FORESTADJCASTLEA Uf (C*,K*,_K,Xu,Ql,Qxu) 100 mushrooms-castle}
+{FORESTADJCASTLEA Ff (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 forest-castle}
+{FORESTADJCASTLEA Fa (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 snow-forest-castle}
+{FORESTADJCASTLEA Ft (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 tropical-forest-castle}
+{FORESTADJCASTLEA Uf (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 mushrooms-castle}
 
 
-{FORESTADJCASTLES Ff (C*,K*,_K,Xu,Ql,Qxu) 100 forest-castle}
-{FORESTADJCASTLES Fa (C*,K*,_K,Xu,Ql,Qxu) 100 snow-forest-castle}
-{FORESTADJCASTLES Ft (C*,K*,_K,Xu,Ql,Qxu) 100 tropical-forest-castle}
-{FORESTADJCASTLES Uf (C*,K*,_K,Xu,Ql,Qxu) 100 mushrooms-castle}
+{FORESTADJCASTLES Ff (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 forest-castle}
+{FORESTADJCASTLES Fa (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 snow-forest-castle}
+{FORESTADJCASTLES Ft (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 tropical-forest-castle}
+{FORESTADJCASTLES Uf (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 mushrooms-castle}
 
-{FORESTADJCASTLEO Ff (C*,K*,_K,Xu,Ql,Qxu) 100 forest-castle}
-{FORESTADJCASTLEO Fa (C*,K*,_K,Xu,Ql,Qxu) 100 snow-forest-castle}
-{FORESTADJCASTLEO Ft (C*,K*,_K,Xu,Ql,Qxu) 100 tropical-forest-castle}
-{FORESTADJCASTLEO Uf (C*,K*,_K,Xu,Ql,Qxu) 100 mushrooms-castle}
+{FORESTADJCASTLEO Ff (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 forest-castle}
+{FORESTADJCASTLEO Fa (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 snow-forest-castle}
+{FORESTADJCASTLEO Ft (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 tropical-forest-castle}
+{FORESTADJCASTLEO Uf (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 mushrooms-castle}
 
-{FORESTADJCASTLE  Ff (C*,K*,_K,Xu,Ql,Qxu) 100 forest-castle}
-{FORESTADJCASTLE  Fa (C*,K*,_K,Xu,Ql,Qxu) 100 snow-forest-castle}
-{FORESTADJCASTLE  Ft (C*,K*,_K,Xu,Ql,Qxu) 100 tropical-forest-castle}
-{FORESTADJCASTLE  Uf (C*,K*,_K,Xu,Ql,Qxu) 100 mushrooms-castle}
+{FORESTADJCASTLE  Ff (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 forest-castle}
+{FORESTADJCASTLE  Fa (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 snow-forest-castle}
+{FORESTADJCASTLE  Ft (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 tropical-forest-castle}
+{FORESTADJCASTLE  Uf (C*,K*,_K,Xu,Ql,Qxu,Rf*) 100 mushrooms-castle}
 
 {MOUNTAINADJCASTLEA (Mm,Vhm,Xm) (C*,K*,_K,Xu,Ql,Qxu) 100 mountains-castle}
 {FORESTADJCASTLE    (Mm,Vhm,Xm) (C*,K*,_K,Xu,Ql,Qxu) 100 mountains-castle}
 
 #33% 17% 5% 45%
-{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu) 33  forest_small}
-{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu) 25  forest3}
-{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu) 10  forest4}
-{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu) 100 forest2_small}
+{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu,Rf*) 33  forest_small}
+{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu,Rf*) 25  forest3}
+{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu,Rf*) 10  forest4}
+{FORESTADJ Ff (W*,M*,Hd,V*,Xu,Ql,Qxu,Rf*) 100 forest2_small}
 
-{FORESTADJ Fa (W*,M*,Hd,V*,Xu,Ql,Qxu) 100 snow-forest_small}
+{FORESTADJ Fa (W*,M*,Hd,V*,Xu,Ql,Qxu,Rf*) 100 snow-forest_small}
 
-{FORESTADJ Uf (W*,M*,Hd,V*,Xu,Ql,Qxu) 100 mushrooms-castle}
+{FORESTADJ Uf (W*,M*,Hd,V*,Xu,Ql,Qxu,Rf*) 100 mushrooms-castle}
 
 
 #define SWAMPADJSINGLE FID ID NID PROB TILE
@@ -153,6 +153,32 @@
 [/terrain_graphics]
 #enddef
 
+#define SHEX_LAYER TYPE FLAG LAYER PROB TILE
+[terrain_graphics]
+      map="
+, *
+* , *
+, 1
+* , *
+, *"
+
+         [tile]
+                 pos=1
+                 type={TYPE}
+                 no_flag={FLAG}
+                 set_flag={FLAG}
+         [/tile]
+
+         probability={PROB}
+
+         [image]
+                 name={TILE}
+                 layer={LAYER}
+                 base=90,146
+         [/image]
+[/terrain_graphics]
+#enddef
+
 #Single hex mountain tiles (mountain + village)
 #33% 33% 33%
 {SHEX (Mm,Vhm,Xm) overlay 33  mountains3}
@@ -337,6 +363,15 @@
 #{TERRAIN_BASE b mountains}
 
 
+#
+#       >  O V E R L A Y S <
+#
+
+{SHEX_LAYER Rfvs       farm       -10       33      farm-veg-spring1}
+{SHEX_LAYER Rfvs       farm       -10       50      farm-veg-spring2}
+{SHEX_LAYER Rfvs       farm       -10       100     farm-veg-spring3}
+
+
 #
 #       >  B A S E   T E R R A I N S  <
 #
@@ -397,7 +432,7 @@
 {TERRAIN_BASE_PROB  (Gs,Ft)           savanna2                 50}
 {TERRAIN_BASE       (Gs,Ft)           savanna3}
 
-{TERRAIN_BASE       Re                dirt}
+{TERRAIN_BASE       (Re,Rf*)          dirt}
 
 #33% 33% 33%
 {TERRAIN_BASE_PROB  Rr                road3                    33}
@@ -883,7 +918,8 @@
 
 {TERRAIN_ADJACENT          -280    (Gs,Ft,Vht)          (!,Gs,Ft,Vht,Qxu)                savanna}
 {TERRAIN_ADJACENT          -290    Rr                   (!,Rr)                           road}
-{TERRAIN_ADJACENT          -259    Re                   (!,Re)                           dirt}
+{TERRAIN_ADJACENT_CUSTOM   -250    Rfvs                 (!,Rfvs,C*,K*,F*,M*,H*,W*,S*)    farm-veg-spring transition2}
+{TERRAIN_ADJACENT          -259    (Re,Rf*)             (!,Re,Rf*)                       dirt}
 {TERRAIN_ADJACENT          -310    Rd                   (!,Rd)                           desert-road}
 {TERRAIN_ADJACENT          -320    (Dd,Do,Vda)          (!,Dd,Do,Vda)                    desert-oasis}
 {TERRAIN_ADJACENT          -330    (Dc,Dd,Dr,Do,Vd*)    (!,Dc,Dd,Dr,Do,Vd*)              desert}

data/terrain.cfg

@@ -537,6 +537,13 @@ char=R
 aliasof=Gg
 [/terrain]
 
+[terrain]
+symbol_image=farm-veg-spring-icon
+id=farm
+name= _ "Farmland"
+string=Rfvs
+aliasof=Gg
+[/terrain]
 
 #
 # Swamp