Ticket #831: checkTargetAngle.diff

binaries/data/mods/public/simulation/components/UnitAI.js

@@ -617 +617 @@
                     if (this.TargetIsAlive(this.order.data.target))
                     {
                         // Check we can still reach the target
-                        if (this.CheckTargetRange(this.order.data.target, IID_Attack, this.attackType))
+                        if (this.CheckTargetRange(this.order.data.target, IID_Attack, this.attackType) && this.CheckTargetAngle(this.order.data.target))
                         {
                             var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
                             cmpAttack.PerformAttack(this.attackType, this.order.data.target);
@@ -1813 +1813 @@
     return cmpUnitMotion.IsInTargetRange(target, range.min, range.max);
 };
 
+UnitAI.prototype.CheckTargetAngle = function(target)
+{
+    var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+    if (!cmpPosition || !cmpPosition.IsInWorld())
+        return false;
+    var cmpTargetPosition = Engine.QueryInterface(target, IID_Position);
+    if (!cmpTargetPosition || !cmpTargetPosition.IsInWorld())
+        return false;
+    var pos = cmpPosition.GetPosition();
+    var targetpos = cmpTargetPosition.GetPosition();
+    var angle = Math.atan2(targetpos.x - pos.x, targetpos.z - pos.z);
+    var rot = cmpPosition.GetRotation();
+    var delta = (rot.y - angle + Math.PI) % (2 * Math.PI) - Math.PI;
+    return Math.abs(delta) < 0.2;
+};
+
 UnitAI.prototype.GetBestAttack = function()
 {
     var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);