Ticket #3818: costroundinthesim.diff

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

@@ -188 +188 @@
         };
 
     if (template.Cost)
     {
         ret.cost = {};
-        if (template.Cost.Resources.food)
-            ret.cost.food = getEntityValue("Cost/Resources/food");
-
-        if (template.Cost.Resources.wood)
-            ret.cost.wood = getEntityValue("Cost/Resources/wood");
-
-        if (template.Cost.Resources.stone)
-            ret.cost.stone = getEntityValue("Cost/Resources/stone");
-
-        if (template.Cost.Resources.metal)
-            ret.cost.metal = getEntityValue("Cost/Resources/metal");
+        for (let r in template.Cost.Resources)
+            ret.cost[r] = Math.round(getEntityValue("Cost/Resources/"+r));
 
         if (template.Cost.Population)
             ret.cost.population = getEntityValue("Cost/Population");
 
         if (template.Cost.PopulationBonus)

binaries/data/mods/public/gui/common/tooltips.js

@@ -312 +312 @@
  */
 function multiplyEntityCosts(template, trainNum)
 {
     let totalCosts = {};
     for (let r in template.cost)
-        totalCosts[r] = Math.floor(template.cost[r] * trainNum);
+        totalCosts[r] = template.cost[r] * trainNum;
 
     return totalCosts;
 }
 
 /**

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

@@ -107 +107 @@
         if (!this.get("Cost"))
             return undefined;
 
         let ret = {};
         for (let type in this.get("Cost/Resources"))
-            ret[type] = +this.get("Cost/Resources/" + type);
+            ret[type] = Math.round(+this.get("Cost/Resources/" + type));
         return ret;
     },
 
     "costSum": function(productionQueue) {
         let cost = this.cost(productionQueue);

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

@@ -58 +58 @@
 {
     if (!owner)
     {
         let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
         if (!cmpOwnership)
-            error("GetResourceCost called without valid ownership");
+            error("GetResourceCosts called without valid ownership");
         else
             owner = cmpOwnership.GetOwner();
     }
 
     let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
     let entityTemplateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
     let entityTemplate = cmpTemplateManager.GetTemplate(entityTemplateName);
 
     let costs = {};
     for (let r in this.template.Resources)
-        costs[r] = ApplyValueModificationsToTemplate("Cost/Resources/"+r, +this.template.Resources[r], owner, entityTemplate);
+        costs[r] = Math.round(ApplyValueModificationsToTemplate("Cost/Resources/"+r, +this.template.Resources[r], owner, entityTemplate));
     return costs;
 };
 
 Cost.prototype.OnOwnershipChanged = function(msg)
 {

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

@@ -293 +293 @@
             var buildTime = ApplyValueModificationsToTemplate("Cost/BuildTime", +template.Cost.BuildTime, cmpPlayer.GetPlayerID(), template);
             var time = timeMult * buildTime;
 
             for (var r in template.Cost.Resources)
             {
-                costs[r] = ApplyValueModificationsToTemplate("Cost/Resources/"+r, +template.Cost.Resources[r], cmpPlayer.GetPlayerID(), template);
-                totalCosts[r] = Math.floor(count * costs[r]);
+                costs[r] = Math.round(ApplyValueModificationsToTemplate("Cost/Resources/"+r, +template.Cost.Resources[r], cmpPlayer.GetPlayerID(), template));
+                totalCosts[r] = count * costs[r];
             }
-
             var population = ApplyValueModificationsToTemplate("Cost/Population",  +template.Cost.Population, cmpPlayer.GetPlayerID(), template);
 
             // TrySubtractResources should report error to player (they ran out of resources)
             if (!cmpPlayer.TrySubtractResources(totalCosts))
                 return;