Ticket #1691: trader.patch

simulation/helpers/TraderGain.js

@@ -4 +4 @@
 // Additional gain for trading performed between markets of different players, in percents
 const INTERNATIONAL_TRADING_ADDITION = 50;
 
+// Fraction of the additionnal gain to go to the owner of the trader, in percents
+const FRACTION_BONUS_TRADER = 60;
+
 function CalculateTraderGain(firstMarket, secondMarket, template)
 {
     var cmpFirstMarketPosition = Engine.QueryInterface(firstMarket, IID_Position);
@@ -31 +34 @@
     return gain;
 }
 
+function CalculateTraderShare()
+{
+    var fraction = (100 - INTERNATIONAL_TRADING_ADDITION + 2*INTERNATIONAL_TRADING_ADDITION*FRACTION_BONUS_TRADER/100);
+    fraction = fraction / (100 + INTERNATIONAL_TRADING_ADDITION);
+    // Add protections against unreasonnable input values
+    if(fraction < 0) return 0;
+    if(fraction > 1) return 1;
+    return fraction;
+}
+
 Engine.RegisterGlobal("CalculateTraderGain", CalculateTraderGain);
+Engine.RegisterGlobal("CalculateTraderShare", CalculateTraderShare);

simulation/components/UnitAI.js

@@ -3180 +3180 @@
 
     if (this.CheckTargetRange(currentMarket, IID_Trader))
     {
-        this.PerformTrade();
+        this.PerformTrade(currentMarket);
         if (this.MoveToMarket(nextMarket))
         {
             // We've started walking to the next market
@@ -3194 +3194 @@
     }
 };
 
-UnitAI.prototype.PerformTrade = function()
+UnitAI.prototype.PerformTrade = function(currentMarket)
 {
     var cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
-    cmpTrader.PerformTrade();
+    cmpTrader.PerformTrade(currentMarket);
 };
 
 UnitAI.prototype.StopTrading = function()

simulation/components/Trader.js

@@ -32 +32 @@
     this.preferredGoods = "metal";
     // Currently carried goods
     this.goods = { "type": null, "amount": 0 };
+    // Fraction of the gain to go to the trader at each market stop
+    this.fraction = CalculateTraderShare();
 }
 
 Trader.prototype.CalculateGain = function(firstMarket, secondMarket, template)
@@ -175 +177 @@
     return true;
 }
 
-Trader.prototype.PerformTrade = function()
+Trader.prototype.PerformTrade = function(market)
 {
     if (this.goods.amount > 0)
     {
+        var traderGain = Math.round(this.fraction * this.goods.amount);
+
         var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
-        cmpPlayer.AddResource(this.goods.type, this.goods.amount);
+        cmpPlayer.AddResource(this.goods.type, traderGain);
 
         var cmpStatisticsTracker = QueryOwnerInterface(this.entity, IID_StatisticsTracker);
         if (cmpStatisticsTracker)
-            cmpStatisticsTracker.IncreaseTradeIncomeCounter(this.goods.amount);
+            cmpStatisticsTracker.IncreaseTradeIncomeCounter(traderGain);
+
+        var marketGain = this.goods.amount - traderGain;
+
+        var marketOwner = QueryOwnerInterface(market, IID_Player);
+        marketOwner.AddResource(this.goods.type, marketGain);
+
+        var marketStatisticsTracker = QueryOwnerInterface(market, IID_StatisticsTracker);
+        if (marketStatisticsTracker)
+            marketStatisticsTracker.IncreaseTradeIncomeCounter(marketGain);
     }
     this.goods.type = this.preferredGoods;
     this.goods.amount = this.gain;