Ticket #3697: trade-v2.4.patch

binaries/data/mods/public/globalscripts/Templates.js

@@ -243 +243 @@
             "walk": func("UnitMotion/WalkSpeed", +template.UnitMotion.WalkSpeed, player, template),
         };
         if (template.UnitMotion.Run)
             ret.speed.run = func("UnitMotion/Run/Speed", +template.UnitMotion.Run.Speed, player, template);
     }
-
-    if (template.Trader)
-    {
-        ret.trader = {
-            "GainMultiplier": func("Trader/GainMultiplier", +template.Trader.GainMultiplier, player, template)
-        };
-    }
         
     if (template.WallSet)
     {
         ret.wallSet = {
             "templates": {

binaries/data/mods/public/gui/session/selection_details.js

@@ -174 +174 @@
         Engine.GetGUIObjectByName("resourceCarryingIcon").sprite = "stretched:session/icons/resources/"+carried.type+".png";
         Engine.GetGUIObjectByName("resourceCarryingText").caption = sprintf(translate("%(amount)s / %(max)s"), { "amount": carried.amount, "max": carried.max });
         Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = "";
     }
     // Use the same indicators for traders
-    else if (entState.trader && entState.trader.goods.amount)
+    else if (entState.trader && entState.trader.trading)
     {
+        var nextMarket = GetEntityState(entState.trader.nextMarket);
+        // Find the connection if it exists.
+        let connection = null;
+
+        if (nextMarket && nextMarket.tradeIncome)
+            connection = nextMarket.tradeIncome.connections.find(conn => conn.marketID === entState.trader.originMarket);
+
         Engine.GetGUIObjectByName("resourceCarryingIcon").hidden = false;
         Engine.GetGUIObjectByName("resourceCarryingText").hidden = false;
-        Engine.GetGUIObjectByName("resourceCarryingIcon").sprite = "stretched:session/icons/resources/"+entState.trader.goods.type+".png";
-        let totalGain = entState.trader.goods.amount.traderGain;
-        if (entState.trader.goods.amount.market1Gain)
-            totalGain += entState.trader.goods.amount.market1Gain;
-        if (entState.trader.goods.amount.market2Gain)
-            totalGain += entState.trader.goods.amount.market2Gain;
-        Engine.GetGUIObjectByName("resourceCarryingText").caption = totalGain;
-        Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = sprintf(translate("Gain: %(gain)s"), { "gain": getTradingTooltip(entState.trader.goods.amount) });
+        Engine.GetGUIObjectByName("resourceCarryingIcon").sprite = "stretched:session/icons/trade.png";
+        Engine.GetGUIObjectByName("resourceCarryingText").caption = "";
+        if (connection)
+            Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = sprintf(translate("This trader is part of a trade route between two markets.\nThis route's efficiency is %(strength)u%%."), { "strength": Math.min(connection.strength, 100) });
+        else
+            Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = translate("This trader is trying to establish a trade route, but the number of traders isn't high enough for this trade route to be viable yet.");
     }
     // And for number of workers
     else if (entState.foundation && entState.visibility == "visible")
     {
         Engine.GetGUIObjectByName("resourceCarryingIcon").hidden = false;
@@ -204 +209 @@
             Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = sprintf(translatePlural("Number of builders.\nTasking another to this foundation would speed construction up by %(speedup)s second.", "Number of builders.\nTasking another to this foundation would speed construction up by %(speedup)s seconds.", timeSpeedup), { "speedup": timeSpeedup });
         }
         else
             Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = translate("Number of builders.");
     }
+    // And for the trade income icon
+    else if (entState.tradeIncome)
+    {
+        Engine.GetGUIObjectByName("resourceCarryingIcon").hidden = false;
+        Engine.GetGUIObjectByName("resourceCarryingText").hidden = false;
+        Engine.GetGUIObjectByName("resourceCarryingIcon").sprite = "stretched:session/icons/trade.png";
+        Engine.GetGUIObjectByName("resourceCarryingText").caption = sprintf(translate("%(MarketEfficiency)u%%  x%(NumberOfConnections)u"),
+                                                                            { "MarketEfficiency": +entState.tradeIncome.rawRate*100,
+                                                                              "NumberOfConnections": entState.tradeIncome.connections.length });
+        Engine.GetGUIObjectByName("resourceCarryingIcon").tooltip = getTradeIncomeTooltip(entState.tradeIncome);
+    }
     else if (entState.repairable && entState.repairable.numBuilders > 0 && entState.visibility == "visible")
     {
         Engine.GetGUIObjectByName("resourceCarryingIcon").hidden = false;
         Engine.GetGUIObjectByName("resourceCarryingText").hidden = false;
         Engine.GetGUIObjectByName("resourceCarryingIcon").sprite = "stretched:session/icons/repair.png";

binaries/data/mods/public/gui/session/selection_panels.js

@@ -949 +949 @@
                 if (data.carried[carrying.type])
                     data.carried[carrying.type] += carrying.amount;
                 else
                     data.carried[carrying.type] = carrying.amount;
             }
-
-            if (state.trader && state.trader.goods && state.trader.goods.amount)
-            {
-                if (!data.carried)
-                    data.carried = {};
-                var amount = state.trader.goods.amount;
-                var type = state.trader.goods.type;
-                var totalGain = amount.traderGain;
-                if (amount.market1Gain)
-                    totalGain += amount.market1Gain;
-                if (amount.market2Gain)
-                    totalGain += amount.market2Gain;
-                if (data.carried[type])
-                    data.carried[type] += totalGain;
-                else
-                    data.carried[type] = totalGain;
-            }
         }
         return true;
     },
     "setTooltip": function(data)
     {

binaries/data/mods/public/gui/session/unit_actions.js

@@ -318 +318 @@
             switch (tradingDetails.type)
             {
             case "is first":
                 tooltip = translate("Origin trade market.");
                 if (tradingDetails.hasBothMarkets)
-                    tooltip += "\n" + sprintf(translate("Gain: %(gain)s"), {
-                        gain: getTradingTooltip(tradingDetails.gain)
-                    });
+                    tooltip += "\n" + getTradeRouteTooltip(tradingDetails.gain);
                 else
                     tooltip += "\n" + translate("Right-click on another market to set it as a destination trade market.");
                 break;
             case "is second":
-                tooltip = translate("Destination trade market.") + "\n" + sprintf(translate("Gain: %(gain)s"), {
-                    gain: getTradingTooltip(tradingDetails.gain)
-                });
+                tooltip = translate("Destination trade market.") + "\n" + getTradeRouteTooltip(tradingDetails.gain);
                 break;
             case "set first":
                 tooltip = translate("Right-click to set as origin trade market");
                 break;
             case "set second":
-                if (tradingDetails.gain.traderGain == 0)   // markets too close
-                    return false;
-                tooltip = translate("Right-click to set as destination trade market.") + "\n" + sprintf(translate("Gain: %(gain)s"), {
-                    gain: getTradingTooltip(tradingDetails.gain)
-                });
+                tooltip = translate("Right-click to set as destination trade market.") + "\n" + getTradeRouteTooltip(tradingDetails.gain);
                 break;
             }
-            return {"possible": true, "tooltip": tooltip};
-
+            if (tradingDetails.gain !== undefined && tradingDetails.gain == 0)
+                return { "possible": false, "tooltip": translate("This market is too close to trade with.") };
+            else
+                return { "possible": true, "tooltip": tooltip };
         },
         "actionCheck": function(target)
         {
             var actionInfo = getActionInfo("setup-trade-route", target);
-            if (!actionInfo.possible)
+
+            if (!actionInfo.possible && actionInfo.tooltip != undefined)
+                return { "type": "none", "cursor": "cursor-no", "tooltip": actionInfo.tooltip, "target": null };
+            else if (!actionInfo.possible)
                 return false;
-            return {"type": "setup-trade-route", "cursor": "action-setup-trade-route", "tooltip": actionInfo.tooltip, "target": target};
+            return { "type": "setup-trade-route", "cursor": "action-setup-trade-route", "tooltip": actionInfo.tooltip, "target": target };
         },
         "specificness": 0,
     },
 
     "garrison": 
@@ -498 +495 @@
                 data.command = "attack-walk";
                 data.targetClasses = targetClasses;
                 cursor = "action-attack-move";
             }
 
-            if (targetState.garrisonHolder && playerCheck(entState, targetState, ["Player", "MutualAlly"]))
+            if (hasClass(entState, "Market") && hasClass(targetState, "Market") && entState.id != targetState.id &&
+                    (!hasClass(entState, "NavalMarket") || hasClass(targetState, "NavalMarket")) && playerCheck(entState, targetState, ["MutualAlly"]))
+            {
+                // Find a trader (if any) that this building can produce.
+                let trader;
+                if (entState.production && entState.production.entities.length)
+                    for (let i = 0; i < entState.production.entities.length; ++i)
+                        if ((trader = GetTemplateData(entState.production.entities[i]).trader))
+                            break;
+                let traderData = { "firstMarket": entState.id, "secondMarket": targetState.id, "tradeOwner": entState.player };
+                let gain = Engine.GuiInterfaceCall("GetTradingRouteGain", traderData);
+                if (gain)
+                {
+                    data.command = "trade";
+                    data.target = traderData.secondMarket;
+                    data.source = traderData.firstMarket;
+                    cursor = "action-setup-trade-route";
+                    tooltip = translate("Right-click to establish a default route for new traders.");
+                }
+            }
+            else if (targetState.garrisonHolder && playerCheck(entState, targetState, ["Player", "MutualAlly"]))
             {
                 data.command = "garrison";
                 data.target = targetState.id;
                 cursor = "action-garrison";
                 tooltip = sprintf(translate("Current garrison: %(garrisoned)s/%(capacity)s"), {
@@ -521 +538 @@
                     cursor = "action-gather-" + resourceType.specific;
                 data.command = "gather";
                 data.resourceType = resourceType;
                 data.resourceTemplate = targetState.template;
             }
-            else if (hasClass(entState, "Market") && hasClass(targetState, "Market") && entState.id != targetState.id &&
-                    (!hasClass(entState, "NavalMarket") || hasClass(targetState, "NavalMarket")) && !playerCheck(entState, targetState, ["Enemy"]))
-            {
-                // Find a trader (if any) that this building can produce.
-                var trader;
-                if (entState.production && entState.production.entities.length)
-                    for (var i = 0; i < entState.production.entities.length; ++i)
-                        if ((trader = GetTemplateData(entState.production.entities[i]).trader))
-                            break;
-
-                var traderData = { "firstMarket": entState.id, "secondMarket": targetState.id, "template": trader };
-                var gain = Engine.GuiInterfaceCall("GetTradingRouteGain", traderData);
-                if (gain && gain.traderGain)
-                {
-                    data.command = "trade";
-                    data.target = traderData.secondMarket;
-                    data.source = traderData.firstMarket;
-                    cursor = "action-setup-trade-route";
-                    tooltip = translate("Right-click to establish a default route for new traders.");
-                    if (trader)
-                        tooltip += "\n" + sprintf(translate("Gain: %(gain)s"), { gain: getTradingTooltip(gain) });
-                    else // Foundation or cannot produce traders
-                        tooltip += "\n" + sprintf(translate("Expected gain: %(gain)s"), { gain: getTradingTooltip(gain) });
-                }
-            }
             else if (targetState.foundation && playerCheck(entState, targetState, ["Ally"]))
             {
                 data.command = "build";
                 data.target = targetState.id;
                 cursor = "action-build";

binaries/data/mods/public/gui/session/utility_functions.js

@@ -70 +70 @@
 }
 
 /**
  * Returns a message with the details of the trade gain.
  */
-function getTradingTooltip(gain)
+function getTradeRouteTooltip(gain)
 {
+    return translate("This trader is currently trading between two markets, creating wealth for his empire.") + "\n" +
+           sprintf(translate("The basic value of this trade route is %(value).1f."), { "value": gain });
+}
+
+/**
+ * Returns a message with the details of the trade income.
+ */
+function getTradeIncomeTooltip(details)
+{
+    if (details.connections.length === 0)
+        return translate("This market has no trade routes. Use traders to connect markets and create wealth.");
+
+    let avgStrength = 0.0;
+    for (let connection in details.connections)
+        avgStrength += Math.min(100, details.connections[connection].strength);
+    avgStrength /= details.connections.length;
+
+    let tooltip = "[font=\"sans-bold-13\"]" + translate("Trade income") + ":[/font] " +
+        sprintf(translate("%(tradeRate).1f"), { "tradeRate": details.rate * 60.0 }) +
+        " [font=\"sans-10\"]" + translate("resources/minute") + "[/font]\n";
+
+    tooltip += "[font=\"sans-bold-13\"]" + translate("Efficiency") + ":[/font] " +
+        sprintf(translate("%(tradeEfficiency)u%%"), { "tradeEfficiency": details.rawRate * 100 }) + "\n";
+
+    tooltip += "[font=\"sans-bold-13\"]" + translate("Number of trade routes") + ":[/font] " +
+        sprintf(translateWithContext("trade", "%(connections)s"), { "connections": details.connections.length }) + "\n";
+
+    tooltip += "[font=\"sans-bold-13\"]" + translate("Average trade route effiency") + ":[/font] " +
+        sprintf(translateWithContext("trade", "%(connectionStrength)s%%"), { "connectionStrength": avgStrength });
 
-    var playerID = Engine.GetPlayerID();
-    var simState = GetSimState();
-    
-    var gainString = gain.traderGain;
-    if (gain.market1Gain && gain.market1Owner == gain.traderOwner)
-        gainString += translate("+") + gain.market1Gain;
-    if (gain.market2Gain && gain.market2Owner == gain.traderOwner)
-        gainString += translate("+") + gain.market2Gain;
-
-    var tooltip = sprintf(translate("%(gain)s (%(player)s)"), {
-        gain: gainString,
-        player: (!g_IsNetworked && gain.traderOwner == playerID) ? translate("You") : simState.players[gain.traderOwner].name
-    });
-    
-    if (gain.market1Gain && gain.market1Owner != gain.traderOwner)
-        tooltip += translateWithContext("Separation mark in an enumeration", ", ") + sprintf(translate("%(gain)s (%(player)s)"), {
-            gain: gain.market1Gain,
-            player: (!g_IsNetworked && gain.market1Owner == playerID) ? translate("You") : simState.players[gain.market1Owner].name
-        });
-    if (gain.market2Gain && gain.market2Owner != gain.traderOwner)
-        tooltip += translateWithContext("Separation mark in an enumeration", ", ") + sprintf(translate("%(gain)s (%(player)s)"), {
-            gain: gain.market2Gain,
-            player: (!g_IsNetworked && gain.market2Owner == playerID) ? translate("You") : simState.players[gain.market2Owner].name
-        });
+    tooltip += "[font=\"sans-10\"]\n\n" + translate("To increase your income, garrison workers until the efficiency is 100% and trade with more markets, or reinforce your current trade lines' strengths.") + "[/font]";
 
     return tooltip;
 }
 
 /**

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

@@ -240 +240 @@
         "production": null,
         "rallyPoint": null,
         "resourceCarrying": null,
         "rotation": null,
         "trader": null,
+        "tradeIncome": null,
         "unitAI": null,
         "visibility": null,
     };
 
     let cmpMirage = Engine.QueryInterface(ent, IID_Mirage);
@@ -303 +304 @@
         };
 
     let cmpTrader = Engine.QueryInterface(ent, IID_Trader);
     if (cmpTrader)
         ret.trader = {
-            "goods": cmpTrader.GetGoods(),
-            "requiredGoods": cmpTrader.GetRequiredGoods()
+            "trading": cmpTrader.HasBothMarkets(),
+            "nextMarket": cmpTrader.GetNextMarket(),
+            "originMarket": cmpTrader.GetOriginMarket()
+        };
+
+    let cmpTradeIncome = Engine.QueryInterface(ent, IID_TradeIncome);
+    if (cmpTradeIncome)
+        ret.tradeIncome = {
+            "connections": cmpTradeIncome.GetConnections(),
+            "rate": cmpTradeIncome.GetTradeIncomeRate(),
+            "rawRate": cmpTradeIncome.GetRawEfficiency()
         };
 
     let cmpFogging = Engine.QueryInterface(ent, IID_Fogging);
     if (cmpFogging)
     {
@@ -1646 +1656 @@
 GuiInterface.prototype.GetTradingRouteGain = function(player, data)
 {
     if (!data.firstMarket || !data.secondMarket)
         return null;
 
-    return CalculateTraderGain(data.firstMarket, data.secondMarket, data.template);
+    return CalculateMarketConnectionBonus(data.firstMarket, data.secondMarket, data.tradeOwner);
 };
 
 GuiInterface.prototype.GetTradingDetails = function(player, data)
 {
     let cmpEntityTrader = Engine.QueryInterface(data.trader, IID_Trader);
@@ -1665 +1675 @@
         result = {
             "type": "is first",
             "hasBothMarkets": cmpEntityTrader.HasBothMarkets()
         };
         if (cmpEntityTrader.HasBothMarkets())
-            result.gain = cmpEntityTrader.GetGain();
+            result.gain = CalculateMarketConnectionBonus(firstMarket, secondMarket, player)
     }
     else if (data.target === secondMarket)
     {
         result = {
             "type": "is second",
-            "gain": cmpEntityTrader.GetGain(),
+            "gain": CalculateMarketConnectionBonus(firstMarket, data.target, player)
         };
     }
     else if (!firstMarket)
     {
         result = { "type": "set first" };
     }
     else if (!secondMarket)
     {
         result = {
             "type": "set second",
-            "gain": cmpEntityTrader.CalculateGain(firstMarket, data.target),
+            "gain": CalculateMarketConnectionBonus(firstMarket, data.target, player)
         };
     }
     else
     {
         // Else both markets are not null and target is different from them

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

@@ -34 +34 @@
     var cmpResourceGatherer = Engine.QueryInterface(targetEntity, IID_ResourceGatherer);
     if (cmpResourceGatherer)
         for (let resource of cmpResourceGatherer.GetCarryingStatus())
             resources[resource.type] += resource.amount;
 
-    // Loot resources traders carry
-    var cmpTrader = Engine.QueryInterface(targetEntity, IID_Trader);
-    if (cmpTrader)
-    {
-        let carriedGoods = cmpTrader.GetGoods();
-        if (carriedGoods.amount)
-        {
-            resources[carriedGoods.type] +=
-                + (carriedGoods.amount.traderGain || 0)
-                + (carriedGoods.amount.market1Gain || 0)
-                + (carriedGoods.amount.market2Gain || 0);
-        }
-    }
-
     // Transfer resources
     var cmpPlayer = QueryOwnerInterface(this.entity);
     cmpPlayer.AddResources(resources);
 
     // Update statistics

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

@@ +1 @@
+// Array of resource names
+const RESOURCES = ["food", "wood", "stone", "metal"];
+
+function TradeIncome() {}
+
+TradeIncome.prototype.Schema =
+    "<a:help>Lets the unit generate resources that traders could pick up and trade with.</a:help>" +
+    "<a:example>" +
+        "<Efficiency>2.0</Efficiency>" +
+    "</a:example>" +
+    "<element name='Efficiency' a:help='Gives the basic trade income of the building at full efficiency.'>" +
+        "<ref name='positiveDecimal'/>" +
+    "</element>" +
+    "<optional>" +
+        "<element name='GarrisonEfficiency' a:help='Improve the efficiency of trading by garrisoning units inside'>" +
+            "<optional>" +
+                "<element name='Classes' a:help='only units having one of the following classes will be considered. Defaults to all.'>" +
+                    "<text/>" +
+                "</element>" +
+            "</optional>" +
+            "<element name='EmptyEfficiency' a:help='Basic efficiency when empty. Expressed as a % of total efficiency.'>" +
+                "<ref name='nonNegativeDecimal'/>" +
+            "</element>" +
+            "<optional>" +
+                "<element name='MaxGarrison' a:help='Number of unit required for efficiency to be 100%. Defaults to \"garrison capacity\"'>" +
+                    "<data type='nonNegativeInteger'/>" +
+                "</element>" +
+            "</optional>" +
+        "</element>" +
+    "</optional>";
+
+TradeIncome.prototype.Init = function()
+{
+    this.connections = new Map();
+
+    // Call the timer
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    cmpTimer.SetInterval(this.entity, IID_TradeIncome, "GenerateResources", 5000, 5000, undefined);
+
+    // Quick sanity check
+    let cmpGarrisonHolder = Engine.QueryInterface(this.entity, IID_GarrisonHolder);
+    if (this.template.GarrisonEfficiency && !cmpGarrisonHolder)
+        warn("Entity " + this.entity + " has a TradeIncome component that makes use of garrisoned entity but does not support garrisoning.");
+};
+
+// When a trader arrives, it either establishes or reinforces a connection.
+TradeIncome.prototype.AddConnectionWithMarket = function(market, amount)
+{
+    if (!this.connections.get(market))
+        this.connections.set(market, { "strength" : 0, "distance" : 0, "international" : false });
+
+    this.connections.get(market).strength += +amount;
+    // Set up a maximal amount so that you can't just get enough connection strength then delete your traders.
+    if (this.connections.get(market).strength > 1000)
+        this.connections.get(market).strength = 1000;
+
+    // Reset distance. Ought not change.
+    let cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+    let cmpConnectionPosition = Engine.QueryInterface(market, IID_Position);
+    if (!cmpPosition || !cmpPosition.IsInWorld() || !cmpConnectionPosition || !cmpConnectionPosition.IsInWorld())
+        return;
+
+    let Position = cmpPosition.GetPosition2D();
+    let ConnectionPosition = cmpConnectionPosition.GetPosition2D();
+    let distance = Math.sqrt(Math.pow(Position.x - ConnectionPosition.x, 2) +
+                             Math.pow(Position.y - ConnectionPosition.y, 2));
+    this.connections.get(market).distance = distance;
+
+    // Reset internationality, in case the owner changes: from our POV until a trader brings news, we are selling items from a faraway land.
+    let owner = Engine.QueryInterface(this.entity, IID_Ownership).GetOwner();
+    let ownerConnection = Engine.QueryInterface(market, IID_Ownership).GetOwner();
+
+    this.connections.get(market).international = owner != ownerConnection;
+};
+
+TradeIncome.prototype.GetConnections = function()
+{
+    let ret = [];
+    for (let conn of this.connections.keys())
+        ret.push(
+            {
+                "marketID": conn,
+                "strength": this.connections.get(conn).strength,
+                "distance": this.connections.get(conn).distance,
+                "international": this.connections.get(conn).international
+            });
+    return ret;
+};
+
+TradeIncome.prototype.GetTradeIncomeRate = function()
+{
+    if (this.connections.size === 0)
+        return 0;
+
+    // Calculate our connection bonuses
+    let connectionEffect = 0;
+
+    let owner = Engine.QueryInterface(this.entity, IID_Ownership).GetOwner();
+
+    for (let i of this.connections.keys())
+    {
+        let bonus = CalculateMarketConnectionBonusDirect(this.connections.get(i).distance, owner, this.connections.get(i).international);
+        connectionEffect += bonus * Math.min(1.0, this.connections.get(i).strength/100.0);
+    }
+    return Math.sqrt(connectionEffect) * this.GetRawEfficiency();
+};
+
+TradeIncome.prototype.GetRawEfficiency = function()
+{
+    if (!this.template.GarrisonEfficiency)
+        return 1.0;
+
+    let cmpGarrisonHolder = Engine.QueryInterface(this.entity, IID_GarrisonHolder);
+    if (!cmpGarrisonHolder)
+        return 1.0;
+
+    // Depending on how many units are garrisoned, modulate efficiency
+    let capacity = this.template.GarrisonEfficiency.MaxGarrison === undefined ? cmpGarrisonHolder.GetCapacity() : +this.template.GarrisonEfficiency.MaxGarrison;
+    let currentCount = this.template.GarrisonEfficiency.Classes === undefined ?
+                          cmpGarrisonHolder.GetEntities().length : cmpGarrisonHolder.GetGarrisonedArcherCount(this.template.GarrisonEfficiency.Classes);
+    return 0.2 + (currentCount / capacity) * 0.8;
+};
+
+TradeIncome.prototype.GenerateResources = function()
+{
+    if (this.connections.size === 0)
+        return;
+
+    let cmpPlayer = QueryOwnerInterface(this.entity);
+    if (!cmpPlayer)
+        return;
+
+    let cmpStatisticsTracker = QueryOwnerInterface(this.entity, IID_StatisticsTracker);
+
+    let rate = this.GetTradeIncomeRate() * 5;
+    let goods = cmpPlayer.GetTradingGoods();
+
+    for (let good in goods)
+    {
+        if (RESOURCES.indexOf(good) === -1)
+            continue;
+
+        cmpPlayer.AddResource(good, rate * goods[good]/100.0);  // Should add up to 100%
+
+        if (cmpStatisticsTracker)
+            cmpStatisticsTracker.IncreaseTradeIncomeCounter(rate * goods[good]);
+    }
+
+    for (let i of this.connections.keys())
+    {
+        this.connections.get(i).strength -= 10;
+        if (this.connections.get(i).strength <= 0)
+            this.connections.delete(i);
+    }
+};
+
+Engine.RegisterComponentType(IID_TradeIncome, "TradeIncome", TradeIncome);

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 
-
-// Additional gain for ships for each garrisoned trader, in percents
-const GARRISONED_TRADER_ADDITION = 20;
-
 // Array of resource names
 const RESOURCES = ["food", "wood", "stone", "metal"];
 
 function Trader() {}
 
 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>" +
+        "<ConnectionStrength>5.0</ConnectionStrength>" +
     "</a:example>" +
-    "<element name='GainMultiplier' a:help='Additional gain multiplier'>" +
+    "<element name='ConnectionStrength' a:help='How much more connection strength a trader gives.'>" +
         "<ref name='positiveDecimal'/>" +
     "</element>";
 
 Trader.prototype.Init = function()
 {
     this.firstMarket = INVALID_ENTITY;
     this.secondMarket = INVALID_ENTITY;
-    // Gain from one pass between markets
-    this.gain = null;
-    // Selected resource for trading
-    this.requiredGoods = undefined;
-    // Currently carried goods
-    this.goods = { "type": null, "amount": null, "origin": null };
-};
-
-Trader.prototype.CalculateGain = function(firstMarket, secondMarket)
-{
-    var gain = CalculateTraderGain(firstMarket, secondMarket, this.template, this.entity);
-    if (!gain)  // One of our markets must have been destroyed
-        return null;
-
-    // For ship increase gain for each garrisoned trader
-    // Calculate this here to save passing unnecessary stuff into the CalculateTraderGain function
-    var cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
-    if (cmpIdentity && cmpIdentity.HasClass("Ship"))
-    {
-        var cmpGarrisonHolder = Engine.QueryInterface(this.entity, IID_GarrisonHolder);
-        if (cmpGarrisonHolder)
-        {
-            var garrisonMultiplier = 1;
-            var garrisonedTradersCount = 0;
-            for each (var entity in cmpGarrisonHolder.GetEntities())
-            {
-                var cmpGarrisonedUnitTrader = Engine.QueryInterface(entity, IID_Trader);
-                if (cmpGarrisonedUnitTrader)
-                    garrisonedTradersCount++;
-            }
-            garrisonMultiplier *= 1 + GARRISONED_TRADER_ADDITION * garrisonedTradersCount / 100;
-
-            if (gain.traderGain)
-                gain.traderGain = Math.round(garrisonMultiplier * gain.traderGain);
-            if (gain.market1Gain)
-                gain.market1Gain = Math.round(garrisonMultiplier * gain.market1Gain);
-            if (gain.market2Gain)
-                gain.market2Gain = Math.round(garrisonMultiplier * gain.market2Gain);
-        }
-    }
-    
-    return gain;
-};
 
-Trader.prototype.GetGain = function()
-{
-    return this.gain;
+    // Currently carried goods
+    this.goodsOrigin = null;
 };
 
 // Set target as target market.
 // Return true if at least one of markets was changed.
 Trader.prototype.SetTargetMarket = function(target, source)
@@ -108 +57 @@
         // If we have only one market and target is different from it,
         // set the target as second one
         if (target == this.firstMarket)
             marketsChanged = false;
         else
-        {
             this.secondMarket = target;
-            this.gain = this.CalculateGain(this.firstMarket, this.secondMarket);
-        }
     }
     else
     {
         // Else we don't have target markets at all,
         // set the target as first market
         this.firstMarket = target;
     }
     if (marketsChanged)
     {
         // Drop carried goods
-        this.goods.amount = null;
+        this.goodsOrigin = null;
     }
     return marketsChanged;
 };
 
 Trader.prototype.GetFirstMarket = function()
@@ -142 +88 @@
 Trader.prototype.HasBothMarkets = function()
 {
     return this.firstMarket && this.secondMarket;
 };
 
-Trader.prototype.GetRequiredGoods = function()
-{
-    return this.requiredGoods;
-};
-
-Trader.prototype.SetRequiredGoods = function(requiredGoods)
-{
-    // Check that argument is a correct resource name
-    if (!requiredGoods || RESOURCES.indexOf(requiredGoods) == -1)
-        this.requiredGoods = undefined;
-    else
-        this.requiredGoods = requiredGoods;
-};
-
 Trader.prototype.CanTrade = function(target)
 {
     var cmpTraderIdentity = Engine.QueryInterface(this.entity, IID_Identity);
     var cmpTargetIdentity = Engine.QueryInterface(target, IID_Identity);
     // Check that the target exists
@@ -184 +116 @@
     return true;
 };
 
 Trader.prototype.PerformTrade = function(currentMarket)
 {
-    if (this.goods.amount && this.goods.amount.traderGain)
-    {
-        var cmpPlayer = QueryOwnerInterface(this.entity);
-        if (cmpPlayer)
-            cmpPlayer.AddResource(this.goods.type, this.goods.amount.traderGain);
-
-        var cmpStatisticsTracker = QueryOwnerInterface(this.entity, IID_StatisticsTracker);
-        if (cmpStatisticsTracker)
-            cmpStatisticsTracker.IncreaseTradeIncomeCounter(this.goods.amount.traderGain);
-
-        if (this.goods.amount.market1Gain)
-        {
-            var cmpPlayer = QueryOwnerInterface(this.firstMarket);
-            if (cmpPlayer)
-                cmpPlayer.AddResource(this.goods.type, this.goods.amount.market1Gain);
-
-            var cmpStatisticsTracker = QueryOwnerInterface(this.firstMarket, IID_StatisticsTracker);
-            if (cmpStatisticsTracker)
-                cmpStatisticsTracker.IncreaseTradeIncomeCounter(this.goods.amount.market1Gain);
-        }
-
-        if (this.goods.amount.market2Gain)
-        {
-            var cmpPlayer = QueryOwnerInterface(this.secondMarket);
-            if (cmpPlayer)
-                cmpPlayer.AddResource(this.goods.type, this.goods.amount.market2Gain);
-
-            var cmpStatisticsTracker = QueryOwnerInterface(this.secondMarket, IID_StatisticsTracker);
-            if (cmpStatisticsTracker)
-                cmpStatisticsTracker.IncreaseTradeIncomeCounter(this.goods.amount.market2Gain);
-        }
-    }
-
-    // First take the preferred goods of the trader if any,
-    // otherwise choose one according to the player's trading priorities
-    // if still nothing (but should never happen), choose metal
-    // and recomputes the gain in case it has changed (for example by technology)
-    var nextGoods = this.GetRequiredGoods();
-    if (!nextGoods || RESOURCES.indexOf(nextGoods) == -1)
+    if (this.goodsOrigin && this.goodsOrigin !== currentMarket)
     {
-        var cmpPlayer = QueryOwnerInterface(this.entity);
-        if (cmpPlayer)
-            nextGoods = cmpPlayer.GetNextTradingGoods();
-
-        if (!nextGoods || RESOURCES.indexOf(nextGoods) == -1)
-            nextGoods = "metal";
+        let cmpTradeIncome = Engine.QueryInterface(currentMarket, IID_TradeIncome);
+        if (cmpTradeIncome)
+            cmpTradeIncome.AddConnectionWithMarket(this.goodsOrigin, this.template.ConnectionStrength);
     }
-    this.goods.type = nextGoods;
-    this.goods.amount = this.CalculateGain(this.firstMarket, this.secondMarket);
-    this.goods.origin = currentMarket;
-};
-
-Trader.prototype.GetGoods = function()
-{
-    return this.goods;
+    this.goodsOrigin = +currentMarket;
 };
 
 Trader.prototype.GetNextMarket = function()
 {
-    if (this.goods.amount && this.goods.origin == this.firstMarket)
+    if (this.goodsOrigin == this.firstMarket)
         return this.secondMarket;
 
-    if (this.goods.amount && this.goods.origin != this.secondMarket)
-        this.goods.amount = null;   // leftover from previous trading
+    if (this.goodsOrigin != this.secondMarket)
+        this.goodsOrigin = null;   // Leftover from previous trading
     return this.firstMarket;
 };
 
+Trader.prototype.GetOriginMarket = function()
+{
+    return this.GetNextMarket() == this.firstMarket ? this.secondMarket : this.firstMarket;
+};
+
 Trader.prototype.StopTrading = function()
 {
     // Drop carried goods
-    this.goods.amount = null;
+    this.goodsOrigin = null;
     // Reset markets
     this.firstMarket = INVALID_ENTITY;
     this.secondMarket = INVALID_ENTITY;
 };
 
@@ -272 +161 @@
     if (cmpObstruction)
         max += cmpObstruction.GetUnitRadius()*1.5;
     return { "min": 0, "max": max};
 };
 
-Trader.prototype.OnGarrisonedUnitsChanged = function()
-{
-    if (this.HasBothMarkets())
-        this.gain = this.CalculateGain(this.firstMarket, this.secondMarket);
-};
-
 Engine.RegisterComponentType(IID_Trader, "Trader", Trader);

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

@@ -5238 +5238 @@
         return;
     }
 
     if (this.CheckTargetRange(currentMarket, IID_Trader))
     {
-        var cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
+        let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
         cmpTrader.PerformTrade(currentMarket);
-        if (!cmpTrader.GetGain().traderGain)
-        {
-            this.StopTrading();
-            return;
-        }
 
         if (this.order.data.route && this.order.data.route.length)
         {
             this.waypoints = this.order.data.route.slice();
             if (nextFsmStateName == "APPROACHINGSECONDMARKET")

binaries/data/mods/public/simulation/components/interfaces/TradeIncome.js

@@ +1 @@
+Engine.RegisterInterface("TradeIncome");

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;
+const DISTANCE_FACTOR = 1 / 100.0;
 
-// Additional gain (applying to each market) for trading performed between markets of different players, in percents
-const INTERNATIONAL_TRADING_ADDITION = 25;
+// When performing trade between markets owned by two different players, multiply trader gain by this value.
+// When trading between your markets, you gain the resources at both markets.
+// So this must be at least above 2 to make it interesting to trade with your ally.
+const INTERNATIONAL_TRADING_MULTIPLICATION = 1.4;
 
-// If trader undefined, the trader owner is supposed to be the same as the first market
-function CalculateTraderGain(firstMarket, secondMarket, template, trader)
+function CalculateMarketConnectionBonus(firstMarket, secondMarket, tradeOwner)
 {
-    var gain = {};
-
-    var cmpFirstMarketPosition = Engine.QueryInterface(firstMarket, IID_Position);
-    var cmpSecondMarketPosition = Engine.QueryInterface(secondMarket, IID_Position);
+    let cmpFirstMarketPosition = Engine.QueryInterface(firstMarket, IID_Position);
+    let cmpSecondMarketPosition = Engine.QueryInterface(secondMarket, IID_Position);
     if (!cmpFirstMarketPosition || !cmpFirstMarketPosition.IsInWorld() ||
-        !cmpSecondMarketPosition || !cmpSecondMarketPosition.IsInWorld())
+        !cmpSecondMarketPosition || !cmpSecondMarketPosition.IsInWorld())
         return null;
-    var firstMarketPosition = cmpFirstMarketPosition.GetPosition2D();
-    var secondMarketPosition = cmpSecondMarketPosition.GetPosition2D();
+    let firstMarketPosition = cmpFirstMarketPosition.GetPosition2D();
+    let 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);
-    // 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;
-    }
-    // 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)
-        return null;
-    gain.traderOwner = cmpOwnership.GetOwner();
+    let distance = Math.sqrt(Math.pow(firstMarketPosition.x - secondMarketPosition.x, 2) +
+                             Math.pow(firstMarketPosition.y - secondMarketPosition.y, 2));
 
     // 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;
-    }
+    let ownerFirstMarket = Engine.QueryInterface(firstMarket, IID_Ownership).GetOwner();
+    let ownerSecondMarket = Engine.QueryInterface(secondMarket, IID_Ownership).GetOwner();
 
-    // 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);
+    return CalculateMarketConnectionBonusDirect(distance, tradeOwner, ownerFirstMarket != ownerSecondMarket);
+}
 
-    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);
-    }
+function CalculateMarketConnectionBonusDirect(distance, tradeOwner, international)
+{
+    let bonus = Math.log(distance * DISTANCE_FACTOR);
+    let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    let cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(tradeOwner), IID_Player);
+    if (cmpPlayer)
+        bonus *= cmpPlayer.GetTradeRateMultiplier();
 
-    return gain;
+    if (international)
+        bonus *= +ApplyValueModificationsToEntity("Trade/International", INTERNATIONAL_TRADING_MULTIPLICATION, tradeOwner);
+    return Math.max(0, bonus);
 }
 
-Engine.RegisterGlobal("CalculateTraderGain", CalculateTraderGain);
+Engine.RegisterGlobal("CalculateMarketConnectionBonusDirect", CalculateMarketConnectionBonusDirect);
+Engine.RegisterGlobal("CalculateMarketConnectionBonus", CalculateMarketConnectionBonus);

binaries/data/mods/public/simulation/templates/special/player.xml

@@ -28 +28 @@
       <Theater>1</Theater>
       <Council>1</Council>
       <Library>1</Library>
       <Lighthouse>1</Lighthouse>
       <Juggernaut>1</Juggernaut>
+      <Market>0</Market>
     </Limits>
     <LimitChangers>
+      <Market>
+        <CivilCentre>1</CivilCentre>
+      </Market>
       <WarDog>
         <Kennel>10</Kennel>
       </WarDog>
       <Pillar>
         <Ashoka>5</Ashoka>

binaries/data/mods/public/simulation/templates/structures/cart_dock.xml

@@ -25 +25 @@
   <ProductionQueue>
     <Technologies datatype="tokens">
       -training_naval_architects
     </Technologies>
   </ProductionQueue>
+  <TradeIncome>
+    <Efficiency>0.8</Efficiency>
+  </TradeIncome>
   <VisualActor>
     <Actor>structures/carthaginians/dock.xml</Actor>
     <FoundationActor>structures/fndn_6x4_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>

binaries/data/mods/public/simulation/templates/structures/pers_market.xml

@@ -13 +13 @@
     <History>Traders from all distant parts of the huge empire met, exchanged and sold goods in the huge bazaars present in almost every big city. Babylon and Susa were the largest and most frequented trade centers.</History>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
+  <TradeIncome>
+    <Efficiency>1.25</Efficiency>
+  </TradeIncome>
   <VisualActor>
     <Actor>structures/persians/market.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>

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

@@ -38 +38 @@
   <UnitMotion>
     <FormationController>true</FormationController>
     <WalkSpeed>1.0</WalkSpeed>
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
-  <Trader>
-    <GainMultiplier>1.0</GainMultiplier>
-  </Trader>
 </Entity>

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <BuildRestrictions>
     <Category>Market</Category>
+    <Distance>
+      <FromClass>CivilCentre</FromClass>
+      <MaxDistance>140</MaxDistance>
+    </Distance>
   </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
@@ -11 +15 @@
   </Cost>
   <Footprint>
     <Square width="33.0" depth="29.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+    <EjectHealth>0.2</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Worker</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
   <Health>
     <Max>1500</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
@@ -45 +57 @@
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
+  <TradeIncome>
+    <Efficiency>1.0</Efficiency>
+    <GarrisonEfficiency>
+      <EmptyEfficiency>0.2</EmptyEfficiency>
+    </GarrisonEfficiency>
+  </TradeIncome>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       unlock_shared_los
       trade_convoys_speed

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

@@ -69 +69 @@
       armor_ship_reinforcedhull
       armor_ship_hypozomata
       armor_ship_hullsheathing
     </Technologies>
   </ProductionQueue>
+  <TradeIncome>
+    <Efficiency>0.5</Efficiency>
+  </TradeIncome>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4_dock.xml</FoundationActor>

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

@@ -43 +43 @@
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <Trader>
-    <GainMultiplier>1.0</GainMultiplier>
+    <ConnectionStrength>100</ConnectionStrength>
   </Trader>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
   </UnitAI>

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

@@ -16 +16 @@
     <GenericName>Trader</GenericName>
     <History>Trade was a very important part of ancient civilization - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</History>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
     <Formations disable=""/>
   </Identity>
+  <Loot>
+    <xp>10</xp>
+    <food>25</food>
+    <wood>25</wood>
+    <stone>15</stone>
+    <metal>15</metal>
+  </Loot>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
       <order_trade>voice/{lang}/civ/civ_{gender}_trade.xml</order_trade>
       <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
@@ -37 +44 @@
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
     </SoundGroups>
   </Sound>
   <Trader>
-    <GainMultiplier>1.0</GainMultiplier>
+    <ConnectionStrength>50</ConnectionStrength>
   </Trader>
   <UnitAI>
     <CanGuard>false</CanGuard>
   </UnitAI>
   <UnitMotion>

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

@@ -10 +10 @@
     <History>The entire purpose of the Phoenicians/Carthaginians was to conduct trade and commerce principally upon the sea (though not limited to that as far as Carthage was concerned). </History>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures. Carthaginians have +25% sea trading bonus.</Tooltip>
     <Icon>units/cart_ship_merchant.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
-  <Trader>
-    <GainMultiplier>1.25</GainMultiplier>
-  </Trader>
   <VisualActor>
     <Actor>structures/carthaginians/merchant_ship.xml</Actor>
   </VisualActor>
 </Entity>

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

@@ -18 +18 @@
       <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.25</GainMultiplier>
-  </Trader>
   <VisualActor>
     <Actor>units/persians/trader.xml</Actor>
   </VisualActor>
 </Entity>