Ticket #1215: finalPatch2.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;
-                switch (tradingDetails.type)
+                if (tradingDetails !== null)
                 {
-                case "is first":
-                    tooltip = "First trade market.";
-                    if (tradingDetails.hasBothMarkets)
-                        tooltip += " Gain: " + tradingDetails.gain + " " + tradingDetails.goods + ". Click to establish another route."
-                    else
-                        tooltip += " Click on another market to establish a trade route."
-                    break;
-                case "is second":
-                    tooltip = "Second trade market. Gain: " + tradingDetails.gain + " " + tradingDetails.goods + "." + " Click to establish another route.";
-                    break;
-                case "set first":
-                    tooltip = "Set as first trade market";
-                    break;
-                case "set second":
-                    tooltip = "Set as second trade market. Gain: " + tradingDetails.gain + " " + tradingDetails.goods + ".";
-                    break;
+                    switch (tradingDetails.type)
+                    {
+                    case "is first":
+                        tooltip = "First trade market.";
+                        if (tradingDetails.hasBothMarkets)
+                            tooltip += " Gain: " + tradingDetails.gain + " " + tradingDetails.goods + ". Click to establish another route."
+                        else
+                            tooltip += " Click on another market to establish a trade route."
+                        break;
+                    case "is second":
+                        tooltip = "Second trade market. Gain: " + tradingDetails.gain + " " + tradingDetails.goods + "." + " Click to establish another route.";
+                        break;
+                    case "set first":
+                        tooltip = "Set as first trade market";
+                        break;
+                    case "set second":
+                        tooltip = "Set as second trade market. Gain: " + tradingDetails.gain + " " + tradingDetails.goods + ".";
+                        break;
+                    }
+                    return {"possible": true, "tooltip": tooltip};
                 }
-                return {"possible": true, "tooltip": tooltip};
+                else
+                {
+                    return {"possible": false};
+                }
             }
             break;
         case "gather":
@@ -376 +383 @@
     {
         target = targets[0];
     }
-
+    //targetState = target;
     if (preSelectedAction != ACTION_NONE)
     {
         switch (preSelectedAction)
@@ -1175 +1182 @@
 }
 
 // Called by GUI when user clicks training button
-function addToTrainingQueue(entity, trainEntType)
+function addToTrainingQueue(entity, trainEntType, selection)
 {
+    var selectionUnits = new Array(0);
+    for (var j = 0; j < selection.length; ++j)
+    {
+        selectionUnits.push (GetEntityState(selection[j]).id);
+    }
     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": selectionUnits});
+        }
         inputState = INPUT_BATCHTRAINING;
         batchTrainingEntity = entity;
         batchTrainingType = trainEntType;
@@ -1202 +1222 @@
     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": selectionUnits});
     }
 }