wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

# Fixes to Latium random map.

Browse Source 
- Replaced calls to Math.max with own function because Math.max wasn't
working properly in latest Spidermonkey (?).
- Fixed some code that could cause weird ridges to appear.

This was SVN commit r5221.
This commit is contained in:
Matei 2007-07-04 22:42:53 +00:00
parent 22f11a8ab9
commit 08862db42c
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
binaries/data/mods/official/maps/random/latium.js
View File

@ -140,7 +140,7 @@ function distanceToPlayers(x, y) {
for(var i=1; i<=NUM_PLAYERS; i++) {
var dx = x-playerX[i];
var dy = y-playerY[i];
r = Math.min(r, dx*dx + dy*dy);
r = min(r, dx*dx + dy*dy);
}
return Math.sqrt(r);
}
@ -152,6 +152,14 @@ function playerNearness(x, y) {
else return 1;
}
function max(x, y) {
return x > y ? x : y;
}
function min(x, y) {
return x < y ? x : y;
}
// Paint elevation
println("Painting elevation...");
@ -176,16 +184,19 @@ for(ix=0; ix<=SIZE; ix++) {
h = 0;
distToWater = 0;
h = 32 * (x-.5);
// add the rough shape of the water
if(x < WATER_WIDTH) {
h = Math.max(-16, -32*(WATER_WIDTH-x)/WATER_WIDTH);
h = max(-16.0, -28.0*(WATER_WIDTH-x)/WATER_WIDTH);
}
else if(x > 1-WATER_WIDTH) {
h = Math.max(-16, -32*(x-(1-WATER_WIDTH))/WATER_WIDTH);
else if(x > 1.0-WATER_WIDTH) {
h = max(-16.0, -28.0*(x-(1.0-WATER_WIDTH))/WATER_WIDTH);
}
else {
distToWater = (0.5 - WATER_WIDTH - Math.abs(x-0.5));
u = 1 - Math.abs(x-0.5)/(0.5-WATER_WIDTH);
u = 1 - Math.abs(x-0.5) / (0.5-WATER_WIDTH);
h = 12*u;
}
@ -193,7 +204,7 @@ for(ix=0; ix<=SIZE; ix++) {
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 - 9*distToWater/(0.5-WATER_WIDTH));
baseNoise *= max(0.1, distToWater / (0.5-WATER_WIDTH));
}
oldH = h;
h += baseNoise;
@ -201,7 +212,7 @@ for(ix=0; ix<=SIZE; ix++) {
// add some higher-frequency noise on land
if( oldH > 0 )
{
h += (1.5*noise2a.eval(x,y) + 0.7*noise2b.eval(x,y)) * Math.min(oldH/10.0, 1.0);
h += (0.4*noise2a.eval(x,y) + 0.2*noise2b.eval(x,y)) * min(oldH/10.0, 1.0);
}
// create cliff noise
@ -221,7 +232,7 @@ for(ix=0; ix<=SIZE; ix++) {
cliffNoise -= 0.59;
cliffNoise *= pn;
if(cliffNoise > 0) {
h += 19 * Math.min(cliffNoise, 0.045) / 0.045;
h += 19 * min(cliffNoise, 0.045) / 0.045;
}
}
@ -255,15 +266,15 @@ for(ix=0; ix<SIZE; ix++) {
h11 = getHeight(ix+1, iy+1);
// find min and max height
maxH = Math.max(h00, h01, h10, h11);
minH = Math.min(h00, h01, h10, h11);
maxH = max(h00, h01, h10, h11);
minH = min(h00, h01, h10, h11);
// figure out if we're at the top of a cliff using min adjacent height
minAdjHeight = minH;
if(maxH > 15) {
for(nx=Math.max(ix-1, 0); nx<=Math.min(ix+2, SIZE); nx++) {
for(ny=Math.max(iy-1, 0); ny<=Math.min(iy+2, SIZE); ny++) {
minAdjHeight = Math.min(minAdjHeight, getHeight(nx, ny));
for(nx=max(ix-1, 0); nx<=min(ix+2, SIZE); nx++) {
for(ny=max(iy-1, 0); ny<=min(iy+2, SIZE); ny++) {
minAdjHeight = min(minAdjHeight, getHeight(nx, ny));
}
}
}