Ticket #3992: entityModif.patch

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

@@ -44 +44 @@
     this.accessibility = sharedAI.accessibility;
     this.terrainAnalyzer = sharedAI.terrainAnalyzer;
     
-    this.techModifications = sharedAI._techModifications[this.player];
-    this.playerData = sharedAI.playersData[this.player];
-    
     this.gameState = sharedAI.gameState[this.player];
     this.gameState.ai = this;
     this.sharedScript = sharedAI;
@@ -53 +50 @@
     
     this.timeElapsed = sharedAI.timeElapsed;
 
-    this.circularMap = sharedAI.circularMap;
-
-    this.gameType = sharedAI.gameType;
-
-    this.barterPrices = sharedAI.barterPrices;
-
     this.CustomInit(this.gameState, this.sharedScript);
 };
 

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

@@ -16 +16 @@
     get: function(string)
     {
         var value = this._template;
-        if (this._auraTemplateModif && this._auraTemplateModif.has(string))
-            return this._auraTemplateModif.get(string);
-        else if (this._techModif && this._techModif.has(string))
-            return this._techModif.get(string);
+        if (this._entityModif && this._entityModif.has(string))
+            return this._entityModif.get(string);
+        else if (this._templateModif && this._templateModif.has(string))
+            return this._templateModif.get(string);
 
         if (!this._tpCache.has(string))
         {
@@ -565 +565 @@
 
         this._templateName = entity.template;
         this._entity = entity;
-        this._auraTemplateModif = new Map();    // 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] = new Map();
-        this._techModif = sharedAI._techModifications[entity.owner][this._templateName]; // save a reference to the template tech modifications
+        // save a reference to the template tech modifications
+        if (!sharedAI._templatesModifications[entity.owner][this._templateName])
+            sharedAI._templatesModifications[entity.owner][this._templateName] = new Map();
+        this._templateModif = sharedAI._templatesModifications[entity.owner][this._templateName];
+        // save a reference to the entity tech/aura modifications
+        if (!sharedAI._entitiesModifications.has(entity.id))
+            sharedAI._entitiesModifications.set(entity.id, new Map());
+        this._entityModif = sharedAI._entitiesModifications.get(entity.id);
     },
 
     toString: function() {

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

@@ -20 +20 @@
     this.entities = SharedScript.entities;
     this.player = player;
     this.playerData = SharedScript.playersData[this.player];
-    this.techModifications = SharedScript._techModifications[this.player];
     this.barterPrices = SharedScript.barterPrices;
     this.gameType = SharedScript.gameType;
 
@@ -61 +60 @@
     this._entities = SharedScript._entities;
     this.entities = SharedScript.entities;
     this.playerData = SharedScript.playersData[this.player];
-    this.techModifications = SharedScript._techModifications[this.player];
     this.barterPrices = SharedScript.barterPrices;
 };
 
@@ -129 +127 @@
 {
     if (this.techTemplates[type] !== undefined)
         return new m.Technology(this.techTemplates, type);
-    
+
     if (!this.templates[type])
         return null;
-    
-    return new m.Template(this.templates[type], this.techModifications);
+
+    return new m.Template(this.templates[type]);
 };
 
 m.GameState.prototype.applyCiv = function(str)

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

@@ -18 +18 @@
 
     // array of entity collections
     this._entityCollections = new Map();
-    this._techModifications = {};
+    this._entitiesModifications = new Map();    // entities modifications
+    this._templatesModifications = {};  // template modifications
     // each name is a reference to the actual one.
     this._entityCollectionsName = new Map();
     this._entityCollectionsByDynProp = {};
@@ -38 +39 @@
 {
     return {
         "players": this._players,
-        "techTp": this._techTemplates,
-        "techModifications": this._techModifications,
+        "techTemplates": this._techTemplates,
+        "templatesModifications": this._templatesModifications,
+        "entitiesModifications": this._entitiesModifications,
         "metadata": this._entityMetadata
     };
 };
@@ -49 +51 @@
 m.SharedScript.prototype.Deserialize = function(data)
 {
     this._players = data.players;
-    this._techTemplates = data.techTp;
-    this._techModifications = data.techModifications;
+    this._techTemplates = data.techTemplates;
+    this._templatesModifications = data.templatesModifications;
+    this._entitiesModifications = data.entitiesModifications;
     this._entityMetadata = data.metadata;
-    this._derivedTemplates = {}; 
+    this._derivedTemplates = {};
 
     this.isDeserialized = true;
 };
@@ -83 +86 @@
 {   
     if (this._templates[name])
         return this._templates[name];
-    
+
     if (this._derivedTemplates[name])
         return this._derivedTemplates[name];
-    
+
     // If this is a foundation template, construct it automatically
     if (name.indexOf("foundation|") !== -1)
     {
@@ -112 +115 @@
         this._derivedTemplates[name] = resource;
         return resource;
     }
-    
+
     error("Tried to retrieve invalid template '"+name+"'");
     return null;
 };
@@ -123 +126 @@
 m.SharedScript.prototype.init = function(state, deserialization)
 {
     if (!deserialization)
+    {
+        this._entitiesModifications = new Map();
         for (let i = 0; i < state.players.length; ++i)
-            this._techModifications[i] = {};
+            this._templatesModifications[i] = {};
+    }
 
     this.ApplyTemplatesDelta(state);
 
@@ -310 +316 @@
         this.entities.removeEnt(entity);
         
         this._entities.delete(evt.entity);
+        this._entitiesModifications.delete(evt.entity)
         for (let j in this._players)
             delete this._entityMetadata[this._players[j]][evt.entity];
     }
@@ -332 +339 @@
         if (!this._entities.has(+id))
             continue;   // dead, presumably.
         let changes = state.changedEntityTemplateInfo[id];
-        let entity = this._entities.get(+id);
+        if (!this._entitiesModifications.has(+id))
+            this._entitiesModifications.set(+id, new Map());
+        let modif = this._entitiesModifications.get(+id);
         for (let change of changes)
-            entity._auraTemplateModif.set(change.variable, change.value);
+            modif.set(change.variable, change.value);
     }
     Engine.ProfileStop();
 };
@@ -349 +358 @@
         for (let template in playerDiff)
         {
             let changes = playerDiff[template];
-            if (!this._techModifications[player][template])
-                this._techModifications[player][template] = new Map();
+            if (!this._templatesModifications[player][template])
+                this._templatesModifications[player][template] = new Map();
+            let modif = this._templatesModifications[player][template];
             for (let change of changes)
-                this._techModifications[player][template].set(change.variable, change.value);
+                modif.set(change.variable, change.value);
         }
     }
     Engine.ProfileStop();

binaries/data/mods/public/simulation/ai/petra/mapModule.js

@@ -127 +127 @@
     var border = Math.round(80 / map.cellSize);
     var passabilityMap = gameState.sharedScript.passabilityMap;
     var obstructionMask = gameState.getPassabilityClassMask("unrestricted");
-    if (gameState.ai.circularMap)
+    if (gameState.circularMap)
     {
         let ic = (width - 1) / 2;
         let radcut = (ic - border) * (ic - border);