Ticket #1520: experimental-ai-techs-r12056.patch

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);