Changeset 9663 for ps

Timestamp:

06/26/11 04:03:36 (14 years ago)

Author:

Badmadblacksad

Message:

stances improvement and bugfixing. units now targets buildings last, after workers, and after every other units.

Location:

ps/trunk/binaries/data/mods/public/simulation

Files:

• components/Promotion.js (modified) (1 diff)
• components/UnitAI.js (modified) (4 diffs)
• helpers/Entity.js (modified) (1 diff)

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

@@ -68 +68 @@
     cmpPromotedUnitAI.SetHeldPosition(cmpCurrentUnitAI.GetHeldPosition());
     if (cmpCurrentUnitAI.GetStanceName())
-        cmpPromotedUnitAI.SetStance(cmpCurrentUnitAI.GetStanceName());
+        cmpPromotedUnitAI.SwitchToStance(cmpCurrentUnitAI.GetStanceName());
     cmpPromotedUnitAI.Cheer();
     var orders = cmpCurrentUnitAI.GetOrders();

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

@@ -284 +284 @@
 
     "Order.Gather": function(msg) {
-        //If target is not visible anymore, give up
-        if (!this.CheckTargetVisible(this.order.data.target))
-        {
-            this.FinishOrder();
-            return;
-        }
-
         // If the target is still alive, we need to kill it first
-        if (this.MustKillGatherTarget(this.order.data.target))
+        if (this.MustKillGatherTarget(this.order.data.target) && this.CheckTargetVisible(this.order.data.target))
         {
             // Make sure we can attack the target, else we'll get very stuck
@@ -382 +375 @@
 
         "Order.Walk": function(msg) {
+            var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
+            cmpFormation.CallMemberFunction("SetHeldPosition", [msg.data.x, msg.data.z]);
+
             this.MoveToPoint(this.order.data.x, this.order.data.z);
             this.SetNextState("WALKING");
@@ -734 +730 @@
                 // TODO: respond to target deaths immediately, rather than waiting
                 // until the next Timer event
+
+                "Attacked": function(msg) {
+                    if (this.order.data.target != msg.data.attacker)
+                    {
+                        // If we're attacked by a close enemy stronger than our current target, we choose to attack him
+                        if (this.GetStance().targetAttackers && msg.data.type == "Melee")
+                        {
+                            var ents = [this.order.data.target, msg.data.attacker];
+                            SortEntitiesByPriority(ents);
+                            if (ents[0] != this.order.data.target)
+                            {
+                                this.RespondToTargetedEntities(ents);
+                            }
+                        }
+                    }
+                },
             },
 
@@ -2361 +2373 @@
         return false;
 
+    SortEntitiesByPriority(ents);
     return this.RespondToTargetedEntities(ents);
 };

ps/trunk/binaries/data/mods/public/simulation/helpers/Entity.js

@@ -18 +18 @@
 }
 
+/**
+ *  Returns entities ordered by decreasing priority
+ *  Do not alter order when units have the same priority
+ */
+function SortEntitiesByPriority(ents)
+{
+  // Priority list, weakers first
+  var types = ["Structure", "Worker"];
+
+  ents.sort(function  (a, b) {
+    var cmpIdentityA = Engine.QueryInterface(a, IID_Identity);
+    var cmpIdentityB = Engine.QueryInterface(b, IID_Identity);
+    if (!cmpIdentityA || !cmpIdentityB)
+      return 0;
+    var classesA = cmpIdentityA.GetClassesList();
+    var classesB = cmpIdentityB.GetClassesList();
+    for each (var type in types)
+    {
+      var inA = classesA.indexOf(type) != -1;
+      var inB = classesB.indexOf(type) != -1;
+      if (inA && !inB)
+        return +1;
+      if (inB && !inA)
+        return -1;
+    }
+    return 0;
+  });
+}
+
 Engine.RegisterGlobal("DistanceBetweenEntities", DistanceBetweenEntities);
+Engine.RegisterGlobal("SortEntitiesByPriority", SortEntitiesByPriority);