diff --git a/code/portal_highlighter.js b/code/portal_highlighter.js index c7a94753..bf0dfb19 100644 --- a/code/portal_highlighter.js +++ b/code/portal_highlighter.js @@ -7,7 +7,6 @@ window._current_highlighter = localStorage.portal_highlighter; window.changing_highlighters = false; window.addPortalHighlighter = function(name, callback) { - console.log("Regisering Portal Highlighter: " + name); if(_highlighters === null) { _highlighters = {}; } diff --git a/plugins/portal-highlighter-my-portals.user.js b/plugins/portal-highlighter-my-portals.user.js index 47246fbf..77ed233f 100644 --- a/plugins/portal-highlighter-my-portals.user.js +++ b/plugins/portal-highlighter-my-portals.user.js @@ -1,11 +1,11 @@ // ==UserScript== -// @id iitc-plugin-highlight-portals-missing-resonators@vita10gy -// @name IITC plugin: highlight portals missing resonators +// @id iitc-plugin-highlight-portals-my-portals@vita10gy +// @name IITC plugin: highlight my portals // @version 0.1.0.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ -// @description [@@BUILDNAME@@-@@BUILDDATE@@] Uses the fill color of the portals to denote if the portal is missing resonators. +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Uses the fill color of the portals to denote portals you have a hand in. Orange is just ownership. Yellow is sheilds. Red is Resonators. Red trumps both, yellow trumps orange. // @include https://www.ingress.com/intel* // @include http://www.ingress.com/intel* // @match https://www.ingress.com/intel* @@ -23,38 +23,44 @@ if(typeof window.plugin !== 'function') window.plugin = function() {}; window.plugin.portalHighligherMyPortals = function() {}; window.plugin.portalHighligherMyPortals.highlight = function(data) { - - console.log(PLAYER.guid); var d = data.portal.options.details; var portal_weakness = 0; if(getTeam(d) !== 0) { + var color = ''; + var opacity = .7; + if(PLAYER.guid === d.captured.capturingPlayerId) { + color = 'orange'; + } + + var modCount = 0; + $.each(d.portalV2.linkedModArray, function(ind, mod) { + if(mod !== null && mod.installingUser === PLAYER.guid) { + color = 'yellow'; + modCount++; + } + }); + + if(modCount > 0) { + opacity = modCount*.25*.7 + .3; + } - console.log(d); - //Ding the portal for every missing resonator. var resCount = 0; $.each(d.resonatorArray.resonators, function(ind, reso) { - if(reso === null) { - portal_weakness += .125; - } else { + if(reso !== null && reso.ownerGuid === PLAYER.guid) { + color = 'red'; resCount++; } }); - if(portal_weakness > 0) { - var fill_opacity = portal_weakness*.85 + .15; - var color = 'red'; - fill_opacity = Math.round(fill_opacity*100)/100; - var params = {fillColor: color, fillOpacity: fill_opacity}; - if(resCount < 8) { - // Hole per missing resonator - var dash = new Array(8-resCount + 1).join("1,4,") + "100,0" - params["dashArray"] = dash; - } - data.portal.setStyle(params); + if(resCount > 0) { + opacity = resCount*.125*.7 + .3; + } + + if(color !== '') { + data.portal.setStyle({fillColor: color, fillOpacity: opacity}); } else { data.portal.setStyle({color: COLORS[getTeam(data.portal.options.details)], - fillOpacity: 0.5, - dashArray: null}); + fillOpacity: 0.5}); } } window.COLOR_SELECTED_PORTAL = '#f0f'; diff --git a/plugins/portal-highlighter-portal-ap.user.js b/plugins/portal-highlighter-portal-ap.user.js new file mode 100644 index 00000000..258d0fbe --- /dev/null +++ b/plugins/portal-highlighter-portal-ap.user.js @@ -0,0 +1,68 @@ +// ==UserScript== +// @id iitc-plugin-highlight-portals-by-ap@vita10gy +// @name IITC plugin: highlight portals by ap +// @version 0.1.0.@@DATETIMEVERSION@@ +// @namespace https://github.com/jonatkins/ingress-intel-total-conversion +// @updateURL @@UPDATEURL@@ +// @downloadURL @@DOWNLOADURL@@ +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Uses the fill color of the portals to denote AP value. +// @include https://www.ingress.com/intel* +// @include http://www.ingress.com/intel* +// @match https://www.ingress.com/intel* +// @match http://www.ingress.com/intel* +// ==/UserScript== + +function wrapper() { +// ensure plugin framework is there, even if iitc is not yet loaded +if(typeof window.plugin !== 'function') window.plugin = function() {}; + + +// PLUGIN START //////////////////////////////////////////////////////// + +// use own namespace for plugin +window.plugin.portalHighligherPortalAP = function() {}; + +window.plugin.portalHighligherPortalAP.minAP = 65; +//Anything over max AP will be 100% opacity. +window.plugin.portalHighligherPortalAP.maxAP = 6000; + + +window.plugin.portalHighligherPortalAP.highlight = function(data) { + var d = data.portal.options.details; + var ap = getAttackApGain(d); + var portal_ap = PLAYER.team === d.controllingTeam.team ? ap.friendlyAp : ap.enemyAp; + console.log(PLAYER.team); + console.log(d.controllingTeam.team); + console.log(d); + console.log(portal_ap); + var color = 'red'; + var opacity = (portal_ap - window.plugin.portalHighligherPortalAP.minAP) / window.plugin.portalHighligherPortalAP.maxAP; + if(opacity < 0) { + opacity = 0; + } + if(opacity > 1) { + opacity = 1; + } + data.portal.setStyle({fillColor: color, fillOpacity: opacity}); + window.COLOR_SELECTED_PORTAL = '#f0f'; +} + +var setup = function() { + window.addPortalHighlighter('Portal AP', window.plugin.portalHighligherPortalAP.highlight); +} + +// PLUGIN END ////////////////////////////////////////////////////////// + +if(window.iitcLoaded && typeof setup === 'function') { + setup(); +} else { + if(window.bootPlugins) + window.bootPlugins.push(setup); + else + window.bootPlugins = [setup]; +} +} // wrapper end +// inject code into site context +var script = document.createElement('script'); +script.appendChild(document.createTextNode('('+ wrapper +')();')); +(document.body || document.head || document.documentElement).appendChild(script); diff --git a/plugins/show-portal-weakness.user.js b/plugins/show-portal-weakness.user.js index 6f0dace2..59021ba5 100644 --- a/plugins/show-portal-weakness.user.js +++ b/plugins/show-portal-weakness.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @id iitc-plugin-show-portal-weakness@vita10gy // @name IITC plugin: show portal weakness -// @version 0.6.2.@@DATETIMEVERSION@@ +// @version 0.7.0.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@