Terrain Cf* - dwarf castles under normal castle rules (#4645)

* Terrain Cf* - first non-cave dwarf castle reivision (includes snow version)

* recut dwarf castle (Cf) images

* fix-up to remaining images in outside and winter dwarf castles

* Terrain Cfr - dwarf castle ruins variation

data/core/terrain-graphics.cfg

@@ -586,14 +586,23 @@ 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                Cfa                                  castle/winter-dwarven/dwarven-castle-floor LAYER=-2}
+{NEW:BASE                Cfa                                  castle/winter-dwarven/dwarven-castle-floor LAYER=-80}
 {NEW:OVERLAY             Cfa                                  castle/winter-dwarven/dwarven-castle-snow PROB=30}
-{NEW:BASE                Kfa                                  castle/winter-dwarven/dwarven-keep-floor   LAYER=-2}
+{NEW:BASE                Kfa                                  castle/winter-dwarven/dwarven-keep-floor LAYER=-80}
 {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                Cfr                                  castle/ruin-dwarven/dwarven-castle-floor}
+{NEW:OVERLAY             Cfr                                  castle/ruin-dwarven/debris PROB=30}
+{NEW:BASE                Kfr                                  castle/ruin-dwarven/dwarven-keep-floor}
+{NEW:OVERLAY             Kfr                                  castle/ruin-dwarven/dwarven-keep}
+
+{NEW:BASE                Cf*                                  castle/outside-dwarven/dwarven-castle-floor}
+{NEW:BASE                Kf*                                  castle/outside-dwarven/dwarven-keep-floor}
+{NEW:OVERLAY             Kf*                                  castle/outside-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}
@@ -712,6 +721,12 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:CASTLEWALL             Kh*           (Ke,Kea,!,K*,Xu*,Xo*) K*                castle/ruinkeep1 PROB=75}
 {NEW:CASTLEWALL             Kh*           (Ke,Kea,!,K*,Xu*,Xo*) K*                castle/keep}
 
+# Dwarf outside castles (similar appearance, but different rules and transitions than classic cave version)
+
+{NEW:CASTLEWALL             Cf,Kf         (!,C*,K*,Xu*,Xo*)     !,Ket,!,C*,Ke*    castle/outside-dwarven/dwarven-castle}
+{NEW:CASTLEWALL             Cfa,Kfa       (!,C*,K*,Xu*,Xo*)     !,Ket,!,C*,Ke*    castle/winter-dwarven/dwarven-castle}
+{NEW:CASTLEWALL             Cfr,Kfr       (!,C*,K*,Xu*,Xo*)     !,Ket,!,C*,Ke*    castle/ruin-dwarven/dwarven-castle}
+
 # Encampment
 
 {NEW:CASTLEWALL             Ce,Ke         (!,C*,K*,Xu*,Xo*)     !,Ket,!,C*,Ke*    castle/encampment/regular}
@@ -723,6 +738,12 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 
 # Castle & Encampment Base Transtions
 
+{NEW:TRANSITION           !,Kfa,Cfa,!,C*,K*      Kfa,Cfa                         -79               castle/winter-dwarven/dwarven-castle-floor FLAG=inside}
+{NEW:TRANSITION           Kfa,Cfa                !,Kfa,Cfa,!,C*,K*               -79               castle/winter-dwarven/dwarven-castle-floor}
+
+{NEW:TRANSITION           !,Kf*,Cf*,!,C*,K*      Kf*,Cf*                         -79               castle/outside-dwarven/dwarven-castle-floor FLAG=inside}
+{NEW:TRANSITION           Kf*,Cf*                !,Kf*,Cf*,!,C*,K*               -79               castle/outside-dwarven/dwarven-castle-floor}
+
 {NEW:TRANSITION           Chs                  !,S*,W*,H*,M*,A*,Chs,K*     -230               swamp/water}
 
 {NEW:TRANSITION           Ch,Chr,Cha           !,Ch,Chr,Cha,Ket,!,Ke*,C*   -300               flat/road}
@@ -784,7 +805,6 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {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             (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}
@@ -818,7 +838,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:WALL                        Xo*           (!,Xu*,Xo*)      walls/stone/wall-stone}
 
 # 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 (Cha,Kha,Coa,Koa,Cea,Kea,Cfa,Kfa)        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}

data/core/terrain.cfg

@@ -2055,7 +2055,7 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     symbol_image=castle/dwarven-castle-tile
     id=dwarven_castle
     name= _ "Castle"
-    editor_name= _ "Dwarven Castle"
+    editor_name= _ "Dwarven Underground Castle"
     string=Cud
     aliasof=Ct
     unit_height_adjust=0
@@ -2063,6 +2063,30 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle, cave
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/outside-dwarven/dwarven-castle-tile
+    id=dwarven_castle2
+    name= _ "Castle"
+    editor_name= _ "Dwarven Castle"
+    string=Cf
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=castle/ruin-dwarven/dwarven-castle-tile
+    id=dwarven_castle_ruin
+    name= _ "Castle"
+    editor_name= _ "Dwarven Castle Ruins"
+    string=Cfr
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/winter-dwarven/dwarven-castle-tile
     id=dwarven_castle_winter
@@ -2324,7 +2348,7 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     symbol_image=castle/dwarven-keep-tile
     id=dwarven_keep
     name= _ "Keep"
-    editor_name= _ "Dwarven Castle Keep"
+    editor_name= _ "Dwarven Underground Keep"
     string=Kud
     aliasof=Ct
     unit_height_adjust=0
@@ -2333,6 +2357,32 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle, cave
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/outside-dwarven/dwarven-keep-tile
+    id=dwarven_keep2
+    name= _ "Keep"
+    editor_name= _ "Dwarven Castle Keep"
+    string=Kf
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_from=yes
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=castle/ruin-dwarven/dwarven-keep-tile
+    id=dwarven_keep_ruin
+    name= _ "Keep"
+    editor_name= _ "Dwarven Ruin Keep"
+    string=Kfr
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_from=yes
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/winter-dwarven/dwarven-keep-tile
     id=dwarven_keep_winter