diff --git a/plugins/scoreboard.user.js b/plugins/scoreboard.user.js index 5e334a9f..61baaed4 100644 --- a/plugins/scoreboard.user.js +++ b/plugins/scoreboard.user.js @@ -21,47 +21,35 @@ if(typeof window.plugin !== 'function') window.plugin = function() {}; window.plugin.scoreboard = function() {}; window.plugin.scoreboard.resetTeam = function(team) { - window.plugin.scoreboard.scores['team'][team] = {}; - window.plugin.scoreboard.scores['team'][team]['mu'] = 0; - window.plugin.scoreboard.scores['team'][team]['count_fields'] = 0; - window.plugin.scoreboard.scores['team'][team]['count_links'] = 0; - window.plugin.scoreboard.scores['team'][team]['count_portals'] = 0; - window.plugin.scoreboard.scores['team'][team]['count_resonators'] = 0; - window.plugin.scoreboard.scores['team'][team]['largest'] = {}; + var scores = window.plugin.scoreboard.scores['team']; + scores[team] = {}; + scores[team]['mu'] = 0; + scores[team]['count_fields'] = 0; + scores[team]['count_links'] = 0; + scores[team]['count_portals'] = 0; + scores[team]['count_resonators'] = 0; + scores[team]['largest'] = {}; }; -window.plugin.scoreboard.initPlayer = function(player,team) { - //Init Player info - if(window.plugin.scoreboard.scores['player'][player] === undefined) { - window.plugin.scoreboard.scores['player'][player] = {}; - window.plugin.scoreboard.scores['player'][player]['team'] = team; - } - if(window.plugin.scoreboard.scores['player'][player]['mu'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['mu'] = 0; - } - if(window.plugin.scoreboard.scores['player'][player]['count_fields'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['count_fields'] = 0; - } - if(window.plugin.scoreboard.scores['player'][player]['count_links'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['count_links'] = 0; - } - if(window.plugin.scoreboard.scores['player'][player]['count_portals'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['count_portals'] = 0; - } - if(window.plugin.scoreboard.scores['player'][player]['count_resonators'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['count_resonators'] = 0; - } - //if(window.plugin.scoreboard.scores['player'][player]['count_shields'] === undefined) { - // window.plugin.scoreboard.scores['player'][player]['count_shields'] = 0; - //} - if(window.plugin.scoreboard.scores['player'][player]['largest'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['largest'] = {}; - } +window.plugin.scoreboard.initPlayer = function(player, team) { + var scores = window.plugin.scoreboard.scores['player']; + if(scores[player] === undefined) { + scores[player] = {}; + scores[player]['team'] = team; + scores[player]['mu'] = 0; + scores[player]['count_fields'] = 0; + scores[player]['count_links'] = 0; + scores[player]['count_portals'] = 0; + scores[player]['count_resonators'] = 0; + // scores[player]['count_shields'] = 0; + scores[player]['largest'] = {}; + } } window.plugin.scoreboard.compileStats = function() { - var something_in_view = false; - window.plugin.scoreboard.scores = {"team": {}, "player": {}}; + var somethingInView = false; + window.plugin.scoreboard.scores = {'team': {}, 'player': {}}; + var scores = window.plugin.scoreboard.scores; window.plugin.scoreboard.resetTeam(TEAM_RES); window.plugin.scoreboard.resetTeam(TEAM_ENL); @@ -75,149 +63,146 @@ window.plugin.scoreboard.compileStats = function() { window.portals[val.options.vertices.vertexB.guid] !== undefined || window.portals[val.options.vertices.vertexC.guid] !== undefined ) { - something_in_view = true; - window.plugin.scoreboard.scores['team'][team]['mu'] += parseInt(val.options.data.entityScore.entityScore); - window.plugin.scoreboard.scores['player'][player]['mu'] += parseInt(val.options.data.entityScore.entityScore); - window.plugin.scoreboard.scores['team'][team]['count_fields']++; - window.plugin.scoreboard.scores['player'][player]['count_fields']++; + somethingInView = true; + scores['team'][team]['mu'] += parseInt(val.options.data.entityScore.entityScore); + scores['player'][player]['mu'] += parseInt(val.options.data.entityScore.entityScore); + scores['team'][team]['count_fields']++; + scores['player'][player]['count_fields']++; - if(window.plugin.scoreboard.scores['team'][team]['largest']['mu'] === undefined) { - window.plugin.scoreboard.scores['team'][team]['largest']['mu'] = val; + if(scores['team'][team]['largest']['mu'] === undefined) { + scores['team'][team]['largest']['mu'] = val; } - else if(window.plugin.scoreboard.scores['team'][team]['largest']['mu'].options.data.entityScore.entityScore < val.options.data.entityScore.entityScore) { - window.plugin.scoreboard.scores['team'][team]['largest']['mu'] = val; + else if(scores['team'][team]['largest']['mu'].options.data.entityScore.entityScore < val.options.data.entityScore.entityScore) { + scores['team'][team]['largest']['mu'] = val; } - if(window.plugin.scoreboard.scores['player'][player]['largest']['mu'] === undefined) { - window.plugin.scoreboard.scores['player'][player]['largest']['mu'] = val; + if(scores['player'][player]['largest']['mu'] === undefined) { + scores['player'][player]['largest']['mu'] = val; } - else if(window.plugin.scoreboard.scores['player'][player]['largest']['mu'].options.data.entityScore.entityScore < val.options.data.entityScore.entityScore) { - window.plugin.scoreboard.scores['player'][player]['largest']['mu'] = val; + else if(scores['player'][player]['largest']['mu'].options.data.entityScore.entityScore < val.options.data.entityScore.entityScore) { + scores['player'][player]['largest']['mu'] = val; } } }); $.each(window.links, function(qk, link) { - something_in_view = true; + somethingInView = true; var team = getTeam(link.options.data); var player = link.options.data.creator.creatorGuid; window.plugin.scoreboard.initPlayer(player,team); - window.plugin.scoreboard.scores['team'][team]['count_links']++; - window.plugin.scoreboard.scores['player'][player]['count_links']++; + scores['team'][team]['count_links']++; + scores['player'][player]['count_links']++; }); $.each(window.portals, function(qk, portal) { - something_in_view = true; + somethingInView = true; var team = getTeam(portal.options.details); var player = portal.options.details.captured.capturingPlayerId; window.plugin.scoreboard.initPlayer(player,team); - window.plugin.scoreboard.scores['team'][team]['count_portals']++; - window.plugin.scoreboard.scores['player'][player]['count_portals']++; + scores['team'][team]['count_portals']++; + scores['player'][player]['count_portals']++; //$.each(portal.options.details.portalV2.linkedModArray, function(ind, mod) { // if(mod !== null) { - // something_in_view = true; - // window.plugin.scoreboard.scores['team'][team]['count_shields']++; - // window.plugin.scoreboard.scores['player'][mod.installingUser]['count_shields']++; + // somethingInView = true; + // scores['team'][team]['count_shields']++; + // scores['player'][mod.installingUser]['count_shields']++; // } //}); $.each(portal.options.details.resonatorArray.resonators, function(ind, reso) { if(reso !== null) { - something_in_view = true; + somethingInView = true; window.plugin.scoreboard.initPlayer(reso.ownerGuid,team); - window.plugin.scoreboard.scores['team'][team]['count_resonators']++; - window.plugin.scoreboard.scores['player'][reso.ownerGuid]['count_resonators']++; + scores['team'][team]['count_resonators']++; + scores['player'][reso.ownerGuid]['count_resonators']++; } }); }); - - return(something_in_view) + return somethingInView; }; -window.plugin.scoreboard.percentSpan = function(percent,css_class) { +window.plugin.scoreboard.percentSpan = function(percent, cssClass) { var retVal = ''; if(percent > 0) { - retVal += ''; + retVal += ''; if(percent >= 7) { //anything less than this and the text doesnt fit in the span. retVal += percent; } retVal += '%'; } - return(retVal); + return retVal; }; window.plugin.scoreboard.teamTableRow = function(field,title) { - var retVal = '' - + title - + '' - + window.plugin.scoreboard.scores['team'][TEAM_RES][field] - + '' - + window.plugin.scoreboard.scores['team'][TEAM_ENL][field] - + '' - + (window.plugin.scoreboard.scores['team'][TEAM_RES][field] + window.plugin.scoreboard.scores['team'][TEAM_ENL][field]) - + ''; - return(retVal); + var scores = window.plugin.scoreboard.scores['team']; + var retVal = '' + + title + + '' + + scores[TEAM_RES][field] + + '' + + scores[TEAM_ENL][field] + + '' + + (scores[TEAM_RES][field] + scores[TEAM_ENL][field]) + + ''; + return retVal; }; -window.plugin.scoreboard.playerTableRow = function(player_guid) { - +window.plugin.scoreboard.playerTableRow = function(playerGuid) { + var scores = window.plugin.scoreboard.scores['player']; var retVal = '' - + window.getPlayerName(player_guid); + + window.getPlayerName(playerGuid); + ''; - $.each(['mu','count_fields','count_links','count_portals','count_resonators'], function(i,field) { - retVal += '' - + window.plugin.scoreboard.scores['player'][player_guid][field] + $.each(['mu','count_fields','count_links','count_portals','count_resonators'], function(i, field) { + retVal += '' + + scores[playerGuid][field] + ''; }); retVal += ''; - return(retVal); + return retVal; }; window.plugin.scoreboard.display = function() { - var something_in_view = window.plugin.scoreboard.compileStats(); + var somethingInView = window.plugin.scoreboard.compileStats(); - var res_mu = window.plugin.scoreboard.scores['team'][TEAM_RES]['mu']; - var enl_mu = window.plugin.scoreboard.scores['team'][TEAM_ENL]['mu']; + var resMu = window.plugin.scoreboard.scores['team'][TEAM_RES]['mu']; + var enlMu = window.plugin.scoreboard.scores['team'][TEAM_ENL]['mu']; - var score_html = ''; - if(something_in_view) { + var scoreHtml = ''; + if(somethingInView) { - if(res_mu + enl_mu > 0) { - var res_mu_percent = Math.round((res_mu / (res_mu + enl_mu)) * 100); - score_html += '
' - + window.plugin.scoreboard.percentSpan(res_mu_percent,'res') - + window.plugin.scoreboard.percentSpan(100-res_mu_percent,'enl') + if(resMu + enlMu > 0) { + var resMuPercent = Math.round((resMu / (resMu + enlMu)) * 100); + scoreHtml += '
' + + window.plugin.scoreboard.percentSpan(resMuPercent, 'res') + + window.plugin.scoreboard.percentSpan(100-resMuPercent, 'enl') + '
'; } - score_html += '' + scoreHtml += '
' + ''; - score_html += window.plugin.scoreboard.teamTableRow('mu','Mu'); - score_html += window.plugin.scoreboard.teamTableRow('count_fields','Fields'); - score_html += window.plugin.scoreboard.teamTableRow('count_links','Links'); - score_html += window.plugin.scoreboard.teamTableRow('count_portals','Portals'); - score_html += window.plugin.scoreboard.teamTableRow('count_resonators','Resonators'); - score_html += '
ResistanceEnlightenedTotal
'; + scoreHtml += window.plugin.scoreboard.teamTableRow('mu','Mu'); + scoreHtml += window.plugin.scoreboard.teamTableRow('count_fields','Fields'); + scoreHtml += window.plugin.scoreboard.teamTableRow('count_links','Links'); + scoreHtml += window.plugin.scoreboard.teamTableRow('count_portals','Portals'); + scoreHtml += window.plugin.scoreboard.teamTableRow('count_resonators','Resonators'); + scoreHtml += ''; - score_html += '' + scoreHtml += '
' + ''; - $.each(window.plugin.scoreboard.scores['player'], function(guid, player_data) { - score_html += window.plugin.scoreboard.playerTableRow(guid); + $.each(window.plugin.scoreboard.scores['player'], function(guid, playerData) { + scoreHtml += window.plugin.scoreboard.playerTableRow(guid); }); - score_html += '
PlayerMuFieldsLinksPortalsResonators
'; + scoreHtml += ''; - score_html += '
Score is subject to portals available based on zoom level. If names are unresolved try again. For best results wait until updates are fully loaded.
'; + scoreHtml += '
Score is subject to portals available based on zoom level. If names are unresolved try again. For best results wait until updates are fully loaded.
'; } else { - score_html += 'You need something in view.'; + scoreHtml += 'You need something in view.'; } - $('#scoreboard').html(score_html); - $( "#scoreboard" ).dialog({autoOpen: true, - modal: true, - width: 500, - buttons: [ { text: "Close", click: function() { $( this ).dialog( "close" ); } } ]}); + alert('
' + scoreHtml + '
'); + $(".ui-dialog").addClass('ui-dialog-scoreboard'); } var setup = function() { @@ -226,11 +211,13 @@ var setup = function() { $('body').append(''); $('#toolbox').append('scoreboard'); $('head').append('');