Ticket #2757: 2757.4.patch

binaries/data/mods/public/simulation/ai/petra/chatHelper.js

@@ -106 +106 @@
     Engine.PostCommand(PlayerID, chat);
 };
 
+m.chatNewPhase = function(gameState, phase, started)
+{
+    if (started)
+        var message = "/allies " + markForTranslation("I am advancing to the %(phase)s.");
+    else
+        var message = "/allies " + markForTranslation("I have reached the %(phase)s.");
+    
+    var chat = {
+        "type": "aichat",
+        "message": message,
+        "translateMessage": true,
+        "translateParameters": ["phase"],
+        "parameters": { "phase": phase }
+    };
+    Engine.PostCommand(PlayerID, chat);
+};
+
+
 return m;
 }(PETRA);

binaries/data/mods/public/simulation/ai/petra/headquarters.js

@@ -19 +19 @@
     this.Config = Config;
     
     this.econState = "growth";  // existing values: growth, townPhasing.
-    this.phaseStarted = undefined;
+    this.currentPhase = undefined;
 
     // cache the rates.
     this.wantedRates = { "food": 0, "wood": 0, "stone":0, "metal": 0 };
@@ -71 +71 @@
         return false;
     });
     this.treasures.registerUpdates();
+    this.currentPhase = gameState.currentPhase();
 };
 
 /**
@@ -279 +280 @@
 {
     if (this.Config.difficulty > 2 && this.femaleRatio > 0.4)
         this.femaleRatio = 0.4;
-
-    this.phaseStarted = 2;
+    
+    var phaseName = gameState.getTemplate(gameState.townPhase()).name();
+    m.chatNewPhase(gameState, phaseName, true);
 };
 
 // Called by the "city phase" research plan once it's started
@@ -288 +290 @@
 {
     if (this.Config.difficulty > 2 && this.femaleRatio > 0.3)
         this.femaleRatio = 0.3;
-
-    this.phaseStarted = 3;
+        
+    var phaseName = gameState.getTemplate(gameState.cityPhase()).name();    
+    m.chatNewPhase(gameState, phaseName, true);
 };
 
 // This code trains females and citizen workers, trying to keep close to a ratio of females/CS
@@ -1722 +1725 @@
 m.HQ.prototype.update = function(gameState, queues, events)
 {
     Engine.ProfileStart("Headquarters update");
+    
+    if (this.currentPhase != gameState.currentPhase())
+    {
+        this.currentPhase = gameState.currentPhase();
+        
+        if (this.currentPhase == 2)
+        {
+            var phaseName = gameState.getTemplate(gameState.townPhase()).name();
+            m.chatNewPhase(gameState, phaseName, false);
+        }
+        else if (this.currentPhase == 3)
+        {
+            var phaseName = gameState.getTemplate(gameState.cityPhase()).name();
+            m.chatNewPhase(gameState, phaseName, false);
+        }
+        this.updateTerritories(gameState);
+    }
+    else if (gameState.ai.playedTurn - this.lastTerritoryUpdate > 100)
+        this.updateTerritories(gameState);
 
     this.territoryMap = m.createTerritoryMap(gameState);
 
@@ -1751 +1773 @@
 
     this.researchManager.checkPhase(gameState, queues);
 
-    // TODO find a better way to update
-    if (this.phaseStarted && gameState.currentPhase() == this.phaseStarted)
-    {
-        this.phaseStarted = undefined;
-        this.updateTerritories(gameState);
-    }
-    else if (gameState.ai.playedTurn - this.lastTerritoryUpdate > 100)
-        this.updateTerritories(gameState);
-
     if (gameState.getGameType() === "wonder")
         this.buildWonder(gameState, queues);
 
@@ -1825 +1838 @@
 {
     let properties = {
         "econState": this.econState,
-        "phaseStarted": this.phaseStarted,
+        "currentPhase": this.currentPhase,
         "wantedRates": this.wantedRates,
         "currentRates": this.currentRates,
         "lastFailedGather": this.lastFailedGather,