Ticket #4288: 4288_water_v2.patch

File 4288_water_v2.patch, 4.1 KB (added by Imarok, 8 years ago)

Improved patch based on elexis' critique

  • binaries/data/mods/public/maps/random/guadalquivir_river.js

     
    420420createStragglerTrees(types, [avoidClasses(clWater, 1, clForest, 1, clHill, 1, clPlayer, 9, clMetal, 1, clRock, 1, clRiver, 1), stayClasses(clLand, 7)]);
    421421
    422422setSkySet("cumulus");
    423 setWaterColor(0.443,0.412,0.322);
    424 setWaterTint(0.647,0.82,0.949);
     423setWaterColor(0.2,0.312,0.522);
     424setWaterTint(0.1,0.1,0.8);
    425425setWaterWaviness(4.0);
    426426setWaterType("lake");
    427 setWaterMurkiness(0.70);
     427setWaterMurkiness(0.73);
    428428
    429429setFogFactor(0.3);
    430430setFogThickness(0.25);

  • binaries/data/mods/public/maps/random/latium.js

     
    616616
    617617// Adjust environment
    618618setSkySet("sunny");
    619 setWaterColor(0.024,0.212,0.024);
    620 setWaterTint(0.133, 0.725,0.855);
     619setWaterColor(0.024,0.262,0.224);
     620setWaterTint(0.133, 0.325,0.255);
    621621setWaterWaviness(2.5);
    622622setWaterType("ocean");
    623623setWaterMurkiness(0.8);

  • binaries/data/mods/public/maps/random/lorraine_plain.js

     
    495495
    496496// Set environment
    497497setSkySet("cirrus");
    498 setWaterColor(0.443,0.412,0.322);
    499 setWaterTint(0.647,0.82,0.949);
     498setWaterColor(0.1,0.212,0.422);
     499setWaterTint(0.3,0.1,0.949);
    500500setWaterWaviness(3.0);
    501501setWaterType("lake");
    502502setWaterMurkiness(0.80);

  • binaries/data/mods/public/maps/random/northern_lights.js

     
    406406setSunColor(0.6, 0.6, 0.6);
    407407setSunElevation(PI/ 6);
    408408
    409 setWaterColor(0.3, 0.347, 0.386);               // dark majestic blue
    410 setWaterTint(0.171, 0.236, 0.263);              // light blue
     409setWaterColor(0.02, 0.17, 0.52);                // dark majestic blue
     410setWaterTint(0.494, 0.682, 0.808);              // light blue
    411411setWaterMurkiness(0.82);
    412412setWaterWaviness(0.5);
    413413setWaterType("ocean");

  • binaries/data/mods/public/maps/random/pyrenean_sierra.js

     
    779779    setSunColor(0.73,0.73,0.65);
    780780    setTerrainAmbientColor(0.45,0.45,0.50);
    781781    setUnitsAmbientColor(0.4,0.4,0.4);
    782     setWaterColor(0.114, 0.192, 0.463);
    783     setWaterTint(0.255, 0.361, 0.651);
    784     setWaterWaviness(3.0);
     782    setWaterColor(0.104, 0.172, 0.463);
     783    setWaterTint(0.263, 0.353, 0.616);
     784    setWaterWaviness(5.0);
    785785setWaterType("ocean");
    786786    setWaterMurkiness(0.83);
    787787//}

  • binaries/data/mods/public/maps/scenarios/Siwa

     
    1212        <Water>
    1313            <WaterBody>
    1414                <Type>clap</Type>
    15                 <Color r="0.294118" g="0.34902" b="0.694118"/>
     15                <Color r="0.294118" g="0.3902" b="0.694118"/>
    1616                <Height>21.1935</Height>
    17                 <Shininess>1.46484</Shininess>
     17                <Shininess>1.26</Shininess>
    1818                <Waviness>8</Waviness>
    19                 <Murkiness>0.870117</Murkiness>
    20                 <Tint r="0.392157" g="0.47451" b="0.654902"/>
    21                 <ReflectionTint r="0.392157" g="0.47451" b="0.654902"/>
     19                <Murkiness>0.65</Murkiness>
     20                <Tint r="0.3" g="0.36" b="0.44"/>
     21                <ReflectionTint r="0.392157" g="0.37451" b="0.654902"/>
    2222                <ReflectionTintStrength>0.355469</ReflectionTintStrength>
    2323            </WaterBody>
    2424        </Water>