Ticket #2377: AIAuraTech.patch

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/ai/aegis/base-manager.js

@@ -86 +86 @@
     this.anchor.setMetadata(PlayerID, "base", this.ID);
     this.anchor.setMetadata(PlayerID, "baseAnchor", true);
     this.buildings.updateEnt(this.anchor);
-
     if (this.territoryBuildings.indexOf(this.anchor.id()) === -1)
         this.territoryBuildings.push(this.anchor.id());
     return true;
@@ -908 +907 @@
         }
     }
 
-    // auras/techs are buggy and the AI tries to repair healthy buildings.
-    // TODO: reimplement once that's fixed.
-    return;
-
     // don't repair if we're still under attack, unless it's like a vital (civcentre or wall) building that's getting destroyed.
     for (var i in damagedBuildings) {
         var target = damagedBuildings[i];
@@ -947 +942 @@
 };
 
 m.BaseManager.prototype.update = function(gameState, queues, events) {
+
+        warn (this.anchor.hitpoints());
+
+
     Engine.ProfileStart("Base update - base " + this.ID);
     var self = this;
     

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/ai/common-api/entity.js

@@ -1 +1 @@
 var API3 = function(m)
 {
 
-m.EntityTemplate = m.Class({
+// defines a template.
+// It's completely raw data, except it's slightly cleverer now and then.
+m.Template = m.Class({
 
-    // techModifications should be the tech modifications of only one player.
-    // gamestates handle "GetTemplate" and should push the player's
-    // while entities should push the owner's
-    _init: function(template, techModifications)
+    _init: function(template)
     {
-        this._techModifications = techModifications;
         this._template = template;
     },
     
+    // helper function to return a template value, optionally adjusting for tech.
+    // TODO: there's no support for "_string" values here.
+    get: function(string)
+    {
+        var value = this._template;
+        if (this._auraTemplateModif && this._auraTemplateModif[string])     {
+            return this._auraTemplateModif[string];
+        } else if (this._techModif && this._techModif[string]) {
+            return this._techModif[string];
+        } else {
+            var args = string.split("/");
+            for (var i = 0; i < args.length; ++i)
+                if (value[args[i]])
+                    value = value[args[i]];
+                else
+                    return undefined;
+            return value;
+        } 
+    },
+
     genericName: function() {
-        if (!this._template.Identity || !this._template.Identity.GenericName)
+        if (!this.get("Identity") || !this.get("Identity/GenericName"))
             return undefined;
-        return this._template.Identity.GenericName;
+        return this.get("Identity/GenericName");
     },
-                           
+                          
     rank: function() {
-        if (!this._template.Identity)
+        if (!this.get("Identity"))
             return undefined;
-        return this._template.Identity.Rank;
+        return this.get("Identity/Rank");
     },
 
     classes: function() {
-        if (!this._template.Identity || !this._template.Identity.Classes || !this._template.Identity.Classes._string)
+        if (!this.get("Identity") || !this.get("Identity/Classes") || !this.get("Identity/Classes/_string"))
             return undefined;
-        return this._template.Identity.Classes._string.split(/\s+/);
+        return this.get("Identity/Classes/_string").split(/\s+/);
     },
     
     requiredTech: function() {
-        if (!this._template.Identity || !this._template.Identity.RequiredTechnology)
-            return undefined;
-        return this._template.Identity.RequiredTechnology;
+        return this.get("Identity/RequiredTechnology");
     },
-                           
+                          
     available: function(gameState) {
-        if (!this._template.Identity || !this._template.Identity.RequiredTechnology)
-            return true;
-        return gameState.isResearched(this._template.Identity.RequiredTechnology);
+        return gameState.isResearched(this.get("Identity/RequiredTechnology"));
     },
-                           
+                          
     // specifically
     phase: function() {
-        if (!this._template.Identity || !this._template.Identity.RequiredTechnology)
+        if (!this.get("Identity/RequiredTechnology"))
             return 0;
-        if (this.template.Identity.RequiredTechnology == "phase_village")
+        if (this.get("Identity/RequiredTechnology") == "phase_village")
             return 1;
-        if (this.template.Identity.RequiredTechnology == "phase_town")
+        if (this.get("Identity/RequiredTechnology") == "phase_town")
             return 2;
-        if (this.template.Identity.RequiredTechnology == "phase_city")
+        if (this.get("Identity/RequiredTechnology") == "phase_city")
             return 3;
         return 0;
     },
@@ -72 +86 @@
     },
 
     civ: function() {
-        if (!this._template.Identity)
-            return undefined;
-        return this._template.Identity.Civ;
+        return this.get("Identity/Civ");
     },
 
     cost: function() {
-        if (!this._template.Cost)
+        if (!this.get("Cost"))
             return undefined;
 
         var ret = {};
-        for (var type in this._template.Cost.Resources)
-            ret[type] = GetTechModifiedProperty(this._techModifications, this._template, "Cost/Resources/"+type, +this._template.Cost.Resources[type]);
+        for (var type in this.get("Cost/Resources"))
+            ret[type] = +this.get("Cost/Resources/" + type);
         return ret;
     },
     
     costSum: function() {
-        if (!this._template.Cost)
+        if (!this.get("Cost"))
             return undefined;
         
         var ret = 0;
-        for (var type in this._template.Cost.Resources)
-            ret += +this._template.Cost.Resources[type];
+        for (var type in this.get("Cost/Resources"))
+            ret += +this.get("Cost/Resources/" + type);
         return ret;
     },
 
@@ -102 +114 @@
      * obstruction shape, or undefined if no obstruction.
      */
     obstructionRadius: function() {
-        if (!this._template.Obstruction)
+        if (!this.get("Obstruction"))
             return undefined;
 
-        if (this._template.Obstruction.Static)
+        if (this.get("Obstruction/Static"))
         {
-            var w = +this._template.Obstruction.Static["@width"];
-            var h = +this._template.Obstruction.Static["@depth"];
+            var w = +this.get("Obstruction/Static/@width");
+            var h = +this.get("Obstruction/Static/@depth");
             return Math.sqrt(w*w + h*h) / 2;
         }
 
-        if (this._template.Obstruction.Unit)
-            return +this._template.Obstruction.Unit["@radius"];
+        if (this.get("Obstruction/Unit"))
+            return +this.get("Obstruction/Unit/@radius");
 
         return 0; // this should never happen
     },
-                           
+                          
     /**
      * Returns the radius of a circle surrounding this entity's
      * footprint.
      */
     footprintRadius: function() {
-        if (!this._template.Footprint)
+        if (!this.get("Footprint"))
             return undefined;
         
-        if (this._template.Footprint.Square)
+        if (this.get("Footprint/Square"))
         {
-            var w = +this._template.Footprint.Square["@width"];
-            var h = +this._template.Footprint.Square["@depth"];
+            var w = +this.get("Footprint/Square/@width");
+            var h = +this.get("Footprint/Square/@depth");
             return Math.sqrt(w*w + h*h) / 2;
         }
         
-        if (this._template.Footprint.Circle)
-            return +this._template.Footprint.Circle["@radius"];
+        if (this.get("Footprint/Circle"))
+            return +this.get("Footprint/Circle/@radius");
         
         return 0; // this should never happen
     },
 
     maxHitpoints: function()
     {
-        if (this._template.Health !== undefined)
-            return GetTechModifiedProperty(this._techModifications, this._template, "Health/Max",+this._template.Health.Max);
+        if (this.get("Health") !== undefined)
+            return +this.get("Health/Max");
         return 0;
     },
+
     isHealable: function()
     {
-        if (this._template.Health !== undefined)
-            return this._template.Health.Unhealable !== "true";
+        if (this.get("Health") !== undefined)
+            return this.get("Health/Unhealable") !== "true";
         return false;
     },
+
     isRepairable: function()
     {
-        if (this._template.Health !== undefined)
-            return this._template.Health.Repairable === "true";
+        if (this.get("Health") !== undefined)
+            return this.get("Health/Repairable") === "true";
         return false;
     },
 
     getPopulationBonus: function() {
-        if (!this._template.Cost || !this._template.Cost.PopulationBonus)
-            return undefined;
-        return this._template.Cost.PopulationBonus;
+        return this.get("Cost/PopulationBonus");
     },
 
     armourStrengths: function() {
-        if (!this._template.Armour)
+        if (!this.get("Armour"))
             return undefined;
 
         return {
-            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)
+            hack: +this.get("Armour/Hack"),
+            pierce: +this.get("Armour/Pierce"),
+            crush: +this.get("Armour/Crush")
         };
     },
 
     attackTypes: function() {
-        if (!this._template.Attack)
+        if (!this.get("Attack"))
             return undefined;
 
         var ret = [];
-        for (var type in this._template.Attack)
+        for (var type in this.get("Attack"))
             ret.push(type);
 
         return ret;
     },
 
     attackRange: function(type) {
-        if (!this._template.Attack || !this._template.Attack[type])
+        if (!this.get("Attack/" + type +""))
             return undefined;
 
         return {
-                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))
+                max: +this.get("Attack/" + type +"/MaxRange"),
+                min: +(this.get("Attack/" + type +"/MinRange") || 0)
         };
     },
 
     attackStrengths: function(type) {
-        if (!this._template.Attack || !this._template.Attack[type])
+        if (!this.get("Attack/" + type +""))
             return undefined;
 
         return {
-            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))
+            hack: +(this.get("Attack/" + type + "/Hack") || 0),
+            pierce: +(this.get("Attack/" + type + "/Pierce") || 0),
+            crush: +(this.get("Attack/" + type + "/Crush") || 0)
         };
     },
     
     attackTimes: function(type) {
-        if (!this._template.Attack || !this._template.Attack[type])
+        if (!this.get("Attack/" + type +""))
             return undefined;
 
         return {
-            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))
+            prepare: +(this.get("Attack/" + type + "/PrepareTime") || 0),
+            repeat: +(this.get("Attack/" + type + "/RepeatTime") || 1000)
         };
     },
 
     // returns the classes this templates counters:
-    // Return type is [ [-neededClasses-] , multiplier ].
+    // Return type is [ [-neededClasses- , multiplier], … ].
     getCounteredClasses: function() {
-        if (!this._template.Attack)
+        if (!this.get("Attack"))
             return undefined;
         
         var Classes = [];
-        for (var i in this._template.Attack) {
-            if (!this._template.Attack[i].Bonuses)
+        for (var i in this.get("Attack")) {
+            if (!this.get("Attack/" + i + "/Bonuses"))
                 continue;
-            for (var o in this._template.Attack[i].Bonuses)
-                if (this._template.Attack[i].Bonuses[o].Classes)
-                    Classes.push([this._template.Attack[i].Bonuses[o].Classes.split(" "), +this._template.Attack[i].Bonuses[o].Multiplier]);
+            for (var o in this.get("Attack/" + i + "/Bonuses"))
+                if (this.get("Attack/" + i + "/Bonuses/" + o + "/Classes"))
+                    Classes.push([this.get("Attack/" + i +"/Bonuses/" + o +"/Classes").split(" "), +this.get("Attack/" + i +"/Bonuses" +o +"/Multiplier")]);
         }
         return Classes;
     },
@@ -237 +249 @@
     // returns true if the entity counters those classes.
     // TODO: refine using the multiplier
     countersClasses: function(classes) {
-        if (!this._template.Attack)
+        if (!this.get("Attack"))
             return false;
         var mcounter = [];
-        for (var i in this._template.Attack) {
-            if (!this._template.Attack[i].Bonuses)
+        for (var i in this.get("Attack")) {
+            if (!this.get("Attack/" + i + "/Bonuses"))
                 continue;
-            for (var o in this._template.Attack[i].Bonuses)
-                if (this._template.Attack[i].Bonuses[o].Classes)
-                    mcounter.concat(this._template.Attack[i].Bonuses[o].Classes.split(" "));
+            for (var o in this.get("Attack/" + i + "/Bonuses"))
+                if (this.get("Attack/" + i + "/Bonuses/" + o + "/Classes"))
+                    mcounter.concat(this.get("Attack/" + i + "/Bonuses/" + o + "/Classes").split(" "));
         }
         for (var i in classes)
         {
@@ -257 +269 @@
 
     // returns, if it exists, the multiplier from each attack against a given class
     getMultiplierAgainst: function(type, againstClass) {
-        if (!this._template.Attack || !this._template.Attack[type])
+        if (!this.get("Attack/" + type +""))
             return undefined;
 
-        if (this._template.Attack[type].Bonuses)
-            for (var o in this._template.Attack[type].Bonuses) {
-                if (!this._template.Attack[type].Bonuses[o].Classes)
+        if (this.get("Attack/" + type + "/Bonuses"))
+            for (var o in this.get("Attack/" + type + "/Bonuses")) {
+                if (!this.get("Attack/" + type + "/Bonuses/" + o + "/Classes"))
                     continue;
-                var total = this._template.Attack[type].Bonuses[o].Classes.split(" ");
+                var total = this.get("Attack/" + type + "/Bonuses/" + o + "/Classes").split(" ");
                 for (var j in total)
                     if (total[j] === againstClass)
-                        return this._template.Attack[type].Bonuses[o].Multiplier;
+                        return this.get("Attack/" + type + "/Bonuses/" + o + "/Multiplier");
             }
         return 1;
     },
 
     // returns true if the entity can attack the given class
     canAttackClass: function(saidClass) {
-        if (!this._template.Attack)
+        if (!this.get("Attack"))
             return false;
         
-        for (var i in this._template.Attack) {
-            if (!this._template.Attack[i].RestrictedClasses || !this._template.Attack[i].RestrictedClasses._string)
+        for (var i in this.get("Attack")) {
+            if (!this.get("Attack/" + i + "/RestrictedClasses") || !this.get("Attack/" + i + "/RestrictedClasses/_string"))
                 continue;
-            var cannotAttack = this._template.Attack[i].RestrictedClasses._string.split(" ");
+            var cannotAttack = this.get("Attack/" + i + "/RestrictedClasses/_string").split(" ");
             if (cannotAttack.indexOf(saidClass) !== -1)
                 return false;
         }
@@ -288 +300 @@
     },
 
     buildableEntities: function() {
-        if (!this._template.Builder)
-            return undefined;
-        if (!this._template.Builder.Entities._string)
+        if (!this.get("Builder/Entities/_string"))
             return [];
         var civ = this.civ();
-        var templates = this._template.Builder.Entities._string.replace(/\{civ\}/g, civ).split(/\s+/);
+        var templates = this.get("Builder/Entities/_string").replace(/\{civ\}/g, civ).split(/\s+/);
         return templates; // TODO: map to Entity?
     },
 
     trainableEntities: function() {
-        if (!this._template.ProductionQueue || !this._template.ProductionQueue.Entities || !this._template.ProductionQueue.Entities._string)
+        if (!this.get("ProductionQueue/Entities/_string"))
             return undefined;
         var civ = this.civ();
-        var templates = this._template.ProductionQueue.Entities._string.replace(/\{civ\}/g, civ).split(/\s+/);
+        var templates = this.get("ProductionQueue/Entities/_string").replace(/\{civ\}/g, civ).split(/\s+/);
         return templates;
     },
 
     researchableTechs: function() {
-        if (!this._template.ProductionQueue || !this._template.ProductionQueue.Technologies || !this._template.ProductionQueue.Technologies._string)
+        if (!this.get("ProductionQueue/Technologies/_string"))
             return undefined;
-        var templates = this._template.ProductionQueue.Technologies._string.split(/\s+/);
+        var templates = this.get("ProductionQueue/Technologies/_string").split(/\s+/);
         return templates;
     },
 
     resourceSupplyType: function() {
-        if (!this._template.ResourceSupply)
+        if (!this.get("ResourceSupply"))
             return undefined;
-        var [type, subtype] = this._template.ResourceSupply.Type.split('.');
+        var [type, subtype] = this.get("ResourceSupply/Type").split('.');
         return { "generic": type, "specific": subtype };
     },
     // will return either "food", "wood", "stone", "metal" and not treasure.
     getResourceType: function() {
-        if (!this._template.ResourceSupply)
+        if (!this.get("ResourceSupply"))
             return undefined;
-        var [type, subtype] = this._template.ResourceSupply.Type.split('.');
+        var [type, subtype] = this.get("ResourceSupply/Type").split('.');
         if (type == "treasure")
             return subtype;
         return type;
     },
 
     resourceSupplyMax: function() {
-        if (!this._template.ResourceSupply)
+        if (!this.get("ResourceSupply"))
             return undefined;
-        return +this._template.ResourceSupply.Amount;
+        return +this.get("ResourceSupply/Amount");
     },
 
     maxGatherers: function()
     {
-        if (this._template.ResourceSupply !== undefined)
-            return +this._template.ResourceSupply.MaxGatherers;
+        if (this.get("ResourceSupply") !== undefined)
+            return +this.get("ResourceSupply/MaxGatherers");
         return 0;
     },
     
     resourceGatherRates: function() {
-        if (!this._template.ResourceGatherer)
+        if (!this.get("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] = GetTechModifiedProperty(this._techModifications, this._template, "ResourceGatherer/Rates/"+r, +this._template.ResourceGatherer.Rates[r]) * baseSpeed;
+        var baseSpeed = +this.get("ResourceGatherer/BaseSpeed");
+        for (var r in this.get("ResourceGatherer/Rates"))
+            ret[r] = +this.get("ResourceGatherer/Rates/" + r) * baseSpeed;
         return ret;
     },
 
     resourceDropsiteTypes: function() {
-        if (!this._template.ResourceDropsite)
+        if (!this.get("ResourceDropsite"))
             return undefined;
-        return this._template.ResourceDropsite.Types.split(/\s+/);
+        return this.get("ResourceDropsite/Types").split(/\s+/);
     },
 
 
     garrisonableClasses: function() {
-        if (!this._template.GarrisonHolder || !this._template.GarrisonHolder.List._string)
+        if (!this.get("GarrisonHolder") || !this.get("GarrisonHolder/List/_string"))
             return undefined;
-        return this._template.GarrisonHolder.List._string.split(/\s+/);
+        return this.get("GarrisonHolder/List/_string").split(/\s+/);
     },
 
     garrisonMax: function() {
-        if (!this._template.GarrisonHolder)
+        if (!this.get("GarrisonHolder"))
             return undefined;
-        return this._template.GarrisonHolder.Max;
+        return this.get("GarrisonHolder/Max");
     },
     
     /**
@@ -375 +385 @@
      * (Any non domestic currently.)
      */
     isUnhuntable: function() {
-        if (!this._template.UnitAI || !this._template.UnitAI.NaturalBehaviour)
+        if (!this.get("UnitAI") || !this.get("UnitAI/NaturalBehaviour"))
             return false;
 
         // only attack domestic animals since they won't flee nor retaliate.
-        return this._template.UnitAI.NaturalBehaviour !== "domestic";
+        return this.get("UnitAI/NaturalBehaviour") !== "domestic";
     },
-                           
+                          
     walkSpeed: function() {
-        if (!this._template.UnitMotion || !this._template.UnitMotion.WalkSpeed)
+        if (!this.get("UnitMotion") || !this.get("UnitMotion/WalkSpeed"))
              return undefined;
-        return this._template.UnitMotion.WalkSpeed;
+        return this.get("UnitMotion/WalkSpeed");
     },
 
     buildCategory: function() {
-        if (!this._template.BuildRestrictions || !this._template.BuildRestrictions.Category)
+        if (!this.get("BuildRestrictions") || !this.get("BuildRestrictions/Category"))
             return undefined;
-        return this._template.BuildRestrictions.Category;
+        return this.get("BuildRestrictions/Category");
     },
     
     buildTime: function() {
-        if (!this._template.Cost || !this._template.Cost.BuildTime)
+        if (!this.get("Cost") || !this.get("Cost/BuildTime"))
             return undefined;
-        return this._template.Cost.BuildTime;
+        return this.get("Cost/BuildTime");
     },
 
     buildDistance: function() {
-        if (!this._template.BuildRestrictions || !this._template.BuildRestrictions.Distance)
+        if (!this.get("BuildRestrictions") || !this.get("BuildRestrictions/Distance"))
             return undefined;
-        return this._template.BuildRestrictions.Distance;
+        return this.get("BuildRestrictions/Distance");
     },
 
     buildPlacementType: function() {
-        if (!this._template.BuildRestrictions || !this._template.BuildRestrictions.PlacementType)
+        if (!this.get("BuildRestrictions") || !this.get("BuildRestrictions/PlacementType"))
             return undefined;
-        return this._template.BuildRestrictions.PlacementType;
+        return this.get("BuildRestrictions/PlacementType");
     },
 
     buildTerritories: function() {
-        if (!this._template.BuildRestrictions || !this._template.BuildRestrictions.Territory)
+        if (!this.get("BuildRestrictions") || !this.get("BuildRestrictions/Territory"))
             return undefined;
-        return this._template.BuildRestrictions.Territory.split(/\s+/);
+        return this.get("BuildRestrictions/Territory").split(/\s+/);
     },
 
     hasBuildTerritory: function(territory) {
@@ -424 +434 @@
     },
 
     hasTerritoryInfluence: function() {
-        return (this._template.TerritoryInfluence !== undefined);
+        return (this.get("TerritoryInfluence") !== undefined);
     },
 
     territoryInfluenceRadius: function() {
-        if (this._template.TerritoryInfluence !== undefined)
-            return (this._template.TerritoryInfluence.Radius);
+        if (this.get("TerritoryInfluence") !== undefined)
+            return (this.get("TerritoryInfluence/Radius"));
         else
             return -1;
     },
 
     territoryInfluenceWeight: function() {
-        if (this._template.TerritoryInfluence !== undefined)
-            return (this._template.TerritoryInfluence.Weight);
+        if (this.get("TerritoryInfluence") !== undefined)
+            return (this.get("TerritoryInfluence/Weight"));
         else
             return -1;
     },
 
     visionRange: function() {
-        if (!this._template.Vision)
-            return undefined;
-        return this._template.Vision.Range;
+        return this.get("Vision/Range");
     }
 });
 
 
-
+// defines an entity, with a super Template.
+// also redefines several of the template functions where the only change is applying aura and tech modifications.
 m.Entity = m.Class({
-    _super: m.EntityTemplate,
+    _super: m.Template,
 
     _init: function(sharedAI, entity)
     {
-        this._super.call(this, sharedAI.GetTemplate(entity.template), sharedAI._techModifications[entity.owner]);
+        this._super.call(this, sharedAI.GetTemplate(entity.template));
 
-        this._ai = sharedAI;
         this._templateName = entity.template;
         this._entity = entity;
+        this._auraTemplateModif = {};   // template modification from auras. this is only for this entity.
+        this._ai = sharedAI;
+        if (!sharedAI._techModifications[entity.owner][this._templateName])
+            sharedAI._techModifications[entity.owner][this._templateName] = {};
+        this._techModif = sharedAI._techModifications[entity.owner][this._templateName]; // save a reference to the template tech modifications
     },
 
     toString: function() {
@@ -477 +490 @@
     /**
      * Returns extra data that the AI scripts have associated with this entity,
      * for arbitrary local annotations.
-     * (This data is not shared with any other AI scripts.)
+     * (This data should not be shared with any other AI scripts.)
      */
     getMetadata: function(player, key) {
         return this._ai.getMetadata(player, this, key);
@@ -493 +506 @@
     deleteAllMetadata: function(player) {
         delete this._ai._entityMetadata[player][this.id()];
     },
-                   
+                  
     deleteMetadata: function(player, key) {
         this._ai.deleteMetadata(player, this, key);
     },
@@ -508 +521 @@
     
     unitAIState: function() { return this._entity.unitAIState; },
     unitAIOrderData: function() { return this._entity.unitAIOrderData; },
-    hitpoints: function() { if (this._entity.hitpoints !== undefined) return this._entity.hitpoints; return undefined; },
+    
+    hitpoints: function() {if (this._entity.hitpoints !== undefined) return this._entity.hitpoints; return undefined; },
     isHurt: function() { return this.hitpoints() < this.maxHitpoints(); },
     healthLevel: function() { return (this.hitpoints() / this.maxHitpoints()); },
     needsHeal: function() { return this.isHurt() && this.isHealable(); },
@@ -540 +554 @@
     owner: function() {
         return this._entity.owner;
     },
+
     isOwn: function(player) {
         if (typeof(this._entity.owner) === "undefined")
             return false;
         return this._entity.owner === player;
     },
+    
     isFriendly: function(player) {
         return this.isOwn(player); // TODO: diplomacy
     },
+    
     isEnemy: function(player) {
         return !this.isOwn(player); // TODO: diplomacy
     },
@@ -557 +574 @@
             return undefined;
         return this._entity.resourceSupplyAmount;
     },
-                   
+                  
     resourceSupplyGatherers: function(player)
     {
         if (this._entity.resourceSupplyGatherers !== undefined)
-            return this._entity.resourceSupplyGatherers[player-1];
+            return this._entity.resourceSupplyGatherers[player];
         return [];
     },
-                   
+                  
     isFull: function(player)
     {
         if (this._entity.resourceSupplyGatherers !== undefined)
-            return (this.maxGatherers() === this._entity.resourceSupplyGatherers[player-1].length);
+            return (this.maxGatherers() === this._entity.resourceSupplyGatherers[player].length);
 
         return undefined;
     },
@@ -578 +595 @@
             return undefined;
         return this._entity.resourceCarrying; 
     },
-                   
+                  
     currentGatherRate: function() {
         // returns the gather rate for the current target if applicable.
-        if (!this._template.ResourceGatherer)
+        if (!this.get("ResourceGatherer"));
             return undefined;
         
         if (this.unitAIOrderData().length &&
@@ -599 +616 @@
             
             var type = ress.resourceSupplyType();
             var tstring = type.generic + "." + type.specific;
-                   
+                  
             if (type.generic == "treasure")
                 return 1000;
                 
-            var speed = GetTechModifiedProperty(this._techModifications, this._template, "ResourceGatherer/BaseSpeed", +this._template.ResourceGatherer.BaseSpeed);
-            speed *= GetTechModifiedProperty(this._techModifications, this._template, "ResourceGatherer/Rates/"+tstring, +this._template.ResourceGatherer.Rates[tstring]);
-                   
+            var speed = +this.get("ResourceGatherer/BaseSpeed");
+            speed *= +this.get("ResourceGatherer/Rates/" +tstring);
+                  
             if (speed)
                 return speed;
             return 0;
@@ -644 +661 @@
     },
 
     unload: function(id) {
-        if (!this._template.GarrisonHolder)
+        if (!this.get("GarrisonHolder"))
             return undefined;
         Engine.PostCommand(PlayerID,{"type": "unload", "garrisonHolder": this.id(), "entities": [id]});
         return this;
@@ -652 +669 @@
 
     // Unloads all owned units, don't unload allies
     unloadAll: function() {
-        if (!this._template.GarrisonHolder)
+        if (!this.get("GarrisonHolder"))
             return undefined;
         Engine.PostCommand(PlayerID,{"type": "unload-all-own", "garrisonHolders": [this.id()]});
         return this;
@@ -751 +768 @@
         });
         return this;
     },
-                   
+                  
      research: function(template) {
         Engine.PostCommand(PlayerID,{ "type": "research", "entity": this.id(), "template": template });
         return this;

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/ai/common-api/gamestate.js

@@ -126 +126 @@
     if (!this.templates[type])
         return null;
     
-    return new m.EntityTemplate(this.templates[type], this.techModifications);
+    return new m.Template(this.templates[type], this.techModifications);
 };
 
 m.GameState.prototype.applyCiv = function(str) {

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/ai/common-api/shared.js

@@ -58 +58 @@
 // Components that will be disabled in foundation entity templates.
 // (This is a bit yucky and fragile since it's the inverse of
 // CCmpTemplateManager::CopyFoundationSubset and only includes components
-// that our EntityTemplate class currently uses.)
+// that our Template class currently uses.)
 m.g_FoundationForbiddenComponents = {
     "ProductionQueue": 1,
     "ResourceSupply": 1,
@@ -119 +119 @@
 // We need to now the initial state of the game for this, as we will use it.
 // This is called right at the end of the map generation.
 m.SharedScript.prototype.init = function(state) {
+    this.ApplyTemplatesDelta(state);
+
     this.passabilityClasses = state.passabilityClasses;
     this.passabilityMap = state.passabilityMap;
     this.players = this._players;
@@ -127 +129 @@
     this.timeElapsed = state.timeElapsed;
     this.barterPrices = state.barterPrices;
 
-    for (var o in state.players)
-        this._techModifications[o] = state.players[o].techModifications;
-    
     this._entities = {};
     for (var id in state.entities)
         this._entities[id] = new m.Entity(this, state.entities[id]);
@@ -166 +165 @@
         return;
     // deals with updating based on create and destroy messages.
     this.ApplyEntitiesDelta(state);
+    this.ApplyTemplatesDelta(state);
 
     Engine.ProfileStart("onUpdate");
 
@@ -178 +178 @@
     this.timeElapsed = state.timeElapsed;
     this.barterPrices = state.barterPrices;
     
-    for (var o in state.players)
-        this._techModifications[o] = state.players[o].techModifications;
-
     for (var i in this.gameState)
         this.gameState[i].update(this,state);
 
@@ -313 +310 @@
             this.updateEntityCollections(prop, this._entities[id]);
         }
     }
+
+    // apply per-entity aura-related changes.
+    // this supersedes tech-related changes.
+    for (var id in state.changedEntityTemplateInfo)
+    {
+        var changes = state.changedEntityTemplateInfo[id];
+        for each (var change in changes)
+            this._entities[id]._auraTemplateModif[change.variable] = change.value;
+    }
     Engine.ProfileStop();
 };
 
+m.SharedScript.prototype.ApplyTemplatesDelta = function(state)
+{
+    Engine.ProfileStart("Shared ApplyTemplatesDelta");
+
+    for (var player in state.changedTemplateInfo)
+    {
+        var playerDiff = state.changedTemplateInfo[player];
+        for (var template in playerDiff)
+        {
+            var changes = playerDiff[template];
+            if (!this._techModifications[player][template])
+                this._techModifications[player][template] = {};
+            for each (var change in changes)
+                this._techModifications[player][template][change.variable] = change.value;
+        }
+    }
+    Engine.ProfileStop();
+};
+
+m.SharedScript.prototype.registerUpdatingEntityCollection = function(entCollection, noPush)
+{
+    if (!noPush) {
+        this._entityCollections.push(entCollection);
+    }
+    entCollection.setUID(this._entityCollectionsUID);
+    for each (var prop in entCollection.dynamicProperties())
+    {
+        this._entityCollectionsByDynProp[prop] = this._entityCollectionsByDynProp[prop] || [];
+        this._entityCollectionsByDynProp[prop].push(entCollection);
+    }
+    this._entityCollectionsUID++;
+};
+
+m.SharedScript.prototype.removeUpdatingEntityCollection = function(entCollection)
+{
+    for (var i in this._entityCollections)
+    {
+        if (this._entityCollections[i].getUID() === entCollection.getUID())
+        {
+            this._entityCollections.splice(i, 1);
+        }
+    }
+    
+    for each (var prop in entCollection.dynamicProperties())
+    {
+        for (var i in this._entityCollectionsByDynProp[prop])
+        {
+            if (this._entityCollectionsByDynProp[prop][i].getUID() === entCollection.getUID())
+            {
+                this._entityCollectionsByDynProp[prop].splice(i, 1);
+            }
+        }
+    }
+};
 m.SharedScript.prototype.registerUpdatingEntityCollection = function(entCollection, noPush)
 {
     if (!noPush) {

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/components/AIInterface.js

@@ -18 +18 @@
     this.events["OwnershipChanged"] = [];
 
     this.changedEntities = {};
+
+    // cache for technology changes;
+    // this one is PlayerID->TemplateName->{StringForTheValue, ActualValue}
+    this.changedTemplateInfo = {};
+    // this is for auras and is EntityID->{StringForTheValue, ActualValue}
+    this.changedEntityTemplateInfo = {};
 };
 
-AIInterface.prototype.GetRepresentation = function()
+AIInterface.prototype.GetNonEntityRepresentation = function()
 {
     var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
-
+    
     // Return the same game state as the GUI uses
     var state = cmpGuiInterface.GetExtendedSimulationState(-1);
-
+    
     // Add some extra AI-specific data
     state.events = {};
     state.events["Create"] = this.events["Create"];
@@ -39 +45 @@
     state.events["PlayerDefeated"] = this.events["PlayerDefeated"];
     state.events["EntityRenamed"] = this.events["EntityRenamed"];
     state.events["OwnershipChanged"] = this.events["OwnershipChanged"];
-
     // Reset the event list for the next turn
     this.events["Create"] = [];
     this.events["Destroy"] = [];
@@ -51 +56 @@
     this.events["PlayerDefeated"] = [];
     this.events["EntityRenamed"] = [];
     this.events["OwnershipChanged"] = [];
-    
+
+    return state;
+}
+
+AIInterface.prototype.GetRepresentation = function()
+{
+    var state = this.GetNonEntityRepresentation();
+
     // Add entity representations
     Engine.ProfileStart("proxy representations");
     state.entities = {};
@@ -64 +76 @@
     this.changedEntities = {};
     Engine.ProfileStop();
 
+    state.changedTemplateInfo = this.changedTemplateInfo;
+    this.changedTemplateInfo = {};
+    state.changedEntityTemplateInfo = this.changedEntityTemplateInfo;
+    this.changedEntityTemplateInfo = {};
+
     return state;
 };
+
 // Intended to be called first, during the map initialization: no caching
 AIInterface.prototype.GetFullRepresentation = function(flushEvents)
-{
-    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
-    
-    // Return the same game state as the GUI uses
-    var state = cmpGuiInterface.GetExtendedSimulationState(-1);
-    
-    // Add some extra AI-specific data
-    state.events = {};
-    state.events["Create"] = this.events["Create"];
-    state.events["Destroy"] = this.events["Destroy"];
-    state.events["Attacked"] = this.events["Attacked"];
-    state.events["RangeUpdate"] = this.events["RangeUpdate"];
-    state.events["ConstructionFinished"] = this.events["ConstructionFinished"];
-    state.events["TrainingFinished"] = this.events["TrainingFinished"];
-    state.events["AIMetadata"] = this.events["AIMetadata"];
-    state.events["PlayerDefeated"] = this.events["PlayerDefeated"];
-    state.events["EntityRenamed"] = this.events["EntityRenamed"];
-    state.events["OwnershipChanged"] = this.events["OwnershipChanged"];
-    
+{   
+    var state = this.GetNonEntityRepresentation();
 
     if (flushEvents)
     {
@@ -102 +103 @@
         state.events["OwnershipChanged"] = [];
     }
 
-    // Reset the event list for the next turn
-    this.events["Create"] = [];
-    this.events["Destroy"] = [];
-    this.events["Attacked"] = [];
-    this.events["RangeUpdate"] = [];
-    this.events["ConstructionFinished"] = [];
-    this.events["TrainingFinished"] = [];
-    this.events["AIMetadata"] = [];
-    this.events["PlayerDefeated"] = [];
-    this.events["EntityRenamed"] = [];
-    this.events["OwnershipChanged"] = [];
-
-
     // Add entity representations
     Engine.ProfileStart("proxy representations");
     state.entities = {};
@@ -127 +115 @@
     }
     Engine.ProfileStop();
     
+    state.changedTemplateInfo = this.changedTemplateInfo;
+    this.changedTemplateInfo = {};
+    state.changedEntityTemplateInfo = this.changedEntityTemplateInfo;
+    this.changedEntityTemplateInfo = {};
+
     return state;
 };
 
@@ -156 +149 @@
     this.events["EntityRenamed"].push(msg);
 };
 
+// When a new technology is researched, check which templates it affects,
+// and send the updated values to the AI.
+// this relies on the fact that any "value" in a technology can only ever change
+// one template value, and that the naming is the same (with / in place of .)
+// it's not incredibly fast but it's not incredibly slow.
+AIInterface.prototype.OnValueModification = function(msg)
+{
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    if (!this.templates)
+        this.templates = cmpTemplateManager.FindAllTemplates(false);
+    for (var o = 0; o < this.templates.length; ++o)
+    {
+        var tmp = this.templates[o];
+        var template = cmpTemplateManager.GetTemplateWithoutValidation(this.templates[o]);
+        // remove templates that we obviously don't care about.
+        if (!template || !template.Identity || ! template.Identity.Civ)
+        {
+            this.templates.splice(o--,1);
+            continue;
+        }
+        for each (var value in msg.valueNames)
+        {
+            // let's get the base template value.
+            var strings = value.split("/");
+            var item = template;
+            var ended = true;
+            for (var i = 0; i < strings.length; ++i)
+            {
+                if (item !== undefined && item[strings[i]] !== undefined)
+                    item = item[strings[i]];
+                else
+                    ended = false;
+            }
+            if (!ended)
+                continue;
+            // item now contains the template value for this.
+            var newValue = ApplyValueModificationsToTemplate(value, +item, msg.player, template);
+            newValue = typeof(newValue) === "Number" ? Math.round(newValue) : newValue;
+            if(item != newValue)
+            {
+                if (!this.changedTemplateInfo[msg.player])
+                    this.changedTemplateInfo[msg.player] = {};
+                if (!this.changedTemplateInfo[msg.player][this.templates[o]])
+                    this.changedTemplateInfo[msg.player][this.templates[o]] = [ { "variable" : value, "value" : newValue} ];
+                else
+                    this.changedTemplateInfo[msg.player][this.templates[o]].push({ "variable" : value, "value" : newValue });
+            }
+        }
+    }
+};
+
+AIInterface.prototype.AuraChange = function(msg, ent)
+{
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    var template = cmpTemplateManager.GetTemplateWithoutValidation(cmpTemplateManager.GetCurrentTemplateName(ent));
+    for each (var value in msg.valueNames)
+    {
+        // let's get the base template value.
+        var strings = value.split("/");
+        var item = template;
+        var ended = true;
+        for (var i = 0; i < strings.length; ++i)
+        {
+            if (item !== undefined && item[strings[i]] !== undefined)
+                item = item[strings[i]];
+            else
+                ended = false;
+        }
+        if (!ended)
+            continue;
+        // "item" now contains the unmodified template value for this.
+        var newValue = ApplyValueModificationsToEntity(value, +item, ent);
+        newValue = typeof(newValue) === "Number" ? Math.round(newValue) : newValue;
+        if(item != newValue)
+        {
+            if (!this.changedEntityTemplateInfo[ent])
+                this.changedEntityTemplateInfo[ent] = [{ "variable" : value, "value" : newValue }];
+            else
+                this.changedEntityTemplateInfo[ent].push({ "variable" : value, "value" : newValue });
+        }
+    }
+};
+
 Engine.RegisterComponentType(IID_AIInterface, "AIInterface", AIInterface);

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/components/AIProxy.js

@@ -36 +36 @@
     this.needsFullGet = true;
     this.owner = -1;    // for convenience now and then.
     
+    this.cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
+
     // Let the AIInterface know that we exist and that it should query us
     this.NotifyChange();
 };
@@ -67 +69 @@
     if (!this.changes)
     {
         this.changes = {};
-
-        var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-        cmpAIInterface.ChangedEntity(this.entity);
+    this.cmpAIInterface.ChangedEntity(this.entity);
     }
 };
 
@@ -261 +261 @@
     
     if (msg.from === -1)
     {
-        var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-        cmpAIInterface.PushEvent("Create", {"entity" : msg.entity});
+        this.cmpAIInterface.PushEvent("Create", {"entity" : msg.entity});
         return;
     } else if (msg.to === -1)
     {
-        var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-        cmpAIInterface.PushEvent("Destroy", {"entity" : msg.entity});
+        this.cmpAIInterface.PushEvent("Destroy", {"entity" : msg.entity});
         return;
     }
     
     this.owner = msg.to;
     this.changes.owner = msg.to;
     
-    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-    cmpAIInterface.PushEvent("OwnershipChanged", msg);
+this.cmpAIInterface.PushEvent("OwnershipChanged", msg);
 };
 
 AIProxy.prototype.OnAttacked = function(msg)
 {
-    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-    cmpAIInterface.PushEvent("Attacked", msg);
+this.cmpAIInterface.PushEvent("Attacked", msg);
 };
 
 /*
  Deactivated for actually not really being practical for most uses.
  AIProxy.prototype.OnRangeUpdate = function(msg)
 {
-    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
     msg.owner = this.owner;
-    cmpAIInterface.PushEvent("RangeUpdate", msg);
+this.cmpAIInterface.PushEvent("RangeUpdate", msg);
     warn(uneval(msg));
 };*/
 
 AIProxy.prototype.OnConstructionFinished = function(msg)
 {
-    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-    cmpAIInterface.PushEvent("ConstructionFinished", msg);
+    this.cmpAIInterface.PushEvent("ConstructionFinished", msg);
 };
 
 AIProxy.prototype.OnTrainingFinished = function(msg)
 {
-    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-    cmpAIInterface.PushEvent("TrainingFinished", msg);
+    this.cmpAIInterface.PushEvent("TrainingFinished", msg);
 };
 
 AIProxy.prototype.OnAIMetadata = function(msg)
 {
-    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
-    cmpAIInterface.PushEvent("AIMetadata", msg);
+    this.cmpAIInterface.PushEvent("AIMetadata", msg);
+};
+
+AIProxy.prototype.OnAI_AuraChange = function(msg)
+{
+    this.cmpAIInterface.AuraChange(msg, this.entity);
 };
 
 Engine.RegisterComponentType(IID_AIProxy, "AIProxy", AIProxy);

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/components/AuraManager.js

@@ -46 +46 @@
         this.modificationsCache[value][ent].add += data.add;
 
     // post message to the entity to notify it about the change
-    Engine.PostMessage(ent, MT_ValueModification, { "component": value.split("/")[0] });
+    Engine.PostMessage(ent, MT_AI_AuraChange, { "valueNames": [value] });
+    Engine.PostMessage(ent, MT_ValueModification, { "player": 0, "component": value.split("/")[0], "valueNames": [value] });
 };
 
 AuraManager.prototype.ApplyTemplateBonus = function(value, player, classes, data, key)
@@ -98 +99 @@
         this.modificationsCache[value][ent].multiply /= data.multiply;
 
     // post message to the entity to notify it about the change
-    Engine.PostMessage(ent, MT_ValueModification, { "component": value.split("/")[0] });
+    var effects = {};
+    effects[value] = this.modificationsCache[value][ent];
+    Engine.PostMessage(ent, MT_AI_AuraChange, { "valueNames": [value] });
+    Engine.PostMessage(ent, MT_ValueModification, { "player": Engine.QueryInterface(ent, IID_Ownership).GetOwner(), "component": value.split("/")[0], "valueNames": [value] });
 };
 
 AuraManager.prototype.RemoveTemplateBonus = function(value, player, classes, key)

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -97 +97 @@
             "entityLimits": cmpPlayerEntityLimits.GetLimits(),
             "entityCounts": cmpPlayerEntityLimits.GetCounts(),
             "entityLimitChangers": cmpPlayerEntityLimits.GetLimitChangers(),
-            "techModifications": cmpTechnologyManager.GetTechModifications(),
             "researchQueued": cmpTechnologyManager.GetQueuedResearch(),
             "researchStarted": cmpTechnologyManager.GetStartedResearch(),
             "researchedTechs": cmpTechnologyManager.GetResearchedTechs(),
@@ -475 +474 @@
     {
         ret.armour = {
             "hack": ApplyValueModificationsToTemplate("Armour/Hack", +template.Armour.Hack, player, template),
-            "pierce": ApplyValueModificationsToTemplate("Armour/Pierce", +template.Armour.Hack, player, template),
-            "crush": ApplyValueModificationsToTemplate("Armour/Crush", +template.Armour.Hack, player, template),
+            "pierce": ApplyValueModificationsToTemplate("Armour/Pierce", +template.Armour.Pierce, player, template),
+            "crush": ApplyValueModificationsToTemplate("Armour/Crush", +template.Armour.Crush, player, template),
         };
     }
     

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/components/TechnologyManager.js

@@ -226 +226 @@
                 var modifications = this.modifications[name];
                 var component = name.split("/")[0];
                 for (var i in modifications)
-                    if (!modifiedComponents[component] && DoesModificationApply(modifications[i], classes))
-                        modifiedComponents[component] = true;
+                    if (DoesModificationApply(modifications[i], classes))
+                    {
+                        if (!modifiedComponents[component])
+                            modifiedComponents[component] = [];
+                        modifiedComponents[component].push(name);
+                    }
             }
 
             // Send mesage(s) to the entity so it knows about researched techs
             for (var component in modifiedComponents)
-                Engine.PostMessage(msg.entity, MT_ValueModification, { "component": component });
+                Engine.PostMessage(msg.entity, MT_ValueModification, { "player": playerID, "component": component, "valueNames": modifiedComponents[component] });
         }
     }
     if (msg.from == playerID)
@@ -322 +326 @@
                     mod[j] = modification[j];
             
             this.modifications[modification.value].push(mod);
-            modifiedComponents[modification.value.split("/")[0]] = true;
+            var component = modification.value.split("/")[0];
+            if (!modifiedComponents[component])
+                modifiedComponents[component] = [];
+            modifiedComponents[component].push(modification.value);
             this.modificationCache[modification.value] = {};
         }
     }
     
     this.UpdateAutoResearch();
     
+
+    var player = +(+this.entity - 2);
+    // it appears that this.entity - 2 = playerID
+    // now this is just ugly but because of below's TODO it works.
     // TODO: Handle technology broadcasting for autoresearch properly (some components might not be initialized currently)
     for (var component in modifiedComponents)
-        Engine.BroadcastMessage(MT_ValueModification, { "component": component });
+        Engine.BroadcastMessage(MT_ValueModification, { "player": player, "component": component, "valueNames": modifiedComponents[component]});
 };
 
 // Clears the cached data for an entity from the modifications cache

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/components/interfaces/AuraManager.js

@@ -1 +1 @@
 Engine.RegisterInterface("AuraManager");
+
+// Message of the form { "value" : whatever }.
+// intended for AIProxy so it won't clutter everything.
+Engine.RegisterMessageType("AI_AuraChange");

Users/Lancelot/Desktop/0ad-svn/trunk/binaries/data/mods/public/simulation/helpers/Commands.js

@@ -1 +1 @@
 // Setting this to true will display some warnings when commands
 //  are likely to fail, which may be useful for debugging AIs
-var g_DebugCommands = false;
+var g_DebugCommands = true;
 
 function ProcessCommand(player, cmd)
 {

Users/Lancelot/Desktop/0ad-svn/trunk/source/simulation2/MessageTypes.h

@@ -373 +373 @@
 public:
     DEFAULT_MESSAGE_IMPL(ValueModification)
 
-    CMessageValueModification(std::wstring component) :
-        component(component)
+    CMessageValueModification(player_id_t player, std::wstring component, const std::vector<std::wstring>& valueNames) :
+        player(player),
+        component(component),
+        valueNames(valueNames)
     {
     }
 
+    player_id_t player;
     std::wstring component;
+    std::vector<std::wstring> valueNames;
 };
 
 /**

Users/Lancelot/Desktop/0ad-svn/trunk/source/simulation2/components/ICmpTemplateManager.cpp

@@ -23 +23 @@
 
 BEGIN_INTERFACE_WRAPPER(TemplateManager)
 DEFINE_INTERFACE_METHOD_1("GetTemplate", const CParamNode*, ICmpTemplateManager, GetTemplate, std::string)
+DEFINE_INTERFACE_METHOD_1("GetTemplateWithoutValidation", const CParamNode*, ICmpTemplateManager, GetTemplateWithoutValidation, std::string)
 DEFINE_INTERFACE_METHOD_1("GetCurrentTemplateName", std::string, ICmpTemplateManager, GetCurrentTemplateName, entity_id_t)
 DEFINE_INTERFACE_METHOD_1("FindAllTemplates", std::vector<std::string>, ICmpTemplateManager, FindAllTemplates, bool)
 DEFINE_INTERFACE_METHOD_1("GetEntitiesUsingTemplate", std::vector<entity_id_t>, ICmpTemplateManager, GetEntitiesUsingTemplate, std::string)

Users/Lancelot/Desktop/0ad-svn/trunk/source/simulation2/scripting/MessageTypeConversions.cpp

@@ -303 +303 @@
 jsval CMessageValueModification::ToJSVal(ScriptInterface& scriptInterface) const
 {
     TOJSVAL_SETUP();
+    SET_MSG_PROPERTY(player);
     SET_MSG_PROPERTY(component);
+    SET_MSG_PROPERTY(valueNames);
     return OBJECT_TO_JSVAL(obj);
 }
 
 CMessage* CMessageValueModification::FromJSVal(ScriptInterface& scriptInterface, jsval val)
 {
     FROMJSVAL_SETUP();
+    GET_MSG_PROPERTY(player_id_t, player);
     GET_MSG_PROPERTY(std::wstring, component);
-    return new CMessageValueModification(component);
+    GET_MSG_PROPERTY(std::vector<std::wstring>, valueNames);
+    return new CMessageValueModification(player, component, valueNames);
 }
 
 ////////////////////////////////