Ticket #3216: 3216.5.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)
@@ -63 +64 @@
 function calculateBuildings(playerState, position)
 {
     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]';
+    return '   ' + TRAINED_COLOR + playerState.statistics.buildingsConstructed[type] + '[/color] / ' +
+    KILLED_COLOR + playerState.statistics.enemyBuildingsDestroyed[type] + '[/color]\n' +
+    CAPTURED_COLOR + playerState.statistics.buildingsCaptured[type] + '[/color] / ' +
+    LOST_COLOR + playerState.statistics.buildingsLost[type] + '[/color]';
 }
 
 function calculateColorsTeam(counters)

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

@@ -29 +29 @@
             { "caption": translate("Wonders"), "yStart": 34, "width": 85 }
         ],
         "titleHeadings": [
-            { "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed)"), "yStart": 16, "width": (85 * 7 + 105) },   // width = 735
+            { "caption": translate("Buildings Statistics") + ' (' + 
+                                            '[color="201 255 200"]' + translate("Constructed") + '[/color]' + 
+                                    ' / ' + '[color="196 198 255"]' + translate("Destroyed") + '[/color]' +
+                                    ' / ' + '[color="255 255 157"]' + translate("Captured") + '[/color]' + 
+                                    ' / ' + '[color="255 213 213"]' + translate("Lost") + '[/color]' + ')', 
+              "yStart": 16, "width": (85 * 7 + 105) 
+            },  // width = 735
         ],
         "counters": [   // counters on buildings panel
             {"width": 105, "fn": calculateBuildings},
@@ -189 +195 @@
 {
     var rowPlayerObjectWidth = 0;
     var left = 0;
+    
+    if (panelsData[1].counters == counters) //for buildings panel
+        var verticalOffset = 3;
+    else
+        var verticalOffset = 12;
+        
     for (var p = 0; p < MAX_SLOTS; ++p)
     {
         left = 240;
@@ -196 +208 @@
         for (var w in counters)
         {
             counterObject = Engine.GetGUIObjectByName("valueData[" + p + "][" + w + "]");
-            counterObject.size = left + " 6 " + (left + counters[w].width) + " 100%";
+            counterObject.size = left + " " + verticalOffset + " " + (left + counters[w].width) + " 100%";
             counterObject.hidden = false;
             left += counters[w].width;
         }

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

@@ -6 +6 @@
 // const for filtering long collective headings
 const LONG_HEADING_WIDTH = 250;
 // vertical size of player box
-const PLAYER_BOX_Y_SIZE = 30;
+const PLAYER_BOX_Y_SIZE = 40;
 // gap between players boxes
 const PLAYER_BOX_GAP = 2;
 // alpha for player box
@@ -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="255 255 157"]';
 
 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/gui/summary/summary.xml

@@ -140 +140 @@
             <object type="image" name="noTeamsBox" size="0 65 100% 100%-50" hidden="true"> 
                 <repeat count="8">
                     <object type="image" name="playerBox[n]" size="10 0 10 30" hidden="true">
-                        <object type="image" sprite="ForegroundBox" size="10 4 34 28">
+                        <object type="image" sprite="ForegroundBox" size="10 9 34 33">
                             <object name="playerColorBox[n]" type="image" size="2 2 22 22"/>
                         </object>
                         <object name="playerName[n]" type="text"  size="40 2 208 100%" style="ModernLeftLabelText"/>
-                        <object name="civIcon[n]" type="image" size="208 0 240 32"/>
+                        <object name="civIcon[n]" type="image" size="208 5 240 37"/>
                         <repeat var="x" count="8">
                             <object name="valueData[n][x]" type="text" style="ModernTabLabelText">
                             </object>

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);
+        cmpLostPlayerStatisticsTracker.CapturedBuilding(this.entity);
+    }
     cmpOwnership.SetOwner(bestPlayer);
 
     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;
 };
 
 /**