Ticket #3277: Trader_js.patch

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

@@ -1 @@
-// See helpers/TraderGain.js for the CalculateTaderGain() function which works out how many 
-// resources a trader gets 
+// See helpers/TraderGain.js for the CalculateTaderGain() function which works out how many
+// resources a trader gets
 
 // Additional gain for ships for each garrisoned trader, in percents
 const GARRISONED_TRADER_ADDITION = 20;
@@ -63 +63 @@
                 gain.market2Gain = Math.round(garrisonMultiplier * gain.market2Gain);
         }
     }
-    
+
     return gain;
 };
 
@@ -255 +255 @@
 
 Trader.prototype.StopTrading = function()
 {
-    // Drop carried goods
-    this.goods.amount = null;
     // Reset markets
     this.firstMarket = INVALID_ENTITY;
     this.secondMarket = INVALID_ENTITY;
@@ -280 +278 @@
         this.gain = this.CalculateGain(this.firstMarket, this.secondMarket);
 };
 
+Trader.prototype.InvalidateFirstMarket = function()
+{
+    this.firstMarket = INVALID_ENTITY;
+}
+
+Trader.prototype.InvalidateSecondMarket = function()
+{
+    this.secondMarket = INVALID_ENTITY;
+}
+
+Trader.prototype.MoveToFirstMarket = function() {
+    let cmpUnitAI = Engine.QueryInterface(this.entity, IID_UnitAI);
+    cmpUnitAI.MoveToMarket(this.firstMarket);
+}
+
+Trader.prototype.MoveToSecondMarket = function() {
+    let cmpUnitAI = Engine.QueryInterface(this.enitity, IID_UnitAI);
+    cmpUnitAI.MoveToMarket(this.secondMarket);
+}
+
 Engine.RegisterComponentType(IID_Trader, "Trader", Trader);