Changeset 9595 for ps

Timestamp:

06/07/11 00:08:26 (14 years ago)

Author:

Badmadblacksad

Message:

Ranged units always face their targets when attacking. fixes #831

Location:

ps/trunk

Files:

• binaries/data/mods/public/simulation/components/UnitAI.js (modified) (3 diffs)
• source/simulation2/components/ICmpPosition.cpp (modified) (1 diff)

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

@@ -620 +620 @@
                     // TODO: if .prepare is short, players can cheat by cycling attack/stop/attack
                     // to beat the .repeat time; should enforce a minimum time
+
+                    this.FaceTowardsTarget(this.order.data.target);
                 },
 
@@ -633 +635 @@
                         if (this.CheckTargetRange(this.order.data.target, IID_Attack, this.attackType))
                         {
+                            this.FaceTowardsTarget(this.order.data.target);
                             var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
                             cmpAttack.PerformAttack(this.attackType, this.order.data.target);
@@ -1813 +1816 @@
 };
 
+UnitAI.prototype.FaceTowardsTarget = function(target)
+{
+    var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+    if (!cmpPosition || !cmpPosition.IsInWorld())
+            return;
+    var cmpTargetPosition = Engine.QueryInterface(target, IID_Position);
+    if (!cmpTargetPosition || !cmpTargetPosition.IsInWorld())
+            return;
+    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;
+    if (Math.abs(delta) > 0.2)
+    {
+        var cmpUnitMotion = Engine.QueryInterface(this.entity, IID_UnitMotion);
+        if (cmpUnitMotion)
+        {
+            cmpPosition.TurnTo(angle);
+        }
+    }
+}
+
 UnitAI.prototype.GetBestAttack = function()
 {

ps/trunk/source/simulation2/components/ICmpPosition.cpp

@@ -32 +32 @@
 DEFINE_INTERFACE_METHOD_0("GetPosition", CFixedVector3D, ICmpPosition, GetPosition)
 DEFINE_INTERFACE_METHOD_0("GetPosition2D", CFixedVector2D, ICmpPosition, GetPosition2D)
+DEFINE_INTERFACE_METHOD_1("TurnTo", void, ICmpPosition, TurnTo, entity_angle_t)
 DEFINE_INTERFACE_METHOD_1("SetYRotation", void, ICmpPosition, SetYRotation, entity_angle_t)
 DEFINE_INTERFACE_METHOD_2("SetXZRotation", void, ICmpPosition, SetXZRotation, entity_angle_t, entity_angle_t)