phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4 from Hollow011/gh-pages

Browse Source 
Merge requested small style changes from base repo owner
This commit is contained in:
Hollow011 2013-02-19 23:21:46 -08:00
commit e04572a08c
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/hooks.js
View File

@ -30,11 +30,16 @@
// yet been displayed. The data hash contains both the un- // yet been displayed. The data hash contains both the un-
// processed raw ajax response as well as the processed // processed raw ajax response as well as the processed
// chat data that is going to be used for display. // chat data that is going to be used for display.
// portalDataLoaded: callback is passed the argument of
// {portals : [portal, portal, ...]} where "portal" is the
// data element and not the leaflet object. "portal" is an
// array [GUID, time, details]. Plugin can manipulate the
// array to change order or add additional values to the
// details of a portal.
window._hooks = {} window._hooks = {}
window.VALID_HOOKS = ['portalAdded', 'portalDetailsUpdated', window.VALID_HOOKS = ['portalAdded', 'portalDetailsUpdated',
'publicChatDataAvailable']; 'publicChatDataAvailable', 'portalDataLoaded'];
window.runHooks = function(event, data) { window.runHooks = function(event, data) {
if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event); if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event);

2
code/map_data.js
View File

@ -127,6 +127,8 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
// Preserve and restore "selectedPortal" between portal re-render // Preserve and restore "selectedPortal" between portal re-render
if(portalUpdateAvailable) var oldSelectedPortal = selectedPortal; if(portalUpdateAvailable) var oldSelectedPortal = selectedPortal;
runHooks('portalDataLoaded', {portals : ppp});
$.each(ppp, function(ind, portal) { renderPortal(portal); }); $.each(ppp, function(ind, portal) { renderPortal(portal); });
var selectedPortalLayer = portals[oldSelectedPortal]; var selectedPortalLayer = portals[oldSelectedPortal];

32
plugins/compute-ap-stats.user.js
View File

@ -1,10 +1,10 @@
// ==UserScript== // ==UserScript==
// @id iitc-plugin-compute-ap-stats@breunigs // @id iitc-plugin-compute-ap-stats@Hollow011
// @name iitc: Compute AP statistics // @name iitc: Compute AP statistics
// @version 0.1 // @version 0.1
// @namespace https://github.com/breunigs/ingress-intel-total-conversion // @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 // @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 // @downloadURL https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/compute-AP-stats.user.js
// @description Tries to determine overal AP stats for the current zoom // @description Tries to determine overal AP stats for the current zoom
// @include http://www.ingress.com/intel* // @include http://www.ingress.com/intel*
// @match http://www.ingress.com/intel* // @match http://www.ingress.com/intel*
@ -29,15 +29,15 @@ window.plugin.compAPStats.compAPStats = function() {
var totalAP_RES = 0; var totalAP_RES = 0;
var totalAP_ENL = 0; var totalAP_ENL = 0;
var allResEdges = new Array(); var allResEdges = [];
var allResFields = new Array(); var allResFields = [];
var allEnlEdges = new Array(); var allEnlEdges = [];
var allEnlFields = new Array(); var allEnlFields = [];
// Grab every portal in the viewable area and compute individual AP stats (ignoring links and fields for now) // Grab every portal in the viewable area and compute individual AP stats (ignoring links and fields for now)
$.each(window.portals, function(ind, portal) { $.each(window.portals, function(ind, portal) {
var d = portal.options.details var d = portal.options.details;
var resoCount = 0; var resoCount = 0;
// see how many resonators the portal has // see how many resonators the portal has
@ -50,34 +50,32 @@ window.plugin.compAPStats.compAPStats = function() {
var resoAp = resoCount * DESTROY_RESONATOR; var resoAp = resoCount * DESTROY_RESONATOR;
var portalSum = resoAp + CAPTURE_PORTAL + 8*DEPLOY_RESONATOR + COMPLETION_BONUS; var portalSum = resoAp + CAPTURE_PORTAL + 8*DEPLOY_RESONATOR + COMPLETION_BONUS;
// Team1 is a Res portal, Team2 is a Enl portal if (getTeam(d) === TEAM_ENL) {
if ( getTeam(d) === TEAM_ENL ) {
totalAP_RES += portalSum; totalAP_RES += portalSum;
$.each(d.portalV2.linkedEdges, function(ind,edge) { $.each(d.portalV2.linkedEdges, function(ind, edge) {
if(!edge) return true; if(!edge) return true;
allEnlEdges.push(edge.edgeGuid); allEnlEdges.push(edge.edgeGuid);
}); });
$.each(d.portalV2.linkedFields, function(ind,field) { $.each(d.portalV2.linkedFields, function(ind, field) {
if(!field) return true; if(!field) return true;
allEnlFields.push(field); allEnlFields.push(field);
}); });
} }
else if ( getTeam(d) === TEAM_RES ) { else if (getTeam(d) === TEAM_RES) {
totalAP_ENL += portalSum; totalAP_ENL += portalSum;
$.each(d.portalV2.linkedEdges, function(ind,edge) { $.each(d.portalV2.linkedEdges, function(ind, edge) {
if(!edge) return true; if(!edge) return true;
allResEdges.push(edge.edgeGuid); allResEdges.push(edge.edgeGuid);
}); });
$.each(d.portalV2.linkedFields, function(ind,field) { $.each(d.portalV2.linkedFields, function(ind, field) {
if(!field) return true; if(!field) return true;
allResFields.push(field); allResFields.push(field);
}); });
} } else {
else {
// it's a neutral portal, potential for both teams. by definition no fields or edges // it's a neutral portal, potential for both teams. by definition no fields or edges
totalAP_ENL += portalSum; totalAP_ENL += portalSum;
totalAP_RES += portalSum; totalAP_RES += portalSum;