Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

dist/style.0.7.css

@@ -401,6 +401,10 @@ input {
   font-style: italic;
 }
 
+.leaflet-control-layers input {
+  height: auto;
+  padding: 0;
+}
 
 /* portal title and image */
 h3 {

plugins/compute-ap-stats.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-compute-ap-stats@Hollow011
 // @name           iitc: Compute AP statistics
-// @version        0.2.1
+// @version        0.3
 // @namespace      https://github.com/breunigs/ingress-intel-total-conversion
 // @updateURL      https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/compute-ap-stats.user.js
 // @downloadURL    https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/compute-ap-stats.user.js
@@ -44,6 +44,21 @@ window.plugin.compAPStats.onPositionMove = function() {
     + '</table>');
 }
 
+window.plugin.compAPStats.missingResonatorAP = function(portal) {
+  var resAP = 0;
+  var missing_resonators = 0;
+  $.each(portal.resonatorArray.resonators, function(ind, reso) {
+    if(reso === null) {
+      missing_resonators++;
+    }
+  });
+  if(missing_resonators > 0) {
+    resAP = window.DEPLOY_RESONATOR * missing_resonators;
+    resAP += window.COMPLETION_BONUS;
+  }
+  return(resAP);
+};
+
 window.plugin.compAPStats.compAPStats = function() {
 
   var totalAP_RES = 0;
@@ -78,6 +93,9 @@ window.plugin.compAPStats.compAPStats = function() {
         if(!field) return true;
         allEnlFields.push(field);
       });
+      
+      totalAP_ENL += window.plugin.compAPStats.missingResonatorAP(d);
+      
     }
     else if (getTeam(d) === TEAM_RES) {
       totalAP_ENL += portalSum;
@@ -91,6 +109,9 @@ window.plugin.compAPStats.compAPStats = function() {
         if(!field) return true;
         allResFields.push(field);
       });
+      
+      totalAP_RES += window.plugin.compAPStats.missingResonatorAP(d);
+      
     } else {
       // it's a neutral portal, potential for both teams.  by definition no fields or edges
       totalAP_ENL += portalSum;

plugins/show-portal-weakness.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-show-portal-weakness@vita10gy
 // @name           iitc: show portal weakness
-// @version        0.4
+// @version        0.5
 // @namespace      https://github.com/breunigs/ingress-intel-total-conversion
 // @updateURL      https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/show-portal-weakness.user.js
 // @downloadURL    https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/show-portal-weakness.user.js
@@ -74,6 +74,10 @@ window.plugin.portalWeakness.portalAdded = function(data) {
         params["dashArray"] = dash;
       }
       data.portal.setStyle(params);
+    } else {
+      data.portal.setStyle({color:  COLORS[getTeam(data.portal.options.details)],
+                            fillOpacity: 0.5,
+                            dashArray: null});
     }
   }
 }

style.css

@@ -401,6 +401,11 @@ input {
   font-style: italic;
 }
 
+.leaflet-control-layers input {
+  height: auto;
+  padding: 0;
+}
+
 
 /* portal title and image */
 h3 {