Ticket #3917: tradeinternational.4.diff

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

@@ -12 +12 @@
 Trader.prototype.Schema =
     "<a:help>Lets the unit generate resouces while moving between markets (or docks in case of water trading).</a:help>" +
     "<a:example>" +
         "<MaxDistance>2.0</MaxDistance>" +
         "<GainMultiplier>1.0</GainMultiplier>" +
+        "<InternationalBonus>0.25</InternationalBonus>" +
     "</a:example>" +
     "<element name='GainMultiplier' a:help='Additional gain multiplier'>" +
         "<ref name='positiveDecimal'/>" +
+    "</element>" +
+    "<element name='InternationalBonus' a:help='Additional part of the gain donated when two different players trade'>" +
+        "<ref name='positiveDecimal'/>" +
     "</element>";
 
 Trader.prototype.Init = function()
 {
     this.markets = [];

binaries/data/mods/public/simulation/helpers/TraderGain.js

@@ -1 +1 @@
 // This constant used to adjust gain value depending on distance
-const DISTANCE_FACTOR = 1 / 115;
-
-// Additional gain (applying to each market) for trading performed between markets of different players, in percents
-const INTERNATIONAL_TRADING_ADDITION = 25;
+const DISTANCE_FACTOR = 1 / 13225;
 
 // If trader undefined, the trader owner is supposed to be the same as the first market
-function CalculateTraderGain(firstMarket, secondMarket, template, trader)
+function CalculateTraderGain(firstMarket, secondMarket, traderTemplate, trader)
 {
+    if (!traderTemplate)
+        return null;
     var gain = {};
 
     var cmpFirstMarketPosition = Engine.QueryInterface(firstMarket, IID_Position);
     var cmpSecondMarketPosition = Engine.QueryInterface(secondMarket, IID_Position);
     if (!cmpFirstMarketPosition || !cmpFirstMarketPosition.IsInWorld() ||
@@ -17 +16 @@
     var firstMarketPosition = cmpFirstMarketPosition.GetPosition2D();
     var secondMarketPosition = cmpSecondMarketPosition.GetPosition2D();
 
     // Calculate ordinary Euclidean distance between markets.
     // We don't use pathfinder, because ordinary distance looks more fair.
-    var distance = firstMarketPosition.distanceTo(secondMarketPosition);
+    var distanceSq = firstMarketPosition.distanceToSquared(secondMarketPosition);
     // We calculate gain as square of distance to encourage trading between remote markets
-    gain.traderGain = Math.pow(distance * DISTANCE_FACTOR, 2);
-    if (template && template.GainMultiplier)
-    {
-        if (trader)
-            gain.traderGain *= ApplyValueModificationsToEntity("Trader/GainMultiplier", +template.GainMultiplier, trader);
-        else    // called from the gui with modifications already applied
-            gain.traderGain *= template.GainMultiplier;
-    }
+    gain.traderGain = distanceSq * DISTANCE_FACTOR;
+    let gainMultiplier = traderTemplate.GainMultiplier || 1;
+    // false when called from the gui, modifications already applied
+    if (trader)
+        gainMultiplier = ApplyValueModificationsToEntity("Trader/GainMultiplier", gainMultiplier, trader);
+    let cmpFirstMarketPlayer = QueryOwnerInterface(firstMarket);
+    let cmpSecondMarketPlayer = QueryOwnerInterface(secondMarket);
+    if (!cmpFirstMarketPlayer || !cmpSecondMarketPlayer)
+        return null;
+    gain.market1Owner = cmpFirstMarketPlayer.GetPlayerID();
+    gain.market2Owner = cmpSecondMarketPlayer.GetPlayerID();
     // If trader undefined, the trader owner is supposed to be the same as the first market
-    var cmpOwnership = trader ? Engine.QueryInterface(trader, IID_Ownership) : Engine.QueryInterface(firstMarket, IID_Ownership);
-    if (!cmpOwnership)
+    let cmpPlayer = trader ? QueryOwnerInterface(trader) : cmpFirstMarketPlayer;
+    if (!cmpPlayer)
         return null;
-    gain.traderOwner = cmpOwnership.GetOwner();
-
+    gain.traderOwner = cmpPlayer.GetPlayerID();
+    // Add potential player trade multipliers
+    let playerBonus = cmpPlayer.GetTradeRateMultiplier();
     // If markets belong to different players, add gain from international trading
-    var ownerFirstMarket = Engine.QueryInterface(firstMarket, IID_Ownership).GetOwner();
-    var ownerSecondMarket = Engine.QueryInterface(secondMarket, IID_Ownership).GetOwner();
-    if (ownerFirstMarket != ownerSecondMarket)
-    {
-        gain.market1Gain = gain.traderGain * ApplyValueModificationsToEntity("Trade/International", INTERNATIONAL_TRADING_ADDITION, firstMarket) / 100;
-        gain.market1Owner = ownerFirstMarket;
-        gain.market2Gain = gain.traderGain * ApplyValueModificationsToEntity("Trade/International", INTERNATIONAL_TRADING_ADDITION, secondMarket) / 100;
-        gain.market2Owner = ownerSecondMarket;
-    }
-
-    // Add potential trade multipliers and roundings
-    var cmpPlayer = trader ? QueryOwnerInterface(trader) : QueryOwnerInterface(firstMarket);
-    if (cmpPlayer)
-        gain.traderGain *= cmpPlayer.GetTradeRateMultiplier();
-    gain.traderGain = Math.round(gain.traderGain);
-
-    if (ownerFirstMarket != ownerSecondMarket)
-    {
-        if ((cmpPlayer = QueryOwnerInterface(firstMarket)))
-            gain.market1Gain *= cmpPlayer.GetTradeRateMultiplier();
-        gain.market1Gain = Math.round(gain.market1Gain);
-
-        if ((cmpPlayer = QueryOwnerInterface(secondMarket)))
-            gain.market2Gain *= cmpPlayer.GetTradeRateMultiplier();
-        gain.market2Gain = Math.round(gain.market2Gain);
-    }
+    let internationalBonus = traderTemplate && traderTemplate.InternationalBonus && gain.market1Owner != gain.market2Owner ? traderTemplate.InternationalBonus : 0;
+    let market1Bonus = ApplyValueModificationsToEntity("Trader/InternationalBonus", internationalBonus, firstMarket) * ((gain.traderOwner == gain.market1Owner) ? playerBonus : 1);
+    let market2Bonus = ApplyValueModificationsToEntity("Trader/InternationalBonus", internationalBonus, secondMarket) * ((gain.traderOwner == gain.market2Owner) ? playerBonus : 1);
+    gain.traderGain *= gainMultiplier;
+    gain.market1Gain = Math.round(gain.traderGain * market1Bonus);
+    gain.market2Gain = Math.round(gain.traderGain * market2Bonus);
+    gain.traderGain = Math.round(gain.traderGain * playerBonus);
 
     return gain;
 }
 
 Engine.RegisterGlobal("CalculateTraderGain", CalculateTraderGain);

binaries/data/mods/public/simulation/templates/template_formation.xml

@@ -40 +40 @@
     <WalkSpeed>1.0</WalkSpeed>
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
   <Trader>
     <GainMultiplier>1.0</GainMultiplier>
+    <InternationalBonus>0.25</InternationalBonus>
   </Trader>
 </Entity>

binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml

@@ -44 +44 @@
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <Trader>
     <GainMultiplier>1.0</GainMultiplier>
+    <InternationalBonus>0.25</InternationalBonus>
   </Trader>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
   </UnitAI>

binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml

@@ -38 +38 @@
       <gather_ore>resource/mining/mining.xml</gather_ore>
     </SoundGroups>
   </Sound>
   <Trader>
     <GainMultiplier>1.0</GainMultiplier>
+    <InternationalBonus>0.25</InternationalBonus>
   </Trader>
   <UnitAI>
     <CanGuard>false</CanGuard>
   </UnitAI>
   <UnitMotion>

binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml

@@ -12 +12 @@
     <Icon>units/cart_ship_merchant.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Trader>
     <GainMultiplier>1.25</GainMultiplier>
+    <InternationalBonus op="add">0.1</InternationalBonus>
   </Trader>
   <VisualActor>
     <Actor>structures/carthaginians/merchant_ship.xml</Actor>
   </VisualActor>
 </Entity>

binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml

@@ -16 +16 @@
       <select>actor/fauna/animal/camel.xml</select>
       <order_walk>actor/fauna/movement/camel.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
+  <Trader>
+    <GainMultiplier>1.0</GainMultiplier>
+    <InternationalBonus op="add">0.1</InternationalBonus>
+  </Trader>
   <VisualActor>
     <Actor>units/carthaginians/trader.xml</Actor>
   </VisualActor>
 </Entity>