Ticket #3887: put_auras_back_in_structree.patch

globalscripts/Templates.js

@@ -72 +72 @@
  *               of properties.
  * @param aurasTemplate An object in the form of {key: {auraName: "", auraDescription: ""}}
  */
-function GetTemplateDataHelper(template, player, aurasTemplate)
+function GetTemplateDataHelper(template, player, auraTemplates)
 {
     var ret = {};
 
@@ -121 +121 @@
     if (template.Auras)
     {
         ret.auras = {};
-        for (let auraID in aurasTemplate)
+        for (let auraID of template.Auras._string.split(/\s+/))
         {
-            let aura = aurasTemplate[auraID];
+            let aura = auraTemplates[auraID];
             if (aura.auraName)
                 ret.auras[auraID] = {
                     "name": aura.auraName || null,

gui/structree/helper.js

@@ -1 +1 @@
 var g_TemplateData = {};
 var g_TechnologyData = {};
+var g_AuraData = {};
 
 function loadTemplate(templateName)
 {
@@ -8 +9 @@
         // We need to clone the template because we want to perform some translations.
         var data = clone(Engine.GetTemplate(templateName));
         translateObjectKeys(data, ["GenericName", "SpecificName", "Tooltip"]);
-        
+
+        if (template.Auras)
+            for (let auraID of template.Auras._string.split(/\s+/))
+                loadAuraData(auraID);
+
         g_TemplateData[templateName] = data;
     }
 
@@ -29 +34 @@
     return g_TechnologyData[templateName];
 }
 
+function loadAuraData(templateName)
+{
+    if (!(templateName in g_AuraData))
+    {
+        let filename = "simulation/data/auras/" + templateName + ".json";
+        let data = Engine.ReadJSONFile(filename);
+        translateObjectKeys(data, ["auraName", "auraDescription"]);
+
+        g_AuraData[templateName] = data;
+    }
+
+    return g_AuraData[templateName];
+}
+
 /**
  * Fetch a value from an entity's template
  *
@@ -85 +104 @@
 function GetTemplateData(templateName)
 {
     var template = loadTemplate(templateName);
-    return GetTemplateDataHelper(template);
+    return GetTemplateDataHelper(template, null, g_AuraData);
 }

gui/structree/load.js

@@ -41 +41 @@
         return null;
     var template = loadTemplate(templateName);
 
-    var unit = GetTemplateDataHelper(template);
+    var unit = GetTemplateDataHelper(template, null, g_AuraData);
     unit.phase = false;
 
     if (unit.requiredTechnology)
@@ -87 +87 @@
 function loadStructure(templateName)
 {
     var template = loadTemplate(templateName);
-    var structure = GetTemplateDataHelper(template);
+    var structure = GetTemplateDataHelper(template, null, g_AuraData);
     structure.phase = false;
 
     if (structure.requiredTechnology)