Ticket #1822: 1822.patch

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

@@ -878 +878 @@
             this.SetNextStateAlwaysEntering("MEMBER");
         },
 
+        "Order.Trade": function(msg) {
+            //this.AddOrder("Trade", { "target": target, "source": source, "force": false }, queued);
+            var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
+            // We don't want to rearrange the formation if the individual units are carrying
+            // out a task and one of the members dies/leaves the formation.
+            cmpFormation.SetRearrange(false);
+            cmpFormation.CallMemberFunction("SetupTradeRoute", [msg.data.target, msg.data.source, false]);
+
+            this.SetNextStateAlwaysEntering("MEMBER");
+        },
+
         "Order.Pack": function(msg) {
             var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
             // We don't want to rearrange the formation if the individual units are carrying
@@ -3682 +3693 @@
 
             break; // and continue the loop
 
+        case "Trade": // Added here for formation trading only, but that doesn't make that much sense
         case "WalkToTarget":
         case "WalkToTargetRange": // This doesn't move to the target (just into range), but a later order will.
         case "Flee":
@@ -3920 +3932 @@
     }
 
     var cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
+    // Formation controller probably (TODO: make this explicit?)
+    if (!cmpTrader)
+    {
+        this.AddOrder("Trade", { "target": target, "source": source, "force": false }, queued);
+        return;
+    }
+
     var marketsChanged = cmpTrader.SetTargetMarket(target, source);
     if (marketsChanged)
     {

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -428 +428 @@
         break;
 
     case "setup-trade-route":
-        for each (var ent in cmd.entities)
-        {
-            var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-            if (cmpUnitAI)
-                cmpUnitAI.SetupTradeRoute(cmd.target, cmd.source);
-        }
+        var entities = FilterEntityList(cmd.entities, player, controlAllUnits);
+        GetFormationUnitAIs(entities, player).forEach(function(cmpUnitAI) {
+            cmpUnitAI.SetupTradeRoute(cmd.target,cmd.source, cmd.queued);
+        });
         break;
 
     case "select-trading-goods":