Ticket #3769: aurapatch.2.diff

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

@@ -170 +170 @@
     if (!template || !template.Identity)
         return value;
     var classes = GetIdentityClasses(template.Identity);
-
     var usedKeys = new Set();
     var add = 0;
     var multiply = 1;
-    for (let c in cache)
+    for (let [classeName,dataMap] of cache)
     {
-        if (!MatchesClassList(classes, c))
+        if (!MatchesClassList(classes, classeName))
             continue;
 
-        for (let key in cache.get(c))
+        for (let key of dataMap.keys())
         {
             // don't add an aura with the same key twice
             if (usedKeys.has(key))
                 continue;
-
-            add += cache.get(c).get(key).add;
-            multiply *= cache.get(c).get(key).multiply;
+            add += dataMap.get(key).add;
+            multiply *= dataMap.get(key).multiply;
             usedKeys.add(key);
         }
     }

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

@@ -28 +28 @@
 
     // Remember our cost here, so if it changes after construction begins (from technologies)
     //  we will use the correct values to refund partial construction costs
-    var cmpCost = Engine.QueryInterface(this.entity, IID_Cost);
-    this.costs = cmpCost.GetResourceCosts();
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    var templateFull = cmpTemplateManager.GetTemplate(template);
+    this.costs = {};
+    for (var r in templateFull.Cost.Resources)
+    {
+        this.costs[r] = ApplyValueModificationsToTemplate("Cost/Resources/"+r, +templateFull.Cost.Resources[r], owner, templateFull);
+    }
     this.maxProgress = 0;
 
     this.initialised = true;

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -969 +969 @@
         Engine.DestroyEntity(ent); 
     }
     
-    // We need the cost after tech modifications
+    // We need the cost after tech and aura modifications
     // To calculate this with an entity requires ownership, so use the template instead
     var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-    var template = cmpTemplateManager.GetTemplate(foundationTemplate);
     var costs = {};
     for (var r in template.Cost.Resources)
     {
-        costs[r] = +template.Cost.Resources[r];
-        if (cmpTechnologyManager)
-            costs[r] = cmpTechnologyManager.ApplyModificationsTemplate("Cost/Resources/"+r, costs[r], template);
+        costs[r] = ApplyValueModificationsToTemplate("Cost/Resources/"+r, +template.Cost.Resources[r], player, template);
     }
     
     if (!cmpPlayer.TrySubtractResources(costs))