Ticket #2180: AIFix_.3.patch

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

@@ -222 +222 @@
                 if (ent && ent.resourceSupplyAmount() && ent.owner() == 0)
                     this.assignResourceToDP(gameState,ent);
             }
+        }  else if (events[i].type == "EntityRenamed")
+        {
+            var evt = events[i];
+            debug (evt);
+
         }
     }
 };
@@ -483 +488 @@
     // 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

@@ -180 +180 @@
         this._techModifications[o] = state.players[o].techModifications;
     
     this._entities = {};
-    this.entities = new EntityCollection(this);
 
-    /* (var id in state.entities)
+    for (var id in state.entities)
     {
         this._entities[id] = new Entity(this, state.entities[id]);
     }
     // entity collection updated on create/destroy event.
     this.entities = new EntityCollection(this, this._entities);
-    */
     
-    this.ApplyEntitiesDelta(state);
-
     // create the terrain analyzer
     this.terrainAnalyzer = new TerrainAnalysis();
     this.terrainAnalyzer.init(this, state);
@@ -214 +210 @@
 // 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 +292 @@
             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));
+
+            // Switch the metadata
+            for (var i in this._players)
+            {
+                warn (uneval(this._entityMetadata[this._players[i]][evt.msg.entity]));
+                this._entityMetadata[this._players[i]][evt.msg.newentity] = this._entityMetadata[this._players[i]][evt.msg.entity];
+                this._entityMetadata[this._players[i]][evt.msg.entity] = {};
+            }
+        }
         else if (evt.type == "TrainingFinished")
         {
             // Apply metadata stored in training queues

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

@@ -37 +37 @@
     return state;
 };
 // Intended to be called first, during the map initialization: no caching
-AIInterface.prototype.GetFullRepresentation = function()
+AIInterface.prototype.GetFullRepresentation = function(flushEvents)
 {
     var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     
@@ -46 +46 @@
     
     // Add some extra AI-specific data
     state.events = this.events;
+    if (flushEvents)
+    {
+        state.events = [];
+        this.events = [];
+    }
     
     // Add entity representations
     Engine.ProfileStart("proxy representations");
@@ -81 +86 @@
     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);
 };
 

source/simulation2/components/CCmpAIManager.cpp

@@ -994 +994 @@
         ENSURE(cmpAIInterface);
         
         // Get the game state from AIInterface
-        CScriptVal state = cmpAIInterface->GetFullRepresentation();
+        CScriptVal state = cmpAIInterface->GetFullRepresentation(true);
 
         // Get the passability data
         Grid<u16> dummyGrid;

source/simulation2/components/ICmpAIInterface.cpp

@@ -34 +34 @@
     {
         return m_Script.Call<CScriptVal> ("GetRepresentation");
     }
-    virtual CScriptVal GetFullRepresentation()
+    virtual CScriptVal GetFullRepresentation(bool flushEvents = false)
     {
-        return m_Script.Call<CScriptVal> ("GetFullRepresentation");
+        return m_Script.Call<CScriptVal> ("GetFullRepresentation",flushEvents);
     }
     
 };

source/simulation2/components/ICmpAIInterface.h

@@ -32 +32 @@
      * Returns a script object that represents the current world state,
      * to be passed to AI scripts. No caching for initialization
      */
-    virtual CScriptVal GetFullRepresentation() = 0;
+    virtual CScriptVal GetFullRepresentation(bool flushEvents) = 0;
 
     DECLARE_INTERFACE_TYPE(AIInterface)
 };