Ticket #2180: AIFix_.5.patch

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

@@ -23 +23 @@
 };
 
 /**
- * Replace this entity with a civ-specific entity on the first turn
+ * Replace this entity with a civ-specific entity
+ * Message is sent right before InitGame() is called, in InitGame.js
  */
-SkirmishReplacer.prototype.OnUpdate = function(msg)
+SkirmishReplacer.prototype.OnSkirmishReplace = function(msg)
 {
     var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
     var civ = cmpPlayer.GetCiv();
-
+    
     var templateName = "";
     if (civ in this.template)
         templateName = this.template[civ];
     else if ("general" in this.template)
         templateName = this.template.general;
-
+    
     if (!templateName || civ == "gaia")
     {
         Engine.DestroyEntity(this.entity);
@@ -43 +45 @@
     }
     
     templateName = templateName.replace(/\{civ\}/g, civ);
-
+    
     var cmpCurPosition = Engine.QueryInterface(this.entity, IID_Position);
     var replacement = Engine.AddEntity(templateName);
     var cmpReplacementPosition = Engine.QueryInterface(replacement, IID_Position)
@@ -54 +56 @@
     var cmpCurOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
     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/components/interfaces/SkirmishReplacer.js

@@ -1 +1 @@
 Engine.RegisterInterface("SkirmishReplacer");
+Engine.RegisterMessageType("SkirmishReplace");

binaries/data/mods/public/simulation/helpers/InitGame.js

@@ -1 @@
-function InitGame(settings)
+function ReplaceSkirmishGlobals()
 {
     // This will be called after the map settings have been loaded,
     // before the simulation has started.
     // This is only called at the start of a new game, not when loading
     // a saved game.
+    Engine.BroadcastMessage(MT_SkirmishReplace, {});
+}
 
+function InitGame(settings)
+{
+    // This is called right after ReplaceSkirmishGlobals
+
     // No settings when loading a map in Atlas, so do nothing
     if (!settings)
         return;
+    
+    Engine.BroadcastMessage(MT_SkirmishReplace, {});
 
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
     var cmpAIManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AIManager);
@@ -37 +45 @@
     cmpAIManager.RunGamestateInit();
 }
 
+Engine.RegisterGlobal("ReplaceSkirmishGlobals", ReplaceSkirmishGlobals);
 Engine.RegisterGlobal("InitGame", InitGame);

source/ps/Game.cpp

@@ -48 +48 @@
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "soundmanager/ISoundManager.h"
 
+#include "tools/atlas/GameInterface/GameLoop.h"
+
 extern bool g_GameRestarted;
+extern GameLoopState* g_AtlasGameLoop;
 
 /**
  * Globally accessible pointer to the CGame object.
@@ -200 +203 @@
     // Call the script function InitGame only for new games, not saved games
     if (!m_IsSavedGame)
     {
+        if (!g_AtlasGameLoop->running)
+        {
+            m_Simulation2->ReplaceSkirmishGlobals();
+            m_Simulation2->FlushDestroyedEntities();
+        }
         CScriptVal settings;
         m_Simulation2->GetScriptInterface().GetProperty(m_Simulation2->GetInitAttributes().get(), "settings", settings);
         m_Simulation2->InitGame(settings);

source/simulation2/Simulation2.cpp

@@ -647 +647 @@
     return m->m_ComponentManager.GetScriptInterface();
 }
 
+void CSimulation2::ReplaceSkirmishGlobals()
+{
+    GetScriptInterface().CallFunctionVoid(GetScriptInterface().GetGlobalObject(), "ReplaceSkirmishGlobals");
+}
+
 void CSimulation2::InitGame(const CScriptVal& data)
 {
     GetScriptInterface().CallFunctionVoid(GetScriptInterface().GetGlobalObject(), "InitGame", data);

source/simulation2/Simulation2.h

@@ -147 +147 @@
     void ResetState(bool skipScriptedComponents = false, bool skipAI = false);
 
     /**
+     * Send a message to replace skirmish entities with real ones
+     * Called right before InitGame, on CGame instantiation.
+     * (This mustn't be used when e.g. loading saved games, only when starting new ones.)
+     * This calls the ReplaceSkirmishGlobals function defined in helpers/InitGame.js.
+     */
+    void ReplaceSkirmishGlobals();
+
+    /**
      * Initialise a new game, based on some script data. (Called on CGame instantiation)
      * (This mustn't be used when e.g. loading saved games, only when starting new ones.)
      * This calls the InitGame function defined in helpers/InitGame.js.

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)
 };