Ticket #2180: AIFix_.patch

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

@@ -214 +214 @@
 // applies entity deltas, and each gamestate.
 SharedScript.prototype.onUpdate = function(state)
 {
-    if (this.turn !== 0)
-        this.ApplyEntitiesDelta(state);
+    this.ApplyEntitiesDelta(state);
 
     Engine.ProfileStart("onUpdate");
     
@@ -297 +296 @@
             for (var i in this._players)
                 delete this._entityMetadata[this._players[i]][evt.msg.entity];
         }
+        else if (evt.type == "EntityRenamed")
+        {
+            //combines destroy and create.
+
+            if (!state.entities[evt.msg.newentity])
+                continue;
+
+            this._entities[evt.msg.newentity] = new Entity(this, state.entities[evt.msg.newentity]);
+            this.entities.addEnt(this._entities[evt.msg.newentity]);
+            
+            // Update all the entity collections since the create operation affects static properties as well as dynamic
+            for (var entCollection in this._entityCollections)
+                this._entityCollections[entCollection].updateEnt(this._entities[evt.msg.newentity]);
+
+            if (!this._entities[evt.msg.entity])
+                continue;
+            
+            // Dunno if this is relevant on renaming.
+            if (foundationFinished[evt.msg.entity])
+                evt.msg["SuccessfulFoundation"] = true;
+            
+            // Switch the metadata
+            for (var i in this._players)
+                this._entityMetadata[this._players[i]][evt.msg.entity] = this._entityMetadata[this._players[i]][evt.msg.entity];
+            
+            for each (var entCol in this._entityCollections)
+                entCol.removeEnt(this._entities[evt.msg.entity]);
+            this.entities.removeEnt(this._entities[evt.msg.entity]);
+        }
         else if (evt.type == "TrainingFinished")
         {
             // Apply metadata stored in training queues

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

@@ -288 +288 @@
     cmpAIInterface.PushEvent("TrainingFinished", msg);
 };
 
+AIProxy.prototype.OnGlobalEntityRenamed = function(msg)
+{
+    var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);
+    cmpAIInterface.PushEvent("EntityRenamed", msg);
+};
+
 AIProxy.prototype.OnAIMetadata = function(msg)
 {
     var cmpAIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface);