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

more work on fixing things for the 2014-05-23 changes

Browse Source 
it's a big job - much is still broken
This commit is contained in:
Jon Atkins
2014-05-23 23:50:37 +01:00
parent 589fd83b93
commit b595af30ad
11 changed files with 89 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
plugins/draw-resonators.user.js
View File

@ -1,12 +1,12 @@
// ==UserScript==
// @id iitc-plugin-draw-resonators@xelio
// @name IITC plugin: Draw resonators
// @category Layer
// @version 0.5.0.@@DATETIMEVERSION@@
// @category Deleted
// @version 0.6.0.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Draw resonators on map for currently selected portal.
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Resonator deployment distance data is no longer available, as of 2014-05-23
// @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel*
@ -14,133 +14,3 @@
// @grant none
// ==/UserScript==
@@PLUGINSTART@@
// PLUGIN START ////////////////////////////////////////////////////////
window.RESONATOR_MIN_ZOOM = 16;
// use own namespace for plugin
window.plugin.drawResonators = function() {};
window.plugin.drawResonators.levelLayerGroup = null;
window.plugin.drawResonators.portalSelected = function(data) {
// new portal selected - clear any existing resonators..
window.plugin.drawResonators.levelLayerGroup.clearLayers();
// then, if a portal is selected...
if (data.selectedPortalGuid) {
// draw it's resonators if we have it's details
var details = portalDetail.get(data.selectedPortalGuid);
if (details) {
window.plugin.drawResonators.drawData(details);
}
}
}
window.plugin.drawResonators.portalDetailLoaded = function(data) {
// the detailed data for a portal was just loaded - if this is the selected portal, draw them
if (data.guid == window.selectedPortal) {
window.plugin.drawResonators.levelLayerGroup.clearLayers();
window.plugin.drawResonators.drawData(data.details);
}
}
window.plugin.drawResonators.drawData = function(portalDetails) {
if(window.map.getZoom() < window.RESONATOR_MIN_ZOOM) return;
var portalLatLng = [portalDetails.locationE6.latE6/1E6, portalDetails.locationE6.lngE6/1E6];
for(var i in portalDetails.resonatorArray.resonators) {
resoData = portalDetails.resonatorArray.resonators[i];
if(resoData === null) continue;
var resoLatLng = window.plugin.drawResonators.getResonatorLatLng(resoData.distanceToPortal, resoData.slot, portalLatLng);
var resoMarker = window.plugin.drawResonators.createResoMarker(resoData, resoLatLng);
var connMarker = window.plugin.drawResonators.createConnMarker(resoData, resoLatLng, portalLatLng);
window.plugin.drawResonators.levelLayerGroup.addLayer(resoMarker);
window.plugin.drawResonators.levelLayerGroup.addLayer(connMarker);
}
}
window.plugin.drawResonators.getResonatorLatLng = function(dist, slot, portalLatLng) {
// offset in meters
var dn = dist*SLOT_TO_LAT[slot];
var de = dist*SLOT_TO_LNG[slot];
// Coordinate offset in radians
var dLat = dn/EARTH_RADIUS;
var dLon = de/(EARTH_RADIUS*Math.cos(Math.PI/180*portalLatLng[0]));
// OffsetPosition, decimal degrees
var lat0 = portalLatLng[0] + dLat * 180/Math.PI;
var lon0 = portalLatLng[1] + dLon * 180/Math.PI;
return [lat0, lon0];
}
window.plugin.drawResonators.createResoMarker = function(resoData, resoLatLng) {
var resoProperty = {
fillColor: COLORS_LVL[resoData.level],
fillOpacity: resoData.energyTotal/RESO_NRG[resoData.level],
color: '#aaa',
weight: 1,
radius: 3,
opacity: 1,
clickable: false};
resoProperty.type = 'resonator';
resoProperty.details = resoData;
var reso = L.circleMarker(resoLatLng, resoProperty);
return reso;
}
window.plugin.drawResonators.createConnMarker = function(resoData, resoLatLng, portalLatLng) {
var connProperty = {
opacity: 0.25,
weight: 2,
color: '#FFA000',
dashArray: '0,10' + (new Array(25).join(',8,4')),
fill: false,
clickable: false};
connProperty.type = 'connector';
connProperty.details = resoData;
var conn = L.polyline([portalLatLng, resoLatLng], connProperty);
return conn;
}
window.plugin.drawResonators.zoomListener = function() {
var ctrl = $('.leaflet-control-layers-selector + span:contains("Resonators")').parent();
if(window.map.getZoom() < window.RESONATOR_MIN_ZOOM) {
window.plugin.drawResonators.levelLayerGroup.clearLayers();
ctrl.addClass('disabled').attr('title', 'Zoom in to show those.');
} else {
ctrl.removeClass('disabled').attr('title', 'Select a portal to draw resos');
window.plugin.drawResonators.levelLayerGroup.clearLayers();
if (window.selectedPortal) {
var details = portalDetail.get(window.selectedPortal);
if (details) {
window.plugin.drawResonators.drawData(details);
}
}
};
}
var setup = function() {
window.plugin.drawResonators.levelLayerGroup = new L.LayerGroup();
window.addLayerGroup('Resonators', window.plugin.drawResonators.levelLayerGroup, true);
window.addHook('portalSelected', window.plugin.drawResonators.portalSelected);
window.addHook('portalDetailLoaded', window.plugin.drawResonators.portalDetailLoaded);
window.map.on('zoomend', function() {
window.plugin.drawResonators.zoomListener();
});
}
// PLUGIN END //////////////////////////////////////////////////////////
@@PLUGINEND@@

12
plugins/guess-player-levels.user.js
View File

@ -134,7 +134,7 @@ window.plugin.guessPlayerLevels.extractPortalData = function(data) {
var owner = data.details.captured && data.details.captured.capturingPlayerId || "";
var ownerModCount = 0;
data.details.portalV2.linkedModArray.forEach(function(mod) {
data.details.mods.forEach(function(mod) {
if(mod && mod.installingUser == owner)
ownerModCount++;
});
@ -144,12 +144,12 @@ window.plugin.guessPlayerLevels.extractPortalData = function(data) {
$.each(r, function(ind, reso) {
if(!reso) return true;
if(!players[reso.ownerGuid]) players[reso.ownerGuid] = [];
if(!players[reso.owner]) players[reso.owner] = [];
if(players[reso.ownerGuid][reso.level] === undefined)
players[reso.ownerGuid][reso.level] = 1
if(players[reso.owner][reso.level] === undefined)
players[reso.owner][reso.level] = 1
else
players[reso.ownerGuid][reso.level]++;
players[reso.owner][reso.level]++;
});
for(nickname in players) {
@ -422,7 +422,7 @@ window.plugin.guessPlayerLevels.guess = function() {
var r = details.resonatorArray.resonators;
$.each(r, function(ind, reso) {
if(!reso) return true;
var nick = reso.ownerGuid;
var nick = reso.owner;
if(isSystemPlayer(nick)) return true;
var lvl = window.plugin.guessPlayerLevels.fetchLevelDetailsByPlayer(nick).min;

6
plugins/ipas-link.user.js
View File

@ -2,7 +2,7 @@
// @id iitc-plugin-ipas-link@graphracer
// @name IITC Plugin: simulate an attack on portal
// @category Portal Info
// @version 0.2.1.@@DATETIMEVERSION@@
// @version 0.2.2.@@DATETIMEVERSION@@
// @namespace https://github.com/xosofox/IPAS
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@ -35,14 +35,14 @@ window.plugin.ipasLink.getHash = function (p) {
var hashParts = [];
$.each(details.resonatorArray.resonators, function (ind, reso) {
if (reso)
hashParts.push(reso.level + "," + reso.distanceToPortal + "," + reso.energyTotal);
hashParts.push(reso.level + ",-1," + reso.energyTotal);
else
hashParts.push("1,20,0");
});
var resos = hashParts.join(";");
hashParts = [];
$.each(details.portalV2.linkedModArray, function (ind, mod) {
$.each(details.mods, function (ind, mod) {
// s - shields
// h - heat sink
// i - intentionally left in

38
plugins/show-address.user.js
View File

@ -1,12 +1,12 @@
// ==UserScript==
// @id iitc-plugin-show-address@vita10gy
// @name IITC plugin: show portal address in sidebar
// @category Portal Info
// @version 0.2.4.@@DATETIMEVERSION@@
// @category Deleted
// @version 0.3.0.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Portal address will show in the sidebar.
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Address no longer available, as of Niantic changes 2014-05-23
// @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel*
@ -14,35 +14,3 @@
// @grant none
// ==/UserScript==
@@PLUGINSTART@@
// PLUGIN START ////////////////////////////////////////////////////////
// use own namespace for plugin
window.plugin.portalAddress = function() {};
window.plugin.portalAddress.portalDetail = function(data) {
// If there's 4 sets of comma delimited info the last one is the
// country, so get rid of it. If the country is in the [2] then it
// doesn't matter because address is usually short enough to fit.
var d = data.portalDetails;
var address = d.descriptiveText.map.ADDRESS;
if (address) {
address = address.split(',').splice(0,3).join(',');
$('.imgpreview').append('<div id="address">'+address+'</div>');
}
}
var setup = function() {
window.addHook('portalDetailsUpdated', window.plugin.portalAddress.portalDetail);
$('head').append('<style>' +
'.res #address { border: 1px solid #0076b6; }' +
'.enl #address { border: 1px solid #017f01; }' +
'#address { position: absolute; bottom: 0; left: 5px; right: 8px; padding: 3px; font-size: 11px; background-color: rgba(0, 0, 0, 0.7); text-align: center; overflow: hidden; }' +
'</style>');
}
// PLUGIN END //////////////////////////////////////////////////////////
@@PLUGINEND@@

18
plugins/show-linked-portals.user.js
View File

@ -2,7 +2,7 @@
// @id iitc-plugin-show-linked-portals@fstopienski
// @name IITC plugin: Show linked portals
// @category Portal Info
// @version 0.1.2.@@DATETIMEVERSION@@
// @version 0.2.0.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@ -41,11 +41,17 @@ window.plugin.showLinkedPortal.portalDetail = function (data) {
// if (data.portalDetails.controllingTeam.team == 'NEUTRAL')
// return;
var d = data.portalDetails.portalV2,
c = 1;
//get linked portals
$(d.linkedEdges).each(function () {
var portalInfo = window.plugin.showLinkedPortal.getPortalByGuid(this.otherPortalGuid, this.isOrigin);
var portalLinks = getPortalLinks(data.guid);
var c = 1;
$(portalLinks.out).each(function () {
var portalInfo = window.plugin.showLinkedPortal.getPortalByGuid(this.otherPortalGuid, true);
$('#portaldetails').append('<div class="showLinkedPortalLink showLinkedPortalLink' + c + '" id="showLinkedPortalLink_' + c + '" data-guid="' + this.otherPortalGuid + '">' + portalInfo + '</div>');
c = c + 1;
});
$(portalLinks.in).each(function () {
var portalInfo = window.plugin.showLinkedPortal.getPortalByGuid(this.otherPortalGuid, false);
$('#portaldetails').append('<div class="showLinkedPortalLink showLinkedPortalLink' + c + '" id="showLinkedPortalLink_' + c + '" data-guid="' + this.otherPortalGuid + '">' + portalInfo + '</div>');
c = c + 1;
});