From 5a3219ccc56c53a2261155a6143d2fde6966e703 Mon Sep 17 00:00:00 2001 From: elexis Date: Sun, 10 Sep 2017 01:58:04 +0000 Subject: [PATCH] Create arrays with [], not new Array in random map scripts, as stated by the Coding_Conventions, except Snowflake Searocks which will receive special treatment. git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@20153 3db68df2-c116-0410-a063-a993310a9797 --- binaries/data/mods/public/maps/random/canyon.js | 6 +++--- binaries/data/mods/public/maps/random/corsica.js | 8 +++----- .../public/maps/random/cycladic_archipelago.js | 7 ++++--- .../data/mods/public/maps/random/deep_forest.js | 6 +++--- .../mods/public/maps/random/guadalquivir_river.js | 6 +++--- .../mods/public/maps/random/gulf_of_bothnia.js | 6 +++--- .../mods/public/maps/random/hyrcanian_shores.js | 16 ++------------- binaries/data/mods/public/maps/random/kerala.js | 15 ++------------ binaries/data/mods/public/maps/random/latium.js | 4 ++-- binaries/data/mods/public/maps/random/migration.js | 6 +++--- .../mods/public/maps/random/northern_lights.js | 15 ++------------ .../mods/public/maps/random/phoenician_levant.js | 15 ++------------ .../mods/public/maps/random/pyrenean_sierra.js | 14 ++++++------- binaries/data/mods/public/maps/random/rivers.js | 24 +++++++++++----------- .../data/mods/public/maps/random/rmgen/misc.js | 6 ++---- .../data/mods/public/maps/random/rmgen/noise.js | 10 ++++----- .../data/mods/public/maps/random/rmgen/painter.js | 12 +++++------ .../mods/public/maps/random/rmgen/pathplacer.js | 4 +--- .../mods/public/maps/random/rmgen/tileclass.js | 4 ++-- .../data/mods/public/maps/random/schwarzwald.js | 6 +++--- .../public/maps/random/survivalofthefittest.js | 4 ++-- binaries/data/mods/public/maps/random/unknown.js | 12 +++++------ .../data/mods/public/maps/random/unknown_land.js | 12 +++++------ .../data/mods/public/maps/random/unknown_nomad.js | 4 ++-- 24 files changed, 86 insertions(+), 136 deletions(-) diff --git a/binaries/data/mods/public/maps/random/canyon.js b/binaries/data/mods/public/maps/random/canyon.js index d7d3f7836c..2e04a798c5 100644 --- a/binaries/data/mods/public/maps/random/canyon.js +++ b/binaries/data/mods/public/maps/random/canyon.js @@ -224,15 +224,15 @@ for (var g = 0; g < scaleByMapSize(5,30); g++) var newarea = createArea(placer, [terrainPainter, elevationPainter, paintClass(clLand)], avoidClasses(clLand, 6)); if (newarea !== null) { - var distances = new Array(0); + var distances = []; var d1 = 9999; var d2 = 9999; var p1 = -1; var p2 = 0; + for (var i = 0; i < numPlayers; i++) - { distances.push(sqrt((tx-mapSize*playerX[i])*(tx-mapSize*playerX[i])+(tz-mapSize*playerZ[i])*(tz-mapSize*playerZ[i]))); - } + for (var a = 0; a < numPlayers; a++) { if (d1 >= distances[a]) diff --git a/binaries/data/mods/public/maps/random/corsica.js b/binaries/data/mods/public/maps/random/corsica.js index 6abc4216ac..ce2822d85d 100644 --- a/binaries/data/mods/public/maps/random/corsica.js +++ b/binaries/data/mods/public/maps/random/corsica.js @@ -224,13 +224,11 @@ elevationPainter = new SmoothElevationPainter(ELEVATION_MODIFY, 30,fractionToTil createArea( placer, [elevationPainter], null); log("Creating players"); - var playerIDs = sortAllPlayers(); -// place players -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerAngle = new Array(numPlayers); +var playerX = []; +var playerZ = []; +var playerAngle = []; var island = 0; var formerTeam = getPlayerTeam(0); diff --git a/binaries/data/mods/public/maps/random/cycladic_archipelago.js b/binaries/data/mods/public/maps/random/cycladic_archipelago.js index 185c3ce23b..be41aeb84e 100644 --- a/binaries/data/mods/public/maps/random/cycladic_archipelago.js +++ b/binaries/data/mods/public/maps/random/cycladic_archipelago.js @@ -87,9 +87,10 @@ var playerIDs = sortAllPlayers(); var startingPlaces=[[0],[0,3],[0,2,4],[0,1,3,4],[0,1,2,3,4],[0,1,2,3,4,5]]; var numIslands = Math.max(6, numPlayers); -var islandX = new Array(numIslands); -var islandZ = new Array(numIslands); -var islandAngle = new Array(numIslands); +var islandX = []; +var islandZ = []; +var islandAngle = []; + //holds all land areas var areas = []; diff --git a/binaries/data/mods/public/maps/random/deep_forest.js b/binaries/data/mods/public/maps/random/deep_forest.js index 0cbe84c2b8..13b3911ced 100644 --- a/binaries/data/mods/public/maps/random/deep_forest.js +++ b/binaries/data/mods/public/maps/random/deep_forest.js @@ -46,9 +46,9 @@ var numPlayers = getNumPlayers(); var baseRadius = 20; var minPlayerRadius = min(mapRadius-1.5*baseRadius, 5*mapRadius/8); var maxPlayerRadius = min(mapRadius-baseRadius, 3*mapRadius/4); -var playerStartLocX = new Array(numPlayers); -var playerStartLocZ = new Array(numPlayers); -var playerAngle = new Array(numPlayers); +var playerStartLocX = []; +var playerStartLocZ = []; +var playerAngle = []; var playerAngleStart = randFloat(0, 2*PI); var playerAngleAddAvrg = 2*PI / numPlayers; var playerAngleMaxOff = playerAngleAddAvrg/4; diff --git a/binaries/data/mods/public/maps/random/guadalquivir_river.js b/binaries/data/mods/public/maps/random/guadalquivir_river.js index 7624f342db..2e2f3bf40b 100644 --- a/binaries/data/mods/public/maps/random/guadalquivir_river.js +++ b/binaries/data/mods/public/maps/random/guadalquivir_river.js @@ -94,9 +94,9 @@ createArea(placer, [terrainPainter, elevationPainter, paintClass(clLand)], null) var playerIDs = primeSortAllPlayers(); // place players -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerAngle = new Array(numPlayers); +var playerX = []; +var playerZ = []; +var playerAngle = []; var startAngle = 0; for (var i = 0; i < numPlayers; i++) diff --git a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js index 0a5dbdfe18..d4f880fd9a 100644 --- a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js +++ b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js @@ -140,9 +140,9 @@ initTerrain(tPrimary); var playerIDs = sortAllPlayers(); -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerAngle = new Array(numPlayers); +var playerX = []; +var playerZ = []; +var playerAngle = []; var startAngle = -PI/6; for (var i = 0; i < numPlayers; i++) diff --git a/binaries/data/mods/public/maps/random/hyrcanian_shores.js b/binaries/data/mods/public/maps/random/hyrcanian_shores.js index 99e17fb49b..5d1fb4f2de 100644 --- a/binaries/data/mods/public/maps/random/hyrcanian_shores.js +++ b/binaries/data/mods/public/maps/random/hyrcanian_shores.js @@ -64,18 +64,6 @@ var clFlatlands = createTileClass(); var playerIDs = sortAllPlayers(); -// place players -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerPos = new Array(numPlayers); - -for (var i = 0; i < numPlayers; i++) -{ - playerPos[i] = (i + 1) / (numPlayers + 1); - playerX[i] = playerPos[i]; - playerZ[i] = 0.4 + 0.2*(i%2); -} - for (var i = 0; i < numPlayers; i++) { var id = playerIDs[i]; @@ -86,8 +74,8 @@ for (var i = 0; i < numPlayers; i++) var elevation = 20; // get the x and z in tiles - var fx = fractionToTiles(playerX[i]); - var fz = fractionToTiles(playerZ[i]); + var fx = fractionToTiles((i + 1) / (numPlayers + 1)); + var fz = fractionToTiles(0.4 + 0.2 * (i % 2)); var ix = round(fx); var iz = round(fz); diff --git a/binaries/data/mods/public/maps/random/kerala.js b/binaries/data/mods/public/maps/random/kerala.js index f3994df42b..b99a5a3433 100644 --- a/binaries/data/mods/public/maps/random/kerala.js +++ b/binaries/data/mods/public/maps/random/kerala.js @@ -55,17 +55,6 @@ var clMountains = createTileClass(); var playerIDs = sortAllPlayers(); -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerPos = new Array(numPlayers); - -for (var i = 0; i < numPlayers; i++) -{ - playerPos[i] = (i + 1) / (numPlayers + 1); - playerX[i] = 0.45 + 0.2*(i%2); - playerZ[i] = playerPos[i]; -} - for (var i = 0; i < numPlayers; i++) { var id = playerIDs[i]; @@ -76,8 +65,8 @@ for (var i = 0; i < numPlayers; i++) var elevation = 20; // get the x and z in tiles - var fx = fractionToTiles(playerX[i]); - var fz = fractionToTiles(playerZ[i]); + var fx = fractionToTiles(0.45 + 0.2 * (i % 2)); + var fz = fractionToTiles((i + 1) / (numPlayers + 1)); var ix = round(fx); var iz = round(fz); addToClass(ix, iz, clPlayer); diff --git a/binaries/data/mods/public/maps/random/latium.js b/binaries/data/mods/public/maps/random/latium.js index 99c7810e3e..c007ad4460 100644 --- a/binaries/data/mods/public/maps/random/latium.js +++ b/binaries/data/mods/public/maps/random/latium.js @@ -80,8 +80,8 @@ var playerIDs = sortAllPlayers(); log("Creating players..."); -var playerX = new Array(numPlayers+1); -var playerZ = new Array(numPlayers+1); +var playerX = []; +var playerZ = []; var numLeftPlayers = ceil(numPlayers/2); for (var i = 1; i <= numLeftPlayers; i++) diff --git a/binaries/data/mods/public/maps/random/migration.js b/binaries/data/mods/public/maps/random/migration.js index f395013692..9ff54da4ea 100644 --- a/binaries/data/mods/public/maps/random/migration.js +++ b/binaries/data/mods/public/maps/random/migration.js @@ -65,9 +65,9 @@ var clLand = createTileClass(); var playerIDs = sortAllPlayers(); // place players -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerAngle = new Array(numPlayers); +var playerX = []; +var playerZ = []; +var playerAngle = []; var startAngle = PI/2 + PI/14; for (var i = 0; i < numPlayers; i++) diff --git a/binaries/data/mods/public/maps/random/northern_lights.js b/binaries/data/mods/public/maps/random/northern_lights.js index 201d8e4e1c..e84756654d 100644 --- a/binaries/data/mods/public/maps/random/northern_lights.js +++ b/binaries/data/mods/public/maps/random/northern_lights.js @@ -50,17 +50,6 @@ var clSettlement = createTileClass(); var playerIDs = sortAllPlayers(); -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerPos = new Array(numPlayers); - -for (var i = 0; i < numPlayers; i++) -{ - playerPos[i] = (i + 1) / (numPlayers + 1); - playerX[i] = playerPos[i]; - playerZ[i] = 0.35 + 0.2*(i%2); -} - for (var i = 0; i < numPlayers; i++) { var id = playerIDs[i]; @@ -71,8 +60,8 @@ for (var i = 0; i < numPlayers; i++) var elevation = 20; // get the x and z in tiles - var fx = fractionToTiles(playerX[i]); - var fz = fractionToTiles(playerZ[i]); + var fx = fractionToTiles((i + 1) / (numPlayers + 1)); + var fz = fractionToTiles(0.35 + 0.2 * (i % 2)); var ix = round(fx); var iz = round(fz); addToClass(ix, iz, clPlayer); diff --git a/binaries/data/mods/public/maps/random/phoenician_levant.js b/binaries/data/mods/public/maps/random/phoenician_levant.js index bdd560ee3d..f1d17b3f3e 100644 --- a/binaries/data/mods/public/maps/random/phoenician_levant.js +++ b/binaries/data/mods/public/maps/random/phoenician_levant.js @@ -62,17 +62,6 @@ var clIsland = createTileClass(); var playerIDs = sortAllPlayers(); -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerPos = new Array(numPlayers); - -for (var i = 0; i < numPlayers; i++) -{ - playerPos[i] = (i + 1) / (numPlayers + 1); - playerZ[i] = playerPos[i]; - playerX[i] = 0.66 + 0.2*(i%2); -} - for (var i = 0; i < numPlayers; i++) { var id = playerIDs[i]; @@ -83,8 +72,8 @@ for (var i = 0; i < numPlayers; i++) var elevation = 20; // get the x and z in tiles - var fx = fractionToTiles(playerX[i]); - var fz = fractionToTiles(playerZ[i]); + var fx = fractionToTiles(0.66 + 0.2 * (i % 2)); + var fz = fractionToTiles((i + 1) / (numPlayers + 1)); var ix = floor(fx); var iz = floor(fz); addToClass(ix, iz, clPlayer); diff --git a/binaries/data/mods/public/maps/random/pyrenean_sierra.js b/binaries/data/mods/public/maps/random/pyrenean_sierra.js index 5b989ebfde..4066c4b86f 100644 --- a/binaries/data/mods/public/maps/random/pyrenean_sierra.js +++ b/binaries/data/mods/public/maps/random/pyrenean_sierra.js @@ -31,10 +31,10 @@ SemiRandomElevationPainter.prototype.paint = function(area) var mapSize = getMapSize()+1; - var saw = new Array(mapSize); - var dist = new Array(mapSize); - var gotHeightPt = new Array(mapSize); - var newHeight = new Array(mapSize); + var saw = []; + var dist = []; + var gotHeightPt = []; + var newHeight = []; // init typed arrays for (var i = 0; i < mapSize; ++i) @@ -289,9 +289,9 @@ for (var ix = 0; ix < mapSize; ix++) var playerIDs = primeSortAllPlayers(); // place players -var playerX = new Array(numPlayers); -var playerZ = new Array(numPlayers); -var playerAngle = new Array(numPlayers); +var playerX = []; +var playerZ = []; +var playerAngle = []; for (var i = 0; i < numPlayers; i++) { diff --git a/binaries/data/mods/public/maps/random/rivers.js b/binaries/data/mods/public/maps/random/rivers.js index c366f9ac48..fafe9dfb0e 100644 --- a/binaries/data/mods/public/maps/random/rivers.js +++ b/binaries/data/mods/public/maps/random/rivers.js @@ -172,17 +172,17 @@ for (var i = 0; i < numPlayers; i++) RMS.SetProgress(20); //init rivers -var PX = new Array(numPlayers+1); -var PZ = new Array(numPlayers+1); -//isRiver actually tells us if two points must be joined by river -var isRiver = new Array(numPlayers+1); -for (var q=0; q