Ticket #3697: trade-v2.3.patch

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

@@ -245 +245 @@
         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)
     {

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

@@ -320 +320 @@
             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,
     },
@@ -500 +497 @@
                 cursor = "action-attack-move";
             }
 
-            if (targetState.garrisonHolder && playerCheck(entState, targetState, ["Player", "Ally"]))
+            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.
+                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", "Ally"]))
+            {
                 data.command = "garrison";
                 data.target = targetState.id;
                 cursor = "action-garrison";
@@ -523 +540 @@
                 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";

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

@@ -82 +82 @@
 /**
  * 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 });
+}
 
-    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
-        });
-
+/**
+ * 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 to other markets. Use traders to connect markets together 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 = sprintf("[font=\"sans-bold-13\"]" + translate("Trade income") + ":[/font] " + translate("%(tradeRate).1f") + " [font=\"sans-10\"]" + translate("resources/minute") + "[/font]" +
+                        "\n[font=\"sans-bold-13\"]" + translate("Efficiency")   + ":[/font] " + translate("%(tradeEfficiency)u%%") + 
+                        "\n[font=\"sans-bold-13\"]" + translate("Number of trade routes") + ":[/font] " + translate("%(MarketConnection)s") + 
+                        "\n[font=\"sans-bold-13\"]" + translate("Average trade route effiency") + ":[/font] " + translate("%(ConnectionStrenght)s%%"),
+                  { "tradeRate" : details.rate*60.0, "tradeEfficiency": details.rawRate*100,  "MarketConnection": details.connections.length, "ConnectionStrenght": avgStrength });
+    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/gui/session/selection_panels.js

@@ -947 +947 @@
                 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;
     },

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

@@ -175 +175 @@
         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)
-    {
-        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) });
-    }
+    // Use the same indicators for traders
+    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[0] === entState.trader.originMarket);
+
+        Engine.GetGUIObjectByName("resourceCarryingIcon").hidden = false;
+        Engine.GetGUIObjectByName("resourceCarryingText").hidden = false;
+        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[1], 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")
     {
@@ -206 +210 @@
         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;

binaries/data/mods/public/shaders/glsl/water_high.fs

@@ -127 +127 @@
 }
 
 void main()
-{
-    //gl_FragColor = texture2D(waterEffectsTex, gl_FragCoord.xy/screenSize);
-    //return;
-    
+{   
     float fresnel;
-    float t;                // Temporary variable
     vec2 reflCoords, refrCoords;
     vec3 reflColor, refrColor, specular;
-    float losMod;
+    float losMod, reflMod;
     
-    vec3 l = -sunDir;
     vec3 v = normalize(cameraPos - worldPos);
-    vec3 h = normalize(l + v);
     
     // Calculate water normals.
 
@@ -147 +141 @@
     float baseScale = waveParams1.g;
     float flattenism = waveParams1.b;
     float baseBump = waveParams1.a;
-
-    float smallIntensity = waveParams2.r;
-    float smallBase = waveParams2.g;
     float BigMovement = waveParams2.b;
-    float SmallMovement = waveParams2.a;
     
     float moddedTime = mod(time * 60.0, 8.0) / 8.0;
     
     // This method uses 60 animated water frames. We're blending between each two frames
-    // TODO: could probably have fewer frames thanks to this blending.
     // Scale the normal textures by waviness so that big waviness means bigger waves.
     vec3 ww1 = texture2D(normalMap, (normalCoords.st + normalCoords.zw * BigMovement*waviness/10.0) * (baseScale - waviness/wavyEffect)).xzy;
     vec3 ww2 = texture2D(normalMap2, (normalCoords.st + normalCoords.zw * BigMovement*waviness/10.0) * (baseScale - waviness/wavyEffect)).xzy;
@@ -165 +154 @@
     ww1.x = wwInterp.x * WindCosSin.x - wwInterp.z * WindCosSin.y;
     ww1.z = wwInterp.x * WindCosSin.y + wwInterp.z * WindCosSin.x;
     ww1.y = wwInterp.y;
-    
-    vec3 smallWW = texture2D(normalMap, (normalCoords.st + normalCoords.zw * SmallMovement*waviness/10.0) * baseScale*3.0).xzy;
-    vec3 smallWW2 = texture2D(normalMap2, (normalCoords.st + normalCoords.zw * SmallMovement*waviness/10.0) * baseScale*3.0).xzy;
-    vec3 smallWWInterp = mix(smallWW, smallWW2, moddedTime) - vec3(0.5,0.0,0.5);
-
-    smallWW.x = smallWWInterp.x * WindCosSin.x - smallWWInterp.z * WindCosSin.y;
-    smallWW.z = smallWWInterp.x * WindCosSin.y + smallWWInterp.z * WindCosSin.x;
-    smallWW.y = smallWWInterp.y;
-
-    ww1 += vec3(smallWW)*(fwaviness/10.0*smallIntensity + smallBase);
-    
-    ww1 = mix(smallWW, ww1, waterInfo.r);
         
     // Flatten them based on waviness.
     vec3 n = normalize(mix(vec3(0.0,1.0,0.0),ww1, clamp(baseBump + fwaviness/flattenism,0.0,1.0)));
@@ -189 +166 @@
         n = mix(vec3(0.0,1.0,0.0), n,0.5 + waterInfo.r/2.0);
     #endif
 
-    n = vec3(-n.x,n.y,-n.z);
+    n = vec3(-n.x,n.y,-n.z); // the final wave normal vector
     
-    // simulates how parallel the "point->sun", "view->point" vectors are.
-    float ndoth = dot(n , h);
-    
     // how perpendicular to the normal our view is. Used for fresnel.
     float ndotv = clamp(dot(n, v),0.0,1.0);
     
-    // diffuse lighting-like. used for shadows?
-    float ndotl = (dot(n, l) + 1.0)/2.0;
+    // Fresnel for "how much reflection vs how much refraction".
+    fresnel = clamp(((pow(1.1 - ndotv, 3.0)) * 1.5), 0.2, 1.0); // approximation. I'm using 1.1 and not 1.0 because it causes artifacts, see #1714
     
+    // Specular lighting vectors
+    vec3 specVector = normalize(reflect(sunDir, n));
+    float specIntensity = pow(abs(dot(specVector, v)), 256.0);
+
+    specular = specIntensity * sunColor * fresnel;
+    
     float depth;
 #if USE_REAL_DEPTH
     // Don't change these two. They should match the values in the config (TODO: dec uniforms).
@@ -238 +218 @@
     depth = max(depth,fancyeffects.a);
 #endif
     
-    // Fresnel for "how much reflection vs how much refraction".
-    // Since we're not trying to simulate a realistic ocean 100%, aim for something that gives a little too much reflection
-    // because we're not used to seeing the see from above.
-    fresnel = clamp(pow(1.05 - ndotv, 1.1),0.0,0.8); // approximation. I'm using 1.05 and not 1.0 because it causes artifacts, see #1714
-    // multiply by v.y so that in the distance refraction wins.
-    // TODO: this is a hack because reflections don't work in the distance.
-    fresnel = clamp(fresnel*1.5,0.0,0.9);
-    fresnel *= min(1.0,log(1.0 + v.y*5.0));
-    
-    //gl_FragColor = vec4(fresnel,fresnel,fresnel,1.0);
-    //return;
-    
 #if USE_SHADOWS_ON_WATER && USE_SHADOW
     float shadow = get_shadow(vec4(v_shadow.xy, v_shadow.zw));
 #endif
@@ -256 +224 @@
     
     // for refraction, we want to adjust the value by v.y slightly otherwise it gets too different between "from above" and "from the sides".
     // And it looks weird (again, we are not used to seeing water from above).
-    float fixedVy = max(v.y,0.1);
+    float fixedVy = max(v.y,0.01);
     
-    float distoFactor = clamp(depth/2.0,0.0,7.0);
+    // This somewhat complicated function controls the amount of distortion relative to depth.
+    // The overall function is depth/log(depth) to keep distortions from becoming too extreme,
+    // and the extra terms modify the amount of refraction and prevent numerical singularities from
+    // causing artifacts.
+    float distoFactor = (1.5 * depth) / max(1.0, 2.0 * log(1.0 + depth));
     
     float murky = mix(200.0,0.1,pow(murkiness,0.25));
     
 #if USE_REFRACTION
-    refrCoords = clamp( (0.5*refractionCoords.xy - n.xz * distoFactor*7.0) / refractionCoords.z + 0.5,0.0,1.0); // Unbias texture coords
+    // distort the texture coords under where the water is to simulate refraction.
+    refrCoords = (0.5 * refractionCoords.xy - n.xz * distoFactor) / refractionCoords.z + 0.5;
     vec3 refColor = texture2D(refractionMap, refrCoords).rgb;
-    if (refColor.r > refColor.g + refColor.b + 0.25)
+    
+    // note, the refraction map is cleared using (255, 0, 0), so pixels outside of the water plane are pure red.
+    // if we get a pure red fragment, use an undistorted/less distorted coord instead.
+    if (refColor.r == 1.0)
     {
-        refrCoords = clamp( (0.5*refractionCoords.xy + n.xz) / refractionCoords.z + 0.5,0.0,1.0);   // Unbias texture coords
+        refrCoords = (0.5*refractionCoords.xy + n.xz) / refractionCoords.z + 0.5;
         refColor = texture2D(refractionMap, refrCoords).rgb;
     }
     
-    // TODO: make murkiness (both types rematter on that.
-    // linearly extinct the water. This is how quickly we see nothing but the pure water color
+    // Apply water tint and murk color.
     float extFact = max(0.0,1.0 - (depth*fixedVy/murky));
-    // This is how tinted the water is, ie how quickly the refracted floor takes the tint of the water
     float ColextFact = max(0.0,1.0 - (depth*fixedVy/murky));
     vec3 colll = mix(refColor*tint,refColor,ColextFact);
     
-#if USE_SHADOWS_ON_WATER && USE_SHADOW
-    // TODO:
     refrColor = mix(color, colll, extFact);
 #else
+    // Apply water tint and murk color only.
+    float extFact = max(0.0,1.0 - (depth*fixedVy/murky));
+    float ColextFact = max(0.0,1.0 - (depth*fixedVy/murky));
+    vec3 colll = mix(refColor*tint,refColor,ColextFact);
+    
     refrColor = mix(color, colll, extFact);
 #endif
-#else
-    // linearly extinct the water. This is how quickly we see nothing but the pure water color
-    float extFact = max(0.0,1.0 - (depth*fixedVy/20.0));
-    // using both those factors, get our transparency.
-    // This will be our base transparency on top.
-    float base = 0.4 + depth*fixedVy/15.0; // TODO: murkiness.
-    float alphaCoeff = mix(1.0, base, extFact);
-    refrColor = color;
-#endif
     
 #if USE_REFLECTION
     // Reflections
     // we use real reflections against th skybox, and distort a texture of objects closer.
     vec3 eye = reflect(v,n);
-    //eye.y = min(-0.2,eye.y);
+    
     // let's calculate where we intersect with the skycube.
     Ray myRay = Ray(vec3(worldPos.x/4.0,worldPos.y,worldPos.z/4.0),eye);
     vec3 start = vec3(-1500.0 + mapSize/2.0,-100.0,-1500.0 + mapSize/2.0);
@@ -309 +277 @@
     newpos *= skyBoxRot;
     newpos.y *= 4.0;
     reflColor = textureCube(skyCube, newpos.rgb).rgb;
-    
-    // Reflections appear more distorted when viewed from a lower angle. Simulate this.
-    float angleEffect = clamp(1.3 - dot(vec3(0.0,1.0,0.0), v),0.0,1.0);
 
-    reflCoords = clamp( (0.5*reflectionCoords.xy - 40.0 * n.zx * angleEffect) / reflectionCoords.z + 0.5,0.0,1.0);  // Unbias texture coords
+    // Distort the reflection coords based on waves.
+    reflCoords = (0.5*reflectionCoords.xy - 15.0 * n.zx) / reflectionCoords.z + 0.5;
     vec4 refTex = texture2D(reflectionMap, reflCoords);
-    fresnel = clamp(fresnel+refTex.a/3.0,0.0,1.0);
-    reflColor = refTex.rgb * refTex.a + reflColor*(1.0-refTex.a);
     
+    // interpolate between the sky color and nearby objects.
+    reflColor = mix(reflColor.rgb, refTex.rgb, refTex.a);
+    // reflMod is used to reduce the intensity of sky reflections, which otherwise are too extreme.
+    reflMod = max(refTex.a, 0.55);
+    
 #else
-    // Temp fix for some ATI cards (see irc logs on th 1st of august betwee, fexor and wraitii)
-    //reflCoords = clamp( (0.5*reflectionCoords.xy - waviness * mix(1.0, 20.0,waviness/10.0) * n.zx) / reflectionCoords.z + 0.5,0.0,1.0);   // Unbias texture coords
-    //vec3 refTex = texture2D(reflectionMap, reflCoords).rgb;
-    //reflColor = refTex.rgb;
     reflColor = vec3(0.15, 0.7, 0.82);
 #endif
     
-    // TODO: At very low angles the reflection stuff doesn't really work any more:
-    // IRL you would get a blur of the sky, but we don't have that precision (would require mad oversampling)
-    // So tend towards a predefined color (per-map) which looks like what the skybox would look like if you really blurred it.
-    // The TODO here would be to precompute a band (1x32?) that represents the average color around the map.
-    // TODO: another issue is that at high distances (half map) the texture blurs into flatness. Using better mipmaps won't really solve it
-    // So we'll need to stop showing reflections and default to sky color there too.
-    // Unless maybe waviness is so low that you would see like in a mirror anyways.
-    //float disttt = distance(worldPos,cameraPos);
-    //reflColor = mix(vec3(0.5,0.5,0.55), reflColor, clamp(1.0-disttt/600.0*disttt/600.0,0.0,1.0));//clamp(-0.05 + v.y*20.0,0.0,1.0));
-    
-    // Specular.
-    specular = pow(ndoth, mix(5.0,2000.0, clamp(v.y*v.y*2.0,0.0,1.0)))*sunColor * 1.5;// * sunColor * 1.5 * ww.r;
-    
     losMod = texture2D(losMap, losCoords.st).a;
     losMod = losMod < 0.03 ? 0.0 : losMod;
     
-    float wavesFresnel = 1.0;
-    
-#if USE_FANCY_EFFECTS
-    wavesFresnel = mix(1.0-fancyeffects.a,1.0,clamp(depth,0.0,1.0));
-#endif
-    
     vec3 color;
 #if USE_SHADOWS_ON_WATER && USE_SHADOW
     float fresShadow = mix(fresnel, fresnel*shadow, 0.05 + murkiness*0.2);
-    color = mix(refrColor, reflColor, fresShadow * wavesFresnel);
+    color = mix(refrColor, reflColor, fresShadow);
 #else
-    color = mix(refrColor, reflColor, fresnel * wavesFresnel);
+    color = mix(refrColor, reflColor, fresnel * reflMod);
 #endif
     
 #if USE_SHADOWS_ON_WATER && USE_SHADOW
@@ -373 +319 @@
     foaminterp *= mix(foam3, foam4, moddedTime);
     
     foam1.x = foaminterp.x * WindCosSin.x - foaminterp.z * WindCosSin.y;
-    //foam1.z = foaminterp.x * WindCosSin.y + foaminterp.z * WindCosSin.x;
-    //foam1.y = foaminterp.y;
+    
     float foam = FoamEffects.r * FoamEffects.a*0.4 + pow(foam1.x*(5.0+waviness),(2.6 - waviness/5.5));
-    foam *= ndotl;
     
-    gl_FragColor.rgb = get_fog(color) * losMod + foam * losMod;// + fancyeffects.a * losMod;
+    gl_FragColor.rgb = get_fog(color) * losMod + foam * losMod;
 #else
     gl_FragColor.rgb = get_fog(color) * losMod;
 #endif
@@ -393 +337 @@
     if (fancyeffects.a < 0.05 && waterDepth < -1.0 )
         gl_FragColor.a = 0.0;
 #endif
-    
-    //gl_FragColor = vec4(sunColor,1.0);
 }

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
+    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    cmpTimer.SetInterval(this.entity, IID_TradeIncome, "GenerateResources", 5000, 5000, undefined);
+
+    // Quick sanity check
+    var 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.
+    var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+    var cmpConnectionPosition = Engine.QueryInterface(market, IID_Position);
+    if (!cmpPosition || !cmpPosition.IsInWorld() || !cmpConnectionPosition || !cmpConnectionPosition.IsInWorld())
+        return;
+
+    var Position = cmpPosition.GetPosition2D();
+    var ConnectionPosition = cmpConnectionPosition.GetPosition2D();
+    var 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.
+    var owner = Engine.QueryInterface(this.entity, IID_Ownership).GetOwner();
+    var ownerConnection = Engine.QueryInterface(market, IID_Ownership).GetOwner();
+
+    this.connections.get(market).international = owner != ownerConnection;
+}
+
+TradeIncome.prototype.GetConnections = function()
+{
+    var 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.
+    var connectionEffect = 0;
+
+    var 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;
+
+    var cmpGarrisonHolder = Engine.QueryInterface(this.entity, IID_GarrisonHolder);
+    if (!cmpGarrisonHolder)
+        return 1.0; // Probably should not happen
+
+
+    // Depending on how many units are garrisoned, modulate efficiency
+    var capacity = this.template.GarrisonEfficiency.MaxGarrison === undefined ? cmpGarrisonHolder.GetCapacity() : +this.template.GarrisonEfficiency.MaxGarrison;
+    var 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;
+
+    var cmpPlayer = QueryOwnerInterface(this.entity);
+    if (!cmpPlayer)
+        return;
+
+    var cmpStatisticsTracker = QueryOwnerInterface(this.entity, IID_StatisticsTracker);
+
+    var rate = this.GetTradeIncomeRate() * 5;
+    var 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/UnitAI.js

@@ -5221 +5221 @@
 
     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)
         {

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"];
 
@@ -12 +6 @@
 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>";
 
@@ -23 +16 @@
 {
     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 };
+    this.goodsOrigin = 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;
-};
-
 // Set target as target market.
 // Return true if at least one of markets was changed.
 Trader.prototype.SetTargetMarket = function(target, source)
@@ -110 +59 @@
         if (target == this.firstMarket)
             marketsChanged = false;
         else
-        {
             this.secondMarket = target;
-            this.gain = this.CalculateGain(this.firstMarket, this.secondMarket);
-        }
     }
     else
     {
@@ -124 +70 @@
     if (marketsChanged)
     {
         // Drop carried goods
-        this.goods.amount = null;
+        this.goodsOrigin = null;
     }
     return marketsChanged;
 };
@@ -144 +90 @@
     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);
@@ -186 +118 @@
 
 Trader.prototype.PerformTrade = function(currentMarket)
 {
-    if (this.goods.amount && this.goods.amount.traderGain)
+    if (this.goodsOrigin && this.goodsOrigin !== currentMarket)
     {
-        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);
-        }
+        let cmpTradeIncome = Engine.QueryInterface(currentMarket, IID_TradeIncome);
+        if (cmpTradeIncome)
+            cmpTradeIncome.AddConnectionWithMarket(this.goodsOrigin, this.template.ConnectionStrength);
     }
-
-    // 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)
-    {
-        var cmpPlayer = QueryOwnerInterface(this.entity);
-        if (cmpPlayer)
-            nextGoods = cmpPlayer.GetNextTradingGoods();
-
-        if (!nextGoods || RESOURCES.indexOf(nextGoods) == -1)
-            nextGoods = "metal";
-    }
-    this.goods.type = nextGoods;
-    this.goods.amount = this.CalculateGain(this.firstMarket, this.secondMarket);
-    this.goods.origin = currentMarket;
+    this.goodsOrigin = +currentMarket;
 };
 
-Trader.prototype.GetGoods = function()
-{
-    return this.goods;
-};
-
 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;
@@ -274 +163 @@
     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/GuiInterface.js

@@ -240 +240 @@
         "resourceCarrying": null,
         "rotation": null,
         "trader": null,
+        "tradeIncome": null,
         "unitAI": null,
         "visibility": null,
     };
@@ -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()
         };
 
+    var 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 @@
     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)
@@ -1665 +1675 @@
             "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)
@@ -1682 +1692 @@
     {
         result = {
             "type": "set second",
-            "gain": cmpEntityTrader.CalculateGain(firstMarket, data.target),
+            "gain": CalculateMarketConnectionBonus(firstMarket, data.target, player)
         };
     }
     else

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

@@ -36 +36 @@
         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);

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

@@ +1 @@
+Engine.RegisterInterface("TradeIncome");
+ No newline at end of file

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 bonus = 1;
 
     var cmpFirstMarketPosition = Engine.QueryInterface(firstMarket, IID_Position);
     var 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();
 
+    
     // 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();
+    var 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;
-    }
+    
+    return CalculateMarketConnectionBonusDirect(distance, tradeOwner, ownerFirstMarket != ownerSecondMarket);
+}
 
-    // Add potential trade multipliers and roundings
-    var cmpPlayer = trader ? QueryOwnerInterface(trader) : QueryOwnerInterface(firstMarket);
+function CalculateMarketConnectionBonusDirect(distance, tradeOwner, international)
+{
+    var bonus = Math.log(distance*DISTANCE_FACTOR);
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(tradeOwner), IID_Player);
     if (cmpPlayer)
-        gain.traderGain *= cmpPlayer.GetTradeRateMultiplier();
-    gain.traderGain = Math.round(gain.traderGain);
+        bonus *= cmpPlayer.GetTradeRateMultiplier();
 
-    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);
-    }
-
-    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/template_formation.xml

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

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

@@ -71 +71 @@
       armor_ship_hullsheathing
     </Technologies>
   </ProductionQueue>
+  <TradeIncome>
+    <Efficiency>0.5</Efficiency>
+  </TradeIncome>
   <Vision>
     <Range>40</Range>
   </Vision>

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

@@ -45 +45 @@
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <Trader>
-    <GainMultiplier>1.0</GainMultiplier>
+    <ConnectionStrength>100</ConnectionStrength>
   </Trader>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>

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

@@ -2 +2 @@
 <Entity parent="template_structure_economic">
   <BuildRestrictions>
     <Category>Market</Category>
+    <Distance>
+      <FromClass>CivilCentre</FromClass>
+      <MaxDistance>140</MaxDistance>
+    </Distance>
   </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
@@ -13 +17 @@
     <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>
@@ -47 +59 @@
     <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">

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

@@ -18 +18 @@
     <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>
@@ -39 +46 @@
     </SoundGroups>
   </Sound>
   <Trader>
-    <GainMultiplier>1.0</GainMultiplier>
+    <ConnectionStrength>50</ConnectionStrength>
   </Trader>
   <UnitAI>
     <CanGuard>false</CanGuard>

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

@@ -30 +30 @@
       <Library>1</Library>
       <Lighthouse>1</Lighthouse>
       <Juggernaut>1</Juggernaut>
+      <Market>0</Market>
     </Limits>
     <LimitChangers>
+      <Market>
+        <CivilCentre>1</CivilCentre>
+      </Market>
       <WarDog>
         <Kennel>10</Kennel>
       </WarDog>

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

@@ -27 +27 @@
       -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>

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

@@ -15 +15 @@
   <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>

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>
-  </Trader>
   <VisualActor>
     <Actor>structures/carthaginians/merchant_ship.xml</Actor>
   </VisualActor>

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

@@ -20 +20 @@
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
-  <Trader>
-    <GainMultiplier>1.25</GainMultiplier>
-  </Trader>
   <VisualActor>
     <Actor>units/persians/trader.xml</Actor>
   </VisualActor>