Ticket #1215: patch2.patch

GuiInterface.js

@@ -692 +692 @@
 GuiInterface.prototype.GetTradingDetails = function(player, data)
 {
     var cmpEntityTrader = Engine.QueryInterface(data.trader, IID_Trader);
-    if (!cmpEntityTrader || !cmpEntityTrader.CanTrade(data.target))
+    if (!cmpEntityTrader || !cmpEntityTrader.CanTrade(data.target, data.targetState))
         return null;
     var firstMarket = cmpEntityTrader.GetFirstMarket();
     var secondMarket = cmpEntityTrader.GetSecondMarket();

Trader.js

@@ -159 +159 @@
     this.preferredGoods = preferredGoods;
 }
 
-Trader.prototype.CanTrade = function(target)
+Trader.prototype.CanTrade = function(target, targetState)
 {
+    // Check that the target is not a foundation
+    if (targetState.foundation)
+        return false;
     var cmpTraderIdentity = Engine.QueryInterface(this.entity, IID_Identity);
     var cmpTargetIdentity = Engine.QueryInterface(target, IID_Identity);
     // Check that the target exists

UnitAI.js

@@ -2430 +2430 @@
     this.AddOrder("ReturnResource", { "target": target }, queued);
 };
 
-UnitAI.prototype.SetupTradeRoute = function(target, queued)
+UnitAI.prototype.SetupTradeRoute = function(target, queued, targetState)
 {
-    if (!this.CanTrade(target))
+    if (!this.CanTrade(target, targetState))
     {
         this.WalkToTarget(target, queued);
         return;
@@ -2468 +2468 @@
 
 UnitAI.prototype.PerformTradeAndMoveToNextMarket = function(currentMarket, nextMarket, nextFsmStateName)
 {
-    if (!this.CanTrade(currentMarket))
+    if (!this.CanTrade(currentMarket, currentMarket))
     {
         this.StopTrading();
         return;
@@ -2724 +2724 @@
     return true;
 };
 
-UnitAI.prototype.CanTrade = function(target)
+UnitAI.prototype.CanTrade = function(target, targetState)
 {
     // Formation controllers should always respond to commands
     // (then the individual units can make up their own minds)
@@ -2733 +2733 @@
 
     // Verify that we're able to respond to Trade commands
     var cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
-    if (!cmpTrader || !cmpTrader.CanTrade(target))
+    if (!cmpTrader || !cmpTrader.CanTrade(target, targetState))
         return false;
 
     return true;