diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 3937fc90..4c5d2fb9 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -164,6 +164,7 @@ window.getPortalMiscDetails = function(guid,d) { // collect some random data that’s not worth to put in an own method var linkInfo = getPortalLinks(guid); + var linkCount = linkInfo.in.length + linkInfo.out.length; var links = {incoming: linkInfo.in.length, outgoing: linkInfo.out.length}; function linkExpl(t) { return ''+t+''; } @@ -171,33 +172,31 @@ window.getPortalMiscDetails = function(guid,d) { var player = d.owner ? '' + d.owner + '' - : null; - var playerText = player ? ['owner', player] : null; + : '-'; + var playerText = ['owner', player]; - var time = d.capturedTime - ? '' - + unixTimeToString(d.capturedTime) + '' - : null; - var sinceText = time ? ['since', time] : null; var fieldCount = getPortalFieldsCount(guid); - var linkedFields = ['fields', fieldCount]; + var fieldsText = ['fields', fieldCount]; + + var apGainText = getAttackApGainText(d,fieldCount,linkCount); - var linkCount = getPortalLinksCount(guid); // collect and html-ify random data var randDetailsData = []; - if (playerText || sinceText) { - randDetailsData.push (playerText || ['-','-'], sinceText || ['-','-']); + if (d.owner) { + // these pieces of data are only relevant when the portal is captured + randDetailsData.push ( + playerText, getRangeText(d), + linksText, fieldsText, + getMitigationText(d,linkCount), getEnergyText(d) + ); } + // and these have some use, even for uncaptured portals randDetailsData.push ( - getRangeText(d), getEnergyText(d), - linksText, ['-','-'], - linkedFields, getAttackApGainText(d,fieldCount,linkCount), - getHackDetailsText(d), getMitigationText(d,linkCount) + apGainText, getHackDetailsText(d) ); // artifact details