Ticket #3858: AITerritory-v2.patch

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

@@ -172 +172 @@
     for (let entity of this.buildings.values())
         bestbase.assignEntity(gameState, entity);
     gameState.ai.HQ.resetActiveBase();
-    gameState.ai.HQ.updateTerritories(gameState);
 };
 
 /**

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

@@ -31 +31 @@
     this.targetNumWorkers = this.Config.Economy.targetNumWorkers;
     this.supportRatio = this.Config.Economy.supportRatio;
 
-    this.lastTerritoryUpdate = -1;
     this.stopBuilding = new Map(); // list of buildings to stop (temporarily) production because no room
 
     this.fortStartTime = 180;   // wooden defense towers, will start at fortStartTime + towerLapseTime
@@ -95 +94 @@
         let base = this.getBaseByID(ent.getMetadata(PlayerID, "base"));
         base.assignResourceToDropsite(gameState, ent);
     }
+
+    this.updateTerritories(gameState);
 };
 
 // returns the sea index linking regions 1 and region 2 (supposed to be different land region)
@@ -117 +118 @@
 
 m.HQ.prototype.checkEvents = function (gameState, events, queues)
 {
+    if (events.TerritoriesChanged.length || events.DiplomacyChanged.length)
+        this.updateTerritories(gameState);
+
     for (let evt of events.Create)
     {
         // Let's check if we have a building set to create a new base.
@@ -178 +182 @@
                 base.anchor = ent;
                 base.anchorId = evt.newentity;
                 base.buildings.updateEnt(ent);
-                this.updateTerritories(gameState);
                 if (base.ID === this.baseManagers[1].ID)
                 {
                     // this is our first base, let us configure our starting resources
@@ -191 +194 @@
                     this.saveSpace = undefined;
                 }
             }
-            else if (ent.hasTerritoryInfluence())
-                this.updateTerritories(gameState);
         }
     }
 
@@ -237 +238 @@
                 newbase.init(gameState, "captured");
             newbase.setAnchor(gameState, ent);
             this.baseManagers.push(newbase);
-            this.updateTerritories(gameState);
             newbase.assignEntity(gameState, ent);
         }
         else
@@ -244 +244 @@
         {
             // TODO should be reassigned later if a better base is captured
             m.getBestBase(gameState, ent).assignEntity(gameState, ent);
-            if (ent.hasTerritoryInfluence())
-                this.updateTerritories(gameState);
             if (ent.decaying())
             {
                 if (ent.isGarrisonHolder() && this.garrisonManager.addDecayingStructure(gameState, evt.entity, true))
@@ -1824 +1822 @@
 
 m.HQ.prototype.updateTerritories = function(gameState)
 {
-    // TODO may-be update also when territory decreases. For the moment, only increases are taking into account
-    if (this.lastTerritoryUpdate == gameState.ai.playedTurn)
-        return;
-    this.lastTerritoryUpdate = gameState.ai.playedTurn;
-
     var passabilityMap = gameState.getMap();
     var width = this.territoryMap.width;
     var cellSize = this.territoryMap.cellSize;
@@ -2066 +2059 @@
             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);
 
     if (gameState.getGameType() === "wonder")
         this.buildWonder(gameState, queues);
@@ -2145 +2135 @@
         "lastFailedGather": this.lastFailedGather,
         "supportRatio": this.supportRatio,
         "targetNumWorkers": this.targetNumWorkers,
-        "lastTerritoryUpdate": this.lastTerritoryUpdate,
         "stopBuilding": this.stopBuilding,
         "fortStartTime": this.fortStartTime,
         "towerStartTime": this.towerStartTime,

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

@@ -8 +8 @@
     "Destroy",
     "Attacked",
     "ConstructionFinished",
+    "DiplomacyChanged",
     "TrainingStarted",
     "TrainingFinished",
     "AIMetadata",
@@ -16 +17 @@
     "OwnershipChanged",
     "Garrison",
     "UnGarrison",
+    "TerritoriesChanged",
     "TerritoryDecayChanged",
     "TributeExchanged",
     "AttackRequest"
@@ -164 +166 @@
     this.events[type].push(msg);
 };
 
+AIInterface.prototype.OnDiplomacyChanged = function(msg)
+{
+    this.events.DiplomacyChanged.push(msg);
+};
+
 AIInterface.prototype.OnGlobalPlayerDefeated = function(msg)
 {
-    this.events["PlayerDefeated"].push(msg);
+    this.events.PlayerDefeated.push(msg);
 };
 
 AIInterface.prototype.OnGlobalEntityRenamed = function(msg)
@@ -173 +180 @@
 {
     var cmpMirage = Engine.QueryInterface(msg.entity, IID_Mirage);
     if (!cmpMirage)
-        this.events["EntityRenamed"].push(msg);
+        this.events.EntityRenamed.push(msg);
 };
 
 AIInterface.prototype.OnGlobalTributeExchanged = function(msg)
 {
-    this.events["TributeExchanged"].push(msg);
+    this.events.TributeExchanged.push(msg);
 };
 
+AIInterface.prototype.OnTerritoriesChanged = function(msg)
+{
+    this.events.TerritoriesChanged.push(msg);
+};
+
 // When a new technology is researched, check which templates it affects,
 // and send the updated values to the AI.
 // this relies on the fact that any "value" in a technology can only ever change