Canyon fix (Credit Turin 90% of the work on the png cleanups),

...Ford Update (Scott & Shadow- I'm not sure if it's an improvement),
Lava as 'l'. I'll be back after string freeze but before release to
improve / fix / revert if needed.

data/terrain-graphics.cfg

@@ -128,9 +128,13 @@
 {TERRAIN_BASE                 GT savanna}
 {TERRAIN_BASE                 E desert-road}
 {TERRAIN_BASE                 P desert-oasis}
+#set them to 33 for some irregulrity
+{TERRAIN_BASE_PROB            k ford2 33}
 {TERRAIN_BASE                 k ford}
+{TERRAIN_BASE_PROB            l lava2  33}
+{TERRAIN_BASE                 l lava}
 
-
+{TERRAIN_BASE                 X grassland-r1}
 {CANYON X canyon}
 #added ruins
 {BRIDGE \ | / cs CKfFNQq bridge}
@@ -433,30 +437,33 @@
 {TERRAIN_ADJACENT          -180        HA     !HA     snow-hills}
 {TERRAIN_ADJACENT          -181        J      !J      desert-hills}
 {TERRAIN_ADJACENT          -182        ha     !ha     hills}
-{TERRAIN_ADJACENT          -183        uD     !uD     cave-floor}
-{TERRAIN_ADJACENT          -184        SVF    !SVF    snow}
-{TERRAIN_ADJACENT          -185        i      !i      ice}
-{TERRAIN_ADJACENT          -186        TG     cZp\|/  savanna-to-water}
-{TERRAIN_ADJACENT          -187        TG     s       savanna-to-water}
-{TERRAIN_ADJACENT          -188        ftgvX  kcZp\|/  grassland-to-water}
-{TERRAIN_ADJACENT          -189        ftgvX  s       grassland-to-water}
-#{TERRAIN_ADJACENT          -190        ftgvX  cZp\|/s cliff}
-{TERRAIN_ADJACENT          -190        GT     !GT     savanna}
-{TERRAIN_ADJACENT          -191        ftgvX  !ftgvX  grassland}
-{TERRAIN_ADJACENT          -192        PIB    !PIB    desert-oasis}
-{TERRAIN_ADJACENT          -193        IBPU   !IBPU   desert}
-{TERRAIN_ADJACENT          -194        d      !d      sand}
-{TERRAIN_ADJACENT          -195        r      !r      dirt}
-{TERRAIN_ADJACENT          -196        E      !E      desert-road}
-{TERRAIN_ADJACENT          -197        R      !R      road}
+{TERRAIN_ADJACENT          -183        l      !l      lava}
+{TERRAIN_ADJACENT          -184        uD     !uD     cave-floor}
+{TERRAIN_ADJACENT          -185        SVF    !SVF    snow}
+{TERRAIN_ADJACENT          -186        i      !i      ice}
+{TERRAIN_ADJACENT          -187        TG     ks       savanna-to-water}
+{TERRAIN_ADJACENT          -188        TG     cZp\|/  savanna-to-water}
+{TERRAIN_ADJACENT          -189        TG     s       savanna-to-water}
+{TERRAIN_ADJACENT          -190        ftgvX  ks       grassland-to-water}
+{TERRAIN_ADJACENT          -191        ftgvX  cZp\|/  grassland-to-water}
+{TERRAIN_ADJACENT          -192        ftgvX  s       grassland-to-water}
+#{TERRAIN_ADJACENT          -193        ftgvX  cZp\|/s cliff}
+{TERRAIN_ADJACENT          -193        GT     !GT     savanna}
+{TERRAIN_ADJACENT          -194        ftgvX  !ftgvX  grassland}
+{TERRAIN_ADJACENT          -195        PIB    !PIB    desert-oasis}
+{TERRAIN_ADJACENT          -196        IBPU   !IBPU   desert}
+{TERRAIN_ADJACENT          -197        d      !d      sand}
+{TERRAIN_ADJACENT          -198        r      !r      dirt}
+{TERRAIN_ADJACENT          -199        E      !E      desert-road}
+{TERRAIN_ADJACENT          -200        R      !R      road}
 
 #addedruins
-{TERRAIN_ADJACENT          -198        Ywq     !Ywq     swampwater}
-{TERRAIN_ADJACENT          -199        cZp\|/ !cZp\|/ coast}
-{TERRAIN_ADJACENT          -200        s      !s      ocean}
-{TERRAIN_ADJACENT          -201        k      !k      ford}
-{TERRAIN_ADJACENT          -202        Q      N       sunken-ruin}
-{TERRAIN_ADJACENT          -203        Q      !QN     coast}
-{TERRAIN_ADJACENT          -204        !N     N       grassland}
+{TERRAIN_ADJACENT          -201        Ywq     !Ywq     swampwater}
+{TERRAIN_ADJACENT          -202        cZp\|/ !cZp\|/ coast}
+{TERRAIN_ADJACENT          -203        s      !s      ocean}
+{TERRAIN_ADJACENT          -204        k      !k      ford}
+{TERRAIN_ADJACENT          -205        Q      N       sunken-ruin}
+{TERRAIN_ADJACENT          -206        Q      !QN     coast}
+{TERRAIN_ADJACENT          -207        !N     N       grassland}
 
 {TERRAIN_BASE_DEFAULT void}

data/terrain-graphics/canyon.cfg

@@ -89,8 +89,8 @@
 	        layer=-1000
 		name={IMAGE}-all
 	    [/image]
-	    no_flag="base"
-	    set_flag="base"
+	    no_flag="overlay"
+	    set_flag="overlay"
 	[/tile]
 #	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -118,8 +118,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1-@R2-@R3-@R4
 	    [/image]
-	    no_flag=base
-	    set_flag=base,canyon-nt-@R5
+	    no_flag=overlay
+	    set_flag=overlay,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -146,8 +146,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1-@R2-@R3
 	    [/image]
-	    no_flag=base
-	    set_flag=base,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag=overlay
+	    set_flag=overlay,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -174,8 +174,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1-@R2-@R4
 	    [/image]
-	    no_flag=base
-	    set_flag=base,canyon-nt-@R3,canyon-nt-@R5
+	    no_flag=overlay
+	    set_flag=overlay,canyon-nt-@R3,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -201,8 +201,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1-@R2
 	    [/image]
-	    no_flag=base
-	    set_flag=base,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag=overlay
+	    set_flag=overlay,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -228,8 +228,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1-@R4
 	    [/image]
-	    no_flag="base"
-	    set_flag=base,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R5
+	    no_flag="overlay"
+	    set_flag=overlay,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -255,8 +255,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1-@R3
 	    [/image]
-	    no_flag=base
-	    set_flag=base,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag=overlay
+	    set_flag=overlay,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -281,8 +281,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R1
 	    [/image]
-	    no_flag="base"
-	    set_flag=base,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag="overlay"
+	    set_flag=overlay,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -307,8 +307,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R3
 	    [/image]
-	    no_flag="base"
-	    set_flag=base,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag="overlay"
+	    set_flag=overlay,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -333,8 +333,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0-@R2
 	    [/image]
-	    no_flag="base"
-	    set_flag=base,canyon-nt-@R1,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag="overlay"
+	    set_flag=overlay,canyon-nt-@R1,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -358,8 +358,8 @@
 	        layer=-1000
 		name={IMAGE}-@R0
 	    [/image]
-	    no_flag="base"
-	    set_flag=base,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag="overlay"
+	    set_flag=overlay,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]
@@ -378,8 +378,8 @@
 	        layer=-1000
 		name={IMAGE}
 	    [/image]
-	    no_flag="base"
-	    set_flag=base,canyon-nt-@R0,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
+	    no_flag="overlay"
+	    set_flag=overlay,canyon-nt-@R0,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
 	[/tile]
 #	rotations=n,ne,se,s,sw,nw
 [/terrain_graphics]

data/terrain.cfg

@@ -474,4 +474,12 @@ submerge=0.3
 unit_height_adjust=-4
 [/terrain]
 
+[terrain]
+symbol_image=lava
+id=ford
+name= _ "Lava"
+char=l
+aliasof=X
+[/terrain]
+