Ticket #3403: 3403.patch

binaries/data/mods/public/gui/common/chart_sprites.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<sprites>
+
+    <!--
+    ==========================================
+    Chart Bullets
+    ==========================================
+    -->
+
+    <!-- deactivated -->
+    <sprite name="chartDotP0">
+        <image texture="global/charts/dot.grey.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <!-- activated -->
+    <sprite name="chartDotP1">
+        <image texture="global/charts/dot.blue.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP2">
+        <image texture="global/charts/dot.red.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP3">
+        <image texture="global/charts/dot.green.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP4">
+        <image texture="global/charts/dot.yellow.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP5">
+        <image texture="global/charts/dot.turquois.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP6">
+        <image texture="global/charts/dot.pink.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP7">
+        <image texture="global/charts/dot.orange.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <sprite name="chartDotP8">
+        <image texture="global/charts/dot.lightgray.png" size="0 0 100% 100%"/>
+    </sprite>
+
+    <!-- decoration -->
+    <sprite name="chartLineWhite">
+        <image backcolor="white" size="0 0 100% 100%"/> 
+    </sprite>
+
+    <sprite name="chartLineGray">
+        <image backcolor="gray" size="0 0 100% 100%"/> 
+    </sprite>
+
+</sprites>

binaries/data/mods/public/gui/common/functions_repeat_positioning.js

@@ +1 @@
+/*
+    DESCRIPTION : Functions related to positioning UI elements
+    NOTES       :
+*/
+
+/**
+ * Horizontally spaces same-width objects repeated with the `<repeat>` tag
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @return The number of elements affected
+ */
+function horizSpaceRepeatedObjects (basename, splitvar="n", margin=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+    for (let c = 0;;)
+    {
+        let objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        if (!objObj)
+            return c;
+
+        let objSize = objObj.size;
+        let objWidth = objSize.right - objSize.left;
+        objSize.left = c * (objWidth + margin) + margin;
+        objSize.right = ++c * (objWidth + margin);
+        objObj.size = objSize;
+    }
+}
+
+/**
+ * Horizontally fit objects repeated with the `<repeat>` tag within a parent object
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @param limit The number of elements to fit
+ * @return The number of elements affected
+ */
+function horizFitRepeatedObjects (basename, splitvar="n", margin=0, limit=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+
+    var objObj;
+    if (limit == 0)
+        do
+            objObj = Engine.GetGUIObjectByName(basename.join("["+ ++limit +"]"));
+        while (objObj !== undefined)
+
+    for (let c = 0; c < limit; ++c)
+    {
+        objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        let objSize = objObj.size;
+        objSize.rleft = c * (100/limit);
+        objSize.rright = (c+1) * (100/limit);
+        objSize.right = -margin;
+        objObj.size = objSize;
+    }
+
+    return limit;
+}
+
+/**
+ * Vertically spaces same-height objects repeated with the `<repeat>` tag
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @return The number of elements affected
+ */
+function vertiSpaceRepeatedObjects (basename, splitvar="n", margin=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+    for (let c=0;;)
+    {
+        let objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        if (!objObj)
+            return c;
+
+        let objSize = objObj.size;
+        let objHeight = objSize.bottom - objSize.top;
+        objSize.top = c * (objHeight + margin) + margin;
+        objSize.bottom = ++c * (objHeight + margin);
+        objObj.size = objSize;
+    }
+}
+
+/**
+ * Hide all repeated elements after a certain index
+ * @param prefix The part of the element name preceeding the index
+ * @param idx The index from which to start
+ * @param prefix The part of the element name after the index
+ */
+function hideRemaining(prefix, idx, suffix)
+{
+    for (;; ++idx)
+    {
+        let obj = Engine.GetGUIObjectByName(prefix+idx+suffix);
+        if (!obj)
+            break;
+        obj.hidden = true;
+    }
+}

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

@@ -8 +8 @@
 
     <include>summary/summary.xml</include>
     <include>summary/sprites.xml</include>
+
+    <include>common/chart_sprites.xml</include>
 </page>

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

@@ +1 @@
+/* globals Engine, horizSpaceRepeatedObjects, translate */
+
+var Charts = (function() {
+
+    "use strict";
+
+    const DOTS = 110, HEIGHT = 470, DEBUG = 1, VERSION = "0.1.19a";
+
+    /* Define member variables */
+    var m_CurrMetric = 1;
+    var m_MatchLength;
+    var m_Metrics = [
+        { "id": "buildings", "name": "Buildings" },
+        { "id": "units", "name": "Units" },
+        { "id": "food", "name": "Food" },
+        { "id": "wood", "name": "Wood" },
+        { "id": "stone", "name": "Stone" },
+        { "id": "metal", "name": "Metal" },
+        { "id": "explored", "name": "Explored" },
+        { "id": "mapControl", "name": "Territory" },
+    ];
+    var m_Players = [];
+
+    /* ...and a shorthand */
+    var $ = Engine.GetGUIObjectByName;
+
+    function deb   () {if (DEBUG > 0){print(fmt.apply(null, arguments));}}
+    function tab   (s, l) {l=l||8;s=new Array(l+1).join(" ")+s;return s.substr(s.length-l);}
+    function fmt   () {var a=Array.prototype.slice.apply(arguments),s=a[0].split("%s"),p=a.slice(1).concat([""]),c=0;return s.map(function(t){return t + p[c++];}).join('');}
+
+    function getIdxFromName (name) { return +name.substring(name.indexOf("[")+1, name.indexOf("]")); }
+
+    function interpolate(data, points)
+    {
+        // http://www.hevi.info/2012/03/interpolating-and-array-to-fit-another-size/
+
+        var newData = [];
+        var factor  = (data.length - 1) / (points -1);
+
+        function linear(p1, p2, px) {return p1 + (p2 - p1) * px;}
+
+        newData[0] = data[0];
+        newData[points -1] = data[data.length -1];
+
+        for (let i=1; i<points-1; ++i){
+            let tmp = i * factor;
+            let point = ~~tmp;
+            newData[i] = linear(data[point], data[point+1], tmp - point);
+        }
+
+        return newData;
+    }
+
+    function init(dataGame)
+    {
+        var maxPlayers = dataGame.playerStates.length;
+        m_MatchLength = Object.keys(dataGame.playerStates[1].chartData).length - 1;
+
+        deb("init: m_Players: %s, stamps: %s\n", maxPlayers -1, m_MatchLength);
+
+        // add common attributes to m_Metrics object
+        for (let m of m_Metrics)
+        {
+            m.points =  {};
+            m.min = 1e10;
+            m.max = 0;
+        }
+
+        // setup internal player object
+        for (let p=0; p<maxPlayers; ++p)
+            m_Players[p] = {
+                "visible": false,
+                "color": g_GameData.players[p].color
+            };
+
+        // setup menu options
+        horizSpaceRepeatedObjects("chartMenu[m]", "m");
+        var m = 0;
+        for (m in m_Metrics)
+            $("chartMenu["+m+"]_text").caption = translate(m_Metrics[m].name);
+        hideRemaining("chartMenu[", ++m, "]");
+
+        // setup players' dots
+        horizSpaceRepeatedObjects("chartPlayer[p]", "p");
+        for (let p=0; p<8; ++p)
+        {
+            // player dots
+            $("chartPlayerDot[" + p + "]").sprite = "chartDotP" + (p+1);
+            $("chartPlayerText[" + p + "]").caption = (p+1);
+
+            // data dots
+            horizSpaceRepeatedObjects("chartDot[" + p + "][d]", "d");
+            for (let d=0;; ++d)
+            {
+                let objObj = $("chartDot[" + p + "][" + d + "]");
+                if (!objObj)
+                    break;
+                objObj.sprite = "chartDotP"+(p+1);
+                objObj.hidden = "true";
+            }
+        }
+
+        // resample data to available amount of DOTS
+        for (let p=1; p<maxPlayers; ++p)
+        {
+            m_Players[p].visible = true;
+            for (let metricData of m_Metrics)
+            {
+                let chartData = dataGame.playerStates[p].chartData;
+                let data = Object.keys(chartData).map(stamp => chartData[stamp][metricData.id]);
+                // deb("init: p: %s, m: %s, data: %s\n", p, m, data);
+                metricData.points[p] = {};
+                data = interpolate(data, DOTS);
+                // deb("init: p: %s, m: %s, data: %s\n", p, m, data);
+                metricData.points[p] = data;
+            }
+        }
+
+        // determine max/min
+        for (let metricData of m_Metrics)
+        {
+
+            let maxAll = metricData.max;
+            let minAll = metricData.min;
+            for (let p=1; p<maxPlayers; p++)
+            {
+                let minData = Math.min.apply(Math, metricData.points[p]);
+                minAll = minData < minAll ? minData : minAll;
+                let maxData = Math.max.apply(Math, metricData.points[p]);
+                maxAll = maxData > maxAll ? maxData : maxAll;
+            }
+            metricData.max = maxAll;
+            metricData.min = minAll;
+            deb("init: min: %s, max: %s, metric: %s\n", tab(~~minAll, 4), tab(~~maxAll, 6), metricData.id);
+        }
+
+        // scale data to GUI
+        for (let metricData of m_Metrics)
+            for (let p=1; p<maxPlayers; p++)
+                for (let d=0; d<DOTS; d++)
+                    metricData.points[p][d] = HEIGHT * metricData.points[p][d] / metricData.max;
+    }
+
+    function togglePlayer(player)
+    {
+        var sprite = $("chartPlayerDot[" + (player-1) +"]");
+
+        m_Players[player].visible = !m_Players[player].visible;
+        sprite.sprite = m_Players[player].visible ? "chartDotP" + player : "chartDotP0";
+        showMetric(m_CurrMetric);
+    }
+
+    function showTicks()
+    {
+        var metric = m_Metrics[m_CurrMetric].id;
+        var ySuffix = (["explored", "mapControl"].indexOf(metric) > -1) ? "%" : "";
+
+        $("chartTickTextYMax").caption  = ~~m_Metrics[m_CurrMetric].max + ySuffix;
+        $("chartTickTextYHalf").caption = ~~(m_Metrics[m_CurrMetric].max / 2) + ySuffix;
+        $("chartTickTextXMax").caption  = m_MatchLength + " min";
+        $("chartTickTextXHalf").caption = ~~(m_MatchLength / 2) + " min";
+    }
+
+    function showMetric(metric)
+    {
+        m_CurrMetric = metric;
+
+        // highlight current metric's text
+        for (let m in m_Metrics)
+            $("chartMenu["+m+"]_text").textcolor = "180 180 180";
+        $("chartMenu["+metric+"]_text").textcolor = "255 255 255";
+
+        deb("\n====> showMetric: %s (%s), min: %s, max: %s\n", m_Metrics[metric].id, metric, m_Metrics[metric].min, m_Metrics[metric].max);
+
+        var p;
+        for (p in m_Players)
+        {
+            if (+p === 0)
+                continue;
+
+            let player = m_Players[p];
+
+            // data dots
+            if (m_Metrics[metric].points[p])
+            {
+                let data = m_Metrics[metric].points[p];
+                if (DEBUG)
+                {
+                    let min  = +Math.min.apply(Math, data);
+                    let max  = +Math.max.apply(Math, data);
+                    deb("p: %s, vis: %s, len: %s, min: %s, max: %s\n", p, player.visible, data.length, min, max);
+                }
+
+                for (let i = 0; i < DOTS; i++)
+                {
+                    let dot = $("chartDot[" +(p-1)+ "][" +i+ "]");
+                    dot.hidden = true;
+
+                    if (player.visible)
+                    {
+                        let newSize = dot.size;
+                        newSize.top = HEIGHT - data[i];
+                        newSize.bottom = newSize.top + 8;
+                        dot.size = newSize;
+                        dot.hidden = false;
+                    }
+                }
+            }
+        }
+        hideRemaining("chartPlayer[", p, "]");
+
+        showTicks();
+    }  
+
+    return {
+        action: function(metric, player, data) {
+
+            deb("\n====> Charts.action: %s, %s, %s\n", metric, player, data);
+
+            if (!metric && !player){init(data); showMetric(0); return;}
+            if ( metric && !player){showMetric(metric -1);     return;}
+            if (!metric &&  player){togglePlayer(player);      return;}
+
+        },
+        "togglePlayer": function(elem_name)
+        {
+            if (!elem_name)
+                return;
+            togglePlayer(getIdxFromName(elem_name)+1);
+        },
+        "changeMetric": function(elem_name)
+        {
+            if (!elem_name)
+                return;
+            showMetric(getIdxFromName(elem_name));
+        }
+    };
+
+}());
+

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

@@ -42 +42 @@
  */
 function selectPanel(panelNumber)
 {
-    var panelNames = [ 'scorePanel', 'buildingsPanel', 'unitsPanel', 'resourcesPanel', 'marketPanel', 'miscPanel'];
+    var panelNames = [ 'scorePanel', 'buildingsPanel', 'unitsPanel', 'resourcesPanel', 'marketPanel', 'miscPanel', 'chartPanel' ];
 
     function adjustTabDividers(tabSize)
     {
@@ -60 +60 @@
     Engine.GetGUIObjectByName(panelNames[panelNumber] + 'Button').sprite = "ForegroundTab";
     adjustTabDividers(Engine.GetGUIObjectByName(panelNames[panelNumber] + 'Button').size);
 
-    updatePanelData(panelsData[panelNumber]);
+    if (panelNumber<6){
+        updatePanelData(panelsData[panelNumber]);
+        Engine.GetGUIObjectByName("generalPanel").hidden = false;
+        Engine.GetGUIObjectByName("chartPanel").hidden = true;
+    } else {
+        Engine.GetGUIObjectByName("generalPanel").hidden = true;
+        Engine.GetGUIObjectByName("chartPanel").hidden = false;
+    }
 }
 
 function updatePanelData(panelInfo)
@@ -122 +129 @@
         updateCountersPlayer(playerState, panelInfo.counters, playerCounterValue);
     }
     // Update team counters
-    var teamCounterFn = panelInfo.teamCounterFn;
+    var teamCounterFn = panelInfo.teamCounterFn
     if (g_Teams && teamCounterFn)
         teamCounterFn(panelInfo.counters);
 }
@@ -135 +142 @@
     // Map
     var mapDisplayType = translate("Scenario");
 
+    // Initialize Charts
+    Charts.action(null, null, data);
+
     Engine.GetGUIObjectByName("timeElapsed").caption = sprintf(translate("Game time elapsed: %(time)s"), { time: timeToString(data.timeElapsed) });
 
     Engine.GetGUIObjectByName("summaryText").caption = data.gameResult;

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

@@ -9 +9 @@
 <objects>
     <script file="gui/common/functions_global_object.js"/>
     <script file="gui/common/functions_civinfo.js"/>
+    <script file="gui/common/functions_repeat_positioning.js"/>
     <script file="gui/common/functions_utility.js"/>
     <script file="gui/common/settings.js"/>
     <script file="gui/summary/counters.js"/>
     <script file="gui/summary/layout.js"/>
     <script file="gui/summary/summary.js"/>
+    <script file="gui/summary/charts.js"/>
 
     <object type="image"
         style="ModernWindow"
@@ -99 +101 @@
             </object>
         </object>
 
+        <object name="chartPanelButton" type="button" sprite="BackgroundTab" size="762 92 880 120">
+            <action on="Press">selectPanel(6);</action>
+            <object type="text" style="ModernLabelText" ghost="true">
+                <translatableAttribute id="caption">Charts</translatableAttribute>
+            </object>
+        </object>
+
         <object name="generalPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-54">
             <object size="0 0 100% 100%-50">
                 <object name="playerNameHeading" type="text" style="ModernLeftTabLabelText">
@@ -121 +130 @@
                         <repeat count="8" 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="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">
                                     <object name="valueDataTeam[i][n][x]" type="text" style="ModernTabLabelText">
@@ -155 +164 @@
             </object>
         </object>
 
+        <!-- Charts Panel -->
+        <object name="chartPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-58" hidden="true">
+
+            <object size="0 0 100% 100%-30">
+
+                <!-- Menu -->
+                <object size="45 24 100%-45 40">
+                    <repeat count="8">
+                        <object name="chartMenu[n]" type="button"  size="0 0 80 100%">
+                            <action on="Press">Charts.changeMetric(this.name);</action>
+                            <object name="chartMenu[n]_text" type="text" style="ModernLabelText" ghost="true"/>
+                        </object>
+                    </repeat>
+                </object>
+
+                <!-- Menu Line -->
+                <object name="chartLineHeader" type="image" sprite="chartLineWhite" size="40 42 100%-40 43"/>
+
+                <!-- Players -->
+                <object name="chartPlayer" type="text" style="ModernLabelText" size="600 46 680 66" textcolor="200 200 200">Player:</object>
+
+                <object size="670 46 700 66">
+                    <repeat count="8">
+                        <object name="chartPlayer[n]" type="button" size="0 0 30 20">
+                            <object name="chartPlayerDot[n]" type="image" sprite="chartDotP1" size="0 6 8 14"/>
+                            <object name="chartPlayerText[n]" type="text" style="ModernLabelText" ghost="true" textcolor="200 200 200">1</object>
+                            <action on="press">Charts.togglePlayer(this.name);</action>
+                        </object>
+                    </repeat>
+                </object>
+
+                <!-- X/Y Axis -->
+                <object name="chartLineAxisX" type="image" sprite="chartLineGray" size="30 540 960 541"/> 
+                <object name="chartLineAxisY" type="image" sprite="chartLineGray" size="50 63 51 560"/>
+                
+                <!-- Y Axis Ticks -->
+                <object name="chartTickAxisYMax" type="image" sprite="chartLineGray" size="40 70 50 72"/>
+                <object name="chartTickAxisYHalf" type="image" sprite="chartLineGray" size="40 300 50 302"/>
+                <object name="chartTickTextYMax" type="text" style="ModernLabelText" text_align = "right" size="5 75 45 90">100</object>
+                <object name="chartTickTextYHalf" type="text" style="ModernLabelText" text_align = "right" size="5 305 45 320">50</object>
+
+                <!-- X Axis Ticks -->
+                <object name="chartTickAxisXMax" type="image" sprite="chartLineGray" size="922 540 924 550"/>
+                <object name="chartTickAxisXHalf" type="image" sprite="chartLineGray" size="475 540 477 550"/>
+                <object name="chartTickTextXMax" type="text" style="ModernLabelText" text_align = "right" size="850 540 914 560">100 min</object>
+                <object name="chartTickTextXHalf" type="text" style="ModernLabelText" text_align = "right" size="405 540 469 560">50 min</object>
+
+                <!-- Dots -->
+                <object size="50-4 71-4 100% 100%">
+                    <repeat var="p" count="8">
+                        <object>
+                            <repeat var="d" count="110">
+                                <object name="chartDot[p][d]" type="image" sprite="chartDotP0" size="0 0 8 8"/>
+                            </repeat>
+                        </object>
+                    </repeat>
+                </object>
+
+            </object>
+        </object>
+        <!-- End Charts panel -->
+
         <object type="button" style="ModernButtonRed" size="100%-160 100%-48 100%-20 100%-20">
             <translatableAttribute id="caption">Continue</translatableAttribute>
             <action on="Press"><![CDATA[
-                if (g_GameData.isReplay)
+                if (!Engine.HasXmppClient())
                 {
-                    Engine.SwitchGuiPage("page_replaymenu.xml");
-                }
-                else if (!Engine.HasXmppClient())
-                {
                     Engine.SwitchGuiPage("page_pregame.xml");
                 }
                 else

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

@@ +1 @@
+
+// Updates every minute (60000)
+const UPDATE_TIMER_INTERVAL = 60000, VERSION = "0.1.19a";
+
+function ChartsTracker() {}
+
+ChartsTracker.prototype.Schema = "<a:component type='system'/><empty/>";
+
+ChartsTracker.prototype.GetChartData = function()
+{
+    return this.chartData;
+};
+    
+ChartsTracker.prototype.Init = function()
+{
+    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    this.updateTimer = cmpTimer.SetInterval(this.entity, IID_ChartsTracker, "updateData", 0, UPDATE_TIMER_INTERVAL, {});
+    this.timeStamp = -1;
+    this.chartData = {};
+};
+
+ChartsTracker.prototype.updateData = function()
+{
+    // Get player + range + stats manager
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    var id = cmpPlayer.GetPlayerID();
+    var mapExplored = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).GetPercentMapExplored(cmpPlayer.GetPlayerID());
+    var mapControlled = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager).GetTerritoryPercentage(cmpPlayer.GetPlayerID());
+    var resourceCount = cmpPlayer.GetResourceCounts();
+    var statistics = Engine.QueryInterface(this.entity, IID_StatisticsTracker).GetStatistics();
+
+    ++this.timeStamp;
+
+    this.chartData[this.timeStamp.toString()] = {
+        'mapControl': mapControlled,
+        'explored':  mapExplored,
+        'food':  resourceCount.food,
+        'wood':  resourceCount.wood,
+        'stone': resourceCount.stone,
+        'metal': resourceCount.metal,
+        'units': cmpPlayer.GetPopulationCount(),
+        'buildings': statistics.buildingsConstructed.total - statistics.buildingsLost.total
+    };
+
+    // print ("CHARTS: updateData: p: " + id + "/" +  this.timeStamp + " : " + uneval(this.chartData[this.timeStamp + ""]) + "\n");
+};
+
+Engine.RegisterComponentType(IID_ChartsTracker, "ChartsTracker", ChartsTracker);

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

@@ -55 +55 @@
     };
 
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-    var numPlayers = cmpPlayerManager.GetNumPlayers();
-    for (var i = 0; i < numPlayers; ++i)
+    var n = cmpPlayerManager.GetNumPlayers();
+    for (var i = 0; i < n; ++i)
     {
         var playerEnt = cmpPlayerManager.GetPlayerByID(i);
         var cmpPlayerEntityLimits = Engine.QueryInterface(playerEnt, IID_EntityLimits);
@@ -80 +80 @@
         var mutualAllies = [];
         var neutrals = [];
         var enemies = [];
-        for (var j = 0; j < numPlayers; ++j)
+        for (var j = 0; j < n; ++j)
         {
             allies[j] = cmpPlayer.IsAlly(j);
             mutualAllies[j] = cmpPlayer.IsMutualAlly(j);
@@ -148 +148 @@
     ret.barterPrices = cmpBarter.GetPrices();
 
     // Add basic statistics to each player
-    for (var i = 0; i < numPlayers; ++i)
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var n = cmpPlayerManager.GetNumPlayers();
+    for (var i = 0; i < n; ++i)
     {
         var playerEnt = cmpPlayerManager.GetPlayerByID(i);
         var cmpPlayerStatisticsTracker = Engine.QueryInterface(playerEnt, IID_StatisticsTracker);
@@ -176 +178 @@
     for (var i = 0; i < n; ++i)
     {
         var playerEnt = cmpPlayerManager.GetPlayerByID(i);
+
         var cmpPlayerStatisticsTracker = Engine.QueryInterface(playerEnt, IID_StatisticsTracker);
         if (cmpPlayerStatisticsTracker)
             ret.players[i].statistics = cmpPlayerStatisticsTracker.GetStatistics();
+
+        var cmpPlayerChartsTracker = Engine.QueryInterface(playerEnt, IID_ChartsTracker);
+        if (cmpPlayerChartsTracker)
+            ret.players[i].chartData = cmpPlayerChartsTracker.GetChartData();
     }
 
     return ret;
@@ -491 +498 @@
         ret.armour = cmpArmour.GetArmourStrengths();
     }
 
-    var cmpAuras = Engine.QueryInterface(ent, IID_Auras);
+    var cmpAuras = Engine.QueryInterface(ent, IID_Auras)
     if (cmpAuras)
     {
         ret.auras = cmpAuras.GetDescriptions();
@@ -686 +693 @@
 // Used to show a red square over GUI elements you can't yet afford.
 GuiInterface.prototype.GetNeededResources = function(player, amounts)
 {
-    return QueryPlayerIDInterface(player).GetNeededResources(amounts);
+    var cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
+    return cmpPlayer.GetNeededResources(amounts);
 };
 
 /**
@@ -711 +719 @@
             notification.players.push(i);
     }
     this.timeNotifications.push(notification);
-    this.timeNotifications.sort(function (n1, n2){return n2.endTime - n1.endTime;});
+    this.timeNotifications.sort(function (n1, n2){return n2.endTime - n1.endTime});
 
     cmpTimer.SetTimeout(this.entity, IID_GuiInterface, "DeleteTimeNotification", duration, this.timeNotificationID);
 
@@ -884 +892 @@
 
     for (let ent of affectedEnts)
     {
-        let cmpStatusBars = Engine.QueryInterface(ent, IID_StatusBars);
+        let cmpStatusBars = Engine.QueryInterface(ent, IID_StatusBars)
         if (cmpStatusBars)
             cmpStatusBars.RegenerateSprites();
     }
@@ -989 +997 @@
         "parameters": {},
         "translateMessage": false,
         "translateParameters": [],
-    };
+    }
 
     // See if we're changing template
     if (!this.placementEntity || this.placementEntity[0] != cmd.template)
@@ -1844 +1852 @@
     return { "landTrader": landTrader, "shipTrader": shipTrader };
 };
 
-GuiInterface.prototype.GetTradingGoods = function(player)
+GuiInterface.prototype.GetTradingGoods = function(player, tradingGoods)
 {
-    return QueryPlayerIDInterface(player).GetTradingGoods();
+    var cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
+    return cmpPlayer.GetTradingGoods();
 };
 
 GuiInterface.prototype.OnGlobalEntityRenamed = function(msg)

binaries/data/mods/public/simulation/components/interfaces/ChartsTracker.js

@@ +1 @@
+Engine.RegisterInterface("ChartsTracker");

binaries/data/mods/public/simulation/templates/special/player.xml

@@ -13 +13 @@
     <AlertnessPeaceThreshold>0</AlertnessPeaceThreshold>
     <AlertnessMax>8</AlertnessMax>
   </BattleDetection>
+  <ChartsTracker/>
   <EntityLimits>
     <Limits>
       <CivilCentre>1</CivilCentre>