moved grassland type terrain into a subfolder.

data/terrain-graphics.cfg

@@ -351,13 +351,13 @@
 #       >  V I L L A G E   B A S E   T E R R A I N  <
 #
 
-{TERRAIN_BASE (Vhg,Veg) grassland-r1}
+{TERRAIN_BASE (Vhg,Veg) flat/grass-r1}
 {TERRAIN_BASE (Vha,Vea) snow}
 {TERRAIN_BASE Vd*       desert}
 {TERRAIN_BASE Vu*       cave/floor1}
 {TERRAIN_BASE Vhh       hills-variation1}
 {TERRAIN_BASE Vhha      snow-hills}
-{TERRAIN_BASE Vht       savanna}
+{TERRAIN_BASE Vht       flat/savanna}
 {TERRAIN_BASE Vwm       ater/coast}
 {TERRAIN_BASE Vs        swampwater}
 #{TERRAIN_BASE b mountains}
@@ -414,30 +414,30 @@
 
 
 #g 2% 2% 3% 3% 9% 9% 9% 9% 9% 9% 9% 27%
-{TERRAIN_BASE_PROB  Gg                grassland-rocks1         2}
-{TERRAIN_BASE_PROB  Gg                grassland-rocks2         2}
-{TERRAIN_BASE_PROB  Gg                grassland-flowers1       3}
-{TERRAIN_BASE_PROB  Gg                grassland-flowers2       3}
+{TERRAIN_BASE_PROB  Gg                flat/grass-rocks1         2}
+{TERRAIN_BASE_PROB  Gg                flat/grass-rocks2         2}
+{TERRAIN_BASE_PROB  Gg                flat/grass-flowers1       3}
+{TERRAIN_BASE_PROB  Gg                flat/grass-flowers2       3}
 #f? 10% 10% 10% 10% 10% 10% 10% 30%
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r1             10}
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r2             11}
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r3             13}
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r4             14}
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r5             17}
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r6             20}
-{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       grassland-r7             25}
-{TERRAIN_BASE       (Gg,Ff,Fet)       grassland-r8}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r1             10}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r2             11}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r3             13}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r4             14}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r5             17}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r6             20}
+{TERRAIN_BASE_PROB  (Gg,Ff,Fet)       flat/grass-r7             25}
+{TERRAIN_BASE       (Gg,Ff,Fet)       flat/grass-r8}
 
-{TERRAIN_BASE_PROB  (Gs,Ft)           savanna                  33}
-{TERRAIN_BASE_PROB  (Gs,Ft)           savanna2                 50}
-{TERRAIN_BASE       (Gs,Ft)           savanna3}
+{TERRAIN_BASE_PROB  (Gs,Ft)           flat/savanna                  33}
+{TERRAIN_BASE_PROB  (Gs,Ft)           flat/savanna2                 50}
+{TERRAIN_BASE       (Gs,Ft)           flat/savanna3}
 
-{TERRAIN_BASE       (Re,Rf*)          dirt}
+{TERRAIN_BASE       (Re,Rf*)          flat/dirt}
 
 #33% 33% 33%
-{TERRAIN_BASE_PROB  Rr                road3                    33}
-{TERRAIN_BASE_PROB  Rr                road2                    50}
-{TERRAIN_BASE       Rr                road}
+{TERRAIN_BASE_PROB  Rr                flat/road3                    33}
+{TERRAIN_BASE_PROB  Rr                flat/road2                    50}
+{TERRAIN_BASE       Rr                flat/road}
 
 {TERRAIN_BASE       Rd                desert-road}
 
@@ -567,7 +567,7 @@
 {TERRAIN_BASE        Kud       castle/dwarven-keep-floor}
 
 
-{TERRAIN_BASE        (Ce,Ke)   dirt}
+{TERRAIN_BASE        (Ce,Ke)   flat/dirt}
 
 {TERRAIN_BASE        Chr       castle/cobbles}
 {TERRAIN_BASE        Chw       castle/sunken-ruin}
@@ -580,7 +580,7 @@
 
 {TERRAIN_BASE_FLAG _K keep-of-ch castle/cobbles}
 {TERRAIN_BASE_FLAG _K keep-of-cud castle/dwarven-keep-floor}
-{TERRAIN_BASE_FLAG _K keep-of-ce dirt}
+{TERRAIN_BASE_FLAG _K keep-of-ce flat/dirt}
 
 {TERRAIN_BASE_FLAG _K keep-of-chr castle/cobbles}
 {TERRAIN_BASE_FLAG _K keep-of-chw castle/cobbles}
@@ -889,7 +889,7 @@
 # TERRAIN_ADJACENT_CUSTOMs and varying layer numbers are used to make some
 # special transitions to layer in more complex ways.
 
-{TERRAIN_ADJACENT          -140    (Mm,Hh,Ha,Ff,Fa,Fet)                 Chr              grassland}
+{TERRAIN_ADJACENT          -140    (Mm,Hh,Ha,Ff,Fa,Fet)                 Chr              flat/grass}
 
 {TERRAIN_ADJACENT_CUSTOM   -150    (Mm,Vhm,Xm)      (Ha,Aa,Hd,Vud,W*,B*,Vwm,Vs,Ss)       mountains transition2}
 {TERRAIN_ADJACENT_CUSTOM   -151    (Mm,Vhm,Xm)      (!,Mm,Vhm,Qxu,Hh,C*,K*,_K,Xu)        mountains transition2}
@@ -908,7 +908,7 @@
 {TERRAIN_ADJACENT          -220    Ql               (!,Ql,Qxu,Xu)                        lava}
 {TERRAIN_ADJACENT          -230    (Fa,Aa,Vha,Vea)  (W*,B*,Vwm,Vs,Ss)                    snow-to-water}
 {TERRAIN_ADJACENT          -240    (Fa,Aa,Vha,Vea)  (!,Fa,Aa,Vha,Vea,Qxu)                snow}
-{TERRAIN_ADJACENT          -260    (Ft,Gs,Vht)      (W*,B*,Vwm)                          savanna-to-water}
+{TERRAIN_ADJACENT          -260    (Ft,Gs,Vht)      (W*,B*,Vwm)                          flat/savanna-to-water}
 
 {TERRAIN_ADJACENT          -250    (Ss,Vs,Chs,Bss*)      (!,Ss,Vss,Chs,H*,M*,Vhh*,Vhm,Xm,Bss*)     swampwater}
 
@@ -916,13 +916,13 @@
 # These two work in conjunction with the mountain and hill transitions to create
 # a smooth coastline between grassland, hills and mountains.
 
-{TERRAIN_ADJACENT          -270    (Ff,Gg,Veg,Vhg,Fet,Qxu)  (!,Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Xm,Hh,Vha,W*,B*,Vwm,Vss,Ss) grassland}
-{TERRAIN_ADJACENT          -319    (Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Hh,Vhh,Xm)   (W*,B*,Vwm)   grassland-to-water}
+{TERRAIN_ADJACENT          -270    (Ff,Gg,Veg,Vhg,Fet,Qxu)  (!,Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Xm,Hh,Vha,W*,B*,Vwm,Vss,Ss) flat/grass}
+{TERRAIN_ADJACENT          -319    (Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Hh,Vhh,Xm)   (W*,B*,Vwm)   flat/grass-to-water}
 
-{TERRAIN_ADJACENT          -280    (Gs,Ft,Vht)          (!,Gs,Ft,Vht,Qxu)                savanna}
-{TERRAIN_ADJACENT          -290    Rr                   (!,Rr)                           road}
+{TERRAIN_ADJACENT          -280    (Gs,Ft,Vht)          (!,Gs,Ft,Vht,Qxu)                flat/savanna}
+{TERRAIN_ADJACENT          -290    Rr                   (!,Rr)                           flat/road}
 {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          -259    (Re,Rf*)             (!,Re,Rf*)                       flat/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}
@@ -946,6 +946,6 @@
 {TERRAIN_ADJACENT_CUSTOM   -550    Chw              (Ch,Chr)             sunken-ruin     transition2}
 {TERRAIN_ADJACENT_CUSTOM   -550    Chs              (Ch,Chr)             swampwater      transition2}
 {TERRAIN_ADJACENT          -560    Chw              (!,Chw,Chr)                          water/coast}
-{TERRAIN_ADJACENT          -570    (!,Chr,Chw)      Chr                                  grassland}
+{TERRAIN_ADJACENT          -570    (!,Chr,Chw)      Chr                                  flat/grass}
 
 {TERRAIN_BASE_DEFAULT void}

data/terrain.cfg

@@ -408,10 +408,10 @@ char=T
 # Grass
 #
 
-#grassland should contain mostly plain grassland, but occasionally
+#grassland should contain mostly plain flat/grass, but occasionally
 #a few rocks
 [terrain]
-symbol_image=grassland-r1
+symbol_image=flat-grass-r1
 id=grassland
 name= _ "Grassland"
 string=Gg
@@ -419,7 +419,7 @@ char=g
 [/terrain]
 
 [terrain]
-symbol_image=savanna
+symbol_image=flat/savanna
 id=savanna
 name= _ "Savanna"
 string=Gs
@@ -520,7 +520,7 @@ aliasof=Gg
 [/terrain]
 
 [terrain]
-symbol_image=dirt
+symbol_image=flat/dirt
 id=dirt
 name= _ "Dirt"
 string=Re
@@ -529,7 +529,7 @@ aliasof=Gg
 [/terrain]
 
 [terrain]
-symbol_image=road
+symbol_image=flat/road
 id=road
 name= _ "Road"
 string=Rr