Ticket #2180: AIFix_.2.patch

binaries/data/mods/public/simulation/ai/aegis/base-manager.js

@@ -483 +483 @@
     // for each dropsite, recalculate
     for (i in this.dropsites)
     {
+        warn(uneval(i));
         for (type in this.dropsites[i])
         {
             this.updateDropsite(gameState,gameState.getEntityById(i),type);

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.
+
+            warn(uneval(evt.msg));
+            if (!state.entities[evt.msg.newentity])
+                continue;
+
+            warn("first check");
+            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;
+            
+            warn("second check");
+            // 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/AIInterface.js

@@ -81 +81 @@
     this.events.push({"type": "PlayerDefeated", "msg": msg});
 };
 
+AIInterface.prototype.OnGlobalEntityRenamed = function(msg)
+{
+    this.events.push({"type": "EntityRenamed", "msg": msg});
+};
+
 Engine.RegisterComponentType(IID_AIInterface, "AIInterface", AIInterface);

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

@@ -55 +55 @@
     var cmpReplacementOwnership = Engine.QueryInterface(replacement, IID_Ownership);
     cmpReplacementOwnership.SetOwner(cmpCurOwnership.GetOwner());
 
+    Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: replacement});
     Engine.DestroyEntity(this.entity);
 };
 

binaries/data/mods/public/simulation/templates/skirmish/structures/default_civil_centre.xml

@@ -3 +3 @@
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
+  <ResourceDropsite disable=""/>
   <SkirmishReplacer>
     <general>structures/{civ}_civil_centre</general>
   </SkirmishReplacer>