diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index a2891067..431a013d 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -193,8 +193,13 @@ window.getResonatorDetails = function(d) { // slot: which slot this resonator occupies. Starts with 0 (east) and // rotates clockwise. So, last one is 7 (southeast). window.renderResonatorDetails = function(slot, level, nrg, dist, nick) { + if(OCTANTS[slot] === 'N') + var className = 'meter north'; + else + var className = 'meter'; + if(level === 0) { - var meter = ''; + var meter = ''; } else { var max = RESO_NRG[level]; var fillGrade = nrg/max*100; @@ -209,11 +214,11 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick) { var color = (level < 3 ? "#9900FF" : "#FFFFFF"); - var lbar = ' ' + level + ' '; + var lbar = ' L ' + level + ' '; var fill = ''; - var meter = '' + fill + lbar + ''; + var meter = '' + fill + lbar + ''; } nick = nick ? ''+nick+'' : null; return [meter, nick || '']; diff --git a/code/smartphone.js b/code/smartphone.js index 56e0c57c..fdd03214 100644 --- a/code/smartphone.js +++ b/code/smartphone.js @@ -66,40 +66,53 @@ window.runOnSmartphonesBeforeBoot = function() { } window.smartphoneInfo = function(data) { - var d = data.portalDetails; - var lvl = Math.floor(getPortalLevel(d)); - if(lvl == 0) - var t = 'L' + lvl + ''; + var guid = data.selectedPortalGuid; + if(!window.portals[guid]) return; + + var data = window.portals[selectedPortal].options.data; + var details = window.portalDetail.get(guid); + + var lvl = data.level; + if(data.team === "NEUTRAL") + var t = 'L0'; else var t = 'L' + lvl + ''; - var percentage = '0%'; - var totalEnergy = getTotalPortalEnergy(d); - if(getTotalPortalEnergy(d) > 0) { - percentage = Math.floor((getCurrentPortalEnergy(d) / getTotalPortalEnergy(d) * 100)) + '%'; + + var percentage = data.health; + if(details) { + var totalEnergy = getTotalPortalEnergy(details); + if(getTotalPortalEnergy(details) > 0) { + percentage = Math.floor(getCurrentPortalEnergy(details) / totalEnergy * 100); + } } - t += ' ' + percentage + ' '; - t += d.portalV2.descriptiveText.TITLE; + t += ' ' + percentage + '% '; + t += data.title; - var l,v,max,perc; - for(var i=0;i<8;i++) - { - var reso = d.resonatorArray.resonators[i]; - if(reso) { - l = parseInt(reso.level); - v = parseInt(reso.energyTotal); - max = RESO_NRG[l]; - perc = v/max*100; - } - else { - l = 0; - v = 0; - max = 0; - perc = 0; - } + if(details) { + var l,v,max,perc; + for(var i=0;i<8;i++) + { + var className = TEAM_TO_CSS[getTeam(details)]; + if(OCTANTS[i] === 'N') + className += ' north' + var reso = details.resonatorArray.resonators[i]; + if(reso) { + l = parseInt(reso.level); + v = parseInt(reso.energyTotal); + max = RESO_NRG[l]; + perc = v/max*100; + } + else { + l = 0; + v = 0; + max = 0; + perc = 0; + } - t += '