Addition of new stone wall terrain variation: "Xot" catacombs (#4527)

* new stone wall terrain variation -> catacombs

* Xot catacombs wall touchup and Efs flames overlay variation (candle)

* minor variations of walls can be spaced every other SE/SW facing panel

* make flames/torches overlay more responsive to type of wall variants if they are mixed

* Xot^Edb can now put skeletons in the SE/SW catacomb holes

data/core/terrain-graphics.cfg

@@ -358,6 +358,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:OVERLAY             (*^Ufi,*^Ii,*^Tfi)                                              cave/beam FLAG=light LAYER=1}
 
 # Wall sconces or torches
+{NEW:WALL_FLAMES_OVERLAY (Xot^Efs)							walls/stone/flames/candle}
 {NEW:WALL_FLAMES_OVERLAY (X*^Efs)							walls/stone/flames/sconce}
 {NEW:TORCH_FLAMES_OVERLAY (!,X*^Efs,!,*^Efs)							walls/stone/flames/torch}
 
@@ -402,7 +403,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:OVERLAY             *^Bs|                                                     cave/chasm-stone-bridge-s-n         FLAG=bridge LAYER=-80}
 {NEW:OVERLAY             *^Bs/                                                     cave/chasm-stone-bridge-sw-ne       FLAG=bridge LAYER=-80}
 
-# Trash/remains
+# Trash/remains - These should be moved to a new file and a more concise macro put here
+{TRASH_DISABLE           Xo*^Edb}
 {TRASH_A                 *^Edt                                  33                                          misc/detritus/trashA}
 {TRASH_A                 *^Edb                                  33                                          misc/detritus/detritusA}
 
@@ -789,11 +791,17 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:WALL_CORNER                 Xoi		   (!,Xo*,Xu*)      walls/stone/wall-stone-white}
 {NEW:WALL_CORNER                 Xom,Xoi		   (!,Xo*,Xu*)      walls/stone/wall-stone-mine}
 {NEW:WALL_CORNER                 Xoc		   (!,Xo*,Xu*)      walls/stone/clean/wall-stone}
+{NEW:WALL_CORNER                 Xot		   (!,Xo*,Xu*)      walls/stone/catacombs/wall-stone}
 {NEW:WALL_CORNER                 Xo*		   (!,Xo*,Xu*)      walls/stone/wall-stone}
 {NEW:WALL_A10                    Xol           (!,Xu*,Xo*)      walls/stone/lit/wall-stone-lit}
 {NEW:WALL                        Xoi           (!,Xu*,Xo*)      walls/stone/wall-stone-white}
+{NEW:WALL_MINOR_VARIANTS         Xoi           Xom              (!,Xu*,Xo*)      walls/stone/wall-stone-white}
 {NEW:WALL                        Xom,Xoi           (!,Xu*,Xo*)      walls/stone/wall-stone-mine}
 {NEW:WALL                        Xoc           (!,Xu*,Xo*)      walls/stone/clean/wall-stone}
+{NEW:WALL_MINOR_VARIANTS         Xoc           Xo*              (!,Xu*,Xo*)      walls/stone/clean/wall-stone}
+{NEW:WALL                        Xot^Edb       (!,Xu*,Xo*)      walls/stone/catacombs/wall-bones FLAG=bones BASE=1,108}
+{NEW:WALL                        Xot           (!,Xu*,Xo*)      walls/stone/catacombs/wall-stone}
+{NEW:WALL_MINOR_VARIANTS         Xot           Xo*              (!,Xu*,Xo*)      walls/stone/catacombs/wall-stone}
 {NEW:WALL                        Xo*           (!,Xu*,Xo*)      walls/stone/wall-stone}
 
 # New Generic Castle-to Chasm transition

data/core/terrain-graphics/new-macros.cfg

@@ -2166,6 +2166,9 @@ corner#endarg
 #arg FLAG
 wall#endarg
 
+#arg BASE
+54,72#endarg
+
     [terrain_graphics]
         map="
 2
@@ -2192,7 +2195,7 @@ wall#endarg
 
         [image]
             layer={LAYER}
-            base=54,72
+            base={BASE}
             name={IMAGESTEM}@V-convex-@R0.png
             variations=";2;3;4;5;6"
         [/image]
@@ -2224,7 +2227,54 @@ wall#endarg
 
         [image]
             layer=0
-            base=54,72
+            base={BASE}
+            name={IMAGESTEM}@V-concave-@R0.png
+            variations=";2;3;4;5;6"
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define NEW:WALL_MINOR_VARIANTS TERRAINLIST VARIANT ADJACENT IMAGESTEM
+
+#arg PROB
+100#endarg
+
+#arg LAYER
+0#endarg
+
+#arg FLAG
+wall#endarg
+
+#arg BASE
+54,72#endarg
+
+    [terrain_graphics]
+        map="
+2
+,  3
+1"
+        [tile]
+            pos=1
+            type={ADJACENT}
+            set_no_flag={FLAG}-@R0
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-@R2
+        [/tile]
+        [tile]
+            pos=3
+            type={VARIANT}
+            set_no_flag={FLAG}-@R4,{FLAG}-@R3
+        [/tile]
+
+        rotations=tr,r,br,null,l,tl
+        probability={PROB}
+
+        [image]
+            layer=0
+            base={BASE}
             name={IMAGESTEM}@V-concave-@R0.png
             variations=";2;3;4;5;6"
         [/image]
@@ -3319,7 +3369,82 @@ X*#endarg
 #arg POST
 wall#endarg
 
+    [terrain_graphics]
+        # this marks the all-flames corners for a non-rotating overlay later
+        map="
+, *
+* , *
+, 1
+3 , 3
+, 2"
+        [tile]
+            pos=1
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-bl
+        [/tile]
+        [tile]
+            pos=2
+            type=!,{ADJACENT}
+            set_no_flag={FLAG}-tl,{FLAG}-tr
+        [/tile]
+        [tile]
+            pos=3
+            type={TERRAINLIST}
+        [/tile]
+    [/terrain_graphics]
     # these are the cases we know we want to quash, that are not covered by the rotations below
+    [terrain_graphics]
+        # this prevents the -convex-tr image from showing for south-facing corners
+        map="
+, *
+* , *
+, 4
+3 , 1
+, 2"
+        [tile]
+            pos=1
+            type={TERRAINLIST}
+        [/tile]
+        [tile]
+            pos=2
+            type=!,{ADJACENT}
+            set_flag={FLAG}-tr
+        [/tile]
+        [tile]
+            pos=3
+            type=!,{TERRAINLIST},!,{ADJACENT}
+        [/tile]
+        [tile]
+            pos=4
+            type={TERRAINLIST},{ADJACENT}
+        [/tile]
+    [/terrain_graphics]
+    [terrain_graphics]
+        # this prevents the -convex-tl image from showing for south-facing corners
+        map="
+, *
+* , *
+, 4
+1 , 3
+, 2"
+        [tile]
+            pos=1
+            type={TERRAINLIST}
+        [/tile]
+        [tile]
+            pos=2
+            type=!,{ADJACENT}
+            set_flag={FLAG}-tl
+        [/tile]
+        [tile]
+            pos=3
+            type=!,{TERRAINLIST},!,{ADJACENT}
+        [/tile]
+        [tile]
+            pos=4
+            type={TERRAINLIST},{ADJACENT}
+        [/tile]
+    [/terrain_graphics]
     [terrain_graphics]
         # this prevents the -convex-bl image from showing for Xo* SE of Xo*^Efs
         map="
@@ -3380,6 +3505,65 @@ wall#endarg
     [/terrain_graphics]
 
     # these are the real rules
+ # this checks the already marked tiles for the south-facing corner case
+    [terrain_graphics]
+        map="
+, 1
+3 , 3
+, 2
+* , *
+, *"
+        [tile]
+            pos=1
+            type={TERRAINLIST}
+            has_flag={FLAG}-bl
+            set_no_flag={FLAG}-bl-drawn
+        [/tile]
+        [tile]
+            pos=2
+            type=!,{ADJACENT}
+            has_flag={FLAG}-tl,{FLAG}-tr
+        [/tile]
+        [tile]
+            pos=3
+            type={TERRAINLIST}
+        [/tile]
+
+#        rotations=bl
+        probability={PROB}
+
+        [image]
+            layer={LAYER2}
+            base=24,24
+            center=62,110
+            name={IMAGESTEM}/{POST}-post-convex-bl.png
+        [/image]
+
+        [image]
+            layer={LAYER}
+            base=24,24
+            center=62,110
+            name={IMAGESTEM}/glow[1,2,3,2]-convex-bl.png:[200,160,140,170]
+        [/image]
+        [image]
+            layer={LAYER}
+            base=54,72
+            center=62,110
+            name="{IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,67)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,66)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,65)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,64)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,63)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,62)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,61)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,60)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,59)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50,
+            {IMAGESTEM}/base-convex-bl.png~BLIT(terrain/{IMAGESTEM}/flames.png,20,58)~MASK(terrain/{IMAGESTEM}/mask@V-convex-bl.png):50"
+            variations=";2;3"
+        [/image]
+
+    [/terrain_graphics]
+
     [terrain_graphics]
         map="
 2
@@ -3396,7 +3580,7 @@ wall#endarg
         [/tile]
         [tile]
             pos=3
-            type={TERRAINLIST}
+            type={TERRAINLIST},{ADJACENT}
         [/tile]
 
         rotations=tr,r,br,bl,l,tl

data/core/terrain-graphics/trash.cfg

@@ -1,5 +1,30 @@
 #textdomain wesnoth
 
+#define TRASH_DISABLE TERRAIN
+
+#arg FLAG
+detritus_medium#endarg
+
+    [terrain_graphics]
+        map="
+, *
+* , *
+, 1
+* , *
+, *"
+
+        [tile]
+            pos=1
+            type={TERRAIN}
+            set_flag=litter_base,{FLAG},{FLAG}_drawn
+        [/tile]
+        probability=100
+
+    [/terrain_graphics]
+#enddef
+
+
+
 #define TRASH_A TERRAIN PROB IMAGESTEM
     [terrain_graphics]
         map="

data/core/terrain.cfg

@@ -1292,6 +1292,17 @@ Occasionally caves are <italic>text='illuminated'</italic>."
     editor_group=cave,obstacle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=void/void
+    editor_image=walls/stone/catacombs/wall-stone-tile
+    id=wall_stone_tomb
+    name= _ "Catacombs Wall"
+    editor_name= _ "Catacombs Stone Wall"
+    string=Xot
+    aliasof=Xt
+    editor_group=cave,obstacle
+[/terrain_type]
+
 #
 #    ## Doors and gates ##
 #