Merge pull request #440 from vita10gy/sb-uncapped

Scoreboard - Uncapped Portal Error
This commit is contained in:
Stefan Breunig 2013-03-11 08:43:52 -07:00
commit ae494d9567

View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @id iitc-plugin-scoreboard@vita10gy // @id iitc-plugin-scoreboard@vita10gy
// @name iitc: show a localized scoreboard. // @name iitc: show a localized scoreboard.
// @version 0.1.1 // @version 0.1.2
// @namespace https://github.com/breunigs/ingress-intel-total-conversion // @namespace https://github.com/breunigs/ingress-intel-total-conversion
// @updateURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/scoreboard.user.js // @updateURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/scoreboard.user.js
// @downloadURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/scoreboard.user.js // @downloadURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/scoreboard.user.js
@ -99,27 +99,29 @@ window.plugin.scoreboard.compileStats = function() {
$.each(window.portals, function(qk, portal) { $.each(window.portals, function(qk, portal) {
somethingInView = true; somethingInView = true;
var team = getTeam(portal.options.details); var team = getTeam(portal.options.details);
var player = portal.options.details.captured.capturingPlayerId; if(team !== TEAM_NONE) {
window.plugin.scoreboard.initPlayer(player, team); var player = portal.options.details.captured.capturingPlayerId;
scores['team'][team]['count_portals']++; window.plugin.scoreboard.initPlayer(player, team);
scores['player'][player]['count_portals']++; scores['team'][team]['count_portals']++;
scores['player'][player]['count_portals']++;
//$.each(portal.options.details.portalV2.linkedModArray, function(ind, mod) { //$.each(portal.options.details.portalV2.linkedModArray, function(ind, mod) {
// if(mod !== null) { // if(mod !== null) {
// somethingInView = true; // somethingInView = true;
// scores['team'][team]['count_shields']++; // scores['team'][team]['count_shields']++;
// scores['player'][mod.installingUser]['count_shields']++; // scores['player'][mod.installingUser]['count_shields']++;
// } // }
//}); //});
$.each(portal.options.details.resonatorArray.resonators, function(ind, reso) { $.each(portal.options.details.resonatorArray.resonators, function(ind, reso) {
if(reso !== null) { if(reso !== null) {
somethingInView = true; somethingInView = true;
window.plugin.scoreboard.initPlayer(reso.ownerGuid, team); window.plugin.scoreboard.initPlayer(reso.ownerGuid, team);
scores['team'][team]['count_resonators']++; scores['team'][team]['count_resonators']++;
scores['player'][reso.ownerGuid]['count_resonators']++; scores['player'][reso.ownerGuid]['count_resonators']++;
} }
}); });
}
}); });
return somethingInView; return somethingInView;
}; };