Ticket #3943: patch.diff

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -195 +195 @@
             {"nick": "zoot"},
             {"nick": "zsol", "name": "Zsolt Dollenstein"},
             {"nick": "Zyi", "name": "Charles De Meulenaer"}
+            {"nick": "LittleDev"}
         ]
     }
     ]

binaries/data/mods/public/simulation/ai/common-api/entity.js

@@ -544 +544 @@
 
     visionRange: function() {
         return +this.get("Vision/Range");
+    },
+
+    gainMultiplier: function() {
+        if(!this.get("Trader")) {
+            return undefined;
+        }
+        return +this.get("Trader/GainMultiplier");
     }
 });
 
@@ -912 +919 @@
         return this;
     },
 
-     research: function(template) {
+    research: function(template) {
         Engine.PostCommand(PlayerID,{ "type": "research", "entity": this.id(), "template": template });
         return this;
     },

binaries/data/mods/public/simulation/ai/common-api/shared.js

@@ -80 +80 @@
 };
 
 m.SharedScript.prototype.GetTemplate = function(name)
-{   
+{
     if (this._templates[name])
         return this._templates[name];
     

binaries/data/mods/public/simulation/ai/petra/config.js

@@ -34 +34 @@
         "provisionFields" : 2
     };
 
-    this.distUnitGain = 115*115;   // TODO  take it directly from helpers/TraderGain.js
-
     // Note: attack settings are set directly in attack_plan.js
     // defense
     this.Defense =

binaries/data/mods/public/simulation/ai/petra/headquarters.js

@@ -1094 +1094 @@
 
     if (bestVal === undefined)  // no constraints. For the time being, place it arbitrarily by the ConstructionPlan
         return [-1, -1, -1, 0];
-
-    var expectedGain = Math.round(bestVal / this.Config.distUnitGain);
+    let shipMerchantTemplate = gameState.applyCiv("units/{civ}_ship_merchant");
+    let supportTraderTemplate = gameState.applyCiv("units/{civ}_support_trader");
+    let template = gameState.getTemplate(isNavalMarket ? shipMerchantTemplate : supportTraderTemplate);
+    let gainMultiplier = template.gainMultiplier();
+    let expectedGain = Math.round(bestVal * gainMultiplier / 10000);
     if (this.Config.debug > 1)
         API3.warn("this would give a trading gain of " + expectedGain);
     // do not keep it if gain is too small, except if this is our first BarterMarket

binaries/data/mods/public/simulation/ai/petra/tradeManager.js

@@ -408 +408 @@
             var sea = (sea1 && sea1 == sea2) ? sea1 : undefined;
             if (!land && !sea)
                 continue;
-            var gain = Math.round(API3.SquareVectorDistance(m1.position(), m2.position()) / this.Config.distUnitGain);
+            let shipMerchantTemplate = gameState.applyCiv("units/{civ}_ship_merchant");
+            let supportTraderTemplate = gameState.applyCiv("units/{civ}_support_trader");
+            let template = gameState.getTemplate(sea ? shipMerchantTemplate : supportTraderTemplate);
+            let gainMultiplier = template.gainMultiplier();
+            let gain = Math.round(API3.SquareVectorDistance(m1.position(), m2.position()) * gainMultiplier / 10000);
             if (gain < this.minimalGain)
                 continue;
             if (m1.foundationProgress() === undefined && m2.foundationProgress() === undefined)