Merge pull request #387 from vita10gy/mod_highlighters

Mod Highlighters

main.js

@@ -162,6 +162,8 @@ window.COLORS_MOD = {VERY_RARE: '#F78AF6', RARE: '#AD8AFF', COMMON: '#84FBBD'};
 window.OPTIONS_RESONATOR_SELECTED = {color: '#fff', weight: 2, radius: 4, opacity: 1, clickable: false};
 window.OPTIONS_RESONATOR_NON_SELECTED = {color: '#aaa', weight: 1, radius: 3, opacity: 1, clickable: false};
 
+window.MOD_TYPE = {RES_SHIELD:'Shield', MULTIHACK:'Multi-hack', FORCE_AMP:'Force Amp', HEATSINK:'Heat Sink', TURRET:'Turret', LINK_AMPLIFIER: 'Link Amp'};
+
 window.OPTIONS_RESONATOR_LINE_SELECTED = {
   opacity: 0.7,
   weight: 3,

plugins/portal-highlighter-mods.user.js

@@ -0,0 +1,70 @@
+// ==UserScript==
+// @id             iitc-plugin-highlight-portals-mods@vita10gy
+// @name           IITC plugin: highlight portal mods
+// @category       Highlighter
+// @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 has the selected mod. 
+// @include        https://www.ingress.com/intel*
+// @include        http://www.ingress.com/intel*
+// @match          https://www.ingress.com/intel*
+// @match          http://www.ingress.com/intel*
+// @grant          none
+// ==/UserScript==
+
+@@PLUGINSTART@@
+
+// PLUGIN START ////////////////////////////////////////////////////////
+
+// use own namespace for plugin
+window.plugin.portalHighligherMods = function() {};
+
+window.plugin.portalHighligherMods.highlight = function(data, mod_type) {
+  var d = data.portal.options.details;
+  
+  var mod_effect = 0;
+  $.each(d.portalV2.linkedModArray, function(ind, mod) {
+    if(mod !== null && mod.type == mod_type) {
+      switch(mod.rarity){
+        case 'COMMON':
+          mod_effect++;
+          break;
+        case 'RARE':
+          mod_effect+=2;
+          break;
+        case 'VERY_RARE':
+          mod_effect+=3;
+          break;
+      }
+    }
+  });
+  
+  if(mod_effect > 0) {
+    var fill_opacity = mod_effect/12*.85 + .15;
+    var color = 'red';
+    fill_opacity = Math.round(fill_opacity*100)/100;
+    var params = {fillColor: color, fillOpacity: fill_opacity};
+    data.portal.setStyle(params);
+  }
+
+  window.COLOR_SELECTED_PORTAL = '#f0f';
+}
+
+window.plugin.portalHighligherMods.getHighlighter = function(type) {
+  return(function(data){ 
+    window.plugin.portalHighligherMods.highlight(data,type);
+  });  
+}
+
+
+var setup =  function() {
+  $.each(MOD_TYPE, function(ind, name){
+    window.addPortalHighlighter('Mod: '+name, window.plugin.portalHighligherMods.getHighlighter(ind));  
+  });
+}
+
+// PLUGIN END //////////////////////////////////////////////////////////
+
+@@PLUGINEND@@

plugins/show-portal-weakness.user.js

@@ -2,11 +2,11 @@
 // @id             iitc-plugin-show-portal-weakness@vita10gy
 // @name           IITC plugin: show portal weakness
 // @category       Highlighter
-// @version        0.7.0.@@DATETIMEVERSION@@
+// @version        0.7.1.@@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 weak (Needs recharging, missing a resonator, needs shields)  Red, needs energy and shields. Orange, only needs energy (either recharge or resonators). Yellow, only needs shields.
+// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Uses the fill color of the portals to denote if the portal is weak (Needs recharging, missing a resonator, needs mods)  Red, needs energy and mods. Orange, only needs energy (either recharge or resonators). Yellow, only needs mods.
 // @include        https://www.ingress.com/intel*
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
@@ -25,17 +25,19 @@ window.plugin.portalWeakness.highlightWeakness = function(data) {
   var d = data.portal.options.details;
   var portal_weakness = 0;
   if(getTeam(d) !== 0) {
-    var only_shields = true;
+    var only_mods = true;
-    var missing_shields = 0;
+    var missing_mods = 0;
     if(window.getTotalPortalEnergy(d) > 0 && window.getCurrentPortalEnergy(d) < window.getTotalPortalEnergy(d)) {
       portal_weakness = 1 - (window.getCurrentPortalEnergy(d)/window.getTotalPortalEnergy(d));
-      only_shields = false;
+      only_mods = false;
     }
-    //Ding the portal for every missing sheild.
+    //Ding the portal for every unapplicable mod.
     $.each(d.portalV2.linkedModArray, function(ind, mod) {
-      if(mod === null) {
+      if(mod === null || mod.type == 'MULTIHACK' || mod.type == 'HEATSINK' || mod.type == 'LINK_AMPLIFIER') {
-        missing_shields++;
+        if(mod === null) {
-        portal_weakness += .03;
+          missing_mods++;
+        }
+        portal_weakness += .08;
       }
     });
     //Ding the portal for every missing resonator.
@@ -43,7 +45,7 @@ window.plugin.portalWeakness.highlightWeakness = function(data) {
     $.each(d.resonatorArray.resonators, function(ind, reso) {
       if(reso === null) {
         portal_weakness += .125;
-        only_shields = false;
+        only_mods = false;
       } else {
         resCount++;
       }
@@ -58,12 +60,12 @@ window.plugin.portalWeakness.highlightWeakness = function(data) {
     if(portal_weakness > 0) {
       var fill_opacity = portal_weakness*.85 + .15;
       var color = 'orange';
-      if(only_shields) {
+      if(only_mods) {
         color = 'yellow';
-        //If only shields are missing, make portal yellow
+        //If only mods are missing, make portal yellow
         // but fill more than usual since pale yellow is basically invisible
-        fill_opacity = missing_shields*.15 + .1;
+        fill_opacity = missing_mods*.15 + .1;
-      } else if(missing_shields > 0) {
+      } else if(missing_mods > 0) {
         color = 'red';
       }
       fill_opacity = Math.round(fill_opacity*100)/100;