Ticket #1358: 1358-git.patch

new file inaries/data/mods/public/globalscripts/Technologies.js

@@ +1 @@
+/**
+ * This file contains shared logic for applying tech modifications
+ * in GUI, AI, and simulation scripts.
+ * As such it must be completely deterministic and can't have any global state,
+ * but each context should do its own caching as needed.
+ *
+ * fullEntityTemplateData: object containing all raw entity template data
+ * fullTechTemplateData: object containing all raw tech template data
+ * currentResearchedTechs: array of objects, one for each player containing their
+ *      currently researched techs (acquired from the simulation/TechManager)
+ * playerID: the player which is testing this tech
+ * entityTemplateName: name of the entity template to retrieve the property
+ * propertyName: name of the tech property we're applying
+ *
+ */
+function GetTechModifiedProperty(
+    fullEntityTemplateData, fullTechTemplateData, currentResearchedTechs,
+    playerID, entityTemplateName, propertyName)
+{
+
+
+
+
+}

source/graphics/MapGenerator.cpp

@@ -88 +88 @@
     m_ScriptInterface->SetCallbackData(static_cast<void*> (this));
 
     // Replace RNG with a seeded deterministic function
-    m_ScriptInterface->ReplaceNondeterministicFunctions(m_MapGenRNG);
+    m_ScriptInterface->ReplaceNondeterministicRNG(m_MapGenRNG);
+    m_ScriptInterface->LoadGlobalScripts();
 
     // Functions for RMS
     m_ScriptInterface->RegisterFunction<bool, std::wstring, CMapGeneratorWorker::LoadLibrary>("LoadLibrary");

source/gui/GUIManager.cpp

@@ -53 +53 @@
 {
     ENSURE(ScriptInterface::GetCallbackData(scriptInterface.GetContext()) == NULL);
     scriptInterface.SetCallbackData(this);
+
+    scriptInterface.LoadGlobalScripts();
 }
 
 CGUIManager::~CGUIManager()

source/scriptinterface/ScriptInterface.cpp

@@ -609 +609 @@
     return JS_GetContextPrivate(cx);
 }
 
-void ScriptInterface::ReplaceNondeterministicFunctions(boost::rand48& rng)
+bool ScriptInterface::LoadGlobalScripts()
 {
-    jsval math;
-    if (!JS_GetProperty(m->m_cx, m->m_glob, "Math", &math) || !JSVAL_IS_OBJECT(math))
-    {
-        LOGERROR(L"ReplaceNondeterministicFunctions: failed to get Math");
-        return;
-    }
+    // Ignore this failure in tests
+    if (!g_VFS)
+        return false;
 
-    JSFunction* random = JS_DefineFunction(m->m_cx, JSVAL_TO_OBJECT(math), "random", Math_random, 0,
-            JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT);
-    if (!random)
+    // Load and execute *.js in the global scripts directory
+    VfsPaths pathnames;
+    vfs::GetPathnames(g_VFS, L"globalscripts/", L"*.js", pathnames);
+    for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
     {
-        LOGERROR(L"ReplaceNondeterministicFunctions: failed to replace Math.random");
-        return;
+        if (!LoadGlobalScriptFile(*it))
+        {
+            LOGERROR(L"LoadGlobalScripts: Failed to load script %ls", it->string().c_str());
+            return false;
+        }
     }
-    // Store the RNG in a slot which is sort-of-guaranteed to be unused by the JS engine
-    JS_SetReservedSlot(m->m_cx, JS_GetFunctionObject(random), 0, PRIVATE_TO_JSVAL(&rng));
-    
-    // Load a script which replaces some of the system dependent trig functions
-    VfsPath path("globalscripts/Math.js");
-    
-    // This function is called from tests without the VFS set up,
-    // so silently fail in that case because every other option seems worse
-    if (g_VFS && VfsFileExists(path))
+
+    return true;
+}
+
+bool ScriptInterface::ReplaceNondeterministicRNG(boost::rand48& rng)
+{
+    jsval math;
+    if (JS_GetProperty(m->m_cx, m->m_glob, "Math", &math) && JSVAL_IS_OBJECT(math))
     {
-        if (!this->LoadGlobalScriptFile(path))
+        JSFunction* random = JS_DefineFunction(m->m_cx, JSVAL_TO_OBJECT(math), "random", Math_random, 0,
+            JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT);
+        if (random)
         {
-            LOGERROR(L"ReplaceNondeterministicFunctions: failed to load %ls", path.string().c_str());
-            return;
+            // Store the RNG in a slot which is sort-of-guaranteed to be unused by the JS engine
+            if (JS_SetReservedSlot(m->m_cx, JS_GetFunctionObject(random), 0, PRIVATE_TO_JSVAL(&rng)))
+                return true;
         }
     }
+
+    LOGERROR(L"ReplaceNondeterministicRNG: failed to replace Math.random");
+    return false;
 }
 
 void ScriptInterface::Register(const char* name, JSNative fptr, size_t nargs)

source/scriptinterface/ScriptInterface.h

@@ -98 +98 @@
     JSContext* GetContext() const;
     JSRuntime* GetRuntime() const;
 
-    void ReplaceNondeterministicFunctions(boost::rand48& rng);
+    /**
+     * Load global scripts that most script contexts need,
+     * located in the /globalscripts directory. VFS must be initialized.
+     */
+    bool LoadGlobalScripts();
+
+    /**
+     * Replace the default JS random number geenrator with a seeded, network-sync'd one.
+     */
+    bool ReplaceNondeterministicRNG(boost::rand48& rng);
 
     /**
      * Call a constructor function, equivalent to JS "new ctor(arg)".

source/scriptinterface/tests/test_ScriptInterface.h

@@ -116 +116 @@
         TS_ASSERT_DIFFERS(d1, d2);
 
         boost::rand48 rng;
-        script.ReplaceNondeterministicFunctions(rng);
+        script.ReplaceNondeterministicRNG(rng);
         rng.seed((u64)0);
         TS_ASSERT(script.Eval("Math.random()", d1));
         TS_ASSERT(script.Eval("Math.random()", d2));

source/simulation2/components/CCmpAIManager.cpp

@@ -82 +82 @@
         {
             m_ScriptInterface.SetCallbackData(static_cast<void*> (this));
 
-            m_ScriptInterface.ReplaceNondeterministicFunctions(rng);
+            m_ScriptInterface.ReplaceNondeterministicRNG(rng);
+            m_ScriptInterface.LoadGlobalScripts();
 
             m_ScriptInterface.RegisterFunction<void, std::wstring, CAIPlayer::IncludeModule>("IncludeModule");
             m_ScriptInterface.RegisterFunction<void, CScriptValRooted, CAIPlayer::PostCommand>("PostCommand");
@@ -269 +270 @@
         m_ScriptInterface.SetCallbackData(static_cast<void*> (this));
 
         // TODO: ought to seed the RNG (in a network-synchronised way) before we use it
-        m_ScriptInterface.ReplaceNondeterministicFunctions(m_RNG);
+        m_ScriptInterface.ReplaceNondeterministicRNG(m_RNG);
+        m_ScriptInterface.LoadGlobalScripts();
     }
 
     ~CAIWorker()

source/simulation2/system/ComponentManager.cpp

@@ -62 +62 @@
     m_ScriptInterface.SetCallbackData(static_cast<void*> (this));
 
     // TODO: ought to seed the RNG (in a network-synchronised way) before we use it
-    m_ScriptInterface.ReplaceNondeterministicFunctions(m_RNG);
+    m_ScriptInterface.ReplaceNondeterministicRNG(m_RNG);
+    m_ScriptInterface.LoadGlobalScripts();
 
     // For component script tests, the test system sets up its own scripted implementation of
     // these functions, so we skip registering them here in those cases

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

@@ -4 +4 @@
  * As such it must be completely deterministic and can't have any global state,
  * but each context should do its own caching as needed.
  *
- * fullEntityTemplateData: object containing all raw entity template data
- * fullTechTemplateData: object containing all raw tech template data
- * currentResearchedTechs: array of objects, one for each player containing their
- *      currently researched techs (acquired from the simulation/TechManager)
- * playerID: the player which is testing this tech
- * entityTemplateName: name of the entity template to retrieve the property
- * propertyName: name of the tech property we're applying
- *
  */
-function GetTechModifiedProperty(
-    fullEntityTemplateData, fullTechTemplateData, currentResearchedTechs,
-    playerID, entityTemplateName, propertyName)
+
+function GetTechModifiedProperty(currentTechModifications, entityTemplateData, propertyName, propertyValue)
 {
+    // Get all modifications to this value
+    var modifications = currentTechModifications[propertyName];
+    if (!modifications) // no modifications so return the original value
+        return propertyValue;
+
+    // Get the classes which this entity template belongs to
+    var rawClasses = entityTemplateData.Identity.Classes;
+    var classes = (rawClasses && "_string" in rawClasses ? rawClasses._string.split(/\s+/) : []);
+
+    var retValue = propertyValue;
 
+    for (var i in modifications)
+    {
+        var modification = modifications[i];
+        var applies = false;
+        // See if any of the lists of classes matches this entity
+        for (var j in modification.affects)
+        {
+            var hasAllClasses = true;
+            // Check each class in affects is present for the entity
+            for (var k in modification.affects[j])
+                hasAllClasses = hasAllClasses && (classes.indexOf(modification.affects[j][k]) !== -1);
 
+            if (hasAllClasses)
+            {
+                applies = true;
+                break;
+            }
+        }
 
+        // We found a match, apply the modification
+        if (applies)
+        {
+            // Nothing is cumulative so that ordering doesn't matter as much as possible
+            if (modification.multiplier)
+                retValue += (modification.multiplier - 1) * propertyValue;
+            else if (modification.add)
+                retValue += modification.add;
+            else if (modification.replace !== undefined) // This will depend on ordering because there is no choice
+                retValue = modification.replace;
+            else
+                warn("GetTechModifiedProperty: modification format not recognised (modifying " + propertyName + "): " + uneval(modification));
+        }
+    }
 
+    return retValue;
 }

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

@@ -53 +53 @@
         var cmpPlayer = Engine.QueryInterface(playerEnt, IID_Player);
         
         // Work out what phase we are in
-        var cmpTechMan = Engine.QueryInterface(playerEnt, IID_TechnologyManager);
+        var cmpTechnologyManager = Engine.QueryInterface(playerEnt, IID_TechnologyManager);
         var phase = "";
-        if (cmpTechMan.IsTechnologyResearched("phase_city"))
+        if (cmpTechnologyManager.IsTechnologyResearched("phase_city"))
             phase = "city";
-        else if (cmpTechMan.IsTechnologyResearched("phase_town"))
+        else if (cmpTechnologyManager.IsTechnologyResearched("phase_town"))
             phase = "town";
-        else if (cmpTechMan.IsTechnologyResearched("phase_village"))
+        else if (cmpTechnologyManager.IsTechnologyResearched("phase_village"))
             phase = "village";
         
         // store player ally/enemy data as arrays
@@ -85 +85 @@
             "isAlly": allies,
             "isEnemy": enemies,
             "buildLimits": cmpPlayerBuildLimits.GetLimits(),
-            "buildCounts": cmpPlayerBuildLimits.GetCounts()
+            "buildCounts": cmpPlayerBuildLimits.GetCounts(),
+            "techModifications": cmpTechnologyManager.GetTechModifications()
         };
         ret.players.push(playerData);
     }
@@ -133 +134 @@
 
 GuiInterface.prototype.GetEntityState = function(player, ent)
 {
-    var cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
 
     // All units must have a template; if not then it's a nonexistent entity id
-    var template = cmpTempMan.GetCurrentTemplateName(ent);
+    var template = cmpTemplateManager.GetCurrentTemplateName(ent);
     if (!template)
         return null;
 
@@ -312 +313 @@
 
 GuiInterface.prototype.GetTemplateData = function(player, name)
 {
-    var cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-    var template = cmpTempMan.GetTemplate(name);
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    var template = cmpTemplateManager.GetTemplate(name);
 
     if (!template)
         return null;
 
     var ret = {};
 
+    var cmpTechnologyManager = QueryPlayerIDInterface(player, IID_TechnologyManager);
+    var techMods = cmpTechnologyManager.GetTechModifications();
+
     if (template.Armour)
     {
         ret.armour = {
-            "hack": +template.Armour.Hack,
-            "pierce": +template.Armour.Pierce,
-            "crush": +template.Armour.Crush,
+            "hack": GetTechModifiedProperty(techMods, template, "Armour/Hack", +template.Armour.Hack),
+            "pierce": GetTechModifiedProperty(techMods, template, "Armour/Pierce", +template.Armour.Pierce),
+            "crush": GetTechModifiedProperty(techMods, template, "Armour/Crush", +template.Armour.Crush),
         };
     }
     
@@ -335 +339 @@
         for (var type in template.Attack)
         {
             ret.attack[type] = {
-                "hack": (+template.Attack[type].Hack || 0),
-                "pierce": (+template.Attack[type].Pierce || 0),
-                "crush": (+template.Attack[type].Crush || 0),
+                "hack": GetTechModifiedProperty(techMods, template, "Attack/"+type+"/Hack", +template.Attack[type].Hack || 0),
+                "pierce": GetTechModifiedProperty(techMods, template, "Attack/"+type+"/Pierce", +template.Attack[type].Pierce || 0),
+                "crush": GetTechModifiedProperty(techMods, template, "Attack/"+type+"/Crush", +template.Attack[type].Crush || 0),
             };
         }
     }
@@ -365 +369 @@
     if (template.Cost)
     {
         ret.cost = {};
-        if (template.Cost.Resources.food) ret.cost.food = +template.Cost.Resources.food;
-        if (template.Cost.Resources.wood) ret.cost.wood = +template.Cost.Resources.wood;
-        if (template.Cost.Resources.stone) ret.cost.stone = +template.Cost.Resources.stone;
-        if (template.Cost.Resources.metal) ret.cost.metal = +template.Cost.Resources.metal;
-        if (template.Cost.Population) ret.cost.population = +template.Cost.Population;
-        if (template.Cost.PopulationBonus) ret.cost.populationBonus = +template.Cost.PopulationBonus;
+        if (template.Cost.Resources.food) ret.cost.food = GetTechModifiedProperty(techMods, template, "Cost/Resources/food", +template.Cost.Resources.food);
+        if (template.Cost.Resources.wood) ret.cost.wood = GetTechModifiedProperty(techMods, template, "Cost/Resources/wood", +template.Cost.Resources.wood);
+        if (template.Cost.Resources.stone) ret.cost.stone = GetTechModifiedProperty(techMods, template, "Cost/Resources/stone", +template.Cost.Resources.stone);
+        if (template.Cost.Resources.metal) ret.cost.metal = GetTechModifiedProperty(techMods, template, "Cost/Resources/metal", +template.Cost.Resources.metal);
+        if (template.Cost.Population) ret.cost.population = GetTechModifiedProperty(techMods, template, "Cost/Population", +template.Cost.Population);
+        if (template.Cost.PopulationBonus) ret.cost.populationBonus = GetTechModifiedProperty(techMods, template, "Cost/PopulationBonus", +template.Cost.PopulationBonus);
     }
     
     if (template.Footprint)
@@ -508 +512 @@
 
 GuiInterface.prototype.IsTechnologyResearched = function(player, tech)
 {
-    var cmpTechMan = QueryPlayerIDInterface(player, IID_TechnologyManager);
+    var cmpTechnologyManager = QueryPlayerIDInterface(player, IID_TechnologyManager);
     
-    if (!cmpTechMan)
+    if (!cmpTechnologyManager)
         return false;
     
-    return cmpTechMan.IsTechnologyResearched(tech);
+    return cmpTechnologyManager.IsTechnologyResearched(tech);
 };
 
 // Checks whether the requirements for this technology have been met
 GuiInterface.prototype.CheckTechnologyRequirements = function(player, tech)
 {
-    var cmpTechMan = QueryPlayerIDInterface(player, IID_TechnologyManager);
+    var cmpTechnologyManager = QueryPlayerIDInterface(player, IID_TechnologyManager);
     
-    if (!cmpTechMan)
+    if (!cmpTechnologyManager)
         return false;
     
-    return cmpTechMan.CanResearch(tech);
+    return cmpTechnologyManager.CanResearch(tech);
 };
 
 GuiInterface.prototype.PushNotification = function(notification)

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

@@ -316 +316 @@
         this.modificationCache[valueName] = {};
     
     if (!this.modificationCache[valueName][ent])
-        this.modificationCache[valueName][ent] = this.ApplyModificationsWorker(valueName, curValue, ent);
-    
-    return this.modificationCache[valueName][ent];
-}
-
-// The code to actually apply the modification
-TechnologyManager.prototype.ApplyModificationsWorker = function(valueName, curValue, ent)
-{
-    // Get all modifications to this value
-    var modifications = this.modifications[valueName];
-    if (!modifications) // no modifications so return the original value
-        return curValue;
-    
-    // Get the classes which this entity belongs to
-    var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
-    var classes = cmpIdentity.GetClassesList();
-    
-    var retValue = curValue;
-    
-    for (var i in modifications)
     {
-        var modification = modifications[i];
-        var applies = false;
-        // See if any of the lists of classes matches this entity
-        for (var j in modification.affects)
-        {
-            var hasAllClasses = true;
-            // Check each class in affects is present for the entity
-            for (var k in modification.affects[j])
-                hasAllClasses = hasAllClasses && (classes.indexOf(modification.affects[j][k]) !== -1);
-            
-            if (hasAllClasses)
-            {
-                applies = true;
-                break;
-            }
-        }
-        
-        // We found a match, apply the modification
-        if (applies)
-        {
-            // Nothing is cumulative so that ordering doesn't matter as much as possible
-            if (modification.multiplier)
-                retValue += (modification.multiplier - 1) * curValue;
-            else if (modification.add)
-                retValue += modification.add;
-            else if (modification.replace !== undefined) // This will depend on ordering because there is no choice
-                retValue = modification.replace;
-            else
-                warn("modification format not recognised (modifying " + valueName + "): " + uneval(modification));
-        }
+        var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+        var templateName = cmpTemplateManager.GetCurrentTemplateName(ent);
+        this.modificationCache[valueName][ent] = GetTechModifiedProperty(this.modifications, cmpTemplateManager.GetTemplate(templateName), valueName, curValue);
     }
     
-    return retValue;
-};
+    return this.modificationCache[valueName][ent];
+}
 
 // Marks a technology as being currently researched
 TechnologyManager.prototype.StartedResearch = function (tech)
@@ -393 +346 @@
         return false;
 };
 
+// Get helper data for tech modifications
+TechnologyManager.prototype.GetTechModifications = function()
+{
+    return this.modifications;
+};
+
 Engine.RegisterComponentType(IID_TechnologyManager, "TechnologyManager", TechnologyManager);

binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js

@@ -73 +73 @@
 
 AddMock(100, IID_TechnologyManager, {
     IsTechnologyResearched: function(tech) { return false; },
+    GetTechModifications: function() { return {}; },
 });
 
 AddMock(100, IID_StatisticsTracker, {
@@ -123 +124 @@
 
 AddMock(101, IID_TechnologyManager, {
     IsTechnologyResearched: function(tech) { if (tech == "phase_village") return true; else return false; },
+    GetTechModifications: function() { return {}; },
 });
 
 AddMock(101, IID_StatisticsTracker, {
@@ -170 +172 @@
             isEnemy: [true, true, true],
             buildLimits: {"Foo": 10},
             buildCounts: {"Foo": 5},
+            techModifications: {},
         },
         {
             name: "Player 2",
@@ -187 +190 @@
             isEnemy: [false, false, false],
             buildLimits: {"Bar": 20},
             buildCounts: {"Bar": 0},
+            techModifications: {},
         }
     ],
     circularMap: false,
@@ -211 +215 @@
             isEnemy: [true, true, true],
             buildLimits: {"Foo": 10},
             buildCounts: {"Foo": 5},
+            techModifications: {},
             statistics: {
                 unitsTrained: 10,
                 unitsLost: 9,
@@ -244 +249 @@
             isEnemy: [false, false, false],
             buildLimits: {"Bar": 20},
             buildCounts: {"Bar": 0},
+            techModifications: {},
             statistics: {
                 unitsTrained: 10,
                 unitsLost: 9,

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

@@ -9 +9 @@
     Object.defineProperty(this, "_derivedTemplates", {value: {}, enumerable: false});
 
     this._entityMetadata = {};
+    this._techModifications = {};
 
     this._entityCollections = [];
     this._entityCollectionsByDynProp = {};
@@ -29 +30 @@
     return {
         _rawEntities: rawEntities,
         _entityMetadata: this._entityMetadata,
+        _techModifications: this._techModifications,
     };
 
     // TODO: ought to get the AI script subclass to serialize its own state
@@ -40 +42 @@
 {
     var rawEntities = data._rawEntities;
     this._entityMetadata = data._entityMetadata;
-    this._entities = {}
+    this._entities = {};
+    this._techModifications = data._techModifications;
     
     for (var id in rawEntities)
     {
@@ -89 +92 @@
 
 BaseAI.prototype.HandleMessage = function(state)
 {
+    // Update tech modifications data (used for constructing entities and templates)
+    this._techModifications = state.players[this._player].techModifications;
+
     if (!this._entities)
     {
         // Do a (shallow) clone of all the initial entity properties (in order
@@ -116 +122 @@
     this.templates = this._templates;
     this.territoryMap = state.territoryMap;
     this.timeElapsed = state.timeElapsed;
+    this.techModifications = this._techModifications;
 
     Engine.ProfileStop();
 
@@ -131 +138 @@
     delete this.templates;
     delete this.territoryMap;
     delete this.timeElapsed;
+    delete this.techModifications;
 };
 
 BaseAI.prototype.ApplyEntitiesDelta = function(state)

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

@@ -1 +1 @@
 var EntityTemplate = Class({
 
-    _init: function(template)
+    _init: function(template, techModifications)
     {
+        this._techModifications = techModifications;
         this._template = template;
     },
 
@@ -34 +35 @@
 
         var ret = {};
         for (var type in this._template.Cost.Resources)
-            ret[type] = +this._template.Cost.Resources[type];
+            ret[type] = GetTechModifiedProperty(this._techModifications, this._template, "Cost/Resources/"+type, +this._template.Cost.Resources[type]);
         return ret;
     },
 
@@ -69 +70 @@
             return undefined;
 
         return {
-            hack: +this._template.Armour.Hack,
-            pierce: +this._template.Armour.Pierce,
-            crush: +this._template.Armour.Crush
+            hack: GetTechModifiedProperty(this._techModifications, this._template, "Armour/Hack", +this._template.Armour.Hack),
+            pierce: GetTechModifiedProperty(this._techModifications, this._template, "Armour/Pierce", +this._template.Armour.Pierce),
+            crush: GetTechModifiedProperty(this._techModifications, this._template, "Armour/Crush", +this._template.Armour.Crush)
         };
     },
 
@@ -91 +92 @@
             return undefined;
 
         return {
-            max: +this._template.Attack[type].MaxRange,
-            min: +(this._template.Attack[type].MinRange || 0)
+            max: GetTechModifiedProperty(this._techModifications, this._template, "Attack/MaxRange", +this._template.Attack[type].MaxRange),
+            min: GetTechModifiedProperty(this._techModifications, this._template, "Attack/MinRange", +(this._template.Attack[type].MinRange || 0))
         };
     },
 
@@ -101 +102 @@
             return undefined;
 
         return {
-            hack: +(this._template.Attack[type].Hack || 0),
-            pierce: +(this._template.Attack[type].Pierce || 0),
-            crush: +(this._template.Attack[type].Crush || 0)
+            hack: GetTechModifiedProperty(this._techModifications, this._template, "Attack/"+type+"/Hack", +(this._template.Attack[type].Hack || 0)),
+            pierce: GetTechModifiedProperty(this._techModifications, this._template, "Attack/"+type+"/Pierce", +(this._template.Attack[type].Pierce || 0)),
+            crush: GetTechModifiedProperty(this._techModifications, this._template, "Attack/"+type+"/Crush", +(this._template.Attack[type].Crush || 0))
         };
     },
     
@@ -112 +113 @@
             return undefined;
 
         return {
-            prepare: +(this._template.Attack[type].PrepareTime || 0),
-            repeat: +(this._template.Attack[type].RepeatTime || 1000)
+            prepare: GetTechModifiedProperty(this._techModifications, this._template, "Attack/"+type+"/PrepareTime", +(this._template.Attack[type].PrepareTime || 0)),
+            repeat: GetTechModifiedProperty(this._techModifications, this._template, "Attack/"+type+"/RepeatTime", +(this._template.Attack[type].RepeatTime || 1000))
         };
     },
 
@@ -152 +153 @@
         if (!this._template.ResourceGatherer)
             return undefined;
         var ret = {};
+        var baseSpeed = GetTechModifiedProperty(this._techModifications, this._template, "ResourceGatherer/BaseSpeed", +this._template.ResourceGatherer.BaseSpeed);
         for (var r in this._template.ResourceGatherer.Rates)
-            ret[r] = this._template.ResourceGatherer.Rates[r] * this._template.ResourceGatherer.BaseSpeed;
+            ret[r] = GetTechModifiedProperty(this._techModifications, this._template, "ResourceGatherer/Rates/"+r, +this._template.ResourceGatherer.Rates[r]) * baseSpeed;
         return ret;
     },
 
@@ -229 +231 @@
 
     _init: function(baseAI, entity)
     {
-        this._super.call(this, baseAI.GetTemplate(entity.template));
+        this._super.call(this, baseAI.GetTemplate(entity.template), baseAI._techModifications);
 
         this._ai = baseAI;
         this._templateName = entity.template;

binaries/data/mods/public/simulation/ai/jubot/gamestate.js

@@ -14 +14 @@
         this.entities = ai.entities;
         this.player = ai.player;
         this.playerData = ai.playerData;
+        this.techModifications = ai.techModifications;
     
         if (!this.ai._gameStateStore){
             this.ai._gameStateStore = {};
@@ -30 +31 @@
     {
         if (!this.templates[type])
             return null;
-        return new EntityTemplate(this.templates[type]);
+        return new EntityTemplate(this.templates[type], this.techModifications);
     },
 
     applyCiv: function(str)

binaries/data/mods/public/simulation/ai/qbot/gamestate.js

@@ -12 +12 @@
     this.player = ai.player;
     this.playerData = ai.playerData;
     this.buildingsBuilt = 0;
+    this.techModifications = ai.techModifications;
     
     if (!this.ai._gameStateStore){
         this.ai._gameStateStore = {};
@@ -41 +42 @@
         return null;
     }
     
-    return new EntityTemplate(this.templates[type]);
+    return new EntityTemplate(this.templates[type], this.techModifications);
 };
 
 GameState.prototype.applyCiv = function(str) {

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

@@ -155 +155 @@
 
 // TODO: event handlers for all the other things
 
+// TODO: research - could updates tech modifications data in the Entity/EntityTemplates
+
 AIProxy.prototype.GetFullRepresentation = function()
 {
     var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);