Ticket #2405: Cost_js_fix_population_cost_and_bonus_v2.patch

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

@@ -33 +33 @@
 
 Cost.prototype.Init = function()
 {
+    this.populationCost = +this.template.Population;
     this.populationBonus = +this.template.PopulationBonus;
 };
 
 Cost.prototype.GetPopCost = function()
 {
-    return +this.template.Population;
+    return this.populationCost;
 };
 
 Cost.prototype.GetPopBonus = function()
@@ -87 +88 @@
     if (msg.component != "Cost")
         return;
 
-    // foundations shouldn't give a pop bonus
+    // foundations shouldn't give a pop bonus and a pop cost
     var cmpFoundation = Engine.QueryInterface(this.entity, IID_Foundation)
     if (cmpFoundation)
         return;
 
+    // update the population costs
+    var newPopCost = ApplyValueModificationsToEntity("Cost/Population",  +this.template.Population, this.entity);
+    var popCostDifference = newPopCost - this.populationCost;
+    if (popCostDifference)
+        this.populationCost = newPopCost;
+
     // update the population bonuses
     var newPopBonus = ApplyValueModificationsToEntity("Cost/PopulationBonus",  +this.template.PopulationBonus, this.entity);
     var popDifference = newPopBonus - this.populationBonus;
-    if (!popDifference)
-        return;
+    if (popDifference)
+        this.populationBonus = newPopBonus;
 
     var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
     if (cmpPlayer)
-        cmpPlayer.AddPopulationBonuses(popDifference);
+    {
+        if (popCostDifference)
+            cmpPlayer.AddPopulation(popCostDifference);
+        if (popDifference)
+            cmpPlayer.AddPopulationBonuses(popDifference);
+    }
 };
 
 Engine.RegisterComponentType(IID_Cost, "Cost", Cost);

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

@@ -112 +112 @@
     return this.popUsed;
 };
 
+Player.prototype.AddPopulation = function(num)
+{
+    this.popUsed += num;
+};
+
 Player.prototype.SetPopulationBonuses = function(num)
 {
     this.popBonuses = num;

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

@@ -244 +244 @@
         if (type == "unit")
         {
             // Find the template data so we can determine the build costs
-            var cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-            var template = cmpTempMan.GetTemplate(templateName);
+            var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+            var template = cmpTemplateManager.GetTemplate(templateName);
             if (!template)
                 return;
             if (template.Promotion)
@@ -275 +275 @@
                 totalCosts[r] = Math.floor(count * costs[r]);
             }
 
-            var population = +template.Cost.Population;
+            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))
@@ -309 +309 @@
         else if (type == "technology")
         {
             // Load the technology template
-            var cmpTechTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
-            var template = cmpTechTempMan.GetTemplate(templateName);
+            var cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
+            var template = cmpTechnologyTemplateManager.GetTemplate(templateName);
             if (!template)
                 return;
             var cmpPlayer = QueryOwnerInterface(this.entity);
@@ -395 +395 @@
         // Update entity count in the EntityLimits component
         if (item.unitTemplate)
         {
-            var cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-            var template = cmpTempMan.GetTemplate(item.unitTemplate);
+            var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+            var template = cmpTemplateManager.GetTemplate(item.unitTemplate);
             if (template.TrainingRestrictions)
             {
                 var unitCategory = template.TrainingRestrictions.Category;
@@ -665 +665 @@
             // If the item is a unit then do population checks
             if (item.unitTemplate)
             {
+                // If something change population cost
+                var template = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager).GetTemplate(item.unitTemplate);
+                item.population = ApplyValueModificationsToTemplate("Cost/Population",  +template.Cost.Population, item.player, template);
+                
                 // Batch's training hasn't started yet.
                 // Try to reserve the necessary population slots
                 item.neededSlots = cmpPlayer.TryReservePopulationSlots(item.population * item.count);