Ticket #3216: 3216.2.patch

binaries/data/mods/public/gui/summary/counters.js

@@ -27 +27 @@
 function calculateMilitaryScore(playerState, position)
 {
     return Math.round((playerState.statistics.enemyUnitsKilledValue +
-        playerState.statistics.enemyBuildingsDestroyedValue) / 10);
+        playerState.statistics.enemyBuildingsDestroyedValue +
+        playerState.statistics.buildingsCapturedValue) / 10);
 }
 
 function calculateExplorationScore(playerState, position)
@@ -65 +66 @@
     var type = BUILDINGS_TYPES[position];
     return TRAINED_COLOR + playerState.statistics.buildingsConstructed[type] + '[/color] / ' +
     LOST_COLOR + playerState.statistics.buildingsLost[type] + '[/color] / ' +
-    KILLED_COLOR + playerState.statistics.enemyBuildingsDestroyed[type] + '[/color]';
+    KILLED_COLOR + playerState.statistics.enemyBuildingsDestroyed[type] + '[/color] / ' +
+    CAPTURED_COLOR + playerState.statistics.buildingsCaptured[type] + '[/color]';
 }
 
 function calculateColorsTeam(counters)

binaries/data/mods/public/gui/summary/layout.js

@@ -20 +20 @@
         "headings": [   // headings on buildings panel
             { "caption": translate("Player name"), "yStart": 26, "width": 200 },
             { "caption": translate("Total"), "yStart": 34, "width": 105 },
-            { "caption": translate("Houses"), "yStart": 34, "width": 85 },
-            { "caption": translate("Economic"), "yStart": 34, "width": 85 },
-            { "caption": translate("Outposts"), "yStart": 34, "width": 85 },
-            { "caption": translate("Military"), "yStart": 34, "width": 85 },
-            { "caption": translate("Fortresses"), "yStart": 34, "width": 85 },
-            { "caption": translate("Civ centers"), "yStart": 34, "width": 85 },
-            { "caption": translate("Wonders"), "yStart": 34, "width": 85 }
+            { "caption": translate("Houses"), "yStart": 34, "width": 95 },
+            { "caption": translate("Economic"), "yStart": 34, "width": 95 },
+            { "caption": translate("Outposts"), "yStart": 34, "width": 95 },
+            { "caption": translate("Military"), "yStart": 34, "width": 95 },
+            { "caption": translate("Fortresses"), "yStart": 34, "width": 95 },
+            { "caption": translate("Civ centers"), "yStart": 34, "width": 95 },
+            { "caption": translate("Wonders"), "yStart": 34, "width": 95 }
         ],
         "titleHeadings": [
-            { "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed)"), "yStart": 16, "width": (85 * 7 + 105) },   // width = 735
+            { "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed / Captured)"), "yStart": 16, "width": (95 * 7 + 105) },    // width = 735
         ],
         "counters": [   // counters on buildings panel
             {"width": 105, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings},
-            {"width": 85, "fn": calculateBuildings}
+            {"width": 95, "fn": calculateBuildings},
+            {"width": 95, "fn": calculateBuildings},
+            {"width": 95, "fn": calculateBuildings},
+            {"width": 95, "fn": calculateBuildings},
+            {"width": 95, "fn": calculateBuildings},
+            {"width": 95, "fn": calculateBuildings},
+            {"width": 95, "fn": calculateBuildings}
         ],
         "teamCounterFn": calculateColorsTeam
     },

binaries/data/mods/public/gui/summary/summary.js

@@ -19 +19 @@
 const TRAINED_COLOR = '[color="201 255 200"]';
 const LOST_COLOR = '[color="255 213 213"]';
 const KILLED_COLOR = '[color="196 198 255"]';
+const CAPTURED_COLOR = '[color="75 45 215"]';
 
 const BUILDINGS_TYPES = [ "total", "House", "Economic", "Outpost", "Military", "Fortress", "CivCentre", "Wonder" ];
 const UNITS_TYPES = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship" ];

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

@@ -103 +103 @@
     for (let i in this.cp)
         if (this.cp[i] >= this.cp[bestPlayer])
             bestPlayer = +i;
-
+    
+    var cmpLostPlayerStatisticsTracker = QueryOwnerInterface(this.entity, IID_StatisticsTracker);
+    if (cmpLostPlayerStatisticsTracker)
+        cmpLostPlayerStatisticsTracker.LostEntity(this.entity);
+    
     cmpOwnership.SetOwner(bestPlayer);
+    
+    var cmpCapturedPlayerStatisticsTracker = QueryOwnerInterface(this.entity, IID_StatisticsTracker);
+    if (cmpCapturedPlayerStatisticsTracker)
+        cmpCapturedPlayerStatisticsTracker.CapturedBuilding(this.entity);
 
     return takenCp;
 };

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

@@ -76 +76 @@
         "CivCentre": 0,
         "Wonder": 0,
         "total": 0
-        };
+    };
     this.buildingsLostValue = 0;
     this.enemyBuildingsDestroyed = {
         "House": 0,
@@ -87 +87 @@
         "CivCentre": 0,
         "Wonder": 0,
         "total": 0
-        };
-    this.enemyBuildingsDestroyedValue = 0;
+    };
+    this.enemyBuildingsDestroyedValue = 0;
+    this.buildingsCaptured = {
+        "House": 0,
+        "Economic": 0,
+        "Outpost": 0,
+        "Military": 0,
+        "Fortress": 0,
+        "CivCentre": 0,
+        "Wonder": 0,
+        "total": 0
+    };
+    this.buildingsCapturedValue = 0;
     // resources
     this.resourcesGathered = {
         "food": 0,
@@ -149 +160 @@
         "buildingsLost": this.buildingsLost,
         "buildingsLostValue": this.buildingsLostValue,
         "enemyBuildingsDestroyed": this.enemyBuildingsDestroyed,
-        "enemyBuildingsDestroyedValue": this.enemyBuildingsDestroyedValue,
+        "enemyBuildingsDestroyedValue": this.enemyBuildingsDestroyedValue,
+        "buildingsCaptured": this.buildingsCaptured,
+        "buildingsCapturedValue": this.buildingsCapturedValue,
         "resourcesGathered": this.resourcesGathered,
         "resourcesUsed": this.resourcesUsed,
         "resourcesSold": this.resourcesSold,
@@ -292 +305 @@
         for each (var cost in costs)
             this.buildingsLostValue += cost;
     }
+};
+
+StatisticsTracker.prototype.CapturedBuilding = function(capturedBuilding)
+{
+    var cmpCapturedBuildingIdentity = Engine.QueryInterface(capturedBuilding, IID_Identity);
+    var cmpCost = Engine.QueryInterface(capturedBuilding, IID_Cost);
+    var costs = cmpCost.GetResourceCosts();
+
+    for each (var type in this.buildingsClasses)
+        this.CounterIncrement(cmpCapturedBuildingIdentity, "buildingsCaptured", type);
+    
+    this.buildingsCaptured.total++;
+    
+    for each (var cost in costs)
+        this.buildingsCapturedValue += cost;
 };
 
 /**