Ticket #3561: t3561_fix_summary_screen_meh_WIP_v0.1.patch

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

@@ -241 +241 @@
                     total.i += (+splitCaption[0]);
                     total.o += (+splitCaption[1]);
                 }
             }
 
-            if (w >= 4)
-                teamTotal = total.i +(w == 4 ? "%" : "");
+            if (w == 4)
+                // average barter efficiency
+                teamTotal = (total.i / g_Teams[t]) + "%";
+            else if (w > 4)
+                // trade income
+                teamTotal = total.i;
             else
+                // resources exchanges
                 teamTotal = INCOME_COLOR + '+' + total.i + '[/color] ' + OUTCOME_COLOR + '-' + total.o + '[/color]';
 
             Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]").caption = teamTotal;
         }
     }
@@ -265 +270 @@
         teamMiscHelperData[playerState.team][position].food += playerState.statistics.resourcesGathered.food;
         teamMiscHelperData[playerState.team][position].vegetarianFood += playerState.statistics.resourcesGathered.vegetarianFood;
         return Math.floor((playerState.statistics.resourcesGathered.vegetarianFood / playerState.statistics.resourcesGathered.food) * 100) + "%";
     }
     else
-        return 0 + "%";
+        return "-";
 }
 
 function calculateFeminization(playerState, position)
 {
     if (!teamMiscHelperData[playerState.team])
@@ -282 +287 @@
         teamMiscHelperData[playerState.team][position].Female = playerState.statistics.unitsTrained.Female;
         teamMiscHelperData[playerState.team][position].Worker = playerState.statistics.unitsTrained.Worker;
         return Math.floor((playerState.statistics.unitsTrained.Female / playerState.statistics.unitsTrained.Worker) * 100) + "%";
     }
     else
-        return 0 + "%";
+        return "-";
 }
 
 function calculateKillDeathRatio(playerState, position)
 {
     if (!teamMiscHelperData[playerState.team])
@@ -295 +300 @@
         teamMiscHelperData[playerState.team][position] = {"enemyUnitsKilled": 0, "unitsLost": 0};
 
     teamMiscHelperData[playerState.team][position].enemyUnitsKilled = playerState.statistics.enemyUnitsKilled.total;
     teamMiscHelperData[playerState.team][position].unitsLost = playerState.statistics.unitsLost.total;
 
-    if (!playerState.statistics.enemyUnitsKilled.total)
-        return DEFAULT_DECIMAL;
-    if (!playerState.statistics.unitsLost.total)    // and enemyUnitsKilled.total > 0
-        return INFINITE_SYMBOL; // infinity symbol
+    if (!playerState.statistics.unitsLost.total)
+        return "-"
 
     return Math.round((playerState.statistics.enemyUnitsKilled.total / playerState.statistics.unitsLost.total)*100)/100;
 }
 
 function calculateMapExploration(playerState, position)
 {
     if (!teamMiscHelperData[playerState.team])
         teamMiscHelperData[playerState.team] = [];
 
-    teamMiscHelperData[playerState.team][position] = playerState.statistics.teamPercentMapExplored;
+    teamMiscHelperData[playerState.team][position] = playerState.statistics.percentMapExplored;
     return playerState.statistics.percentMapExplored + "%";
 }
 
 function calculateMapFinalControl(playerState, position)
 {
@@ -339 +342 @@
         if (t == -1)
             continue;
 
         for (var w in counters)
         {
-            var teamTotal = "undefined";
-
-            if (w == 0)
-                teamTotal = (teamMiscHelperData[t][w].food == 0 ? "0" : Math.floor((teamMiscHelperData[t][w].vegetarianFood / teamMiscHelperData[t][w].food) * 100)) + "%";
-            else if (w == 1)
-                teamTotal = (teamMiscHelperData[t][w].Worker == 0 ? "0" : Math.floor((teamMiscHelperData[t][w].Female / teamMiscHelperData[t][w].Worker) * 100)) + "%";
-            else if (w == 2)
+            var teamTotal = 0;
+            for (var p = 0; p < g_Teams[t]; ++p)
             {
-                if (!teamMiscHelperData[t][w].enemyUnitsKilled)
-                    teamTotal = DEFAULT_DECIMAL;
-                else if (!teamMiscHelperData[t][w].unitsLost)   // and enemyUnitsKilled.total > 0
-                    teamTotal = INFINITE_SYMBOL; // infinity symbol
-                else
-                    teamTotal = Math.round((teamMiscHelperData[t][w].enemyUnitsKilled / teamMiscHelperData[t][w].unitsLost)*100)/100;
+                if (w == 0 && teamMiscHelperData[t][w].food)
+                    // vegetarian ratio
+                    teamTotal += Math.floor(teamMiscHelperData[t][w].vegetarianFood / teamMiscHelperData[t][w].food * 100);
+                else if (w == 1 && teamMiscHelperData[t][w].Worker)
+                    // feminization
+                    teamTotal += Math.floor(teamMiscHelperData[t][w].Female / teamMiscHelperData[t][w].Worker * 100);
+                else if (w == 2 && teamMiscHelperData[t][w].unitsLost)
+                    // kill death ratio
+                    teamTotal += Math.round((teamMiscHelperData[t][w].enemyUnitsKilled / teamMiscHelperData[t][w].unitsLost)*100)/100;
+                else if (w >= 3)
+                    // map exploration, map control at peak, at finish
+                    teamTotal += +teamMiscHelperData[t][w];
             }
-            else if (w >= 3)
-                teamTotal = teamMiscHelperData[t][w] + "%";
-
-            Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]").caption = teamTotal;
+            // compute average
+            teamTotal ;
+            
+            if (w==2)
+                teamTotal
+            Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]").caption = Math.round(teamTotal /  g_Teams[t]) + (w != 2 ? "%" : "");
         }
     }
 }

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

@@ -23 +23 @@
 
 // Colors used for gathered and traded resources
 const INCOME_COLOR = '[color="201 255 200"]';
 const OUTCOME_COLOR = '[color="255 213 213"]';
 
-const DEFAULT_DECIMAL = "0.00";
-const INFINITE_SYMBOL = "\u221E";
 // Load data
 var g_CivData = loadCivData();
 var g_Teams = [];
 // TODO set g_PlayerCount as playerCounters.length
 var g_PlayerCount = 0;