real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

AI: avoid creating some unused maps and cleanings

Browse Source 
This was SVN commit r16690.
This commit is contained in:
mimo 2015-05-28 20:35:05 +00:00
parent e5727980da
commit f200815de4
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/simulation/ai/common-api/shared.js
View File

@ -32,7 +32,7 @@ m.SharedScript = function(settings)
this.CCResourceMaps = {}; // Contains maps showing the density of wood, stone and metal, optimized for CC placement.
// Resource maps data.
// By how much to divide the resource amount when filling the map (ie a tree having 200 wood is "4").
this.decreaseFactor = {'wood': 50.0, 'stone': 90.0, 'metal': 90.0, 'food': 40.0};
this.decreaseFactor = {"wood": 50.0, "stone": 90.0, "metal": 90.0};
};
//Return a simple object (using no classes etc) that will be serialized into saved games

40
binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js
View File

@ -372,22 +372,27 @@ m.Accessibility.prototype.isAccessible = function(gameState, position, onLand){
// Return true if you can go from a point to a point without switching means of transport
// Hardcore means is also checks for isAccessible at the end (it checks for either water or land though, beware).
// This is a blind check and not a pathfinder: for all it knows there is a huge block of trees in the middle.
m.Accessibility.prototype.pathAvailable = function(gameState, start, end, onWater, hardcore){
m.Accessibility.prototype.pathAvailable = function(gameState, start, end, onWater, hardcore)
{
var pstart = this.gamePosToMapPos(start);
var istart = pstart[0] + pstart[1]*this.width;
var pend = this.gamePosToMapPos(end);
var iend = pend[0] + pend[1]*this.width;
if (onWater)
{
if (this.navalPassMap[istart] === this.navalPassMap[iend]) {
if (this.navalPassMap[istart] === this.navalPassMap[iend])
{
if (hardcore && this.isAccessible(gameState, end,false))
return true;
else if (hardcore)
return false;
return true;
}
} else {
if (this.landPassMap[istart] === this.landPassMap[iend]) {
}
else
{
if (this.landPassMap[istart] === this.landPassMap[iend])
{
if (hardcore && this.isAccessible(gameState, end,true))
return true;
else if (hardcore)
@ -398,7 +403,8 @@ m.Accessibility.prototype.pathAvailable = function(gameState, start, end, onWate
return false;
};
m.Accessibility.prototype.getTrajectTo = function(start, end, noBound) {
m.Accessibility.prototype.getTrajectTo = function(start, end, noBound)
{
var pstart = this.gamePosToMapPos(start);
var istart = pstart[0] + pstart[1]*this.width;
var pend = this.gamePosToMapPos(end);
@ -702,9 +708,9 @@ m.Accessibility.prototype.floodFill = function(startIndex, value, onWater)
};
// creates a map of resource density
m.SharedScript.prototype.createResourceMaps = function(sharedScript) {
for (var resource in this.decreaseFactor)
m.SharedScript.prototype.createResourceMaps = function(sharedScript)
{
for (let resource in this.decreaseFactor)
{
// if there is no resourceMap create one with an influence for everything with that resource
if (!this.resourceMaps[resource])
@ -715,15 +721,17 @@ m.SharedScript.prototype.createResourceMaps = function(sharedScript) {
this.CCResourceMaps[resource] = new m.Map(sharedScript, "resource");
}
}
var cellSize = this.resourceMaps["food"].cellSize;
var cellSize = this.resourceMaps["wood"].cellSize;
for (let ent of sharedScript._entities.values())
{
if (ent && ent.position() && ent.resourceSupplyType() && ent.resourceSupplyType().generic !== "treasure") {
var resource = ent.resourceSupplyType().generic;
if (!this.resourceMaps[resource])
continue;
var x = Math.floor(ent.position()[0] / cellSize);
var z = Math.floor(ent.position()[1] / cellSize);
var strength = Math.floor(ent.resourceSupplyMax()/this.decreaseFactor[resource]);
if (resource === "wood" || resource === "food")
if (resource === "wood")
{
this.CCResourceMaps[resource].addInfluence(x, z, 60/cellSize, strength, "constant");
this.resourceMaps[resource].addInfluence(x, z, 36/cellSize, strength/2, "constant");
@ -749,7 +757,7 @@ m.SharedScript.prototype.updateResourceMaps = function(sharedScript, events)
for (let resource in this.decreaseFactor)
{
// if there is no resourceMap create one with an influence for everything with that resource
if (! this.resourceMaps[resource])
if (!this.resourceMaps[resource])
{
// We're creting them 8-bit. Things could go above 255 if there are really tons of resources
// But at that point the precision is not really important anyway. And it saves memory.
@ -757,7 +765,7 @@ m.SharedScript.prototype.updateResourceMaps = function(sharedScript, events)
this.CCResourceMaps[resource] = new m.Map(sharedScript, "resource");
}
}
var cellSize = this.resourceMaps["food"].cellSize;
var cellSize = this.resourceMaps["wood"].cellSize;
// Look for destroy events and subtract the entities original influence from the resourceMap
// TODO: perhaps do something when dropsites appear/disappear.
let destEvents = events["Destroy"];
@ -771,10 +779,12 @@ m.SharedScript.prototype.updateResourceMaps = function(sharedScript, events)
if (ent && ent.position() && ent.resourceSupplyType() && ent.resourceSupplyType().generic !== "treasure")
{
let resource = ent.resourceSupplyType().generic;
if (!this.resourceMaps[resource])
continue;
let x = Math.floor(ent.position()[0] / cellSize);
let z = Math.floor(ent.position()[1] / cellSize);
let strength = Math.floor(ent.resourceSupplyMax()/this.decreaseFactor[resource]);
if (resource === "wood" || resource === "food")
if (resource === "wood")
{
this.CCResourceMaps[resource].addInfluence(x, z, 60/cellSize, -strength, "constant");
this.resourceMaps[resource].addInfluence(x, z, 36/cellSize, -strength/2, "constant");
@ -796,10 +806,12 @@ m.SharedScript.prototype.updateResourceMaps = function(sharedScript, events)
if (ent && ent.position() && ent.resourceSupplyType() && ent.resourceSupplyType().generic !== "treasure")
{
let resource = ent.resourceSupplyType().generic;
if (!this.resourceMaps[resource])
continue;
let x = Math.floor(ent.position()[0] / cellSize);
let z = Math.floor(ent.position()[1] / cellSize);
let strength = Math.floor(ent.resourceSupplyMax()/this.decreaseFactor[resource]);
if (resource === "wood" || resource === "food")
if (resource === "wood")
{
this.CCResourceMaps[resource].addInfluence(x, z, 60/cellSize, strength, "constant");
this.resourceMaps[resource].addInfluence(x, z, 36/cellSize, strength/2, "constant");