Ticket #3948: 3948-sheep-summary-screen.patch

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

@@ -157 +157 @@
 function calculateUnits(playerState, position)
 {
     let type = g_UnitsTypes[position];
-    return g_TrainedColor + playerState.statistics.unitsTrained[type] + '[/color] / ' +
-        g_LostColor + playerState.statistics.unitsLost[type] + '[/color] / ' +
-        g_KilledColor + playerState.statistics.enemyUnitsKilled[type] + '[/color]';
+
+    if (type == "total") {
+        return g_TrainedColor + (playerState.statistics.unitsTrained[type] - playerState.statistics.unitsTrained['Animal']) + '[/color] / ' +
+            g_LostColor + playerState.statistics.unitsLost[type] + '[/color] / ' +
+            g_KilledColor + playerState.statistics.enemyUnitsKilled[type] + '[/color]';
+    } else {
+        return g_TrainedColor + playerState.statistics.unitsTrained[type] + '[/color] / ' +
+            g_LostColor + playerState.statistics.unitsLost[type] + '[/color] / ' +
+            g_KilledColor + playerState.statistics.enemyUnitsKilled[type] + '[/color]';
+    }
 }
 
 function calculateResources(playerState, position)

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

@@ -53 +53 @@
             { "caption": translate("Champion"), "yStart": 34, "width": 100 },
             { "caption": translate("Heroes"), "yStart": 34, "width": 100 },
             { "caption": translate("Navy"), "yStart": 34, "width": 100 },
-            { "caption": translate("Traders"), "yStart": 34, "width": 100 }
+            { "caption": translate("Traders"), "yStart": 34, "width": 100 },
+            { "caption": translate("Animals"), "yStart": 34, "width": 100 } 
         ],
         "titleHeadings": [
-            { "caption": translate("Units Statistics (Trained / Lost / Killed)"), "yStart": 16, "width": (100 * 7 + 120) }, // width = 820
+            { "caption": translate("Units Statistics (Trained / Lost / Killed)"), "yStart": 16, "width": (100 * 8 + 120) }, // width = 920
         ],
         "counters": [   // counters on units panel
             { "width": 120, "fn": calculateUnits },
@@ -66 +67 @@
             { "width": 100, "fn": calculateUnits },
             { "width": 100, "fn": calculateUnits },
             { "width": 100, "fn": calculateUnits },
+            { "width": 100, "fn": calculateUnits },
             { "width": 100, "fn": calculateUnits }
         ],
         "teamCounterFn": calculateColorsTeam

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

@@ -1 @@
-const g_MaxHeadingTitle= 8;
+const g_MaxHeadingTitle= 9;
 
 // const for filtering long collective headings
 const g_LongHeadingWidth = 250;
@@ -18 +18 @@
 const g_KilledColor = '[color="196 198 255"]';
 
 const g_BuildingsTypes = [ "total", "House", "Economic", "Outpost", "Military", "Fortress", "CivCentre", "Wonder" ];
-const g_UnitsTypes = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship", "Trader" ];
+const g_UnitsTypes = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship", "Trader", "Animal" ];
 const g_ResourcesTypes = [ "food", "wood", "stone", "metal" ];
 
 // Colors used for gathered and traded resources

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

@@ -106 +106 @@
                 <object name="playerNameHeading" type="text" style="ModernLeftTabLabelText">
                     <translatableAttribute id="caption">Player name</translatableAttribute>
                 </object>
-                <repeat var="x" count="8">
+                <repeat var="x" count="9">
                     <object name="titleHeading[x]" type="text" style="ModernTabLabelText">
                     </object>
                 </repeat>
-                <repeat var="x" count="8">
+                <repeat var="x" count="9">
                     <object name="Heading[x]" type="text" style="ModernTabLabelText">
                     </object>
                 </repeat>
@@ -120 +120 @@
                 <object type="image" name="teamBoxt[i]" size="0 65 100% 100%-50" hidden="true">
                     <object type="text" name="teamNameHeadingt[i]" size="15 5 100% 100%" style="ModernLeftTabLabelText"/>
                     <object size="0 30 100% 100%">
-                        <repeat count="8" var="n">
+                        <repeat count="9" var="n">
                             <object type="image" name="playerBoxt[i][n]" size="10 0 10 30" hidden="true">
                                 <object name="playerColorBoxt[i][n]" type="image" size="10 4 30 24"/>
                                 <object name="playerNamet[i][n]" type="text"  size="40 2 208 100%" style="ModernLeftLabelText" />
                                 <object name="civIcont[i][n]" type="image" size="208 0 240 32"/>
-                                <repeat var="x" count="8">
+                                <repeat var="x" count="9">
                                     <object name="valueDataTeam[i][n][x]" type="text" style="ModernTabLabelText">
                                     </object>
                                 </repeat>
@@ -133 +133 @@
                         </repeat>
                     </object>
                     <object name="teamHeadingt[i]" type="text" style="ModernLeftTabLabelText"/>
-                    <repeat var="x" count="8">
+                    <repeat var="x" count="9">
                         <object name="valueDataTeam[i][x]" type="text" style="ModernTabLabelText">
                         </object>
                     </repeat>
@@ -141 +141 @@
             </repeat>
 
             <object type="image" name="noTeamsBox" size="0 65 100% 100%-50" hidden="true">
-                <repeat count="8">
+                <repeat count="9">
                     <object type="image" name="playerBox[n]" size="10 0 10 30" hidden="true">
                         <object type="image" sprite="ForegroundBox" size="10 4 34 28">
                             <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"/>
-                        <repeat var="x" count="8">
+                        <repeat var="x" count="9">
                             <object name="valueData[n][x]" type="text" style="ModernTabLabelText">
                             </object>
                         </repeat>

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

@@ -14 +14 @@
         "Champion",
         "Hero",
         "Ship",
-        "Trader"
+        "Trader",
+        "Animal"
     ];  
     this.unitsTrained = {
         "Infantry": 0,
@@ -25 +26 @@
         "Hero": 0,
         "Ship": 0,
         "Trader": 0,
+        "Animal": 0,
         "total": 0
     };
     this.unitsLost = {
@@ -36 +38 @@
         "Hero": 0,
         "Ship": 0,
         "Trader": 0,
+        "Animal": 0,
         "total": 0
     };
     this.unitsLostValue = 0;
@@ -48 +51 @@
         "Hero": 0,
         "Ship": 0,
         "Trader": 0,
+        "Animal": 0,
         "total": 0
     };
     this.enemyUnitsKilledValue = 0;