Ticket #2936: TemplateAnalyzerUpdate.patch

source/tools/templatesanalyzer/CreateRMTest.py

@@ +1 @@
+#
+# CreateRMTest.py
+# Released under the MIT license by Wraitii, 2014
+# See ../LICENSES.TXT for more info
+#
+
 import xml.etree.ElementTree as ET
 import os
 

source/tools/templatesanalyzer/unitTables.py

@@ +1 @@
+#
+# unitTables.py
+# Released under the MIT license by Wraitii, 2014
+# See ../LICENSES.TXT for more info
+#
+
 import xml.etree.ElementTree as ET
 import os
 import glob
@@ -51 +57 @@
 def htout(file, value):
     file.write("<p>" + value + "</p>\n" )
 
+def NumericStatProcess(unit, newValue, templateValue):
+    if (newValue not in unit):
+        unit[newValue] = 0; # This is kind of a sanity hack.
+    if (templateValue.attrib == {}):
+        unit[newValue] = templateValue.text
+    elif (templateValue.attrib == "add"):
+        newValue += templateValue.text
+    elif (templateValue.attrib == "sub"):
+        newValue -= templateValue.text
+    elif (templateValue.attrib == "mul"):
+        newValue *= templateValue.text
+    elif (templateValue.attrib == "div"):
+        newValue /= templateValue.text
+
 def CalcUnit(UnitName, existingUnit = None):
     unit = { 'HP' : "0", "BuildTime" : "0", "Cost" : { 'food' : "0", "wood" : "0", "stone" : "0", "metal" : "0", "population" : "0"},
     'Attack' : { "Melee" : { "Hack" : 0, "Pierce" : 0, "Crush" : 0 }, "Ranged" : { "Hack" : 0, "Pierce" : 0, "Crush" : 0 } },
@@ -69 +89 @@
         unit["Parent"] = Template.getroot().get("parent") + ".xml"
 
     if (Template.find("./Identity/Civ") != None):
-        unit['Civ'] = Template.find("./Identity/Civ").text
+        NumericStatProcess(unit, 'Civ', Template.find("./Identity/Civ"))
 
     if (Template.find("./Health/Max") != None):
-        unit['HP'] = Template.find("./Health/Max").text
+        NumericStatProcess(unit, 'HP', Template.find("./Health/Max"))
 
     if (Template.find("./Cost/BuildTime") != None):
-        unit['BuildTime'] = Template.find("./Cost/BuildTime").text
+        NumericStatProcess(unit, 'BuildTime', Template.find("./Cost/BuildTime"))
     
     if (Template.find("./Cost/Resources") != None):
         for type in list(Template.find("./Cost/Resources")):
-            unit['Cost'][type.tag] = type.text
+            NumericStatProcess(unit['Cost'], type.tag, type)
 
     if (Template.find("./Attack/Melee") != None):
         if (Template.find("./Attack/Melee/RepeatTime") != None):
-            unit['RepeatRate']["Melee"] = Template.find("./Attack/Melee/RepeatTime").text
+            NumericStatProcess(unit['RepeatRate'], "Melee", Template.find("./Attack/Melee/RepeatTime"))
         if (Template.find("./Attack/Melee/PrepareTime") != None):
-            unit['PrepRate']["Melee"] = Template.find("./Attack/Melee/PrepareTime").text
+            NumericStatProcess(unit['PrepRate'], "Melee", Template.find("./Attack/Melee/PrepareTime"))
         for atttype in AttackTypes:
             if (Template.find("./Attack/Melee/"+atttype) != None):
-                unit['Attack']['Melee'][atttype] = Template.find("./Attack/Melee/"+atttype).text
+                NumericStatProcess(unit['Attack']['Melee'], atttype, Template.find("./Attack/Melee/"+atttype))
         if (Template.find("./Attack/Melee/Bonuses") != None):
             for Bonus in Template.find("./Attack/Melee/Bonuses"):
                 Against = []
@@ -112 +132 @@
     if (Template.find("./Attack/Ranged") != None):
         unit['Ranged'] = "true"
         if (Template.find("./Attack/Ranged/MaxRange") != None):
-            unit['Range'] = Template.find("./Attack/Ranged/MaxRange").text
+            NumericStatProcess(unit, 'Range', Template.find("./Attack/Ranged/MaxRange"))
         if (Template.find("./Attack/Ranged/RepeatTime") != None):
-            unit['RepeatRate']["Ranged"] = Template.find("./Attack/Ranged/RepeatTime").text
+            NumericStatProcess(unit['RepeatRate'], "Ranged", Template.find("./Attack/Ranged/RepeatTime"))
         if (Template.find("./Attack/Ranged/PrepareTime") != None):
-            unit['PrepRate']["Ranged"] = Template.find("./Attack/Ranged/PrepareTime").text
+            NumericStatProcess(unit['PrepRate'], "Ranged", Template.find("./Attack/Ranged/PrepareTime"))
         for atttype in AttackTypes:
             if (Template.find("./Attack/Ranged/"+atttype) != None):
-                unit['Attack']['Ranged'][atttype] = Template.find("./Attack/Ranged/"+atttype).text
+                NumericStatProcess(unit['Attack']['Ranged'], atttype, Template.find("./Attack/Ranged/"+atttype))
         if (Template.find("./Attack/Ranged/Bonuses") != None):
             for Bonus in Template.find("./Attack/Ranged/Bonuses"):
                 Against = []
@@ -142 +162 @@
     if (Template.find("./Armour") != None):
         for atttype in AttackTypes:
             if (Template.find("./Armour/"+atttype) != None):
-                unit['Armour'][atttype] = Template.find("./Armour/"+atttype).text
+                NumericStatProcess(unit['Armour'], atttype, Template.find("./Armour/"+atttype))
 
     if (Template.find("./UnitMotion") != None):
         if (Template.find("./UnitMotion/WalkSpeed") != None):
-                unit['WalkSpeed'] = Template.find("./UnitMotion/WalkSpeed").text
+                NumericStatProcess(unit, 'WalkSpeed', Template.find("./UnitMotion/WalkSpeed"))
 
     if (Template.find("./Identity/VisibleClasses") != None):
         newClasses = Template.find("./Identity/VisibleClasses").text.split(" ")
@@ -174 +194 @@
 
     rstr += "<td style=\"text-align:right;\">" + Name + "</td>\n"
     
-    rstr += "<td>" + UnitDict["HP"] + "</td>\n"
+    rstr += "<td>" + str(UnitDict["HP"]) + "</td>\n"
 
-    rstr += "<td>" + UnitDict["BuildTime"] + "</td>\n"
+    rstr += "<td>" + str(UnitDict["BuildTime"]) + "</td>\n"
 
-    rstr += "<td>" + UnitDict["WalkSpeed"] + "</td>\n"
+    rstr += "<td>" + str(UnitDict["WalkSpeed"]) + "</td>\n"
     
     rstr += "<td>" + UnitDict["Cost"]["food"] + "F / " + UnitDict["Cost"]["wood"] + "W / " + UnitDict["Cost"]["stone"] + "S / " + UnitDict["Cost"]["metal"] + "M</td>\n"