Troll (or rough stone?) encampment terrain variation (#2038)

* troll encampment, using same graphics rules as aquatic camp for now

* progress on troll castle

* completed image set for troll encampment

data/core/terrain-graphics.cfg

@@ -588,6 +588,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:OVERLAY             (Cme)                                             castle/aquatic-camp/reef      FLAG=reef    LAYER=-320}
 {NEW:OVERLAY             (Kme)                                             castle/aquatic-camp/floor     FLAG=floor   LAYER=-310}
 
+{NEW:BASE                (Cte)                                  flat/dirt-dark}
+{NEW:BASE                (Kte)                                  flat/stone-path}
+
 #
 #     >  T R A N S I T I O N S   B E T W E E N   T E R R A I N S  <
 #
@@ -597,6 +600,12 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:CASTLEWALL             (Kme,Cme)     (!,C*,K*,X*)           !,Ket,!,C*,Ke*       castle/aquatic-camp/castle}
 {AQUATIC:CAMPS              Kme           Cme,Cm,Km                       castle/aquatic-camp}
 
+# Troll camp
+
+{NEW:CASTLEWALL             (Kte)     (!,C*,K*,X*)           C*       castle/troll/keep}
+{NEW:CASTLEWALL             (Kte,Cte)     (!,C*,K*,X*)           C*       castle/troll/regular}
+{AQUATIC:CAMPS              Kte           Cm*,Ct*     	                  castle/troll}
+
 # Aquatic castle
 
 {NEW:CASTLEWALL             Cm            (!,C*,K*,X*)           !,Ket,!,C*,Ke*       castle/aquatic-castle/castle}

data/core/terrain.cfg

@@ -2044,6 +2044,18 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle, desert
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/troll/tile
+    id=troll_encampment
+    name= _ "Encampment"
+    editor_name= _ "Troll Encampment"
+    string=Cte
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/aquatic-camp/tile
     id=aquatic_camp
@@ -2280,6 +2292,19 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle, water
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/troll/keep-tile
+    id=troll_campkeep
+    name= _ "Encampment Keep"
+    editor_name= _ "Troll Encampment Keep"
+    string=Kte
+    aliasof=Ct
+    unit_height_adjust=1
+    recruit_onto=yes
+    recruit_from=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/aquatic-castle/keep-tile
     id=merman_castlekeep