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

Fixed gathering from enemy farms instead of player owned farms

Browse Source 
This was SVN commit r7735.
This commit is contained in:
WhiteTreePaladin 2010-07-11 01:25:50 +00:00
parent c0e915fd5d
commit 0cb1fbe4d5
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
binaries/data/mods/public/gui/session_new/input.js
View File

@ -100,25 +100,28 @@ function determineAction(x, y)
if (!entState)
continue;
if (targetState.player != entState.player) // If the target is an enemy and we have military units selected, then attack
{
if (targetState.resourceSupply) // If the target is a resource and we have the right kind of resource gatherers selected, then gather
var playerOwned = ((targetState.player == entState.player)? true : false);
var enemyOwned = ((targetState.player != entState.player)? true : false);
var gaiaOwned = ((targetState.player == 0)? true : false);
// If the target is a resource and we have the right kind of resource gatherers selected, then gather
// If the target is a foundation and we have builders selected, then build (or repair)
// If the target is an enemy, then attack
if (targetState.resourceSupply && (playerOwned || gaiaOwned))
{
var resource = findGatherType(entState.resourceGatherRates, targetState.resourceSupply);
if (resource)
return {"type": "gather", "cursor": "action-gather-"+resource, "target": targets[0]};
}
else if (entState.attack) // If the target is an enemy and we have military units selected, then attack
else if (targetState.foundation && entState.buildEntities && playerOwned)
{
return {"type": "build", "cursor": "action-build", "target": targets[0]};
}
else if (entState.attack && enemyOwned)
{
return {"type": "attack", "cursor": "action-attack", "target": targets[0]};
}
}
else
{
if (targetState.foundation && entState.buildEntities) // If the target is a foundation and we have builders selected, then build (or repair)
return {"type": "build", "cursor": "action-build", "target": targets[0]};
}
}
// If we don't do anything more specific, just walk
return {"type": "move"};