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

Correctly face towards target when repairing, gathering, guarding.

Browse Source 
Calls to FaceTowardsTarget were missed in the REPAIRING, GATHERING and
GUARDING unitAI state, leading occasionally to units pointing the wrong
way. This was not an issue prior to 0c20afdfda, which called
MoveToTargetRange, which itself called FaceTowardsTarget when it was
already in range, but it now needs to be explicitly handled in unitAI.

Attacking and Healing already handled this correctly.

Fixes #5518

Differential Revision: https://code.wildfiregames.com/D2096
This was SVN commit r22505.
This commit is contained in:
wraitii 2019-07-18 19:56:09 +00:00
parent 114dcbf655
commit bac777cb29
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
binaries/data/mods/public/simulation/components/UnitAI.js
View File

@ -1634,6 +1634,7 @@ UnitAI.prototype.UnitFsmSpec = {
this.StartTimer(1000, 1000);
this.SetHeldPositionOnEntity(this.entity);
this.SetAnimationVariant("combat");
this.FaceTowardsTarget(this.order.data.target);
return false;
},
@ -1657,6 +1658,7 @@ UnitAI.prototype.UnitFsmSpec = {
this.SetNextState("ESCORTING");
else
{
this.FaceTowardsTarget(this.order.data.target);
// if nothing better to do, check if the guarded needs to be healed or repaired
var cmpHealth = Engine.QueryInterface(this.isGuardOf, IID_Health);
if (cmpHealth && cmpHealth.IsInjured())
@ -2145,8 +2147,8 @@ UnitAI.prototype.UnitFsmSpec = {
{
this.StopMoving();
this.SetDefaultAnimationVariant();
var typename = "gather_" + this.order.data.type.specific;
this.SelectAnimation(typename);
this.FaceTowardsTarget(this.order.data.target);
this.SelectAnimation("gather_" + this.order.data.type.specific);
}
return false;
},
@ -2192,6 +2194,8 @@ UnitAI.prototype.UnitFsmSpec = {
if (cmpResourceGatherer.IsCarryingAnythingExcept(resourceType.generic))
cmpResourceGatherer.DropResources();
this.FaceTowardsTarget(this.order.data.target);
// Collect from the target
let status = cmpResourceGatherer.PerformGather(this.gatheringTarget);
@ -2597,6 +2601,8 @@ UnitAI.prototype.UnitFsmSpec = {
if (cmpBuilderList)
cmpBuilderList.AddBuilder(this.entity);
this.FaceTowardsTarget(this.order.data.target);
this.SelectAnimation("build");
this.StartTimer(1000, 1000);
return false;
@ -2620,7 +2626,9 @@ UnitAI.prototype.UnitFsmSpec = {
return;
}
var cmpBuilder = Engine.QueryInterface(this.entity, IID_Builder);
this.FaceTowardsTarget(this.order.data.target);
let cmpBuilder = Engine.QueryInterface(this.entity, IID_Builder);
cmpBuilder.PerformBuilding(this.repairTarget);
// if the building is completed, the leave() function will be called
// by the ConstructionFinished message