Ticket #1089: AIFix.patch

binaries/data/mods/public/simulation/ai/aegis/aegis.js

@@ -227 +227 @@
     }
 };
 
-// TODO: Remove override when the whole AI state is serialised
-// TODO: this currently is very much equivalent to "rungamestateinit" with a few hacks. Should deserialize/serialize properly someday.
-AegisBot.prototype.Deserialize = function(data, sharedScript)
+/*AegisBot.prototype.Deserialize = function(data, sharedScript)
 {
-    BaseAI.prototype.Deserialize.call(this, data);
-    
-    var ents = sharedScript.entities.filter(Filters.byOwner(PlayerID));
-    var myKeyEntities = ents.filter(function(ent) {
-        return ent.hasClass("CivCentre");
-    });
-    
-    if (myKeyEntities.length == 0){
-        myKeyEntities = sharedScript.entities.filter(Filters.byOwner(PlayerID));
-    }
-    
-    var filter = Filters.byClass("CivCentre");
-    var enemyKeyEntities = sharedScript.entities.filter(Filters.not(Filters.byOwner(PlayerID))).filter(filter);
-    
-    if (enemyKeyEntities.length == 0){
-        enemyKeyEntities = sharedScript.entities.filter(Filters.not(Filters.byOwner(PlayerID)));
-    }
-    
-    this.terrainAnalyzer = sharedScript.terrainAnalyzer;
-    this.passabilityMap = sharedScript.passabilityMap;
-
-    var fakeState = { "ai" : this, "sharedScript" : sharedScript };
-    this.pathFinder = new aStarPath(fakeState, false, true);
-    this.pathsToMe = [];
-    this.pathInfo = { "angle" : 0, "needboat" : true, "mkeyPos" : myKeyEntities.toEntityArray()[0].position(), "ekeyPos" : enemyKeyEntities.toEntityArray()[0].position() };
-    
-    // First path has a sampling of 3, which ensures we'll get at least one path even on Acropolis. The others are 6 so might fail.
-    var pos = [this.pathInfo.mkeyPos[0] + 150*Math.cos(this.pathInfo.angle),this.pathInfo.mkeyPos[1] + 150*Math.sin(this.pathInfo.angle)];
-    var path = this.pathFinder.getPath(this.pathInfo.ekeyPos, pos, 2, 2);
-    
-    if (path !== undefined && path[1] !== undefined && path[1] == false) {
-        // path is viable and doesn't require boating.
-        // blackzone the last two waypoints.
-        this.pathFinder.markImpassableArea(path[0][0][0],path[0][0][1],20);
-        this.pathsToMe.push(path[0][0][0]);
-        this.pathInfo.needboat = false;
-    }
-    this.pathInfo.angle += Math.PI/3.0;
 };
 
 // Override the default serializer
 AegisBot.prototype.Serialize = function()
 {
-    //var ret = BaseAI.prototype.Serialize.call(this);
     return {};
-};
+};*/
 
 function debug(output){
     if (Config.debug){

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

@@ -26 +26 @@
 {
     // TODO: ought to get the AI script subclass to deserialize its own state
     // TODO: actually this is part of a larger reflection on wether AIs should or not.
+    this.isDeserialized = true;
 };
 
 BaseAI.prototype.Init = function(state, sharedAI)
@@ -59 +60 @@
 {
     this.events = sharedAI.events;
     
+    if (this.isDeserialized && this.turn !== 0)
+    {
+        this.isDeserialized = false;
+        this.Init(state, sharedAI);
+    } else if (this.isDeserialized)
+        return;
     this.OnUpdate(sharedAI);
 };
 

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

@@ -37 +37 @@
 //Return a simple object (using no classes etc) that will be serialized
 //into saved games
 //TODO: that
-// note: we'll need to serialize much more than that before this can work.
 SharedScript.prototype.Serialize = function()
 {
-    // serializing entities without using the class.
-    var entities = [];
-    for (var id in this._entities)
-    {
-        var ent = this._entities[id];
-        entities.push( [ent._template, ent._entity, ent._templateName]);
-    }
-    
-    // serialiazing metadata will be done by each AI on a AI basis and they shall update the shared script with that info on deserialization (using DeserializeMetadata() ).
-    // TODO: this may not be the most clever method.
-    return { "entities" : entities, "techModifs" : this._techModifications, "passabClasses" : this.passabilityClasses, "passabMap" : this.passabilityMap,
-        "timeElapsed" : this.timeElapsed, "techTemplates" : this._techTemplates, "players": this._players};
+    return { "players" : this._players, "templates" : this._templates, "techTp" : this._techTemplates };
 };
 
 // Called after the constructor when loading a saved game, with 'data' being
 // whatever Serialize() returned
-// todo: very not-finished. Mostly hacky, and ugly too.
 SharedScript.prototype.Deserialize = function(data)
 {
-    this._entities = {};
-
     this._players = data.players;
-    this._entityMetadata = {};
-    for (var i in this._players)
-        this._entityMetadata[this._players[i]] = {};
-
-    this._techModifications = data.techModifs;
-    this.techModifications = data.techModifs;   // needed for entities
-    
-    this.passabilityClasses = data.passabClasses;
-    this.passabilityMap = data.passabMap;
-    var dataArray = [];
-    for (var i in this.passabilityMap.data)
-        dataArray.push(this.passabilityMap.data[i]);
-
-    this.passabilityMap.data = dataArray;
-
-    // TODO: this is needlessly slow (not to mention a hack)
-    // Should probably call a "init" function rather to avoid this and serialize the terrainanalyzer state.
-    var fakeState = { "passabilityClasses" : this.passabilityClasses, "passabilityMap":this.passabilityMap };
-    this.terrainAnalyzer = new TerrainAnalysis (this, fakeState);
-    this.accessibility = new Accessibility(fakeState, this.terrainAnalyzer);
-    
-    this._techTemplates = data.techTemplates;
-    this.timeElapsed = data.timeElapsed;
-
-    // deserializing entities;
-    for (var i in data.entities)
-    {
-        var entData = data.entities[i];
-        entData[1].template = entData[2];
-        this._entities[entData[1].id] = new Entity(this, entData[1]);
-    }
-    // entity collection updated on create/destroy event.
-    this.entities = new EntityCollection(this, this._entities);
-    
-    //deserializing game states.
-    fakeState["timeElapsed"] = this.timeElapsed;
-    fakeState["players"] = this._players;
-    
-    this.gameState = {};
-    for (var i in this._players)
-        this.gameState[this._players[i]] = new GameState(this, fakeState, this._players[i]);
+    this._templates = data.templates;
+    this._techTemplates = data.techTp;
+    this.isDeserialized = true;
 };
 
 // Components that will be disabled in foundation entity templates.
@@ -207 +154 @@
 // applies entity deltas, and each gamestate.
 SharedScript.prototype.onUpdate = function(state)
 {
+    if (this.isDeserialized && this.turn !== 0)
+    {
+        this.isDeserialized = false;
+        this.init(state);
+    } else if (this.isDeserialized)
+        return;
     // deals with updating based on create and destroy messages.
     this.ApplyEntitiesDelta(state);
 

source/simulation2/components/CCmpAIManager.cpp

@@ -892 +892 @@
     virtual void Init(const CParamNode& UNUSED(paramNode))
     {
         m_TerritoriesDirtyID = 0;
+        m_JustDeserialized = false;
 
         StartLoadEntityTemplates();
     }
@@ -917 +918 @@
         ForceLoadEntityTemplates();
 
         m_Worker.Deserialize(deserialize.GetStream());
+        
+        m_JustDeserialized = true;
     }
 
     virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
@@ -1016 +1019 @@
         ENSURE(cmpAIInterface);
 
         // Get the game state from AIInterface
-        CScriptVal state = cmpAIInterface->GetRepresentation();
+        CScriptVal state;
+        if (m_JustDeserialized)
+            state = cmpAIInterface->GetFullRepresentation(true);
+        else
+            state = cmpAIInterface->GetRepresentation();
 
         // Get the passability data
         Grid<u16> dummyGrid;
@@ -1040 +1047 @@
         LoadPathfinderClasses(state);
 
         m_Worker.StartComputation(scriptInterface.WriteStructuredClone(state.get()), *passabilityMap, *territoryMap, territoryMapDirty);
+        
+        m_JustDeserialized = false;
     }
 
     virtual void PushCommands()
@@ -1069 +1078 @@
     std::vector<std::pair<std::string, const CParamNode*> > m_Templates;
     size_t m_TerritoriesDirtyID;
 
+    bool m_JustDeserialized;
+
     void StartLoadEntityTemplates()
     {
         CmpPtr<ICmpTemplateManager> cmpTemplateManager(GetSystemEntity());