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

petra: try to improve detection of inaccessible targets

Browse Source 
This was SVN commit r18526.
This commit is contained in:
mimo 2016-07-17 18:28:20 +00:00
parent df55f73894
commit 9132fd4406
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
binaries/data/mods/public/simulation/ai/petra/worker.js
View File

@ -863,10 +863,15 @@ m.Worker.prototype.isInaccessibleSupply = function(gameState)
{
if (!this.ent.unitAIOrderData()[0] || !this.ent.unitAIOrderData()[0].target)
return false;
let targetId = this.ent.unitAIOrderData()[0].target;
let target = gameState.getEntityById(targetId);
if (!target)
return true;
let approachingTarget = this.ent.getMetadata(PlayerID, "approachingTarget");
if (!approachingTarget || approachingTarget !== this.ent.unitAIOrderData()[0].target)
if (!approachingTarget || approachingTarget !== targetId)
{
this.ent.setMetadata(PlayerID, "approachingTarget", this.ent.unitAIOrderData()[0].target);
this.ent.setMetadata(PlayerID, "approachingTarget", targetId);
this.ent.setMetadata(PlayerID, "approachingTime", undefined);
this.ent.setMetadata(PlayerID, "approachingPos", undefined);
this.ent.setMetadata(PlayerID, "carriedAmount", undefined);
@ -882,8 +887,12 @@ m.Worker.prototype.isInaccessibleSupply = function(gameState)
return false;
}
let inaccessibleTime = target.getMetadata(PlayerID, "inaccessibleTime");
if (inaccessibleTime && gameState.ai.elapsedTime < inaccessibleTime)
return true;
let approachingTime = this.ent.getMetadata(PlayerID, "approachingTime");
if (!approachingTime || gameState.ai.elapsedTime - approachingTime > 5)
if (!approachingTime || gameState.ai.elapsedTime - approachingTime > 3)
{
let presentPos = this.ent.position();
let approachingPos = this.ent.getMetadata(PlayerID, "approachingPos");
@ -892,12 +901,10 @@ m.Worker.prototype.isInaccessibleSupply = function(gameState)
this.ent.setMetadata(PlayerID, "approachingTime", gameState.ai.elapsedTime);
this.ent.setMetadata(PlayerID, "approachingPos", presentPos);
}
else if (gameState.ai.elapsedTime - approachingTime > 15)
else if (gameState.ai.elapsedTime - approachingTime > 10)
{
let targetId = this.ent.unitAIOrderData()[0].target;
let target = gameState.getEntityById(targetId);
if (target)
target.setMetadata(PlayerID, "inaccessibleTime", gameState.ai.elapsedTime + 600);
target.setMetadata(PlayerID, "inaccessibleTime", gameState.ai.elapsedTime + 600);
return true;
}
}