Deprecated flowers as a base terrain,

...and made them available as an embellishment overlay. Currently that
overlay is graphically unimpressive, but that will soon change. Also
made the farm a baseless embellishment (effects the editor only).

changelog

@@ -81,6 +81,7 @@ Version 1.9.0-svn:
    * new ford that works with animated water
    * improved cobbled road now also used for castle (not keep) floor
    * new etherial abyss terrain added to mainline
+   * flower base terrain is depreciated, now available as an overlay
  * Terrain WML
    * rename TRANSITION_RESTRICTED and TRANSITION_RESTRICTED2 to
      OVERLAY_ROTATION_RESTRICTED and OVERLAY_ROTATION_RESTRICTED2

data/core/terrain-graphics.cfg

@@ -217,19 +217,21 @@
 #       >  O V E R L A Y S <
 #
 
+# Illuminated caves
+{OVERLAY_RANDOM_LF       (*^Ufi,*^Ii)                                  1  light    cave/beam}
+
 #Farmland
-{OVERLAY_RANDOM_L        *^Gvs                                        -10          flat/farm-veg-spring}
+{OVERLAY_RANDOM_L        *^Gvs                                        -10          embellishments/farm-veg-spring}
 
 # Windmill decoration
 {OVERLAY_B                 *^Wm                          	   ANIMATION_18_70 windmill}
 
+{OVERLAY_RANDOM          *^Efm                                                      embellishments/flower-purple}
+
 #Rubble
 {OVERLAY_RANDOM          *^Dr                                                      sand_rubble}
 
-# Illuminated caves
-{OVERLAY_RANDOM_LF       (*^Ufi,*^Ii)                                  1  light    cave/beam}
-
-#Small Stones  (a test)
+#Small Stones
 {OVERLAY_RANDOM          *^Es                                                      embellishments/stones-small}
 {OVERLAY_RANDOM          *^Em                                                      embellishments/mushroom}
 
@@ -560,7 +562,7 @@
 
 {TRANSITION_COMPLETE_L     Rr               (!,Rr,W*,Ai)                      -300               flat/road}
 {TRANSITION_COMPLETE_L     Rp               (!,Rp,W*,Ai)                      -310               flat/stone-path}
-{TRANSITION_COMPLETE_LF    *^Gvs          (!,*^Gvs,C*,K*,*^F*,M*,H*,W*) -320  transition2  flat/farm-veg-spring}
+{TRANSITION_COMPLETE_LF    *^Gvs          (!,*^Gvs,C*,K*,*^F*,M*,H*,W*) -320  transition2  embellishments/farm-veg-spring}
 
 #{TRANSITION_COMPLETE       (Dd,Do)          (!,Dd,Do)                                      desert-oasis}
 

data/core/terrain.cfg

@@ -106,11 +106,11 @@
     editor_group=flat
 [/terrain_type]
 
-# This terrain will soon be obsolete.
+#### This one is depreciated
 [terrain_type]
     symbol_image=flat/grass-flowers
     id=grassland_flowers
-    name= _ "Grassland"
+    name= _ "Depreciated use ^Efm"
     string=Ggf
     aliasof=Gt
     editor_group=flat
@@ -145,15 +145,6 @@
 
 #    ## Roads ##
 
-[terrain_type]
-    symbol_image=flat/farm-veg-spring-icon
-    id=farm
-    name= _ "Farmland"
-    string=^Gvs
-    default_base=Re
-    aliasof=_bas
-    editor_group=flat
-[/terrain_type]
 
 [terrain_type]
     symbol_image=flat/dirt-dark
@@ -285,6 +276,24 @@
 #    ## Embellishments ##
 #
 
+[terrain_type]
+    symbol_image=embellishments/flower-purple
+    id=flowers_mixed
+    name= _ "Mixed Flowers"
+    string=^Efm
+    aliasof=_bas
+    editor_group=embellishments
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=embellishments/farm-veg-spring-icon
+    id=farm
+    name= _ "Farmland"
+    string=^Gvs
+    aliasof=_bas
+    editor_group=embellishments
+[/terrain_type]
+
 [terrain_type]
     symbol_image=embellishments/stones-small7
     id=stones_small