mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-30 19:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix leftovers from 0c20afdfda - improve repairing, chasing and fleeing behaviour.

Browse Source 
0c20afdfda made states more caller-independent but did not change some
callsites to be compatible with that. This fixes those.

This does not fix chasing entirely however since unitMotion does not
always recognize that the target moved enough that the entity will never
be in range.
This will be fixed upstream.

Differential Revision: https://code.wildfiregames.com/D1968
This was SVN commit r22367.
This commit is contained in:
wraitii
2019-06-11 20:06:25 +00:00
parent 98f609df1d
commit 0b41e8ee61
1 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/UnitAI.js
+13 -38
View File
@@ -1686,11 +1686,11 @@ UnitAI.prototype.UnitFsmSpec = {
"FLEEING": {
"enter": function() {
// We use the distance between the entities to account for ranged attacks
let distance = DistanceBetweenEntities(this.entity, this.order.data.target) + (+this.template.FleeDistance);
this.order.data.distanceToFlee = DistanceBetweenEntities(this.entity, this.order.data.target) + (+this.template.FleeDistance);
let cmpUnitMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
// Use unit motion directly to ignore the visibility check. TODO: change this if we add LOS to fauna.
if (this.CheckTargetRangeExplicit(this.order.data.target, distance, distance) ||
!cmpUnitMotion || !cmpUnitMotion.MoveToTargetRange(this.order.data.target, distance, -1))
if (this.CheckTargetRangeExplicit(this.order.data.target, this.order.data.distanceToFlee, -1) ||
!cmpUnitMotion || !cmpUnitMotion.MoveToTargetRange(this.order.data.target, this.order.data.distanceToFlee, -1))
{
this.FinishOrder();
return true;
@@ -1714,7 +1714,7 @@ UnitAI.prototype.UnitFsmSpec = {
"MovementUpdate": function() {
// When we've run far enough, stop fleeing
if (this.CheckRange(this.order.data))
if (this.CheckTargetRangeExplicit(this.order.data, this.order.data.distanceToFlee, -1))
this.FinishOrder();
},
@@ -1803,11 +1803,9 @@ UnitAI.prototype.UnitFsmSpec = {
this.PushOrderFront("Pack", { "force": true });
return;
}
if (this.MoveToTargetAttackRange(target, this.order.data.attackType))
{
this.SetNextState("COMBAT.CHASING");
return true;
}
this.SetNextState("COMBAT.CHASING");
return true;
}
}
@@ -1923,11 +1921,8 @@ UnitAI.prototype.UnitFsmSpec = {
this.PushOrderFront("Pack", { "force": true });
return;
}
if (this.MoveToTargetRange(target, IID_Attack, this.order.data.attackType))
{
this.SetNextState("COMBAT.CHASING");
return;
}
this.SetNextState("COMBAT.CHASING");
return;
}
}
@@ -1979,7 +1974,7 @@ UnitAI.prototype.UnitFsmSpec = {
"CHASING": {
"enter": function() {
if (!this.MoveTo(this.order.data))
if (!this.MoveToTargetAttackRange(this.order.data.target, this.order.data.attackType))
{
this.FinishOrder();
return true;
@@ -2223,20 +2218,6 @@ UnitAI.prototype.UnitFsmSpec = {
this.SetNextState("APPROACHING");
return;
}
// Can't reach the target, or it doesn't exist any more
// We want to carry on gathering resources in the same area as
// the old one. So try to get close to the old resource's
// last known position
var maxRange = 8; // get close but not too close
if (this.order.data.lastPos &&
this.MoveToPointRange(this.order.data.lastPos.x, this.order.data.lastPos.z, 0, maxRange))
{
this.SetNextState("APPROACHING");
return;
}
}
}
@@ -2530,7 +2511,7 @@ UnitAI.prototype.UnitFsmSpec = {
"REPAIR": {
"APPROACHING": {
"enter": function() {
if (!this.MoveTo(this.order.data))
if (!this.MoveTo(this.order.data, IID_Builder))
{
this.FinishOrder();
return true;
@@ -2568,10 +2549,7 @@ UnitAI.prototype.UnitFsmSpec = {
if (!this.CheckTargetRange(this.repairTarget, IID_Builder))
{
if (this.MoveToTargetRange(this.repairTarget, IID_Builder))
this.SetNextState("APPROACHING");
else
this.FinishOrder();
this.SetNextState("APPROACHING");
return true;
}
// Check if the target is still repairable
@@ -2619,11 +2597,8 @@ UnitAI.prototype.UnitFsmSpec = {
// in that case, the repairTarget is deleted, and we can just return
if (!this.repairTarget)
return;
let inRange = this.CheckTargetRange(this.repairTarget, IID_Builder);
if (!inRange && this.MoveToTargetRange(this.repairTarget, IID_Builder))
if (!this.CheckTargetRange(this.repairTarget, IID_Builder))
this.SetNextState("APPROACHING");
else if (!inRange)
this.FinishOrder(); //can't approach and isn't in reach
},
},