From 828c8581ac5089e9920de366b52765676784b00a Mon Sep 17 00:00:00 2001
From: Matei <matei@wildfiregames.com>
Date: Tue, 28 Nov 2006 22:46:48 +0000
Subject: [PATCH] Fixed beaches on Latium to look right on fancy water too
 (moved the sand-wet higher up).

This was SVN commit r4664.
---
 .../data/mods/official/maps/random/latium.js  | 22 +++++++++----------
 .../maps/scenarios/latium_generated.pmp       |  2 +-
 .../maps/scenarios/latium_generated.xml       |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/binaries/data/mods/official/maps/random/latium.js b/binaries/data/mods/official/maps/random/latium.js
index 5b6a28b802..a542470a76 100644
--- a/binaries/data/mods/official/maps/random/latium.js
+++ b/binaries/data/mods/official/maps/random/latium.js
@@ -187,10 +187,10 @@ for(ix=0; ix<=SIZE; ix++) {
 		}
 		
 		// add some base noise
-		baseNoise = 14*noise0.eval(x,y) + 7*noise1.eval(x,y) + 4*noise2.eval(x,y) - (14+7+4)/2;
+		baseNoise = 16*noise0.eval(x,y) + 8*noise1.eval(x,y) + 4*noise2.eval(x,y) - (16+8+4)/2;
 		if( baseNoise < 0 ) {
 			baseNoise *= pn;
-			baseNoise *= Math.max(0, 1 - 8*distToWater/(0.5-WATER_WIDTH));
+			baseNoise *= Math.max(0, 1 - 9*distToWater/(0.5-WATER_WIDTH));
 		}
 		oldH = h;
 		h += baseNoise;
@@ -253,25 +253,25 @@ for(ix=0; ix<SIZE; ix++) {
 		t = tGrass;
 		
 		// water
-		if(maxH < -11) {
+		if(maxH < -10) {
 			t = tOceanDepths;
 		}
-		else if(maxH < -8) {
+		else if(maxH < -7.5) {
 			t = tOceanRockDeep;
 		}
-		else if(maxH < -5) {
+		else if(maxH < -4) {
 			t = tOceanCoral;
 		}
-		else if(maxH < -3) {
+		else if(maxH < -2.2) {
 			t = tOceanRockShallow;
 		}
-		else if(maxH < .5 && minH < -.3) {
+		else if(maxH < .9 && minH < .35) {
 			t = tBeachWet;
 		}
-		else if(maxH < .9 && minH < .4) {
+		else if(maxH < 1.5 && minH < .9) {
 			t = tBeachDry;
 		}
-		else if(maxH < 2.1 && minH < .8) {
+		else if(maxH < 2.3 && minH < 1.3) {
 			t = tBeachGrass;
 		}
 		
@@ -314,10 +314,10 @@ for(ix=0; ix<SIZE; ix++) {
 		if(t==tGrass)
 		{
 			grassNoise = (noise8.eval(x,y) + .6*noise9.eval(x,y)) / 1.6;
-			if(grassNoise < .35) {
+			if(grassNoise < .33) {
 				t = (maxH - minH > 1.2) ? tDirtCliff : tDirt;
 			}
-			else if(grassNoise < .39) {
+			else if(grassNoise < .37) {
 				t = (maxH - minH > 1.2) ? tGrassCliff : tGrassDry;
 				if(maxH - minH < .5 && randFloat() < .03) {
 					placeObject(oGrassDry, 0, ix+randFloat(), iy+randFloat(), randFloat()*2*Math.PI);
diff --git a/binaries/data/mods/official/maps/scenarios/latium_generated.pmp b/binaries/data/mods/official/maps/scenarios/latium_generated.pmp
index 26a8611647..0c35151579 100644
--- a/binaries/data/mods/official/maps/scenarios/latium_generated.pmp
+++ b/binaries/data/mods/official/maps/scenarios/latium_generated.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a11db2ff1ee1dc40bf879594b43563217c27b18486fa5298b0236e3480a04a1
+oid sha256:8cb2e0980a64909bd67ebf10b4b342135c20fc2fa485333bfa844a41f9cde910
 size 311023
diff --git a/binaries/data/mods/official/maps/scenarios/latium_generated.xml b/binaries/data/mods/official/maps/scenarios/latium_generated.xml
index 28287e5be7..02caeed0b5 100644
--- a/binaries/data/mods/official/maps/scenarios/latium_generated.xml
+++ b/binaries/data/mods/official/maps/scenarios/latium_generated.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d1fd2a961603923e8dc994a4bafe4a981a1eb1203152b4fb1f304aa6aa4fa50
-size 239846
+oid sha256:f4c0cb49ede42b34679f964c895414eefabb0bc763405d0901487c1a09a2fd85
+size 235431