New Terrain: Snowy Elf and Dwarf Castles, and outdoor snow embellishments (#4616)

* terrain: snowbits embellishment overlay

* terrain: snowbits embellishment overlay images

* snow elf castle (no keep yet)

* snow elf keeps (no keep-castle yet)

* keep-castle transitions

* deciduous winter snow tree image updates

* snowy dwarven castles (no transition to regular dwarven castle yet)

* small fixes to winter elf castles

* some more image touch-ups, mostly to snow-bits

* winter dwarf castle button images

* some snow-dwarf/regular-dwarf castle base transitions (not wall transitions)

* changing terrain code for snow dwarf castle to make it non-underground version

data/core/terrain-graphics.cfg

@@ -172,7 +172,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:OVERLAY             *^Do                                               village/desert-oasis-3}
 
 # Swamp
-{OVERLAY_COMPLETE_LF     Ss        (!,Xv,Chs,!,C*,H*,M*,X*,Q*,A*,Ke,Kea,Kud,I*) -85 base2      swamp/reed}
+{OVERLAY_COMPLETE_LF     Ss        (!,Xv,Chs,!,C*,H*,M*,X*,Q*,A*,Ke,Kea,Kud*,I*) -85 base2      swamp/reed}
 {OVERLAY_COMPLETE_LF     Chs       (!,C*,K*,Ss)                              -85 base2      swamp/reed}
 
 # Large volcano
@@ -388,6 +388,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:OVERLAY             *^Dr                                                      misc/rubble FLAG=rubble LAYER=-1}
 
 {NEW:OVERLAY             *^Es                                                      embellishments/stones-small}
+{NEW:OVERLAY             *^Esa                                                      embellishments/snowbits-small}
 
 {OVERLAY_RANDOM          *^Em                                                      embellishments/mushroom}
 {OVERLAY_COMPLETE        *^Emf         (C*,K*,X*,Ql*,Qx*,W*,M*,*^V*)               embellishments/mushroom-farm}
@@ -568,6 +569,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:BASE                Kv                                   castle/elven/keep           LAYER=-2}
 {NEW:BASE                Cvr                                   castle/elven-ruin/grounds}
 {NEW:BASE                Kvr                                   castle/elven-ruin/keep           LAYER=-2}
+{NEW:BASE                Cva                                   castle/winter-elven/grounds}
+{NEW:BASE                Kva                                   castle/winter-elven/keep           LAYER=-2}
 
 {NEW:BASE                Ket                                  interior/wood-tan           LAYER=-2}
 {NEW:OVERLAY             Ket                                  interior/wood-tan-debris}
@@ -583,9 +586,14 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:BASE                Ko                                   castle/orcish/keep          LAYER=-2}
 {NEW:BASE                Koa                                  castle/winter-orcish/keep   LAYER=-2}
 
-{NEW:BASE                Cud                                  castle/dwarven-castle-floor LAYER=-2}
-{NEW:BASE                Kud                                  castle/dwarven-keep-floor   LAYER=-2}
-{NEW:OVERLAY             Kud                                  castle/dwarven-keep}
+{NEW:BASE                Cfa                                  castle/winter-dwarven/dwarven-castle-floor LAYER=-2}
+{NEW:OVERLAY             Cfa                                  castle/winter-dwarven/dwarven-castle-snow PROB=30}
+{NEW:BASE                Kfa                                  castle/winter-dwarven/dwarven-keep-floor   LAYER=-2}
+{NEW:OVERLAY             Kfa                                  castle/winter-dwarven/dwarven-keep}
+
+{NEW:BASE                Cud*                                  castle/dwarven-castle-floor LAYER=-2}
+{NEW:BASE                Kud*                                  castle/dwarven-keep-floor   LAYER=-2}
+{NEW:OVERLAY             Kud*                                  castle/dwarven-keep}
 
 {NEW:BASE                Cd                                   castle/sand/dirt}
 {NEW:BASE                Kd                                   castle/sand/cobbles         LAYER=-2}
@@ -640,6 +648,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:CASTLEWALL2            Kvr           !,Ket,!,C*,Ke*        (!,C*,K*,Xu*,Xo*) castle/elven-ruin/keep-castle}
 {NEW:CASTLEWALL             Kvr           (!,K*,Xu*,Xo*)        K*                castle/elven-ruin/keep}
 
+{NEW:CASTLEWALL             Cva           (!,C*,K*,Xu*,Xo*)     !,Ket,!,C*,Ke*    castle/winter-elven/castle}
+{NEW:CASTLEWALL2            Kva           !,Ket,!,C*,Ke*        (!,C*,K*,Xu*,Xo*) castle/winter-elven/keep-castle}
+{NEW:CASTLEWALL             Kva           (!,K*,Xu*,Xo*)        K*                castle/winter-elven/keep}
 
 # Orcish castles
 
@@ -763,17 +774,18 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION            Ior              W*,S*,Qx*        -283               interior/wood-chasm/wood-regular}
 {NEW:TRANSITION            Iwr,Ior,Icn              Ql*        -283               interior/wood-chasm/wood-burnt}
 
-{DISABLE_BASE_TRANSITIONS  Qx*,Ql*,Xu*,Xo*,Cud,Kud}
+{DISABLE_BASE_TRANSITIONS  Qx*,Ql*,Xu*,Xo*,Cud*,Kud*}
 
 #dwarven castle transitions
-{WALL_TRANSITION3     (Cud,Kud)      Ql*                  Qx*                  unwalkable/dcastle-lava-chasm}
+{WALL_TRANSITION3     (Cud*,Kud*)      Ql*                  Qx*                  unwalkable/dcastle-lava-chasm}
 
 # Custom flag used to allow stone walls to still get drawn over these
-{NEW:WALL2            (Cud,Kud)      X*                   (!,Cud,Kud,X*)       castle/dwarven-castle-wall FLAG=castlewall}
-{NEW:WALL2            (Cud,Kud)      Ql*                  (!,Cud,Kud,Ql*)      unwalkable/dcastle-lava FLAG=castlewall}
-{NEW:WALL2            (Cud,Kud)      Qx*                  (!,Cud,Kud,Qx*)      unwalkable/dcastle-chasm FLAG=castlewall}
+{NEW:WALL2            (Cud*,Kud*)      X*                   (!,Cud*,Kud*,X*)       castle/dwarven-castle-wall FLAG=castlewall}
+{NEW:WALL2            (Cud*,Kud*)      Ql*                  (!,Cud*,Kud*,Ql*)      unwalkable/dcastle-lava FLAG=castlewall}
+{NEW:WALL2            (Cud*,Kud*)      Qx*                  (!,Cud*,Kud*,Qx*)      unwalkable/dcastle-chasm FLAG=castlewall}
 
-{NEW:WALL             (Cud,Kud)      (!,Cud,Kud,X*)                            castle/dwarven-castle}
+{NEW:WALL             (Cfa,Kfa)      (!,Cud*,Kud*,X*,Cfa,Kfa)                            castle/winter-dwarven/dwarven-castle}
+{NEW:WALL             (Cud*,Kud*)      (!,Cud*,Kud*,X*)                            castle/dwarven-castle}
 
 {NEW:WALL             Xue            (Qx*,Ql*)                                 cave/earthy-wall-rough-chasm}
 {NEW:WALL             Xue            (!,Xu*,Xo*)                                   cave/earthy-wall-rough}
@@ -807,9 +819,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 
 # New Generic Castle-to Chasm transition
 {TRANSITION_COMPLETE_LF (Cha,Kha,Coa,Koa,Cea,Kea)        Qx*                   -89    transition2   chasm/regular-snow-castle}
-{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*)              Qxe                   -89    transition2   chasm/earthy-castle}
-{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*)              Qx*                   -89    transition2   chasm/regular-castle}
-{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*,Xo*)              Ql*                   -89    transition2   unwalkable/castle-lava-chasm}
+{TRANSITION_COMPLETE_LF (!,Cud*,Kud*,!,C*,K*)              Qxe                   -89    transition2   chasm/earthy-castle}
+{TRANSITION_COMPLETE_LF (!,Cud*,Kud*,!,C*,K*)              Qx*                   -89    transition2   chasm/regular-castle}
+{TRANSITION_COMPLETE_LF (!,Cud*,Kud*,!,C*,K*,Xo*)              Ql*                   -89    transition2   unwalkable/castle-lava-chasm}
 
 # Special Mountain to Chasm Blend transition
 {TRANSITION_COMPLETE_LF    (Qx*,Ql*)       (M*,Mv)              0   transition3   mountains/blend-from-chasm}

data/core/terrain.cfg

@@ -380,6 +380,15 @@ Most units receive 20 to 40% defense in sand."
     editor_group=embellishments
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=embellishments/snowbits-small4
+    id=snowbits_small
+    editor_name= _ "Snowbits"
+    string=^Esa
+    aliasof=_bas
+    editor_group=embellishments
+[/terrain_type]
+
 [terrain_type]
     symbol_image=embellishments/mushroom
     id=mushrooms_small
@@ -2030,6 +2039,18 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/winter-elven/tile
+    id=elven_castle_winter
+    name= _ "Castle"
+    editor_name= _ "Winter Elven Castle"
+    string=Cva
+    aliasof=Ct
+    unit_height_adjust=3
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/dwarven-castle-tile
     id=dwarven_castle
@@ -2042,6 +2063,18 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle, cave
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/winter-dwarven/dwarven-castle-tile
+    id=dwarven_castle_winter
+    name= _ "Castle"
+    editor_name= _ "Winter Dwarven Castle"
+    string=Cfa
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_onto=yes
+    editor_group=castle, frozen
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/ruin-tile
     id=ruin
@@ -2274,6 +2307,19 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/winter-elven/keep-tile
+    id=elven_keep_winter
+    name= _ "Keep"
+    editor_name= _ "Winter Elven Keep"
+    string=Kva
+    aliasof=Ct
+    unit_height_adjust=20
+    recruit_from=yes
+    recruit_onto=yes
+    editor_group=castle, frozen
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/dwarven-keep-tile
     id=dwarven_keep
@@ -2287,6 +2333,19 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle, cave
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/winter-dwarven/dwarven-keep-tile
+    id=dwarven_keep_winter
+    name= _ "Keep"
+    editor_name= _ "Winter Dwarven Keep"
+    string=Kfa
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_from=yes
+    recruit_onto=yes
+    editor_group=castle, frozen
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/ruined-keep-tile
     id=ruined_keep