From 7e3f28baecbf4f5039fcfc412a8d8d296c527fcf Mon Sep 17 00:00:00 2001 From: vita10gy Date: Sun, 10 Mar 2013 12:06:10 -0500 Subject: [PATCH] Style changes - Use Largest field info --- plugins/scoreboard.user.js | 115 ++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 40 deletions(-) diff --git a/plugins/scoreboard.user.js b/plugins/scoreboard.user.js index 1c463a73..eb3d1647 100644 --- a/plugins/scoreboard.user.js +++ b/plugins/scoreboard.user.js @@ -75,17 +75,17 @@ window.plugin.scoreboard.compileStats = function() { scores['team'][team]['count_fields']++; scores['player'][player]['count_fields']++; - //var largestMu = scores['team'][team]['largest']['mu']; - //if(largestMu === undefined || parseInt(largestMu.options.data.entityScore.entityScore) < parseInt(val.options.data.entityScore.entityScore)) { - // largestMu = val; - //} - //scores['team'][team]['largest']['mu'] = largestMu; - // - //var largestMu = scores['player'][player]['largest']['mu']; - //if(largestMu === undefined || parseInt(largestMu.options.data.entityScore.entityScore) < parseInt(val.options.data.entityScore.entityScore)) { - // largestMu = val; - //} - //scores['player'][player]['largest']['mu'] = largestMu; + var largestMu = scores['team'][team]['largest']['mu']; + if(largestMu === undefined || parseInt(largestMu.options.data.entityScore.entityScore) < parseInt(val.options.data.entityScore.entityScore)) { + largestMu = val; + } + scores['team'][team]['largest']['mu'] = largestMu; + + var largestMu = scores['player'][player]['largest']['mu']; + if(largestMu === undefined || parseInt(largestMu.options.data.entityScore.entityScore) < parseInt(val.options.data.entityScore.entityScore)) { + largestMu = val; + } + scores['player'][player]['largest']['mu'] = largestMu; } }); $.each(window.links, function(qk, link) { @@ -141,15 +141,35 @@ window.plugin.scoreboard.teamTableRow = function(field,title) { var retVal = '' + title + '' - + scores[TEAM_RES][field] + + window.digits(scores[TEAM_RES][field]) + '' - + scores[TEAM_ENL][field] + + window.digits(scores[TEAM_ENL][field]) + '' - + (scores[TEAM_RES][field] + scores[TEAM_ENL][field]) + + window.digits(scores[TEAM_RES][field] + scores[TEAM_ENL][field]) + ''; return retVal; }; +window.plugin.scoreboard.fieldInfo = function(field) { + var title = ''; + var retVal = ''; + + if(field !== undefined) { + var portal = window.portals[field.options.vertices.vertexA.guid]; + if(portal !== undefined) { + title = ' @' + portal.options.details.portalV2.descriptiveText.TITLE; + } + + retVal = '
' + + field.options.data.entityScore.entityScore + + ' - ' + window.getPlayerName(field.options.data.creator.creatorGuid) + + '
'; + } else { + retVal = 'N/A'; + } + return retVal; +}; + window.plugin.scoreboard.playerTableRow = function(playerGuid) { var scores = window.plugin.scoreboard.scores['player']; var retVal = '' - + scores[playerGuid][field] + + window.digits(scores[playerGuid][field]) + ''; }); retVal += ''; @@ -184,12 +204,12 @@ window.plugin.scoreboard.playerTable = function(sortBy) { var sort = window.plugin.scoreboard.playerTableSort; var scoreHtml = '' - + '' - + '' - + '' - + '' - + '' - + ''; + + '' + + '' + + '' + + '' + + '' + + ''; $.each(window.plugin.scoreboard.playerGuids, function(index, guid) { scoreHtml += window.plugin.scoreboard.playerTableRow(guid); }); @@ -210,35 +230,46 @@ window.plugin.scoreboard.playerTableSort = function(name, by) { window.plugin.scoreboard.display = function() { var somethingInView = window.plugin.scoreboard.compileStats(); - - var resMu = window.plugin.scoreboard.scores['team'][TEAM_RES]['mu']; - var enlMu = window.plugin.scoreboard.scores['team'][TEAM_ENL]['mu']; - + var scores = window.plugin.scoreboard.scores; + var resMu = scores['team'][TEAM_RES]['mu']; + var enlMu = scores['team'][TEAM_ENL]['mu']; var scoreHtml = ''; + if(somethingInView) { if(resMu + enlMu > 0) { var resMuPercent = Math.round((resMu / (resMu + enlMu)) * 100); - scoreHtml += '
' + scoreHtml += '
' + window.plugin.scoreboard.percentSpan(resMuPercent, 'res') + window.plugin.scoreboard.percentSpan(100-resMuPercent, 'enl') + '
'; } scoreHtml += '
PlayerMuFieldsLinksPortalsResonators
PlayerMuFieldsLinksPortalsResonators
' - + ''; - 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 += '
ResistanceEnlightenedTotal
'; + + 'ResistanceEnlightenedTotal' + + window.plugin.scoreboard.teamTableRow('mu','Mu') + + window.plugin.scoreboard.teamTableRow('count_fields','Fields') + + window.plugin.scoreboard.teamTableRow('count_links','Links') + + window.plugin.scoreboard.teamTableRow('count_portals','Portals') + + window.plugin.scoreboard.teamTableRow('count_resonators','Resonators') + + ''; + + scoreHtml += '' + + '' + + '' + + '
ResistanceEnlightened
Largest Field' + + window.plugin.scoreboard.fieldInfo(scores['team'][TEAM_RES]['largest']['mu']) + + '' + + window.plugin.scoreboard.fieldInfo(scores['team'][TEAM_ENL]['largest']['mu']) + + '
'; - scoreHtml += '
'; - scoreHtml += window.plugin.scoreboard.playerTable('mu'); - scoreHtml += '
'; + scoreHtml += '
' + + window.plugin.scoreboard.playerTable('mu') + + '
'; - 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.
'; + scoreHtml += '
Click on player table headers to sort by that column. ' + + '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 { scoreHtml += 'You need something in view.'; } @@ -263,12 +294,16 @@ var setup = function() { '#scoreboard table tr.enl td { background-color: #017f01; }' + '#scoreboard table tr:nth-child(even) td { opacity: .8 }' + '#scoreboard table tr:nth-child(odd) td { color: #ddd !important; }' + - '#scoreboard table td.number, #scoreboard table th { text-align:right }' + + '#scoreboard table th { text-align:left }' + + '#scoreboard table td.number, #scoreboard table th.number { text-align:right }' + '#players table th { cursor:pointer; }' + - '#scoreboard table th:nth-child(1) { text-align:left }' + '#scoreboard table th.sorted { color:#FFCE00; }' + '#scoreboard .disclaimer { margin-top:10px; font-size:10px; }' + - '.mu_score { overflow:hidden;}' + + '.mu_score { margin-bottom: 10px; }' + + '.mu_score span { overflow: hidden; padding-top:2px; padding-bottom: 2px; display: block; font-weight: bold; float: left; box-sizing: border-box; -moz-box-sizing:border-box; -webkit-box-sizing:border-box; }' + + '.mu_score span.res { background-color: #005684; text-align: right; padding-right:5px; }' + + '.mu_score span.enl { background-color: #017f01; padding-left: 5px; }' + + ''); }