1.16 - some terrain graphics fixes (#6382)

* make X*^Efs sconce overlay rules symmetric

* different sconces for Xu-style walls (Xo-style was existing type) - minor, graphics only change

(cherry picked from commit d5b5cf1cba)

data/core/terrain-graphics.cfg

@@ -364,7 +364,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 
 # 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:WALL_FLAMES_SIMPLE_OVERLAY (Xu*^Efs)							walls/flames/sconce}
+{NEW:WALL_FLAMES_OVERLAY (Xo*^Efs)							walls/stone/flames/sconce}
 {NEW:TORCH_FLAMES_OVERLAY (!,X*^Efs,!,*^Efs)							walls/stone/flames/torch}
 
 #Farmland

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

@@ -3965,8 +3965,80 @@ X*#endarg
 # wall sconces
 ########################
 
+#define FLAME_WALL_IMAGE_INTERNAL_ CONCON ROT IMAGESTEM X_POS Y_POS
+{IMAGESTEM}/base-{CONCON}-{ROT}.png~BLIT(terrain/{IMAGESTEM}/flames.png,{X_POS},{Y_POS})~MASK(terrain/{IMAGESTEM}/mask@V-{CONCON}-{ROT}.png):50#enddef
+
 #define FLAME_WALL_IMAGE_INTERNAL CONCON IMAGESTEM X_POS Y_POS
-{IMAGESTEM}/base-{CONCON}-@R0.png~BLIT(terrain/{IMAGESTEM}/flames.png,{X_POS},{Y_POS})~MASK(terrain/{IMAGESTEM}/mask@V-{CONCON}-@R0.png):50#enddef
+{FLAME_WALL_IMAGE_INTERNAL_ {CONCON} @R0 {IMAGESTEM} {X_POS} {Y_POS}}#enddef
+
+# simple rules for Xu*-style (vs Xo*-style further down), but keeping a lot of the same naming convention so they (Xu/Xo) are compatible
+#define NEW:WALL_FLAMES_SIMPLE_OVERLAY TERRAINLIST IMAGESTEM
+
+#arg PROB
+100#endarg
+
+#arg LAYER
+4#endarg
+
+#arg LAYER2
+2#endarg
+
+#arg FLAG
+flame#endarg
+
+#arg ADJACENT
+X*#endarg
+
+#arg POST
+wall#endarg
+
+    [terrain_graphics]
+        map="
+, 2
+* , *
+, 1
+* , *
+, *"
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-bl
+        [/tile]
+        [tile]
+            pos=1
+            type=!,{ADJACENT}
+        [/tile]
+
+        probability={PROB}
+
+        [image]
+            layer={LAYER2}
+            base=24,24
+            name={IMAGESTEM}/{POST}-post-convex-bl.png
+        [/image]
+        [image]
+            layer={LAYER}
+            base=24,24
+            name={IMAGESTEM}/glow[1,2,3,2]-convex-bl.png:[200,160,140,170]
+        [/image]
+
+        [image]
+            layer={LAYER}
+            base=54,72
+            name="{FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 67},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 66},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 65},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 64},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 63},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 62},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 61},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 60},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 59},
+        {FLAME_WALL_IMAGE_INTERNAL_ convex bl {IMAGESTEM} 20 58}"
+            variations=";2;3"
+        [/image]
+    [/terrain_graphics]
+#enddef
 
 #define NEW:WALL_FLAMES_OVERLAY TERRAINLIST IMAGESTEM
 
@@ -4122,7 +4194,6 @@ wall#endarg
             type={TERRAINLIST},{ADJACENT}
         [/tile]
     [/terrain_graphics]
-
     # these are the real rules
     # this checks the already marked tiles for the south-facing corner case
     [terrain_graphics]
@@ -4181,7 +4252,8 @@ wall#endarg
             variations=";2;3"
         [/image]
     [/terrain_graphics]
-
+    # concave is currently (1.16) for the SE, SW facing sconces
+    # SW facing
     [terrain_graphics]
         map="
 2
@@ -4201,7 +4273,7 @@ wall#endarg
             type={TERRAINLIST},{ADJACENT}
         [/tile]
 
-        rotations=tr,r,br,bl,l,tl
+        rotations=tr,r,br,null,null,null
         probability={PROB}
 
         [image]
@@ -4232,7 +4304,58 @@ wall#endarg
             variations=";2;3"
         [/image]
     [/terrain_graphics]
+    #SE facing
+    [terrain_graphics]
+        map="
+3
+,  2
+1"
+        [tile]
+            pos=1
+            type=!,{ADJACENT}
+            set_no_flag={FLAG}-@R0
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+        [/tile]
+        [tile]
+            pos=3
+            type={TERRAINLIST},{ADJACENT}
+        [/tile]
 
+        rotations=null,null,null,bl,l,tl
+        probability={PROB}
+
+        [image]
+            layer={LAYER2}
+            base=24,80
+            name={IMAGESTEM}/{POST}-post-concave-@R0.png
+        [/image]
+
+        [image]
+            layer={LAYER}
+            base=24,80
+            name={IMAGESTEM}/glow[1,2,3,2]-concave-@R0.png:[200,160,140,170]
+        [/image]
+
+        [image]
+            layer={LAYER}
+            base=54,72
+            name="{FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 41},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 40},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 39},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 38},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 37},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 36},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 35},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 34},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 33},
+        {FLAME_WALL_IMAGE_INTERNAL concave {IMAGESTEM} 20 32}"
+            variations=";2;3"
+        [/image]
+    [/terrain_graphics]
+    # convex is currently (1.16) for the south-facing sconce
     [terrain_graphics]
         map="
 2