1.17 new terrain - ruined walls (#7629)

Three terrains for ruined walls:  Xur (damaged cave walls); Xor (damaged stone walls); Exos (ruined stone walls, rational for the 'E' is that it's more embellishment than barrier)

data/core/terrain-graphics.cfg

@@ -565,7 +565,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:BASE                Gll                                                       grass/leaf-litter}
 
 {NEW:BASE                Re                                                        flat/dirt}
-{NEW:BASE                Rb                                                        flat/dirt-dark}
+{NEW:BASE                (Rb,Exos)                                                 flat/dirt-dark}
 
 {NEW:BASE                Rr                                                        flat/road}
 {NEW:BASE                Rrd                                                       flat/sandy-path}
@@ -947,6 +947,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:WALL             Xuf            (Qx*,Ql*)                                 walls/hedge/wall-hedge-chasm}
 {NEW:WALL             Xuf            (!,Xu*,Xo*)                                   walls/hedge/wall-hedge}
 {NEW:WALL             Xu*            (Qx*,Ql*)                                 cave/wall-rough-chasm}
+{NEW:WALL             Xur            (!,Xu*,Xo*)                               walls/rubble/wall-rough}
 #{NEW:WALL             Xu*            (!,Xu*)                                   cave/wall-rough}
 
 {NEW:WALL2_CORNER     (Xom,Xoi)      (Xos,Xot,Xoc,Xoa,Xof)           (!,Xu*,Xo*)      walls/stone/wall-minestone-mixed}
@@ -959,6 +960,14 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:WALL2            (Xo*)      Xu*           (!,Xu*,Xo*)      walls/stone/wall-mixed}
 {NEW:WALL                        Xu*           (!,Xu*,Xo*)      cave/wall-rough}
 
+{NEW:WALL2                       Exos          Xor    (!,Exos,Xo*)    walls/stone/ruins/wall-stone-dual}
+{NEW:WALL_CORNER                 Xor           (!,Xo*,Xu*)      walls/stone/damaged/wall-stone}
+{NEW:WALL                        Xor           (!,Xu*,Xo*)      walls/stone/damaged/wall-stone}
+{NEW:WALL_CORNER                 Exos          (!,Exos,Xo*)     walls/stone/ruins/wall-stone FLAG=ruins}
+{NEW:WALL2                       Exos          Xo*    (!,Exos,Xo*)    walls/stone/ruins/wall-stone-edge}
+{NEW:WALL                        Exos          (!,Exos,Xo*)     walls/stone/ruins/wall-stone FLAG=ruins}
+{NEW:OVERLAY                     Exos                           walls/stone/ruins/rubble LAYER=-100}
+
 # Xoi and Xom both have wooden trim, so "white" wall images are only needed for walls with visible faces.
 {NEW:WALL_CORNER                 Xoi           (!,Xo*,Xu*)      walls/stone/wall-stone-white}
 {NEW:WALL_CORNER                 Xom,Xoi       (!,Xo*,Xu*)      walls/stone/wall-stone-mine}
@@ -1131,10 +1140,10 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION            (Md,Mv)          (!,Md,Hhd,Mv,W*,S*)                -166     mountains/dry}
 
 # Special mountain to dry/desert terrain trans
-{NEW:TRANSITION            (Hd,Hhd,Rb,Re,Rd,Rrd,D*,Gd,Ha,A*,U*,Ql*)      Mm           0            mountains/blend-from-dry FLAG=inside}
-{NEW:TRANSITION            (Hd,Hhd,Rb,Re,Rd,Rrd,D*,Gd,U*,Ql*)            Ms           0            mountains/blend-from-dry FLAG=inside}
-{NEW:TRANSITION            (Mm)          (Hd,Hhd,Rb,Re,Rd,D*,Gd,Ha,A*,U*,Ql*)    -166               hills/dry}
-{NEW:TRANSITION            (Ms)          (Hd,Hhd,Rb,Re,Rd,D*,Gd,U*,Ql*)          -166               hills/dry}
+{NEW:TRANSITION            (Hd,Hhd,Rb,Re,Rd,Rrd,D*,Gd,Ha,A*,U*,Ql*,Exos)      Mm           0            mountains/blend-from-dry FLAG=inside}
+{NEW:TRANSITION            (Hd,Hhd,Rb,Re,Rd,Rrd,D*,Gd,U*,Ql*,Exos)            Ms           0            mountains/blend-from-dry FLAG=inside}
+{NEW:TRANSITION            (Mm)          (Hd,Hhd,Rb,Re,Rd,D*,Gd,Ha,A*,U*,Ql*,Exos)    -166               hills/dry}
+{NEW:TRANSITION            (Ms)          (Hd,Hhd,Rb,Re,Rd,D*,Gd,U*,Ql*,Exos)          -166               hills/dry}
 
 {NEW:TRANSITION            (Ms)             (Mm,Md)                     -170               hills/snow-to-hills FILTER_FLAG=mountain-small-3}
 {NEW:TRANSITION            (Ms,Ha)          Hh*                         -170               hills/snow-to-hills}
@@ -1164,10 +1173,10 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 
 # New Super-cool gradual Grass blending
 
-{NEW:TRANSITION             Gs              Gg,Gd,Gll,Re,Rb,Rd,Rp              -250                 grass/semi-dry-long FLAG=inside}
-{NEW:TRANSITION             Gg              Gs,Gd,Gll,Re,Rb,Rd,Rp              -251                 grass/green-long FLAG=inside}
-{NEW:TRANSITION             Gd              Gg,Gs,Gll,Re,Rb,Rd,Rp              -252                 grass/dry-long FLAG=inside}
-{NEW:TRANSITION             Gll             Gg,Gs,Gd,Re,Rb,Rd,Rp               -253                 grass/leaf-litter-long FLAG=inside}
+{NEW:TRANSITION             Gs              Gg,Gd,Gll,Re,Rb,Rd,Rp,Exos              -250                 grass/semi-dry-long FLAG=inside}
+{NEW:TRANSITION             Gg              Gs,Gd,Gll,Re,Rb,Rd,Rp,Exos              -251                 grass/green-long FLAG=inside}
+{NEW:TRANSITION             Gd              Gg,Gs,Gll,Re,Rb,Rd,Rp,Exos              -252                 grass/dry-long FLAG=inside}
+{NEW:TRANSITION             Gll             Gg,Gs,Gd,Re,Rb,Rd,Rp,Exos               -253                 grass/leaf-litter-long FLAG=inside}
 
 {NEW:TRANSITION             Gll             Gg,Gs,Gd                           -254                 grass/leaf-litter-long}
 {NEW:TRANSITION             Gd              Gg,Gs,Gll                          -255                 grass/dry-long}
@@ -1219,11 +1228,11 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION            (!,Re,Rr*,Hh*,M*,Q*,D*,T*)           Re                   -379                 flat/dirt FLAG=inside}
 {NEW:TRANSITION            Re                      (!,Re,Rr*,W*,Ai,Q*,D*,T*)         -380                 flat/dirt}
 
-{NEW:TRANSITION            (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Isa*)        Rb,Isa                       -384                 flat/dirt-dark FLAG=inside}
-{NEW:TRANSITION            Rb,Isa                       (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Isa*)        -388                 flat/dirt-dark}
+{NEW:TRANSITION            (!,Rb,Exos,Rr*,W*,Ai,Q*,D*,T*,Isa*)        Rb,Isa,Exos                       -384                 flat/dirt-dark FLAG=inside}
+{NEW:TRANSITION            Rb,Isa,Exos                       (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Isa*,Exos)        -388                 flat/dirt-dark}
 
-{NEW:TRANSITION            Rb                              Isa                       -384                 flat/dirt-dark FLAG=inside}
-{NEW:TRANSITION            Isa                             Rb                        -388                 flat/dirt-dark}
+{NEW:TRANSITION            Rb,Exos                              Isa                       -384                 flat/dirt-dark FLAG=inside}
+{NEW:TRANSITION            Isa                             Rb,Exos                        -388                 flat/dirt-dark}
 
 # This complicated part keeps the submerged part of ice or a bank from drawing over the above-water parts of banks or ice
 

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

@@ -2828,6 +2828,12 @@ fence#endarg
 #arg ALTERNATIVE
 _off^Fp#endarg
 
+#arg FLAG
+wall#endarg
+
+#arg BASE
+125,105#endarg
+
     [terrain_graphics]
         map="
 ,  4
@@ -2838,17 +2844,17 @@ _off^Fp#endarg
         [tile]
             pos=1
             type={TERRAINLIST}
-            set_no_flag=wall-[@R0,@R5]
+            set_no_flag={FLAG}-[@R0,@R5]
         [/tile]
         [tile]
             pos=2
             type={TERRAINLIST},{ALTERNATIVE}
-            set_no_flag=wall-@R1
+            set_no_flag={FLAG}-@R1
         [/tile]
         [tile]
             pos=3
             type={TERRAINLIST},{ALTERNATIVE}
-            set_no_flag=wall-@R4
+            set_no_flag={FLAG}-@R4
         [/tile]
         [tile]
             pos=4
@@ -2862,8 +2868,7 @@ _off^Fp#endarg
         [image]
             layer=0
             center=90,148
-            base=125,105
-            #            base=54,72
+            base={BASE}
             name={IMAGESTEM}@V-corner-@R0.png
             variations=";2;3;4;5;6"
         [/image]
@@ -3112,6 +3117,7 @@ terrain/walls/dummy/dummy#endarg
         [/image]
     [/terrain_graphics]
 
+    # variations do not seem to work here, need to find out why...
     [terrain_graphics]
         map="
 2

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

@@ -1,5 +1,8 @@
 #textdomain wesnoth
 
+# this file has transition macros for various ledges and walls,
+# but the macros used for the main stone and cave walls are in new-macros.cfg
+
 #define NEW:WALL_TRANSITION TERRAINLIST ADJACENT IMAGESTEM
 
 #arg ADJACENT2

data/core/terrain.cfg

@@ -1405,6 +1405,17 @@ Occasionally caves are <italic>text='illuminated'</italic>."
     editor_group=cave,obstacle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=void/void
+    editor_image=walls/rubble/wall-rough-tile
+    id=cavewall_damaged
+    name= _ "Cave Wall"
+    editor_name= _ "Damaged Cave Wall"
+    string=Xur
+    aliasof=Xt
+    editor_group=cave,obstacle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=void/void
     editor_image=walls/hedge/wall-hedge-tile
@@ -1523,6 +1534,29 @@ Occasionally caves are <italic>text='illuminated'</italic>."
     editor_group=cave,obstacle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=void/void
+    editor_image=walls/stone/damaged/wall-stone-tile
+    id=wall_stone_damaged
+    name= _ "Stone Wall"
+    editor_name= _ "Damaged Stone Wall"
+    string=Xor
+    aliasof=Xt
+    editor_group=cave,obstacle
+[/terrain_type]
+
+[terrain_type]
+    # symbol_image=void/void # not using this because this tile is not a barrier
+    symbol_image=walls/stone/ruins/wall-stone-tile
+    id=wall_stone_ruins
+    name= _ "Ruined Wall"
+    string=Exos # it is sort of an embellishment and also a stone wall
+    aliasof=Gt, Ut
+    mvt_alias=-,Gt, Ut
+    def_alias=-,Gt, Ut
+    editor_group=cave,flat
+[/terrain_type]
+
 #
 #    ## Doors and gates ##
 #