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

Fix Aegis no longer building dropsites after the skirmish fix.

Browse Source 
This was SVN commit r14295.
This commit is contained in:
wraitii 2013-12-05 17:34:24 +00:00
parent 56c805ae93
commit 2f3ce82dc3
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ SharedScript.prototype.initWithState = function(state) {
this.accessibility.init(state, this.terrainAnalyzer);
// defined in TerrainAnalysis.js
this.updateResourceMaps(this, this.events);
this.createResourceMaps(this);
this.gameState = {};
for (var i in this._players)
@ -228,8 +228,7 @@ SharedScript.prototype.onUpdate = function(state)
for (var i in this.gameState)
this.gameState[i].update(this,state);
if (this.turn !== 0)
this.updateResourceMaps(this, this.events);
this.updateResourceMaps(this, this.events);
this.terrainAnalyzer.updateMapWithEvents(this);
//this.OnUpdate();

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

@ -667,6 +667,46 @@ Accessibility.prototype.floodFill = function(startIndex, value, onWater)
return true;
}
// creates a map of resource density
SharedScript.prototype.createResourceMaps = function(sharedScript) {
for (var resource in this.decreaseFactor){
// if there is no resourceMap create one with an influence for everything with that 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.
this.resourceMaps[resource] = new Map(sharedScript, new Uint8Array(sharedScript.passabilityMap.data.length));
this.resourceMaps[resource].setMaxVal(255);
this.CCResourceMaps[resource] = new Map(sharedScript, new Uint8Array(sharedScript.passabilityMap.data.length));
this.CCResourceMaps[resource].setMaxVal(255);
}
}
for (var entI in sharedScript._entities)
{
var ent = sharedScript._entities[entI];
if (ent && ent.position() && ent.resourceSupplyType() && ent.resourceSupplyType().generic !== "treasure") {
var resource = ent.resourceSupplyType().generic;
var x = Math.floor(ent.position()[0] / 4);
var z = Math.floor(ent.position()[1] / 4);
var strength = Math.floor(ent.resourceSupplyMax()/this.decreaseFactor[resource]);
if (resource === "wood" || resource === "food")
{
this.CCResourceMaps[resource].addInfluence(x, z, 15, strength/2.0,'constant');
this.resourceMaps[resource].addInfluence(x, z, 9.0, strength,'constant');
this.resourceMaps[resource].addInfluence(x, z, 2, -5,'constant');
}
else if (resource === "stone" || resource === "metal")
{
this.CCResourceMaps[resource].addInfluence(x, z, 30, strength,'constant');
this.resourceMaps[resource].addInfluence(x, z, 12.0, strength/1.5);
this.resourceMaps[resource].addInfluence(x, z, 12.0, strength/2.0,'constant');
this.resourceMaps[resource].addInfluence(x, z, 8, -50);
}
}
}
};
// TODO: make it regularly update stone+metal mines and their resource levels.
// creates and maintains a map of unused resource density
// this also takes dropsites into account.