--- new/aegean_sea.js   2012-01-05 05:57:02.000000000 +0000
+++ aegean_sea.js   2012-01-05 22:56:42.497318907 +0000
@@ -1,5 +1,7 @@
 RMS.LoadLibrary("rmgen");

+TILE_CENTERED_HEIGHT_MAP = true;
+
 const tCity = "medit_city_pavement";
 const tCityPlaza = "medit_city_pavement";
 const tHill = ["medit_grass_shrubs", "medit_rocks_grass_shrubs", "medit_rocks_shrubs", "medit_rocks_grass", "medit_shrubs"];
@@ -247,38 +249,42 @@
        var x = ix / (mapSize + 1.0);
        var z = iz / (mapSize + 1.0);

-       var h = 0;
-       var distToWater = 0;
-
-       h = 32 * (z - 0.5);
-
        // add the rough shape of the water
        var km = 1/scaleByMapSize(35, 160);
        var cu = km*sin(theta+z*PI*(mapSize/64));
        var cu2 = km*sin(theta+z*PI*(mapSize/64));
-       var zk = z;
-       var xk = x;
-       if ((xk > cu+((1.0-WATER_WIDTH)/2))&&(xk < cu+((1.0+WATER_WIDTH)/2)))
+
+       var fadeDist = 0.05;
+
+       if ((x > cu + 0.5 - WATER_WIDTH/2) && (x < cu + 0.5 + WATER_WIDTH/2))
        {
-           if (xk < cu+((1.05-WATER_WIDTH)/2))
+           var h;
+           if (x < (cu + 0.5 + fadeDist - WATER_WIDTH/2))
            {
-               h = -3.0* abs(cu+((1.05-WATER_WIDTH)/2-xk));
-               placeTerrain(ix, iz, tShore);
-               placeTerrain(ix-1, iz, tShore);
+               h = 1 - 4.0 * (1 - ((cu + 0.5 + fadeDist - WATER_WIDTH/2) - x)/fadeDist);
            }
-           else if (xk > (cu2+(0.95+WATER_WIDTH)/2))
+           else if (x > (cu2 + 0.5 - fadeDist + WATER_WIDTH/2))
            {
-               h = -3.0*(xk-(cu2+((0.95+WATER_WIDTH)/2)));
-               placeTerrain(ix, iz, tShore);
-               placeTerrain(ix+1, iz, tShore);
+               h = 1 - 4.0 * (1 - (x - (cu2 + 0.5 - fadeDist + WATER_WIDTH/2))/fadeDist);
            }
            else
            {
-                   h = -3.0;
-                   placeTerrain(ix, iz, tWater);
+               h = -3.0;
            }
+
+           if (h < -1.5)
+           {
+               placeTerrain(ix, iz, tWater);
+           }
+           else
+           {
+               placeTerrain(ix, iz, tShore);
+           }
+
            setHeight(ix, iz, h);
-           addToClass(ix, iz, clWater);
+           if (h < 0){
+               addToClass(ix, iz, clWater);
+           }
        }
    }
 }