From c06682b9911774eed04d55548e6c7756156aefcf Mon Sep 17 00:00:00 2001 From: sutepasu Date: Sat, 2 Mar 2013 23:18:39 +0700 Subject: [PATCH 1/3] Adding total level, total player and average level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding total level, total player and average level on each faction. Adding line feed  and removing one tab on line 111 so the output will be properly generated. --- plugins/guess-player-levels.user.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/guess-player-levels.user.js b/plugins/guess-player-levels.user.js index c220a76d..02a33858 100644 --- a/plugins/guess-player-levels.user.js +++ b/plugins/guess-player-levels.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @id iitc-plugin-guess-player-levels@breunigs // @name iitc: guess player level -// @version 0.2.1 +// @version 0.2.1.1 // @namespace https://github.com/breunigs/ingress-intel-total-conversion // @updateURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/guess-player-levels.user.js // @downloadURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/guess-player-levels.user.js @@ -92,19 +92,29 @@ window.plugin.guessPlayerLevels.guess = function() { var namesR = plugin.guessPlayerLevels.sort(playersRes); var namesE = plugin.guessPlayerLevels.sort(playersEnl); + var totallvlR = 0; + var totallvlE = 0; var max = Math.max(namesR.length, namesE.length); for(var i = 0; i < max; i++) { var nickR = namesR[i]; var lvlR = playersRes[nickR]; var lineR = nickR ? nickR + ':\t' + lvlR : '\t'; - + if(!isNaN(parseInt(lvlR))) + totallvlR += parseInt(lvlR); + var nickE = namesE[i]; var lvlE = playersEnl[nickE]; var lineE = nickE ? nickE + ':\t' + lvlE : '\t'; - - s += lineR + '\t\t' + lineE + '\n'; + if(!isNaN(parseInt(lvlE))) + totallvlE += parseInt(lvlE); + + s += '\n'+lineR + '\t' + lineE + '\n'; } - + s += '\nTotal level :\t'+totallvlR+'\tTotal level :\t'+totallvlE; + s += '\nTotal player:\t'+namesR.length+'\tTotal player:\t'+namesE.length; + var averageR = (totallvlR/namesR.length); + var averageE = (totallvlE/namesE.length); + s += '\nAverage :\t'+averageR.toFixed(2)+'\tAverage :\t'+averageE.toFixed(2); s += '\n\nIf there are some unresolved names, simply try again.' console.log(s); alert(s); From 8067d2011780bdb33b17cb533ee0d524555f5064 Mon Sep 17 00:00:00 2001 From: sutepasu Date: Sun, 3 Mar 2013 02:39:25 +0700 Subject: [PATCH 2/3] v0.3, fix divide-by-zero, change tabs to space --- plugins/guess-player-levels.user.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/guess-player-levels.user.js b/plugins/guess-player-levels.user.js index 02a33858..cfe2f94f 100644 --- a/plugins/guess-player-levels.user.js +++ b/plugins/guess-player-levels.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @id iitc-plugin-guess-player-levels@breunigs // @name iitc: guess player level -// @version 0.2.1.1 +// @version 0.3 // @namespace https://github.com/breunigs/ingress-intel-total-conversion // @updateURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/guess-player-levels.user.js // @downloadURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/guess-player-levels.user.js @@ -99,21 +99,22 @@ window.plugin.guessPlayerLevels.guess = function() { var nickR = namesR[i]; var lvlR = playersRes[nickR]; var lineR = nickR ? nickR + ':\t' + lvlR : '\t'; - if(!isNaN(parseInt(lvlR))) - totallvlR += parseInt(lvlR); - + if(!isNaN(parseInt(lvlR))) + totallvlR += parseInt(lvlR); + var nickE = namesE[i]; var lvlE = playersEnl[nickE]; var lineE = nickE ? nickE + ':\t' + lvlE : '\t'; - if(!isNaN(parseInt(lvlE))) - totallvlE += parseInt(lvlE); - + if(!isNaN(parseInt(lvlE))) + totallvlE += parseInt(lvlE); + s += '\n'+lineR + '\t' + lineE + '\n'; } s += '\nTotal level :\t'+totallvlR+'\tTotal level :\t'+totallvlE; s += '\nTotal player:\t'+namesR.length+'\tTotal player:\t'+namesE.length; - var averageR = (totallvlR/namesR.length); - var averageE = (totallvlE/namesE.length); + var averageR = 0, averageE = 0; + if (namesR.length > 0) averageR = (totallvlR/namesR.length); + if (namesE.length > 0) averageE = (totallvlE/namesE.length); s += '\nAverage :\t'+averageR.toFixed(2)+'\tAverage :\t'+averageE.toFixed(2); s += '\n\nIf there are some unresolved names, simply try again.' console.log(s); From 612006a7d6ff5d8fcfa6147eaa1ee360520cbb1e Mon Sep 17 00:00:00 2001 From: sutepasu Date: Sun, 3 Mar 2013 02:52:21 +0700 Subject: [PATCH 3/3] Change label 'Average' to --- plugins/guess-player-levels.user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/guess-player-levels.user.js b/plugins/guess-player-levels.user.js index cfe2f94f..cd77945b 100644 --- a/plugins/guess-player-levels.user.js +++ b/plugins/guess-player-levels.user.js @@ -115,7 +115,7 @@ window.plugin.guessPlayerLevels.guess = function() { var averageR = 0, averageE = 0; if (namesR.length > 0) averageR = (totallvlR/namesR.length); if (namesE.length > 0) averageE = (totallvlE/namesE.length); - s += '\nAverage :\t'+averageR.toFixed(2)+'\tAverage :\t'+averageE.toFixed(2); + s += '\nAverage level:\t'+averageR.toFixed(2)+'\tAverage level:\t'+averageE.toFixed(2); s += '\n\nIf there are some unresolved names, simply try again.' console.log(s); alert(s);