1.17 raised terrain (#6975)

* floodfill high/low terrain

* stone and wooden transitions

data/core/editor/terrain-groups.cfg

@@ -109,3 +109,10 @@
     icon="group_x"
     core=yes
 [/editor_group]
+
+[editor_group]
+    id=elevation
+    name= _ "elevation"
+    icon="group_elevation"
+    core=yes
+[/editor_group]

data/core/terrain-graphics.cfg

@@ -37,8 +37,21 @@
 #define TG_RSTAR_NOT_RRD
 Rb,Re,Rd,Rp,Rr,Rrc,Rra#enddef
 
+#define TG_BUILT_STONE
+Irs,Icr#enddef
+
+#define TG_BUILT_WOOD
+Iwr,Ior,Icn#enddef
+
 #############################################################
 
+{NEW:FLOODFILL *^_ml *^Qh*}
+{NEW:FLOODFILL *^_mh (*^Qh*,Qx*,Ql*) FLAG=flood_high}
+#ifdef EDITOR
+{NEW:FLOODFILL_VISUAL darken IPF="~CS(10,40,140)~O(0.5)"}
+{NEW:FLOODFILL_VISUAL darken IPF="~CS(140,190,240)~O(0.55)" FLAG=flood_high}
+#endif
+
 # Tracks and bridges
 
 # basic stone bridge
@@ -820,8 +833,10 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:DISABLE_TRANSITION 	(K*,C*)		(!,K*,C*)	}
 
 # Keep transitions from bleeding across the high-chasm ledges
-{NEW:DISABLE_TRANSITION 	(!,*^Qh*)		(*^Qh*) }
-{NEW:DISABLE_TRANSITION 	(*^Qh*)		        (!,*^Qh*) }
+{NEW:DISABLE_TRANSITION 	(!,*^Qh*)		(*^Qhh) FLAG2=flood_high}
+{NEW:DISABLE_TRANSITION 	(!,*^Qh*)		(!,*^Qhh,!,*^Qh*)  FLAG2=flood_low}
+{NEW:DISABLE_TRANSITION 	(*^Qhu,*^Qhx)		(*^Qhh)  }
+
 #
 # Cave
 # (including dwarven castle, chasm, lava)
@@ -841,15 +856,15 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 
 {NEW:THREE_TERRAIN_TRANSITION Irs,Icr 	Q* 	G*,R*,D*,A*,Uu,Ur,Urc 	-222 	interior/stone-chasm/stone-regular}
 {NEW:THREE_TERRAIN_TRANSITION Irs,Icr 	Q* 	W*                      -222    interior/stone-chasm/stone-dock-regular}
-{NEW:TRANSITION_CROWDED            Irs,Icr              Q*        -222               interior/stone-chasm/stone-regular}
-{NEW:TRANSITION_CROWDED            Irs,Icr              W*,S*,G*,R*,D*,A*,Uu,Ur,Urc        -222               interior/stone-regular}
-{NEW:TRANSITION            Irs,Icr              Q*        -282               interior/stone-chasm/stone-regular}
-{NEW:TRANSITION            Irs,Icr              W*,S*        -222               interior/stone-dock-regular  LAYER2=-221  ADJACENT2=!,Irs,Icr,W*,S*}
-{NEW:TRANSITION            Irs,Icr              !,Irs,Icr,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,Urc,S*        -222               interior/stone-regular}
-{NEW:TRANSITION            Iwr,Ior,Icn              G*,R*,D*,A*,Ur,Urc,Ias        -283               interior/wood-regular}
-{NEW:TRANSITION            Iwr,Icn              W*,S*,Qx*        -283               interior/wood-chasm/wood-clean}
+{NEW:TRANSITION_CROWDED            !,*^Qh*,!,Irs,Icr              Q*        -222               interior/stone-chasm/stone-regular}
+{NEW:TRANSITION_CROWDED            !,*^Qh*,!,Irs,Icr              W*,S*,G*,R*,D*,A*,Uu,Ur,Urc        -222               interior/stone-regular}
+{NEW:TRANSITION            {TG_BUILT_STONE}              Q*        -282               interior/stone-chasm/stone-regular}
+{NEW:TRANSITION            !,*^Qh*,!,{TG_BUILT_STONE}              W*,S*        -222               interior/stone-dock-regular  LAYER2=-221  ADJACENT2=!,Irs,Icr,W*,S*}
+{NEW:TRANSITION            {TG_BUILT_STONE}              !,Irs,Icr,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,Urc,S*        -222               interior/stone-regular}
+{NEW:TRANSITION            {TG_BUILT_WOOD}              G*,R*,D*,A*,Ur,Urc,Ias        -283               interior/wood-regular}
+{NEW:TRANSITION            {TG_BUILT_WOOD}              W*,S*,Qx*        -283               interior/wood-chasm/wood-clean}
 {NEW:TRANSITION            Ior              W*,S*,Qx*        -283               interior/wood-chasm/wood-regular}
-{NEW:TRANSITION            Iwr,Ior,Icn              Ql*        -283               interior/wood-chasm/wood-burnt}
+{NEW:TRANSITION            {TG_BUILT_WOOD}              Ql*        -283               interior/wood-chasm/wood-burnt}
 
 {NEW:DISABLE_TRANSITION 	(Qx*,Ql*,Xu*,Xo*,Cud*,Kud*)		(*,*^*)}
 #{DISABLE_BASE_TRANSITIONS  Qx*,Ql*,Xu*,Xo*,Cud*,Kud*}
@@ -924,17 +939,23 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION_INTRA       (Qx*,Ql*)                            0   mountains/blend-from-chasm FLAG=transition3 ADJACENT="M*"}
 
 #chasm/lava transitions always below castles/walls
+{NEW:FLOODFILL_DISABLE_WALL      (!,*^Qhh,Qx*,Xv,_off^_usr)  *^Qhh               FLAG=ground FLAG1=flood_high}
+{NEW:FLOODFILL_DISABLE_WALL      (!,*^Qhh,!,*^Qh*)     (!,*^Qh*,Qx*,Xv,_off^_usr)              FLAG=ground FLAG2=flood_low}
+
 # these have been moved lower, layer=-290 from -90
 
 {NEW:WALL_TRANSITION2     Ql               Qx*,Xv,_off^_usr       (!,Ql,Qx*)    unwalkable/lava-chasm LAYER=-290 FLAG=ground}
 {NEW:WALL_TRANSITION2     Qlf              Qx*,Xv,_off^_usr       (!,Ql*,Qx*)   unwalkable/lava-chasm LAYER=-290 FLAG=ground}
-{NEW:WALL_TRANSITION2     (!,W*^Qh*,!,*^Qh*)       Ql,Qx*,Xv,_off^_usr    (!,W*^Qh*,!,W*)   chasm/high-chasm/corner-chasm-high-water LAYER=-290 FLAG=ground}
-{NEW:WALL_TRANSITION2     *^Qh*            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,!,A*,Ha*,Ms*,Rra*)   chasm/high-chasm/corner-chasm-high-snow LAYER=-290 FLAG=ground IPF="~CS(-5,10,30)"}
-{NEW:WALL_TRANSITION2     *^Qh*            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,!,A*,Ha*,Ms*,Rra*)   chasm/high-chasm/corner-chasm LAYER=-290 FLAG=ground IPF="~CS(-10,15,45)"} # for missing cases
-{NEW:WALL_TRANSITION2     *^Qh*            (!,Ql,Qx*,Xv,_off^_usr,*^Qh*,A*,Ha*,Ms*,Rra*)    (!,*^Qh*,!,A*,Ha*,Ms*,Rra*)   chasm/high-chasm/corner-snow LAYER=-290 FLAG=ground}
-{NEW:WALL_TRANSITION2     W*^Qh*           Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,Ql*,Qx*,W*)   chasm/high-chasm/corner-chasm-low-water LAYER=-290 FLAG=ground}
-{NEW:WALL_TRANSITION2     W*^Qh*           Ql,Qx*,Xv,_off^_usr    (!,W*^Qh*,!,W*)     chasm/high-chasm/corner-chasm-all-water LAYER=-290 FLAG=ground}
-{NEW:WALL_TRANSITION2     *^Qh*            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,Ql*,Qx*)   chasm/high-chasm/corner-chasm LAYER=-290 FLAG=ground}
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,*^Qh*)       (!,I*^Qh*,!,I*)    (*^Qhh)   chasm/high-chasm/corner-chasm-rock LAYER=-89 FLAG=ground-rock IPF="~GS()"}
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,*^Qh*)       (!,*^Qh*)    (*^Qhh)   chasm/high-chasm/corner-chasm-rock LAYER=-89 FLAG=ground-rock}
+{NEW:WALL_TRANSITION2     (!,W*^Qh*,*^Qhh,!,*^Qh*)       Ql,Qx*,Xv,_off^_usr    (!,W*^Qh*,!,W*)   chasm/high-chasm/corner-chasm-high-water LAYER=-290 FLAG=ground}
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,*^Qh*)            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,!,A*,Ha*,Ms*,Rra*)   chasm/high-chasm/corner-chasm-high-snow LAYER=-290 FLAG=ground IPF="~CS(-5,10,30)"}
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,*^Qh*)            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,!,A*,Ha*,Ms*,Rra*)   chasm/high-chasm/corner-chasm LAYER=-290 FLAG=ground IPF="~CS(-10,15,45)"} # for missing cases
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,*^Qh*)            (!,Ql,Qx*,Xv,_off^_usr,*^Qh*,A*,Ha*,Ms*,Rra*)    (!,*^Qh*,!,A*,Ha*,Ms*,Rra*)   chasm/high-chasm/corner-snow LAYER=-290 FLAG=ground}
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,W*^Qh*)           Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,Ql*,Qx*,W*)   chasm/high-chasm/corner-chasm-low-water LAYER=-290 FLAG=ground}
+{NEW:WALL_TRANSITION2     (!,*^Qhh,!,W*^Qh*)           Ql,Qx*,Xv,_off^_usr    (!,W*^Qh*,!,W*)     chasm/high-chasm/corner-chasm-all-water LAYER=-290 FLAG=ground}
+{NEW:WALL_TRANSITION2     I*^Qh*            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,Ql*,Qx*)   chasm/high-chasm/corner-chasm LAYER=-290 FLAG=ground-sub}
+{NEW:WALL_TRANSITION2     (!,I*^Qh*,!,*^Qh*)            Ql,Qx*,Xv,_off^_usr    (!,*^Qh*,Ql*,Qx*)   chasm/high-chasm/corner-chasm LAYER=-290 FLAG=ground}
 
 {NEW:WALL_TRANSITION      Ql               (!,Ql,Xv,_off^_usr)                  unwalkable/lava LAYER=-290 FLAG=ground}
 {NEW:WALL_TRANSITION      Qlf              (!,Qlf,Xv,_off^_usr)                 unwalkable/lava-high LAYER=-290 FLAG=ground}
@@ -942,6 +963,21 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
 {NEW:WALL_TRANSITION      Qx*              (Wwf,Wwg,S*)                         chasm/swamp LAYER=-290 FLAG=ground}
 {NEW:WALL_TRANSITION      Qx*              (W*)                                 chasm/water LAYER=-290 FLAG=ground}
 {NEW:WALL_TRANSITION      Qxe              (!,Qx*,Xv,_off^_usr)                 chasm/earthy LAYER=-290 FLAG=ground}
+{NEW:WALL_TRANSITION      Q*               (Iwr^Qh*,Ior^Qh*,Icn^Qh*)                         chasm/high-chasm/wood-chasm LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      Q*               I*^Qh*                         chasm/high-chasm/stone-chasm LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qhh)        (Iwr^Qhh,Ior^Qhh,Icn^Qhh)                         chasm/high-chasm/wood LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qhh)        I*^Qhh                         chasm/high-chasm/stone LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (Iwr^Qhu,Iwr^Qhx)     (!,*^Qhu,*^Qhx)                         chasm/high-chasm/wood LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (Ior^Qhu,Ior^Qhx)     (!,*^Qhu,*^Qhx)                         chasm/high-chasm/wood LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (Icn^Qhu,Icn^Qhx)     (!,*^Qhu,*^Qhx)                         chasm/high-chasm/wood LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (I*^Qhu,I*^Qhx)     (!,*^Qhu,*^Qhx)                         chasm/high-chasm/stone LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qh*)        (Iwr^Qh*,Ior^Qh*,Icn^Qh*)                         chasm/high-chasm/wood LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qh*)        I*^Qh*                         chasm/high-chasm/stone LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qhh)        W*^Qhh                         chasm/high-chasm/water LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qhh)        A*^Qhh,Ha*^Qhh,Ms*^Qhh,Rra^Qhh       chasm/high-chasm/snow LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      (!,*^Qhh,Qx*,Xv,_off^_usr)  *^Qhh                     chasm/high-chasm/regular LAYER=-190 FLAG=ground}
+{NEW:WALL_TRANSITION      *^Qh*            (!,*^Qh*,!,Iwr^*,Ior^*,Icn^*)                      chasm/high-chasm/wood LAYER=-90 FLAG=ground}
+{NEW:WALL_TRANSITION      *^Qh*            (!,*^Qh*,!,I*)                      chasm/high-chasm/stone LAYER=-90 FLAG=ground}
 {NEW:WALL_TRANSITION      *^Qh*            (!,*^Qh*,!,W*)                      chasm/high-chasm/water LAYER=-90 FLAG=ground}
 {NEW:WALL_TRANSITION      *^Qh*            (!,*^Qh*,!,A*,Ha*,Ms*,Rra)              chasm/high-chasm/snow LAYER=-90 FLAG=ground}
 {NEW:WALL_TRANSITION      *^Qh*            (!,*^Qh*,Qx*,Xv,_off^_usr)           chasm/high-chasm/regular LAYER=-190 FLAG=ground}

data/core/terrain-graphics/enduring-internal-corners.cfg

@@ -53,6 +53,59 @@ overlay#endarg
     [/terrain_graphics]
 #enddef
 
+#define DISABLE_CORNER_FLAGGED TERRAIN ADJACENT1
+
+#arg ADJACENT2
+{ADJACENT1}#endarg
+
+#arg IPF
+#endarg
+
+#arg PROB
+100#endarg
+
+#arg FLAG
+overlay#endarg
+
+#arg FLAG1
+#endarg
+
+#arg FLAG2
+#endarg
+
+#arg FLAG3
+{FLAG2}#endarg
+
+    [terrain_graphics]
+        map="
+2
+,  3
+1"
+        [tile]
+            pos=1
+            type={TERRAIN}
+
+            has_flag={FLAG1}
+            set_no_flag={FLAG}-@R0
+        [/tile]
+        [tile]
+            pos=2
+            type={ADJACENT1}
+            has_flag={FLAG2}
+            set_no_flag={FLAG}-@R2
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+            has_flag={FLAG3}
+            set_no_flag={FLAG}-@R4
+        [/tile]
+
+        probability={PROB}
+        rotations=tr,r,br,bl,l,tl
+    [/terrain_graphics]
+#enddef
+
 #define DISABLE_CORNER_TRANSITIONS TERRAIN
 
 #arg FLAG

data/core/terrain-graphics/new-internal-floodfill.cfg

@@ -0,0 +1,108 @@
+#textdomain wesnoth
+
+#define NEW:FLOODFILL_INTERNAL_SET MARKER FLAG PROB
+
+    [terrain_graphics]
+        [tile]
+            x,y=0,0
+            type={MARKER}
+            set_no_flag={FLAG}
+        [/tile]
+
+        probability={PROB}
+    [/terrain_graphics]
+
+#enddef
+
+#define NEW:FLOODFILL_INTERNAL_GROW BORDER FLAG PROB
+
+    [terrain_graphics]
+        map="
+2
+,  3
+1"
+
+        [tile]
+            pos=1
+            type=!,{BORDER}
+            set_no_flag={FLAG}
+        [/tile]
+
+        [tile]
+            pos=2
+            type=*
+            has_flag={FLAG}
+        [/tile]
+
+        rotations=ne,se,s,sw,nw,n
+        probability={PROB}
+    [/terrain_graphics]
+
+#enddef
+
+#define NEW:FLOODFILL MARKER BORDER
+
+#arg FLAG
+flood_low#endarg
+
+#arg PROB
+100#endarg
+
+    {NEW:FLOODFILL_INTERNAL_SET  {MARKER} {FLAG} {PROB}}
+    # need multiple iterations of this because flood does not grow up-left more than two hexes
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+    {NEW:FLOODFILL_INTERNAL_GROW {BORDER} {FLAG} {PROB}}
+
+#enddef
+
+#define NEW:FLOODFILL_DISABLE_WALL TERRAINLIST ADJACENT IMAGESTEM
+
+#arg FLAG
+ground#endarg
+
+#arg FLAG1
+#endarg
+
+#arg FLAG2
+#endarg
+
+#arg FLAG3
+{FLAG2}#endarg
+
+#arg PROB
+100#endarg
+
+    {DISABLE_CORNER_FLAGGED ({TERRAINLIST}) ({ADJACENT}) PROB={PROB} FLAG={FLAG} FLAG1={FLAG1} FLAG2={FLAG2} FLAG3={FLAG2}}
+    {DISABLE_CORNER_FLAGGED ({ADJACENT}) ({TERRAINLIST}) PROB={PROB} FLAG={FLAG} FLAG1={FLAG2} FLAG2={FLAG1} FLAG3={FLAG1}}
+
+#enddef
+
+#define NEW:FLOODFILL_VISUAL IMAGESTEM
+
+#arg IPF
+#endarg
+
+#arg FLAG
+flood_low#endarg
+
+#arg PROB
+100#endarg
+
+    [terrain_graphics]
+        [tile]
+            x,y=0,0
+            type=*
+            has_flag={FLAG}
+            [image]
+                name={IMAGESTEM}.png{IPF}
+            [/image]
+        [/tile]
+
+        probability={PROB}
+    [/terrain_graphics]
+#enddef

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

@@ -368,6 +368,12 @@ transition#endarg
 #arg FLAG
 transition#endarg
 
+#arg FLAG1
+dummy#endarg
+
+#arg FLAG2
+dummy#endarg
+
     [terrain_graphics]
         map="
 , 2
@@ -378,11 +384,13 @@ transition#endarg
         [tile]
             pos=1
             type={ADJACENT}
+            no_flag={FLAG1}
             set_flag={FLAG}-@R0
         [/tile]
         [tile]
             pos=2
             type={TERRAINLIST}
+            no_flag={FLAG2}
             set_flag={FLAG}-@R3
         [/tile]
 

data/core/terrain.cfg

@@ -1197,14 +1197,24 @@ Occasionally caves are <italic>text='illuminated'</italic>."
 #    ## Lowered terrain (high chasm) ##
 #
 
-#    ## visual overlay ##
+#    ## visual overlay - higher ##
+[terrain_type]
+    symbol_image=chasm/high-chasm/bluffs-tile
+    id=high_border
+    editor_name= _ "Bluff"
+    string=^Qhh
+    aliasof=_bas
+    editor_group=embellishments, elevation
+[/terrain_type]
+
+#    ## visual overlay - lower ##
 [terrain_type]
     symbol_image=chasm/high-chasm/regular-tile
     id=high_canyon
     editor_name= _ "Gulch"
     string=^Qhu
     aliasof=_bas
-    editor_group=embellishments
+    editor_group=embellishments, elevation
 [/terrain_type]
 
 #    ## Unwalkable ##
@@ -1215,7 +1225,7 @@ Occasionally caves are <italic>text='illuminated'</italic>."
     editor_name= _ "Unwalkable Ravine"
     string=^Qhx
     aliasof=Qt
-    editor_group=obstacle
+    editor_group=obstacle, elevation
 [/terrain_type]
 
 [terrain_type]
@@ -3040,6 +3050,24 @@ For those who go by land or sea, a bridge is the best of both worlds — for gam
 #    ## Special ##
 #
 
+[terrain_type]
+    symbol_image=chasm/high-chasm/marker-high-tile
+    id=mark_high
+    editor_name= _ "Marker High"
+    string=^_mh    # wmllint: ignore
+    editor_group=special, elevation
+    hide_help=yes
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=chasm/high-chasm/marker-low-tile
+    id=mark_low
+    editor_name= _ "Marker Low"
+    string=^_ml    # wmllint: ignore
+    editor_group=special, elevation
+    hide_help=yes
+[/terrain_type]
+
 [terrain_type]
     symbol_image=off-map/symbol
     editor_image=off-map/offmap-editor