The new water shader is a work in progress, but already looks the part.
I accidentally clipped the terrain while I was working on masking out the cel shading under the water. You can see how the cel shading applies itself to the terrain quite clearly in this shot.
