Reworked the winter and hill forests...

...to properly include all the necessary variant terrains.

data/core/terrain-graphics.cfg

@@ -32,23 +32,39 @@
 {SIMPLE_OVERLAY_TERRAIN  *^Fpa           (W*,M*,Hd,*^V*)                           forest/snow-forest}
 
 {SIMPLE_OVERLAY_TERRAIN  *^Fds           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/deciduous-summer-castle}
+{SIMPLE_OVERLAY_TERRAIN  Hh*^Fds         (W*,M*,Hd,*^V*)                           forest/deciduous-summer-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fds           (W*,M*,Hd,*^V*)                           forest/deciduous-summer}
 
 {SIMPLE_OVERLAY_TERRAIN  *^Fdf           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/deciduous-fall-castle}
+{SIMPLE_OVERLAY_TERRAIN  Hh*^Fdf         (W*,M*,Hd,*^V*)                           forest/deciduous-fall-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fdf           (W*,M*,Hd,*^V*)                           forest/deciduous-fall}
 
 {SIMPLE_OVERLAY_TERRAIN  *^Fdw           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/deciduous-winter-castle}
+{SIMPLE_OVERLAY_TERRAIN  Hh*^Fdw         (W*,M*,Hd,*^V*)                           forest/deciduous-winter-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fdw           (W*,M*,Hd,*^V*)                           forest/deciduous-winter}
 
+# these should use the deciduous-winter-snow* images instead when they're added
+{SIMPLE_OVERLAY_TERRAIN  *^Fda           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/deciduous-winter-castle}
+{SIMPLE_OVERLAY_TERRAIN  Ha*^Fda         (W*,M*,Hd,*^V*)                           forest/deciduous-winter-sparse}
+{SIMPLE_OVERLAY_TERRAIN  *^Fda           (W*,M*,Hd,*^V*)                           forest/deciduous-winter}
+
 #{SIMPLE_OVERLAY_TERRAIN  *^Fms           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/mixed-summer-castle}
+#{SIMPLE_OVERLAY_TERRAIN  Hh*^Fms         (W*,M*,Hd,*^V*)                           forest/mixed-summer-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fms           (W*,M*,Hd,*^V*)                           forest/mixed-summer}
 
 #{SIMPLE_OVERLAY_TERRAIN  *^Fmf           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/mixed-fall-castle}
+#{SIMPLE_OVERLAY_TERRAIN  Hh*^Fmf         (W*,M*,Hd,*^V*)                           forest/mixed-fall-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fmf           (W*,M*,Hd,*^V*)                           forest/mixed-fall}
 
 #{SIMPLE_OVERLAY_TERRAIN  *^Fmw           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/mixed-winter-castle}
+#{SIMPLE_OVERLAY_TERRAIN  Hh*^Fmw         (W*,M*,Hd,*^V*)                           forest/mixed-winter-sparse}
 {SIMPLE_OVERLAY_TERRAIN  *^Fmw           (W*,M*,Hd,*^V*)                           forest/mixed-winter}
 
+# these should use the mixed-winter-snow* images instead when they're added
+#{SIMPLE_OVERLAY_TERRAIN  *^Fma           (C*,K*,X*,Ql*,Qx*,Gv*)                    forest/mixed-winter-castle}
+#{SIMPLE_OVERLAY_TERRAIN  Ha*^Fma         (W*,M*,Hd,*^V*)                           forest/mixed-winter-sparse}
+{SIMPLE_OVERLAY_TERRAIN  *^Fma           (W*,M*,Hd,*^V*)                           forest/mixed-winter}
+
 {SIMPLE_OVERLAY_TERRAIN  *^Uf*           (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,Hd,*^V*)      forest/mushrooms}
 
 # Great-tree

data/core/terrain.cfg

@@ -462,14 +462,24 @@
 [terrain]
     symbol_image=forest/deciduous-winter-tile
     id=deciduous_forest_winter
-    name=_ "Snow Forest"
+    name=_ "Forest"
     string=^Fdw
-    default_base=Aa
-    aliasof=_bas,^Fp
-    mvt_alias=-,_bas,^Fp
+    default_base=Gs
+    aliasof=^Fp
     editor_group=forest
 [/terrain]
 
+[terrain]
+    symbol_image=forest/deciduous-winter-snow-tile
+    id=deciduous_forest_winter_snow
+    name=_ "Snow Forest"
+    string=^Fda
+    default_base=Aa
+    aliasof=At,^Fp
+    mvt_alias=-,At,^Fp
+    editor_group=frozen, forest
+[/terrain]
+
 [terrain]
     symbol_image=forest/mixed-summer-tile
     id=mixed_forest_summer
@@ -495,9 +505,19 @@
     id=mixed_forest_winter
     name=_ "Forest"
     string=^Fmw
+    default_base=Gs
+    aliasof=^Fp
+    editor_group=forest
+[/terrain]
+
+[terrain]
+    symbol_image=forest/mixed-winter-snow-tile
+    id=mixed_forest_winter_snow
+    name=_ "Snow Forest"
+    string=^Fma
     default_base=Aa
-    aliasof=_bas,^Fp
-    mvt_alias=-,_bas,^Fp
+    aliasof=At,^Fp
+    mvt_alias=-,At,^Fp
     editor_group=frozen, forest
 [/terrain]
 
@@ -525,6 +545,86 @@
     editor_group=forest, rough, frozen
 [/terrain]
 
+[terrain]
+    symbol_image=forested-deciduous-summer-hills-tile
+    id=deciduous_forest_summer_hills
+    name=_ "Forested Hills"
+    string=Hh^Fds
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-deciduous-fall-hills-tile
+    id=deciduous_forest_fall_hills
+    name=_ "Forested Hills"
+    string=Hh^Fdf
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-deciduous-winter-hills-tile
+    id=deciduous_forest_winter_hills
+    name=_ "Forested Hills"
+    string=Hh^Fdw
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-deciduous-winter-snow-hills-tile
+    id=deciduous_forest_winter_snow_hills
+    name=_ "Forested Snow Hills"
+    string=Ha^Fda
+    aliasof=Ha,^Fp
+    mvt_alias=-,Ha,^Fp
+    editor_group=frozen, forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-mixed-summer-hills-tile
+    id=mixed_forest_summer_hills
+    name=_ "Forested Hills"
+    string=Hh^Fms
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-mixed-fall-hills-tile
+    id=mixed_forest_fall_hills
+    name=_ "Forested Hills"
+    string=Hh^Fmf
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-mixed-winter-hills-tile
+    id=mixed_forest_winter_hills
+    name=_ "Forested Hills"
+    string=Hh^Fmw
+    aliasof=Hh,^Fp
+    mvt_alias=-,Hh,^Fp
+    editor_group=forest, rough
+[/terrain]
+
+[terrain]
+    symbol_image=forested-mixed-winter-snow-hills-tile
+    id=mixed_forest_winter_snow_hills
+    name=_ "Forested Snow Hills"
+    string=Ha^Fma
+    aliasof=Ha,^Fp
+    mvt_alias=-,Ha,^Fp
+    editor_group=frozen, forest, rough
+[/terrain]
+
 #
 # Grass
 #