Ticket #1210: input.js.patch

input.js

@@ -269 +269 @@
             break;
         case "setup-trade-route":
             // If ground or sea trade possible
-            if ((entState.trader && hasClass(entState, "Organic") && (playerOwned || allyOwned) && hasClass(targetState, "Market")) ||
-                (entState.trader && hasClass(entState, "Ship") && (playerOwned || allyOwned) && hasClass(targetState, "NavalMarket")))
+            if ((!targetState.foundation) && ((entState.trader && hasClass(entState, "Organic") && (playerOwned || allyOwned) && hasClass(targetState, "Market")) ||
+                (entState.trader && hasClass(entState, "Ship") && (playerOwned || allyOwned) && hasClass(targetState, "NavalMarket"))))
             {
                 var tradingData = {"trader": entState.id, "target": target};
                 var tradingDetails = Engine.GuiInterfaceCall("GetTradingDetails", tradingData);
                 var tooltip;
+                if (tradingDetails === null)
+                    return {"possible": false};
                 switch (tradingDetails.type)
                 {
                 case "is first":
@@ -376 +378 @@
     {
         target = targets[0];
     }
-
+    //targetState = target;
     if (preSelectedAction != ACTION_NONE)
     {
         switch (preSelectedAction)
@@ -1152 +1154 @@
 // Called by GUI when user changes preferred trading goods
 function selectTradingPreferredGoods(data)
 {
-    Engine.PostNetworkCommand({"type": "select-trading-goods", "trader": data.trader, "preferredGoods": data.preferredGoods});
+    Engine.PostNetworkCommand({"type": "select-trading-goods", "entities": data.entities, "preferredGoods": data.preferredGoods});
 }
 
 // Called by GUI when user clicks exchange resources button
@@ -1175 +1177 @@
 }
 
 // Called by GUI when user clicks training button
-function addToTrainingQueue(entity, trainEntType)
+function addToTrainingQueue(entity, trainEntType, selection)
 {
     if (Engine.HotkeyIsPressed("session.batchtrain"))
     {
-        if (inputState == INPUT_BATCHTRAINING)
+        if (selection.length == 1)
         {
-            // If we're already creating a batch of this unit, then just extend it
-            if (batchTrainingEntity == entity && batchTrainingType == trainEntType)
+            if (inputState == INPUT_BATCHTRAINING)
             {
-                batchTrainingCount += batchIncrementSize;
-                return;
+                // If we're already creating a batch of this unit, then just extend it
+                if (batchTrainingEntity == entity && batchTrainingType == trainEntType)
+                {
+                    batchTrainingCount += batchIncrementSize;
+                    return;
+                }
+                // Otherwise start a new one
+                else
+                {
+                    flushTrainingQueueBatch();
+                    // fall through to create the new batch
+                }
             }
-            // Otherwise start a new one
-            else
-            {
-                flushTrainingQueueBatch();
-                // fall through to create the new batch
-            }
         }
+        else
+        {
+            //create a new batch
+            Engine.PostNetworkCommand({"type": "train", "entity": entity, "template": trainEntType, "count": batchIncrementSize, "entities": selection});
+        }
         inputState = INPUT_BATCHTRAINING;
         batchTrainingEntity = entity;
         batchTrainingType = trainEntType;
@@ -1202 +1212 @@
     else
     {
         // Non-batched - just create a single entity
-        Engine.PostNetworkCommand({"type": "train", "entity": entity, "template": trainEntType, "count": 1});
+        Engine.PostNetworkCommand({"type": "train", "entity": entity, "template": trainEntType, "count": 1, "entities": selection});
     }
 }