From 92c618fec2e48eae866170ea21b60e9b81a4eac0 Mon Sep 17 00:00:00 2001 From: Beakerboy Date: Sat, 6 Dec 2014 08:03:39 -0500 Subject: [PATCH] Changed the chain of if statements to else-if --- plugins/uniques.user.js | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/plugins/uniques.user.js b/plugins/uniques.user.js index 516a3133..926b32bb 100644 --- a/plugins/uniques.user.js +++ b/plugins/uniques.user.js @@ -75,7 +75,6 @@ window.plugin.uniques.onPublicChatDataAvailable = function(data) { var plext = msg[2].plext, markup = plext.markup; - // search for "x deployed an Ly Resonator on z" if(plext.plextType == 'SYSTEM_BROADCAST' && markup.length==5 && markup[0][0] == 'PLAYER' @@ -86,26 +85,22 @@ window.plugin.uniques.onPublicChatDataAvailable = function(data) { && markup[3][0] == 'TEXT' && markup[3][1].plain == ' Resonator on ' && markup[4][0] == 'PORTAL') { + // search for "x deployed an Ly Resonator on z" var portal = markup[4][1]; var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6); if(guid) plugin.uniques.setPortalVisited(guid); - } - - // search for "x captured y" - if(plext.plextType == 'SYSTEM_BROADCAST' + } else if(plext.plextType == 'SYSTEM_BROADCAST' && markup.length==3 && markup[0][0] == 'PLAYER' && markup[0][1].plain == nick && markup[1][0] == 'TEXT' && markup[1][1].plain == ' captured ' && markup[2][0] == 'PORTAL') { + // search for "x captured y" var portal = markup[2][1]; var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6); if(guid) plugin.uniques.setPortalCaptured(guid); - } - - // search for "x linked y to z" - if(plext.plextType == 'SYSTEM_BROADCAST' + } else if(plext.plextType == 'SYSTEM_BROADCAST' && markup.length==5 && markup[0][0] == 'PLAYER' && markup[0][1].plain == nick @@ -115,13 +110,11 @@ window.plugin.uniques.onPublicChatDataAvailable = function(data) { && markup[3][0] == 'TEXT' && markup[3][1].plain == ' to ' && markup[4][0] == 'PORTAL') { + // search for "x linked y to z" var portal = markup[2][1]; var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6); if(guid) plugin.uniques.setPortalVisited(guid); - } - - // search for "Your Lx Resonator on y was destroyed by z" - if(plext.plextType == 'SYSTEM_NARROWCAST' + } else if(plext.plextType == 'SYSTEM_NARROWCAST' && markup.length==6 && markup[0][0] == 'TEXT' && markup[0][1].plain == 'Your ' @@ -132,13 +125,11 @@ window.plugin.uniques.onPublicChatDataAvailable = function(data) { && markup[4][0] == 'TEXT' && markup[4][1].plain == ' was destroyed by ' && markup[5][0] == 'PLAYER') { + // search for "Your Lx Resonator on y was destroyed by z" var portal = markup[3][1]; var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6); if(guid) plugin.uniques.setPortalVisited(guid); - } - - // search for "Your Lx Resonator on y has decayed" - if(plext.plextType == 'SYSTEM_NARROWCAST' + } else if(plext.plextType == 'SYSTEM_NARROWCAST' && markup.length==5 && markup[0][0] == 'TEXT' && markup[0][1].plain == 'Your ' @@ -148,14 +139,11 @@ window.plugin.uniques.onPublicChatDataAvailable = function(data) { && markup[3][0] == 'PORTAL' && markup[4][0] == 'TEXT' && markup[4][1].plain == ' has decayed') { + // search for "Your Lx Resonator on y has decayed" var portal = markup[3][1]; var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6); if(guid) plugin.uniques.setPortalVisited(guid); - } - - // search for "Your Portal x neutralized by y" - // search for "Your Portal x is under attack by y" - if(plext.plextType == 'SYSTEM_NARROWCAST' + } else if(plext.plextType == 'SYSTEM_NARROWCAST' && markup.length==4 && markup[0][0] == 'TEXT' && markup[0][1].plain == 'Your Portal ' @@ -163,6 +151,8 @@ window.plugin.uniques.onPublicChatDataAvailable = function(data) { && markup[2][0] == 'TEXT' && (markup[2][1].plain == ' neutralized by ' || markup[2][1].plain == ' is under attack by ') && markup[3][0] == 'PLAYER') { + // search for "Your Portal x neutralized by y" + // search for "Your Portal x is under attack by y" var portal = markup[1][1]; var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6); if(guid) plugin.uniques.setPortalVisited(guid);