From f9c95b6953745d620c5827594b9a9f87b81b8e7c Mon Sep 17 00:00:00 2001 From: leper Date: Sun, 8 Feb 2015 01:59:02 +0000 Subject: [PATCH] Do not send gaia stats for rated games. This was SVN commit r16292. --- binaries/data/mods/public/gui/session/session.js | 8 +++++--- source/tools/XpartaMuPP/XpartaMuPP.py | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js index 7ef3b80653..f596ac451d 100644 --- a/binaries/data/mods/public/gui/session/session.js +++ b/binaries/data/mods/public/gui/session/session.js @@ -977,7 +977,7 @@ function reportGame(extendedSimState) // Tribute playerStatistics.tributesSent = ""; playerStatistics.tributesReceived = ""; - // Total + // Total playerStatistics.economyScore = ""; playerStatistics.militaryScore = ""; playerStatistics.totalScore = ""; @@ -992,8 +992,11 @@ function reportGame(extendedSimState) var teamsLocked = true; // Serialize the statistics for each player into a comma-separated list. - for each (var player in extendedSimState.players) + // Ignore gaia + for (let i = 1; i < extendedSimState.players.length; ++i) { + let player = extendedSimState.players[i]; + playerStates += player.state + ","; playerCivs += player.civ + ","; teams += player.team + ","; @@ -1066,4 +1069,3 @@ function reportGame(extendedSimState) Engine.SendGameReport(reportObject); } - diff --git a/source/tools/XpartaMuPP/XpartaMuPP.py b/source/tools/XpartaMuPP/XpartaMuPP.py index 73ac2e40be..c1ac71b5d1 100644 --- a/source/tools/XpartaMuPP/XpartaMuPP.py +++ b/source/tools/XpartaMuPP/XpartaMuPP.py @@ -362,8 +362,6 @@ class ReportManager(): split = rawGameReport[key].split(",") # Remove the false split positive. split.pop() - # We just delete gaia for now. - split.pop(0) statToJID = {} for i, part in enumerate(split): statToJID[JIDs[i]] = part @@ -403,8 +401,8 @@ class ReportManager(): # Find a key in the report which holds values for multiple players. for key in rawGameReport: if rawGameReport[key].find(",") != -1: - # Count the number of values, minus one for gaia and one for the false split positive. - return len(rawGameReport[key].split(","))-2 + # Count the number of values, minus one for the false split positive. + return len(rawGameReport[key].split(","))-1 # Return -1 in case of failure. return -1