New ice transitions from trunk

changelog

@@ -1,6 +1,9 @@
 Version 1.1.14+svn:
  * language and i18n:
    * updated translations: French
+ * graphics:
+   * terrain:
+     * new ice transition
 
 Version 1.1.14:
  * campaigns:

data/terrain-graphics.cfg

@@ -844,7 +844,6 @@
 {TERRAIN_ADJACENT          -220    l                !lWX                lava}
 {TERRAIN_ADJACENT          -230    FSVe             kscZ\|/wY           snow-to-water}
 {TERRAIN_ADJACENT          -240    FSVe             !SVFeX              snow}
-{TERRAIN_ADJACENT          -250    i                !iX                 ice}
 {TERRAIN_ADJACENT          -260    TGL              kscZ\|/             savanna-to-water}
 
 {TERRAIN_ADJACENT          -250    Ywq              !YwqhaHAmb&                swampwater}
@@ -868,7 +867,10 @@
 # Water Transitions draw below everything else
 
 {SET_ADJACENT_FLAG         Qq      K                kscZ\|/Y           transition2}
-{TERRAIN_ADJACENT_CUSTOM   -500    CKnNo            kscZ\|/Y           castle-to-water transition2}
+{TERRAIN_ADJACENT_CUSTOM   -500    CKnNo            kscZ\|/i            castle-to-ice transition3}
+{TERRAIN_ADJACENT_CUSTOM   -505    CKnNo            kscZ\|/             castle-to-water transition2}
+{TERRAIN_ADJACENT_CUSTOM   -510    i                kscZ\|/wY           ice-to-water submerged_part}
+{TERRAIN_ADJACENT          -503    i                !iX                 ice}
 
 {TERRAIN_ADJACENT          -520    cZ\|/            !cZ\|/m             coast}
 {TERRAIN_ADJACENT          -530    k                !k                  ford}