New snow-to-water and snow-hills-to-water trans...

...layered on top of the ice-to-water trans. WML by zookeeper

data/core/terrain-graphics/_final.cfg

@@ -805,10 +805,10 @@
 #{TERRAIN_ADJACENT_CUSTOM  -151    Mm               (!,Mm,Qxu,Hh,C*,K*,Xu)               mountains transition2}
 {TERRAIN_ADJACENT          -160    Md               (!,Md,Qxu)                           desert-mountains}
 
+{TERRAIN_ADJACENT          -170    Ha               Hh                                   snow-hills-to-hills}
+{TERRAIN_ADJACENT          -171    Ha               (W*,Ss)                              snow-hills-to-water}
+{TERRAIN_ADJACENT          -172    Ha               (!,Ha,Qxu,Mm,Md,W*,Ss)               snow-hills} 
 
-{TERRAIN_ADJACENT          -170    Ha               (W*,Ss)                              snow-hills-to-water}
-{TERRAIN_ADJACENT          -171    Ha               Hh                                   snow-hills-to-hills}
-{TERRAIN_ADJACENT          -172    Ha               (!,Ha,Qxu,Mm,Md)                     snow-hills}
 {TERRAIN_ADJACENT          -180    Hd               (!,Hd,Qxu)                           desert-hills}
 {TERRAIN_ADJACENT          -190    (Mm,Hh)          (!,Hh,W*,Ss)                         hills}
 {TERRAIN_ADJACENT_CUSTOM   -191    (Mm,Hh)          (W*,Ss)                              hills transition2}
@@ -816,13 +816,20 @@
 
 {TERRAIN_ADJACENT          -210    U*               (!,U*)                               cave/floor}
 {TERRAIN_ADJACENT          -220    Ql               (!,Ql,Qxu,Xu)                        lava}
-{TERRAIN_ADJACENT          -230    Aa               (W*,Ss)                              snow-to-water}
-{TERRAIN_ADJACENT          -240    Aa               (!,Aa,Qxu)                           snow}
+
+# The snow-to-water transition here is applied both to snow and snow hills. The
+# custom layer numbers are used to make the submerged part of the ice-to-water
+# transition be drawn under other land transitions but the non-submerged part to
+# be drawn on top of them.
+ 
+{TERRAIN_ADJACENT          -240    Aa               (!,Aa,Qxu,W*,Ss)                     snow}
+{TERRAIN_ADJACENT          -241    Aa               (W*,Ss)                              snow-to-water}
+{TERRAIN_ADJACENT_CUSTOM   -400    Aa,Ha,Ai         (W*,Ss)                              ice-to-water submerged_part}
+{TERRAIN_ADJACENT_CUSTOM   -242    Aa,Ha,Ai         (W*,Ss)                              ice non_submerged_part}
+ 
 {TERRAIN_ADJACENT          -260    Gs               (W*,Ss)                              flat/savanna-to-water}
 
 
-
-
 # These two work in conjunction with the mountain and hill transitions to create
 # a smooth coastline between grassland, hills and mountains.
 
@@ -843,7 +850,6 @@
 
 {TERRAIN_ADJACENT_CUSTOM   -500    (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud)     (Ai,W*)        castle/castle-to-ice transition3}
 {TERRAIN_ADJACENT_CUSTOM   -505    (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud)     W*             castle/castle-to-water transition2}
-{TERRAIN_ADJACENT_CUSTOM   -510    Ai               (W*,Ss)            ice-to-water      submerged_part}
 {TERRAIN_ADJACENT          -503    Ai               (!,Ai,Qxu)                           ice}
 
 {TERRAIN_ADJACENT          -515    (Ss,Chs)         (!,Ss,Chs,H*,M*)                     swamp/water}