gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Change var -> let and i++ -> ++i in rmgen wall builder and demo map

Browse Source 
In a bid to reduce size of D900 patch.

`var` -> `let` change suggested by @elexis

Refs D900, #2944

This was SVN commit r20546.
This commit is contained in:
s0600204
2017-11-28 01:38:54 +00:00
parent c6807e2fc0
commit 9504f5c36a
2 changed files with 168 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/maps/random/rmgen/wall_builder.js
+132 -132
View File
@@ -122,9 +122,9 @@ var wallScaleByType = {
"rome_siege": 1.5
};
for (var style in wallScaleByType)
for (let style in wallScaleByType)
{
var civ = style;
let civ = style;
if (style == "rome_siege")
civ = "rome";
@@ -292,11 +292,11 @@ var fortressTypes = {};
// Setup some better looking semi default fortresses for "palisades" style
for (let type in fortressTypes)
{
var newKey = type + "Palisades";
var oldWall = fortressTypes[type].wall;
let newKey = type + "Palisades";
let oldWall = fortressTypes[type].wall;
fortressTypes[newKey] = new Fortress(newKey);
var fillTowersBetween = ["wallShort", "wall", "wallLong", "endLeft", "endRight", "cornerIn", "cornerOut"];
for (var j = 0; j < oldWall.length; j++)
let fillTowersBetween = ["wallShort", "wall", "wallLong", "endLeft", "endRight", "cornerIn", "cornerOut"];
for (let j = 0; j < oldWall.length; ++j)
{
fortressTypes[newKey].wall.push(oldWall[j]); // Only works if the first element is not in fillTowersBetween (e.g. entry or gate like it should be)
if (j+1 < oldWall.length)
@@ -350,18 +350,18 @@ function getWallAlignment(startX, startY, wall, style, orientation)
}
orientation = orientation || 0;
var alignment = [];
var wallX = startX;
var wallY = startY;
for (var i = 0; i < wall.length; i++)
let alignment = [];
let wallX = startX;
let wallY = startY;
for (let i = 0; i < wall.length; ++i)
{
var element = wallStyles[style][wall[i]];
let element = wallStyles[style][wall[i]];
if (element === undefined && i == 0)
warn("No valid wall element: " + wall[i]);
// Indentation
var placeX = wallX - element.indent * cos(orientation);
var placeY = wallY - element.indent * sin(orientation);
let placeX = wallX - element.indent * cos(orientation);
let placeY = wallY - element.indent * sin(orientation);
// Add wall elements entity placement arguments to the alignment
alignment.push({
@@ -375,13 +375,13 @@ function getWallAlignment(startX, startY, wall, style, orientation)
if (i+1 < wall.length)
{
orientation += element.bending;
var nextElement = wallStyles[style][wall[i+1]];
let nextElement = wallStyles[style][wall[i+1]];
if (nextElement === undefined)
warn("No valid wall element: " + wall[i+1]);
var distance = (element.width + nextElement.width)/2;
let distance = (element.width + nextElement.width)/2;
// Corrections for elements with indent AND bending
var indent = element.indent;
var bending = element.bending;
let indent = element.indent;
let bending = element.bending;
if (bending !== 0 && indent !== 0)
{
// Indent correction to adjust distance
@@ -408,8 +408,8 @@ function getWallAlignment(startX, startY, wall, style, orientation)
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function getCenterToFirstElement(alignment)
{
var centerToFirstElement = {"x": 0, "y": 0};
for (var i = 0; i < alignment.length; i++)
let centerToFirstElement = { "x": 0, "y": 0 };
for (let i = 0; i < alignment.length; ++i)
{
centerToFirstElement.x -= alignment[i].x/alignment.length;
centerToFirstElement.y -= alignment[i].y/alignment.length;
@@ -434,8 +434,8 @@ function getWallLength(wall, style)
style = "athen";
}
var length = 0;
for (var i = 0; i < wall.length; i++)
let length = 0;
for (let i = 0; i < wall.length; ++i)
length += wallStyles[style][wall[i]].width;
return length;
@@ -475,11 +475,11 @@ function placeWall(startX, startY, wall, style, playerId, orientation)
orientation = orientation || 0;
// Get wall alignment
var AM = getWallAlignment(startX, startY, wall, style, orientation);
let AM = getWallAlignment(startX, startY, wall, style, orientation);
// Place the wall
for (var iWall = 0; iWall < wall.length; iWall++)
for (let iWall = 0; iWall < wall.length; ++iWall)
{
var entity = AM[iWall].entity;
let entity = AM[iWall].entity;
if (entity !== undefined)
placeObject(AM[iWall].x, AM[iWall].y, entity, playerId, AM[iWall].angle);
}
@@ -509,12 +509,12 @@ function placeCustomFortress(centerX, centerY, fortress, style, playerId = 0, or
}
// Calculate center if fortress.centerToFirstElement is undefined (default)
var centerToFirstElement = fortress.centerToFirstElement;
let centerToFirstElement = fortress.centerToFirstElement;
if (centerToFirstElement === undefined)
centerToFirstElement = getCenterToFirstElement(getWallAlignment(0, 0, fortress.wall, style));
// Placing the fortress wall
var startX = centerX + centerToFirstElement.x * cos(orientation) - centerToFirstElement.y * sin(orientation);
var startY = centerY + centerToFirstElement.y * cos(orientation) + centerToFirstElement.x * sin(orientation);
let startX = centerX + centerToFirstElement.x * cos(orientation) - centerToFirstElement.y * sin(orientation);
let startY = centerY + centerToFirstElement.y * cos(orientation) + centerToFirstElement.x * sin(orientation);
placeWall(startX, startY, fortress.wall, style, playerId, orientation);
}
@@ -570,47 +570,47 @@ function placeLinearWall(startX, startY, targetX, targetY, wallPart, style, play
endWithFirst = typeof endWithFirst == "undefined" ? true : endWithFirst;
// Check arguments
for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
for (let elementIndex = 0; elementIndex < wallPart.length; ++elementIndex)
{
var bending = wallStyles[style][wallPart[elementIndex]].bending;
let bending = wallStyles[style][wallPart[elementIndex]].bending;
if (bending != 0)
warn("Bending is not supported by placeLinearWall but a bending wall element is used: " + wallPart[elementIndex] + " -> wallStyles[style][wallPart[elementIndex]].entity");
}
// Setup number of wall parts
var totalLength = Math.euclidDistance2D(startX, startY, targetX, targetY);
var wallPartLength = 0;
for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
let totalLength = Math.euclidDistance2D(startX, startY, targetX, targetY);
let wallPartLength = 0;
for (let elementIndex = 0; elementIndex < wallPart.length; ++elementIndex)
wallPartLength += wallStyles[style][wallPart[elementIndex]].width;
var numParts = 0;
let numParts = 0;
if (endWithFirst)
numParts = ceil((totalLength - wallStyles[style][wallPart[0]].width) / wallPartLength);
else
numParts = ceil(totalLength / wallPartLength);
// Setup scale factor
var scaleFactor = 1;
let scaleFactor = 1;
if (endWithFirst)
scaleFactor = totalLength / (numParts * wallPartLength + wallStyles[style][wallPart[0]].width);
else
scaleFactor = totalLength / (numParts * wallPartLength);
// Setup angle
var wallAngle = getAngle(startX, startY, targetX, targetY); // NOTE: function "getAngle()" is about to be changed...
var placeAngle = wallAngle - PI/2;
let wallAngle = getAngle(startX, startY, targetX, targetY); // NOTE: function "getAngle()" is about to be changed...
let placeAngle = wallAngle - PI/2;
// Place wall entities
var x = startX;
var y = startY;
for (var partIndex = 0; partIndex < numParts; partIndex++)
let x = startX;
let y = startY;
for (let partIndex = 0; partIndex < numParts; ++partIndex)
{
for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
for (let elementIndex = 0; elementIndex < wallPart.length; ++elementIndex)
{
var wallEle = wallStyles[style][wallPart[elementIndex]];
let wallEle = wallStyles[style][wallPart[elementIndex]];
// Width correction
x += scaleFactor * wallEle.width/2 * cos(wallAngle);
y += scaleFactor * wallEle.width/2 * sin(wallAngle);
// Indent correction
var placeX = x - wallEle.indent * sin(wallAngle);
var placeY = y + wallEle.indent * cos(wallAngle);
let placeX = x - wallEle.indent * sin(wallAngle);
let placeY = y + wallEle.indent * cos(wallAngle);
// Placement
var entity = wallEle.entity;
let entity = wallEle.entity;
if (entity !== undefined)
placeObject(placeX, placeY, entity, playerId, placeAngle + wallEle.angle);
x += scaleFactor * wallEle.width/2 * cos(wallAngle);
@@ -619,10 +619,10 @@ function placeLinearWall(startX, startY, targetX, targetY, wallPart, style, play
}
if (endWithFirst)
{
var wallEle = wallStyles[style][wallPart[0]];
let wallEle = wallStyles[style][wallPart[0]];
x += scaleFactor * wallEle.width/2 * cos(wallAngle);
y += scaleFactor * wallEle.width/2 * sin(wallAngle);
var entity = wallEle.entity;
let entity = wallEle.entity;
if (entity !== undefined)
placeObject(x, y, entity, playerId, placeAngle + wallEle.angle);
}
@@ -672,50 +672,50 @@ function placeCircularWall(centerX, centerY, radius, wallPart, style, playerId,
// Check arguments
if (maxBendOff > PI/2 || maxBendOff < 0)
warn("placeCircularWall maxBendOff sould satisfy 0 < maxBendOff < PI/2 (~1.5) but it is: " + maxBendOff);
for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
for (let elementIndex = 0; elementIndex < wallPart.length; ++elementIndex)
{
var bending = wallStyles[style][wallPart[elementIndex]].bending;
let bending = wallStyles[style][wallPart[elementIndex]].bending;
if (bending != 0)
warn("Bending is not supported by placeCircularWall but a bending wall element is used: " + wallPart[elementIndex]);
}
// Setup number of wall parts
var totalLength = maxAngle * radius;
var wallPartLength = 0;
for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
let totalLength = maxAngle * radius;
let wallPartLength = 0;
for (let elementIndex = 0; elementIndex < wallPart.length; ++elementIndex)
wallPartLength += wallStyles[style][wallPart[elementIndex]].width;
var numParts = 0;
let numParts = 0;
if (endWithFirst)
numParts = ceil((totalLength - wallStyles[style][wallPart[0]].width) / wallPartLength);
else
numParts = ceil(totalLength / wallPartLength);
// Setup scale factor
var scaleFactor = 1;
let scaleFactor = 1;
if (endWithFirst)
scaleFactor = totalLength / (numParts * wallPartLength + wallStyles[style][wallPart[0]].width);
else
scaleFactor = totalLength / (numParts * wallPartLength);
// Place wall entities
var actualAngle = orientation + (2*PI - maxAngle) / 2;
var x = centerX + radius*cos(actualAngle);
var y = centerY + radius*sin(actualAngle);
for (var partIndex = 0; partIndex < numParts; partIndex++)
for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
let actualAngle = orientation + (2*PI - maxAngle) / 2;
let x = centerX + radius*cos(actualAngle);
let y = centerY + radius*sin(actualAngle);
for (let partIndex = 0; partIndex < numParts; ++partIndex)
for (let elementIndex = 0; elementIndex < wallPart.length; ++elementIndex)
{
var wallEle = wallStyles[style][wallPart[elementIndex]];
let wallEle = wallStyles[style][wallPart[elementIndex]];
// Width correction
var addAngle = scaleFactor * wallEle.width / radius;
var targetX = centerX + radius * cos(actualAngle + addAngle);
var targetY = centerY + radius * sin(actualAngle + addAngle);
var placeX = x + (targetX - x)/2;
var placeY = y + (targetY - y)/2;
var placeAngle = actualAngle + addAngle/2;
let addAngle = scaleFactor * wallEle.width / radius;
let targetX = centerX + radius * cos(actualAngle + addAngle);
let targetY = centerY + radius * sin(actualAngle + addAngle);
let placeX = x + (targetX - x)/2;
let placeY = y + (targetY - y)/2;
let placeAngle = actualAngle + addAngle/2;
// Indent correction
placeX -= wallEle.indent * cos(placeAngle);
placeY -= wallEle.indent * sin(placeAngle);
// Placement
var entity = wallEle.entity;
let entity = wallEle.entity;
if (entity !== undefined)
placeObject(placeX, placeY, entity, playerId, placeAngle + wallEle.angle);
// Prepare for the next wall element
@@ -726,13 +726,13 @@ function placeCircularWall(centerX, centerY, radius, wallPart, style, playerId,
if (endWithFirst)
{
var wallEle = wallStyles[style][wallPart[0]];
var addAngle = scaleFactor * wallEle.width / radius;
var targetX = centerX + radius * cos(actualAngle + addAngle);
var targetY = centerY + radius * sin(actualAngle + addAngle);
var placeX = x + (targetX - x)/2;
var placeY = y + (targetY - y)/2;
var placeAngle = actualAngle + addAngle/2;
let wallEle = wallStyles[style][wallPart[0]];
let addAngle = scaleFactor * wallEle.width / radius;
let targetX = centerX + radius * cos(actualAngle + addAngle);
let targetY = centerY + radius * sin(actualAngle + addAngle);
let placeX = x + (targetX - x)/2;
let placeY = y + (targetY - y)/2;
let placeAngle = actualAngle + addAngle/2;
placeObject(placeX, placeY, wallEle.entity, playerId, placeAngle + wallEle.angle);
}
}
@@ -775,16 +775,16 @@ function placePolygonalWall(centerX, centerY, radius, wallPart, cornerWallElemen
numCorners = numCorners || 8;
// Setup angles
var angleAdd = 2*PI/numCorners;
var angleStart = orientation - angleAdd/2;
let angleAdd = 2*PI/numCorners;
let angleStart = orientation - angleAdd/2;
// Setup corners
var corners = [];
for (var i = 0; i < numCorners; i++)
let corners = [];
for (let i = 0; i < numCorners; ++i)
corners.push([centerX + radius*cos(angleStart + i*angleAdd), centerY + radius*sin(angleStart + i*angleAdd)]);
// Place Corners and walls
for (var i = 0; i < numCorners; i++)
for (let i = 0; i < numCorners; ++i)
{
var angleToCorner = getAngle(corners[i][0], corners[i][1], centerX, centerY);
let angleToCorner = getAngle(corners[i][0], corners[i][1], centerX, centerY);
placeObject(corners[i][0], corners[i][1], wallStyles[style][cornerWallElement].entity, playerId, angleToCorner);
if (!skipFirstWall || i != 0)
placeLinearWall(
@@ -833,14 +833,14 @@ function placeIrregularPolygonalWall(centerX, centerY, radius, cornerWallElement
// Generating a generic wall part assortment with each wall part including 1 gate lengthened by walls and towers
// NOTE: It might be a good idea to write an own function for that...
var defaultWallPartsAssortment = [["wallShort"], ["wall"], ["wallLong"], ["gate", "tower", "wallShort"]];
var centeredWallPart = ["gate"];
var extandingWallPartAssortment = [["tower", "wallLong"], ["tower", "wall"]];
let defaultWallPartsAssortment = [["wallShort"], ["wall"], ["wallLong"], ["gate", "tower", "wallShort"]];
let centeredWallPart = ["gate"];
let extandingWallPartAssortment = [["tower", "wallLong"], ["tower", "wall"]];
defaultWallPartsAssortment.push(centeredWallPart);
for (var i = 0; i < extandingWallPartAssortment.length; i++)
for (let i = 0; i < extandingWallPartAssortment.length; ++i)
{
var wallPart = centeredWallPart;
for (var j = 0; j < radius; j++)
let wallPart = centeredWallPart;
for (let j = 0; j < radius; ++j)
{
if (j%2 == 0)
wallPart = wallPart.concat(extandingWallPartAssortment[i]);
@@ -864,44 +864,44 @@ function placeIrregularPolygonalWall(centerX, centerY, radius, cornerWallElement
skipFirstWall = skipFirstWall || false;
// Setup angles
var angleToCover = 2*PI;
var angleAddList = [];
for (var i = 0; i < numCorners; i++)
let angleToCover = 2*PI;
let angleAddList = [];
for (let i = 0; i < numCorners; ++i)
{
// Randomize covered angles. Variety scales down with raising angle though...
angleAddList.push(angleToCover/(numCorners-i) * (1 + randFloat(-irregularity, irregularity)));
angleToCover -= angleAddList[angleAddList.length - 1];
}
// Setup corners
var corners = [];
var angleActual = orientation - angleAddList[0]/2;
for (var i = 0; i < numCorners; i++)
let corners = [];
let angleActual = orientation - angleAddList[0]/2;
for (let i = 0; i < numCorners; ++i)
{
corners.push([centerX + radius*cos(angleActual), centerY + radius*sin(angleActual)]);
if (i < numCorners - 1)
angleActual += angleAddList[i+1];
}
// Setup best wall parts for the different walls (a bit confusing naming...)
var wallPartLengths = [];
var maxWallPartLength = 0;
for (var partIndex = 0; partIndex < wallPartsAssortment.length; partIndex++)
let wallPartLengths = [];
let maxWallPartLength = 0;
for (let partIndex = 0; partIndex < wallPartsAssortment.length; ++partIndex)
{
var length = wallPartLengths[partIndex];
let length = wallPartLengths[partIndex];
wallPartLengths.push(getWallLength(wallPartsAssortment[partIndex], style));
if (length > maxWallPartLength)
maxWallPartLength = length;
}
var wallPartList = []; // This is the list of the wall parts to use for the walls between the corners, not to confuse with wallPartsAssortment!
for (var i = 0; i < numCorners; i++)
let wallPartList = []; // This is the list of the wall parts to use for the walls between the corners, not to confuse with wallPartsAssortment!
for (let i = 0; i < numCorners; ++i)
{
var bestWallPart = []; // This is a simpel wall part not a wallPartsAssortment!
var bestWallLength = 99999999;
let bestWallPart = []; // This is a simpel wall part not a wallPartsAssortment!
let bestWallLength = 99999999;
// NOTE: This is not exactly like the length the wall will be in the end. Has to be tweaked...
var wallLength = Math.euclidDistance2D(corners[i][0], corners[i][1], corners[(i + 1) % numCorners][0], corners[(i + 1) % numCorners][1]);
var numWallParts = ceil(wallLength/maxWallPartLength);
for (var partIndex = 0; partIndex < wallPartsAssortment.length; partIndex++)
let wallLength = Math.euclidDistance2D(corners[i][0], corners[i][1], corners[(i + 1) % numCorners][0], corners[(i + 1) % numCorners][1]);
let numWallParts = ceil(wallLength/maxWallPartLength);
for (let partIndex = 0; partIndex < wallPartsAssortment.length; ++partIndex)
{
var linearWallLength = numWallParts*wallPartLengths[partIndex];
let linearWallLength = numWallParts*wallPartLengths[partIndex];
if (linearWallLength < bestWallLength && linearWallLength > wallLength)
{
bestWallPart = wallPartsAssortment[partIndex];
@@ -911,9 +911,9 @@ function placeIrregularPolygonalWall(centerX, centerY, radius, cornerWallElement
wallPartList.push(bestWallPart);
}
// Place Corners and walls
for (var i = 0; i < numCorners; i++)
for (let i = 0; i < numCorners; ++i)
{
var angleToCorner = getAngle(corners[i][0], corners[i][1], centerX, centerY);
let angleToCorner = getAngle(corners[i][0], corners[i][1], centerX, centerY);
placeObject(corners[i][0], corners[i][1], wallStyles[style][cornerWallElement].entity, playerId, angleToCorner);
if (!skipFirstWall || i != 0)
placeLinearWall(
@@ -957,25 +957,25 @@ function placeGenericFortress(centerX, centerY, radius, playerId, style, irregul
maxTrys = maxTrys || 100;
// Setup some vars
var startAngle = randFloat(0, 2*PI);
var actualOffX = radius*cos(startAngle);
var actualOffY = radius*sin(startAngle);
var actualAngle = startAngle;
var pointDistance = wallStyles[style].wallLong.width + wallStyles[style].tower.width;
let startAngle = randFloat(0, 2*PI);
let actualOffX = radius*cos(startAngle);
let actualOffY = radius*sin(startAngle);
let actualAngle = startAngle;
let pointDistance = wallStyles[style].wallLong.width + wallStyles[style].tower.width;
// Searching for a well fitting point derivation
var tries = 0;
var bestPointDerivation = undefined;
var minOverlap = 1000;
var overlap = undefined;
let tries = 0;
let bestPointDerivation = undefined;
let minOverlap = 1000;
let overlap = undefined;
while (tries < maxTrys && minOverlap > wallStyles[style].tower.width / 10)
{
var pointDerivation = [];
var distanceToTarget = 1000;
var targetReached = false;
let pointDerivation = [];
let distanceToTarget = 1000;
let targetReached = false;
while (!targetReached)
{
var indent = randFloat(-irregularity*pointDistance, irregularity*pointDistance);
var tmpAngle = getAngle(actualOffX, actualOffY,
let indent = randFloat(-irregularity*pointDistance, irregularity*pointDistance);
let tmpAngle = getAngle(actualOffX, actualOffY,
(radius + indent)*cos(actualAngle + (pointDistance / radius)),
(radius + indent)*sin(actualAngle + (pointDistance / radius)));
actualOffX += pointDistance*cos(tmpAngle);
@@ -983,7 +983,7 @@ function placeGenericFortress(centerX, centerY, radius, playerId, style, irregul
actualAngle = getAngle(0, 0, actualOffX, actualOffY);
pointDerivation.push([actualOffX, actualOffY]);
distanceToTarget = Math.euclidDistance2D(actualOffX, actualOffY, ...pointDerivation[0]);
var numPoints = pointDerivation.length;
let numPoints = pointDerivation.length;
if (numPoints > 3 && distanceToTarget < pointDistance) // Could be done better...
{
targetReached = true;
@@ -995,21 +995,21 @@ function placeGenericFortress(centerX, centerY, radius, playerId, style, irregul
}
}
}
tries++;
+tries;
}
log("placeGenericFortress: Reduced overlap to " + minOverlap + " after " + tries + " tries");
// Place wall
for (var pointIndex = 0; pointIndex < bestPointDerivation.length; pointIndex++)
for (let pointIndex = 0; pointIndex < bestPointDerivation.length; ++pointIndex)
{
var startX = centerX + bestPointDerivation[pointIndex][0];
var startY = centerY + bestPointDerivation[pointIndex][1];
var targetX = centerX + bestPointDerivation[(pointIndex + 1) % bestPointDerivation.length][0];
var targetY = centerY + bestPointDerivation[(pointIndex + 1) % bestPointDerivation.length][1];
var angle = getAngle(startX, startY, targetX, targetY);
var wallElement = "wallLong";
let startX = centerX + bestPointDerivation[pointIndex][0];
let startY = centerY + bestPointDerivation[pointIndex][1];
let targetX = centerX + bestPointDerivation[(pointIndex + 1) % bestPointDerivation.length][0];
let targetY = centerY + bestPointDerivation[(pointIndex + 1) % bestPointDerivation.length][1];
let angle = getAngle(startX, startY, targetX, targetY);
let wallElement = "wallLong";
if ((pointIndex + 1) % gateOccurence == 0)
wallElement = "gate";
var entity = wallStyles[style][wallElement].entity;
let entity = wallStyles[style][wallElement].entity;
if (entity)
placeObject(
startX + (Math.euclidDistance2D(startX, startY, targetX, targetY) / 2) * Math.cos(angle),
@@ -1019,9 +1019,9 @@ function placeGenericFortress(centerX, centerY, radius, playerId, style, irregul
angle - Math.PI / 2 + wallStyles[style][wallElement].angle);
// Place tower
var startX = centerX + bestPointDerivation[(pointIndex + bestPointDerivation.length - 1) % bestPointDerivation.length][0];
var startY = centerY + bestPointDerivation[(pointIndex + bestPointDerivation.length - 1) % bestPointDerivation.length][1];
var angle = getAngle(startX, startY, targetX, targetY);
let startX = centerX + bestPointDerivation[(pointIndex + bestPointDerivation.length - 1) % bestPointDerivation.length][0];
let startY = centerY + bestPointDerivation[(pointIndex + bestPointDerivation.length - 1) % bestPointDerivation.length][1];
let angle = getAngle(startX, startY, targetX, targetY);
placeObject(
centerX + bestPointDerivation[pointIndex][0],
centerY + bestPointDerivation[pointIndex][1],
binaries/data/mods/public/maps/random/wall_demo.js
+36 -36
View File
@@ -60,14 +60,14 @@ const wallStyleList = ["athen", "brit", "cart", "gaul", "iber", "mace", "maur",
// Custom wall placement (element based)
////////////////////////////////////////
var wall = ['endLeft', 'wallLong', 'tower', 'wall', 'outpost', 'wall', 'cornerOut', 'wall', 'cornerIn', 'wall', 'house', 'endRight', 'entryTower', 'endLeft', 'wallShort', 'barracks', 'gate', 'tower', 'wall', 'wallFort', 'wall', 'endRight'];
for (var styleIndex = 0; styleIndex < wallStyleList.length; styleIndex++)
for (let styleIndex = 0; styleIndex < wallStyleList.length; ++styleIndex)
{
var startX = actualX + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the first wall element
var startY = actualY; // Y coordinate of the first wall element
var style = wallStyleList[styleIndex]; // // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
var orientation = styleIndex * PI/64; // Orientation of the first wall element. 0 means 'outside' or 'front' is right (positive X, like object placement)
let startX = actualX + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the first wall element
let startY = actualY; // Y coordinate of the first wall element
let style = wallStyleList[styleIndex]; // // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
let orientation = styleIndex * PI/64; // Orientation of the first wall element. 0 means 'outside' or 'front' is right (positive X, like object placement)
// That means the wall will be build towards top (positive Y) if no corners are used
var playerId = 0; // Owner of the wall (like in placeObject). 0 is Gaia, 1 is Player 1 (default color blue), ...
let playerId = 0; // Owner of the wall (like in placeObject). 0 is Gaia, 1 is Player 1 (default color blue), ...
placeWall(startX, startY, wall, style, playerId, orientation); // Actually placing the wall
}
actualX = distToMapBorder; // Reset actualX
@@ -77,14 +77,14 @@ actualY += 80 + distToOtherWalls; // Increase actualY for next wall placement me
// Default fortress placement (chosen by fortress type string)
//////////////////////////////////////////////////////////////
var fortressRadius = 15; // The space the fortresses take in average. Just for design of this map
for (var styleIndex = 0; styleIndex < wallStyleList.length; styleIndex++)
for (let styleIndex = 0; styleIndex < wallStyleList.length; ++styleIndex)
{
var centerX = actualX + fortressRadius + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the center of the fortress
var centerY = actualY + fortressRadius; // Y coordinate of the center of the fortress
var type = 'tiny'; // Default fortress types are like map sizes: 'tiny', 'small', 'medium', 'large', 'veryLarge', 'giant'
var style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
var playerId = 0; // Owner of the wall. 0 is Gaia, 1 is Player 1 (default color blue), ...
var orientation = styleIndex * PI/32; // Where the 'main entrance' of the fortress should face (like in placeObject). All fortresses walls should start with an entrance
let centerX = actualX + fortressRadius + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the center of the fortress
let centerY = actualY + fortressRadius; // Y coordinate of the center of the fortress
let type = 'tiny'; // Default fortress types are like map sizes: 'tiny', 'small', 'medium', 'large', 'veryLarge', 'giant'
let style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
let playerId = 0; // Owner of the wall. 0 is Gaia, 1 is Player 1 (default color blue), ...
let orientation = styleIndex * PI/32; // Where the 'main entrance' of the fortress should face (like in placeObject). All fortresses walls should start with an entrance
placeFortress(centerX, centerY, type, style, playerId, orientation); // Actually placing the fortress
placeObject(centerX, centerY, 'other/obelisk', 0, 0*PI); // Place visual marker to see the center of the fortress
}
@@ -98,13 +98,13 @@ actualY += 2 * fortressRadius + 2 * distToOtherWalls; // Increase actualY for ne
var radius = min((mapSize - actualY - distToOtherWalls) / 3, (buildableMapSize / wallStyleList.length - distToOtherWalls) / 2); // The radius of wall circle
var centerY = actualY + radius; // Y coordinate of the center of the wall circle
var orientation = 0; // Where the wall circle will be open if maxAngle < 2*PI, see below. Otherwise where the first wall element will be placed
for (var styleIndex = 0; styleIndex < wallStyleList.length; styleIndex++)
for (let styleIndex = 0; styleIndex < wallStyleList.length; ++styleIndex)
{
var centerX = actualX + radius + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the center of the wall circle
var playerId = 0; // Player ID of the player owning the wall, 0 is Gaia, 1 is the first player (default blue), ...
var wallPart = ['tower', 'wall', 'house']; // List of wall elements the wall will be build of. Optional, default id ['wall']
var style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
var maxAngle = PI/2 * (styleIndex%3 + 2); // How far the wall should circumvent the center
let centerX = actualX + radius + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the center of the wall circle
let playerId = 0; // Player ID of the player owning the wall, 0 is Gaia, 1 is the first player (default blue), ...
let wallPart = ['tower', 'wall', 'house']; // List of wall elements the wall will be build of. Optional, default id ['wall']
let style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
let maxAngle = PI/2 * (styleIndex%3 + 2); // How far the wall should circumvent the center
placeCircularWall(centerX, centerY, radius, wallPart, style, playerId, orientation, maxAngle); // Actually placing the wall
placeObject(centerX, centerY, 'other/obelisk', 0, 0*PI); // Place visual marker to see the center of the wall circle
orientation += PI/16; // Increasing orientation to see how rotation works (like for object placement)
@@ -119,15 +119,15 @@ actualY += 2 * radius + distToOtherWalls; // Increase actualY for next wall plac
var radius = min((mapSize - actualY - distToOtherWalls) / 2, (buildableMapSize / wallStyleList.length - distToOtherWalls) / 2); // The radius of wall polygons
var centerY = actualY + radius; // Y coordinate of the center of the wall polygon
var orientation = 0; // Where the wall circle will be open if ???, see below. Otherwise where the first wall will be placed
for (var styleIndex = 0; styleIndex < wallStyleList.length; styleIndex++)
for (let styleIndex = 0; styleIndex < wallStyleList.length; ++styleIndex)
{
var centerX = actualX + radius + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the center of the wall circle
var playerId = 0; // Player ID of the player owning the wall, 0 is Gaia, 1 is the first player (default blue), ...
var cornerWallElement = 'tower'; // With wall element type will be uset for the corners of the polygon
var wallPart = ['wall', 'tower']; // List of wall elements the wall will be build of. Optional, default id ['wall']
var style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
var numCorners = (styleIndex)%6 + 3; // How many corners the plogon will have
var skipFirstWall = true; // If the wall should be open towards orientation
let centerX = actualX + radius + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the center of the wall circle
let playerId = 0; // Player ID of the player owning the wall, 0 is Gaia, 1 is the first player (default blue), ...
let cornerWallElement = 'tower'; // With wall element type will be uset for the corners of the polygon
let wallPart = ['wall', 'tower']; // List of wall elements the wall will be build of. Optional, default id ['wall']
let style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
let numCorners = (styleIndex)%6 + 3; // How many corners the plogon will have
let skipFirstWall = true; // If the wall should be open towards orientation
placePolygonalWall(centerX, centerY, radius, wallPart, cornerWallElement, style, playerId, orientation, numCorners, skipFirstWall);
placeObject(centerX, centerY, 'other/obelisk', 0, 0*PI); // Place visual marker to see the center of the wall circle
orientation += PI/16; // Increasing orientation to see how rotation works (like for object placement)
@@ -141,16 +141,16 @@ actualY += 2 * radius + distToOtherWalls; // Increase actualY for next wall plac
// NOTE: Don't use bending wall elements like corners here!
var maxWallLength = (mapSize - actualY - distToMapBorder - distToOtherWalls); // Just for this maps design. How long the longest wall will be
var numWallsPerStyle = floor(buildableMapSize / distToOtherWalls / wallStyleList.length); // Just for this maps design. How many walls of the same style will be placed
for (var styleIndex = 0; styleIndex < wallStyleList.length; styleIndex++)
for (var wallIndex = 0; wallIndex < numWallsPerStyle; wallIndex++)
for (let styleIndex = 0; styleIndex < wallStyleList.length; ++styleIndex)
for (let wallIndex = 0; wallIndex < numWallsPerStyle; ++wallIndex)
{
var startX = actualX + (styleIndex * numWallsPerStyle + wallIndex) * distToOtherWalls; // X coordinate the wall will start from
var startY = actualY; // Y coordinate the wall will start from
var endX = startX; // X coordinate the wall will end
var endY = actualY + (wallIndex + 1) * maxWallLength/numWallsPerStyle; // Y coordinate the wall will end
var playerId = 0; // Player ID of the player owning the wall, 0 is Gaia, 1 is the first player (default blue), ...
var wallPart = ['tower', 'wall']; // List of wall elements the wall will be build of
var style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
let startX = actualX + (styleIndex * numWallsPerStyle + wallIndex) * distToOtherWalls; // X coordinate the wall will start from
let startY = actualY; // Y coordinate the wall will start from
let endX = startX; // X coordinate the wall will end
let endY = actualY + (wallIndex + 1) * maxWallLength/numWallsPerStyle; // Y coordinate the wall will end
let playerId = 0; // Player ID of the player owning the wall, 0 is Gaia, 1 is the first player (default blue), ...
let wallPart = ['tower', 'wall']; // List of wall elements the wall will be build of
let style = wallStyleList[styleIndex]; // The wall's style like 'cart', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
placeLinearWall(startX, startY, endX, endY, wallPart, style, playerId); // Actually placing the wall
// placeObject(startX, startY, 'other/obelisk', 0, 0*PI); // Place visual marker to see where exsactly the wall begins
// placeObject(endX, endY, 'other/obelisk', 0, 0*PI); // Place visual marker to see where exsactly the wall ends