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

fix units attacking harmless gaia buildings

Browse Source 
This was SVN commit r14494.
This commit is contained in:
sanderd17
2014-01-03 20:24:02 +00:00
parent fb8032043b
commit e096df0070
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/UnitAI.js
+12 -6
View File
@@ -5031,14 +5031,17 @@ UnitAI.prototype.GetTargetsFromUnit = function()
if (!cmpAttack)
return [];
const animalfilter = function(e) {
const attackfilter = function(e) {
var cmpPlayer = Engine.QueryInterface(e, IID_Player);
if (cmpPlayer && cmpPlayer.GetPlayerID() > 0)
return true;
var cmpUnitAI = Engine.QueryInterface(e, IID_UnitAI);
return !cmpUnitAI || !cmpUnitAI.IsAnimal() || cmpUnitAI.IsDangerousAnimal();
return cmpUnitAI && (!cmpUnitAI.IsAnimal() || cmpUnitAI.IsDangerousAnimal());
};
var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
var entities = rangeMan.ResetActiveQuery(this.losRangeQuery);
var targets = entities.filter(function (v, i, a) { return cmpAttack.CanAttack(v) && animalfilter(v); })
var targets = entities.filter(function (v, i, a) { return cmpAttack.CanAttack(v) && attackfilter(v); })
.sort(function (a, b) { return cmpAttack.CompareEntitiesByPreference(a, b); });
return targets;
@@ -5438,13 +5441,16 @@ UnitAI.prototype.AttackEntitiesByPreference = function(ents)
if (!cmpAttack)
return false;
const animalfilter = function(e) {
const attackfilter = function(e) {
var cmpPlayer = Engine.QueryInterface(e, IID_Player);
if (cmpPlayer && cmpPlayer.GetPlayerID() > 0)
return true;
var cmpUnitAI = Engine.QueryInterface(e, IID_UnitAI);
return !cmpUnitAI || !cmpUnitAI.IsAnimal() || cmpUnitAI.IsDangerousAnimal();
return cmpUnitAI && (!cmpUnitAI.IsAnimal() || cmpUnitAI.IsDangerousAnimal());
};
return this.RespondToTargetedEntities(
ents.filter(function (v, i, a) { return cmpAttack.CanAttack(v) && animalfilter(v); })
ents.filter(function (v, i, a) { return cmpAttack.CanAttack(v) && attackfilter(v); })
.sort(function (a, b) { return cmpAttack.CompareEntitiesByPreference(a, b); })
);
};