Ticket #3321: 3_Statistics-v2.patch

gui/summary/counters.js

@@ -314 +314 @@
     return playerState.statistics.percentMapExplored + "%";
 }
 
+function calculateMapFinalControl(playerState, position)
+{
+    if (!teamMiscHelperData[playerState.team])
+        teamMiscHelperData[playerState.team] = [];
+
+    teamMiscHelperData[playerState.team][position] = playerState.statistics.teamPercentMapControlled;
+    return playerState.statistics.percentMapControlled + "%";
+}
+
+function calculateMapPeakControl(playerState, position)
+{
+    if (!teamMiscHelperData[playerState.team])
+        teamMiscHelperData[playerState.team] = [];
+
+    teamMiscHelperData[playerState.team][position] = playerState.statistics.teamPeakPercentMapControlled;
+    return playerState.statistics.peakPercentMapControlled + "%";
+}
+
 function calculateMiscellaneous(counters)
 {
     for (var t in g_Teams)
@@ -338 +356 @@
                 else
                     teamTotal = Math.round((teamMiscHelperData[t][w].enemyUnitsKilled / teamMiscHelperData[t][w].unitsLost)*100)/100;
             }
-            else if (w == 3)
+            else if (w >= 3)
                 teamTotal = teamMiscHelperData[t][w] + "%";
 
             Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]").caption = teamTotal;

gui/summary/layout.js

@@ -124 +124 @@
             { "caption": translate("Vegetarian\nratio"), "yStart": 16, "width": 100 },
             { "caption": translate("Feminisation"), "yStart": 16, "width": 100 },
             { "caption": translate("Kill / Death\nratio"), "yStart": 16, "width": 100 },
-            { "caption": translate("Map\nexploration"), "yStart": 16, "width": 100 }
+            { "caption": translate("Map\nexploration"), "yStart": 16, "width": 100 },
+            { "caption": translate("At peak"), "yStart": 34, "width": 100 },
+            { "caption": translate("At finish"), "yStart": 34, "width": 100 }
         ],
-        "titleHeadings": [],
+        "titleHeadings": [
+            { "caption": translate("Map control"), "xOffset": 400, "yStart": 16, "width": 200 }
+        ],
         "counters": [   // counters on miscellaneous panel
             {"width": 100, "fn": calculateVegetarianRatio},
             {"width": 100, "fn": calculateFeminisation},
             {"width": 100, "fn": calculateKillDeathRatio},
-            {"width": 100, "fn": calculateMapExploration}
+            {"width": 100, "fn": calculateMapExploration},
+            {"width": 100, "fn": calculateMapPeakControl},
+            {"width": 100, "fn": calculateMapFinalControl}
         ],
         "teamCounterFn": calculateMiscellaneous
     }
@@ -182 +188 @@
         if (th >= MAX_HEADINGTITLE)
             break;
 
+        if (titleHeadings[th].xOffset)
+            left += titleHeadings[th].xOffset;
+
         var headerGUI = Engine.GetGUIObjectByName("titleHeading["+ th +"]");
         headerGUI.caption = titleHeadings[th].caption;
         headerGUI.size = left + " " + titleHeadings[th].yStart + " " + (left + titleHeadings[th].width) + " 100%";
         headerGUI.hidden = false;
+
+        if (titleHeadings[th].width < LONG_HEADING_WIDTH)
+            left += titleHeadings[th].width;
     }
 }
 

simulation/components/StatisticsTracker.js

@@ -123 +123 @@
     this.tributesReceived = 0;
     this.tradeIncome = 0;
     this.treasuresCollected = 0;
-    this.lootCollected = 0;
+    this.lootCollected = 0;
+    this.peakPercentMapControlled = 0;
+    this.teamPeakPercentMapControlled = 0;
 };
 
 /**
@@ -165 +167 @@
         "treasuresCollected": this.treasuresCollected,
         "lootCollected": this.lootCollected,
         "percentMapExplored": this.GetPercentMapExplored(),
-        "teamPercentMapExplored": this.GetTeamPercentMapExplored()
+        "teamPercentMapExplored": this.GetTeamPercentMapExplored(),
+        "percentMapControlled": this.GetPercentMapControlled(),
+        "teamPercentMapControlled": this.GetTeamPercentMapControlled(),
+        "peakPercentMapControlled": this.peakPercentMapControlled,
+        "teamPeakPercentMapControlled": this.teamPeakPercentMapControlled
     };
 };
 
@@ -392 +398 @@
     }
 
     return cmpRangeManager.GetUnionPercentMapExplored(teamPlayers);
-};
-
+};
+
+StatisticsTracker.prototype.GetPercentMapControlled = function()
+{
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
+    if (!cmpPlayer || !cmpTerritoryManager)
+        return 0;
+
+    return cmpTerritoryManager.GetTerritoryPercentage(cmpPlayer.GetPlayerID());
+};
+
+StatisticsTracker.prototype.GetTeamPercentMapControlled = function()
+{
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
+    if (!cmpPlayer || !cmpTerritoryManager)
+        return 0;
+
+    var team = cmpPlayer.GetTeam();
+    if (team == -1 || !cmpPlayer.GetLockTeams())
+        return cmpTerritoryManager.GetTerritoryPercentage(cmpPlayer.GetPlayerID());
+
+    var teamPercent = 0;
+    for (let i = 1; i < cmpPlayerManager.GetNumPlayers(); ++i)
+    {
+        let cmpOtherPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player);
+        if (cmpOtherPlayer && cmpOtherPlayer.GetTeam() == team)
+            teamPercent += cmpTerritoryManager.GetTerritoryPercentage(i);
+    }
+
+    return teamPercent;
+};
+
+StatisticsTracker.prototype.OnTerritoriesChanged = function(msg)
+{
+    var newPercent = this.GetPercentMapControlled();
+    if (newPercent > this.peakPercentMapControlled)
+        this.peakPercentMapControlled = newPercent;
+
+    newPercent = this.GetTeamPercentMapControlled();
+    if (newPercent > this.teamPeakPercentMapControlled)
+        this.teamPeakPercentMapControlled = newPercent;
+};
+
 Engine.RegisterComponentType(IID_StatisticsTracker, "StatisticsTracker", StatisticsTracker);

simulation/components/tests/test_GuiInterface.js

@@ -132 +132 @@
             "treasuresCollected": 0,
             "lootCollected": 0,
             "percentMapExplored": 10,
-            "teamPercentMapExplored": 10
+            "teamPercentMapExplored": 10,
+            "percentMapControlled": 10,
+            "teamPercentMapControlled": 10,
+            "peakPercentOfMapControlled": 10,
+            "teamPeakPercentOfMapControlled": 10
         };
     },
     IncreaseTrainedUnitsCounter: function() { return 1; },
@@ -208 +212 @@
             "treasuresCollected": 0,
             "lootCollected": 0,
             "percentMapExplored": 10,
-            "teamPercentMapExplored": 10
+            "teamPercentMapExplored": 10,
+            "percentMapControlled": 10,
+            "teamPercentMapControlled": 10,
+            "peakPercentOfMapControlled": 10,
+            "teamPeakPercentOfMapControlled": 10
         };
     },
     IncreaseTrainedUnitsCounter: function() { return 1; },
@@ -352 +360 @@
                 treasuresCollected: 0,
                 lootCollected: 0,
                 percentMapExplored: 10,
-                teamPercentMapExplored: 10
+                teamPercentMapExplored: 10,
+                percentMapControlled: 10,
+                teamPercentMapControlled: 10,
+                peakPercentOfMapControlled: 10,
+                teamPeakPercentOfMapControlled: 10
             },
         },
         {
@@ -399 +411 @@
                 treasuresCollected: 0,
                 lootCollected: 0,
                 percentMapExplored: 10,
-                teamPercentMapExplored: 10
+                teamPercentMapExplored: 10,
+                percentMapControlled: 10,
+                teamPercentMapControlled: 10,
+                peakPercentOfMapControlled: 10,
+                teamPeakPercentOfMapControlled: 10
             },
         }
     ],