Ticket #3428: 3428.5.patch

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

@@ -1 +1 @@
 // 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;
+// Additional gain for ships for the first garrisoned trader, in percents
+const GARRISONED_TRADER_ADDITION = 90;
+// Decrease in trade bonus for each additional garrisoned trader, in percents
+const GARRISONED_TRADER_DECREASE = 10;
 
 // Array of resource names
 const RESOURCES = ["food", "wood", "stone", "metal"];
@@ -46 +48 @@
         if (cmpGarrisonHolder)
         {
             var garrisonMultiplier = 1;
-            var garrisonedTradersCount = 0;
+            var garrisonBonusMultiplier = 1;
             for each (var entity in cmpGarrisonHolder.GetEntities())
             {
                 var cmpGarrisonedUnitTrader = Engine.QueryInterface(entity, IID_Trader);
                 if (cmpGarrisonedUnitTrader)
-                    garrisonedTradersCount++;
+                {
+                    garrisonMultiplier += GARRISONED_TRADER_ADDITION * garrisonBonusMultiplier / 100;
+                    garrisonBonusMultiplier *= 1 - GARRISONED_TRADER_DECREASE / 100;
+                }
             }
-            garrisonMultiplier *= 1 + GARRISONED_TRADER_ADDITION * garrisonedTradersCount / 100;
 
             if (gain.traderGain)
                 gain.traderGain = Math.round(garrisonMultiplier * gain.traderGain);

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

@@ -7 +7 @@
   </Armour>
   <Cost>
     <Resources>
-      <wood>0</wood>
-      <metal>100</metal>
+      <wood>100</wood>
+      <metal>80</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>