Added in beetlenaut's new deciduous forest terrains.

This includes a new archetype forest terrain, but that can be removed
in a backwards-compatible way later (it's probably not necessary, but
I can't test and be sure due to the aliasing bug).

data/core/terrain-graphics.cfg

@@ -31,6 +31,24 @@
 {SIMPLE_OVERLAY_TERRAIN  Ha*^Fpa         (W*,M*,Hd,*^V*)                           forest/snow-forest-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fpa           (W*,M*,Hd,*^V*)                           forest/snow-forest}
 
+{OVERLAY_P               *^Fds                                  50                 forest/deciduous-1-summer}
+{OVERLAY                 *^Fds                                                     forest/deciduous-2-summer}
+                                                                                   
+{OVERLAY_P               *^Fdf                                  50                 forest/deciduous-1-fall}
+{OVERLAY                 *^Fdf                                                     forest/deciduous-2-fall}
+                                                                                   
+{OVERLAY_P               *^Fdw                                  50                 forest/deciduous-1-winter}
+{OVERLAY                 *^Fdw                                                     forest/deciduous-2-winter}
+                                                                                   
+{OVERLAY_P               *^Fms                                  50                 forest/mixed-1-summer}
+{OVERLAY                 *^Fms                                                     forest/mixed-2-summer}
+                                                                                   
+{OVERLAY_P               *^Fmf                                  50                 forest/mixed-1-fall}
+{OVERLAY                 *^Fmf                                                     forest/mixed-2-fall}
+                                                                                   
+{OVERLAY_P               *^Fmw                                  50                 forest/mixed-1-winter}
+{OVERLAY                 *^Fmw                                                     forest/mixed-2-winter}
+
 {SIMPLE_OVERLAY_TERRAIN  *^Uf*           (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,Hd,*^V*)      forest/mushrooms}
 
 # Great-tree

data/core/terrain.cfg

@@ -405,8 +405,8 @@
     name= _ "Snow Forest"
     string=^Fpa
     default_base=Aa
-    aliasof=At, ^Fp
-    mvt_alias=-,At, ^Fp
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
     editor_group=frozen, forest
 [/terrain]
 
@@ -416,16 +416,19 @@
     name= _ "Great Tree"
     string=^Fet
     default_base=Gg
-    aliasof=^Fp
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
     editor_group=forest
 [/terrain]
 
 [terrain]
     symbol_image=forest/pine-tile
-    id=forest
+    id=pine_forest
     name= _ "Forest"
     string=^Fp
-    default_base=Gs
+    default_base=Gg
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
     editor_group=forest
 [/terrain]
 
@@ -434,8 +437,75 @@
     id=tropical_forest
     name= _ "Tropical Forest"
     string=^Ft
+    default_base=Gg
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/deciduous-summer-tile
+    id=deciduous_forest_summer
+    name=_ "Forest"
+    string=^Fds
     default_base=Gs
-    aliasof=^Fp
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/deciduous-fall-tile
+    id=deciduous_forest_fall
+    name=_ "Forest"
+    string=^Fdf
+    default_base=Gs
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/deciduous-winter-tile
+    id=deciduous_forest_winter
+    name=_ "Forest"
+    string=^Fdw
+    default_base=Aa
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/mixed-summer-tile
+    id=mixed_forest_summer
+    name=_ "Forest"
+    string=^Fms
+    default_base=Gs
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/mixed-fall-tile
+    id=mixed_forest_fall
+    name=_ "Forest"
+    string=^Fmf
+    default_base=Gs
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/mixed-winter-tile
+    id=mixed_forest_winter
+    name=_ "Forest"
+    string=^Fmw
+    default_base=Aa
+    def_alias=_bas,F
+    mvt_alias=-,_bas,F
     editor_group=forest
 [/terrain]
 
@@ -448,8 +518,8 @@
     id=forested_hills
     name= _ "Forested Hills"
     string=Hh^Fp
-    aliasof=Hh, ^Fp
-    mvt_alias=-,Hh, ^Fp
+    def_alias=Hh,F
+    mvt_alias=-,Hh,F
     editor_group=forest, rough
 [/terrain]
 
@@ -458,8 +528,8 @@
     id=forested_snow_hills
     name= _ "Forested Snow Hills"
     string=Ha^Fpa
-    aliasof=Ha, ^Fpa
-    mvt_alias=-,Ha, ^Fpa
+    def_alias=Ha,F
+    mvt_alias=-,Ha,F
     editor_group=forest, rough, frozen
 [/terrain]
 
@@ -1133,6 +1203,13 @@
     string=Gt       # wmllint: ignore
     hidden=yes
 [/terrain]
+[terrain]
+    symbol_image=void
+    id=forest
+    name= _ "Forest"
+    string=F        # wmllint: ignore
+    hidden=yes
+[/terrain]
 [terrain]
     symbol_image=void
     id=frozen