From 63127f7890db7a49a24419f395e27a8ef7c88641 Mon Sep 17 00:00:00 2001 From: Peter Sorger Date: Wed, 13 Feb 2013 15:21:52 +0100 Subject: [PATCH 1/5] Added capture AP to AP Gain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added AP for capturing a portal (500), deploying a resonator (8×125) and Competition bonus (250). Actually no more shield AP's in Ingress. --- code/portal_detail_display_tools.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index 33571d6c..6486db42 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -1,4 +1,3 @@ - // PORTAL DETAILS DISPLAY //////////////////////////////////////////// // hand any of these functions the details-hash of a portal, and they // will return pretty, displayable HTML or parts thereof. @@ -154,13 +153,16 @@ window.getDestroyAP = function(d) { var resoAp = resoCount * DESTROY_RESONATOR; var linkAp = linkCount * DESTROY_LINK; var fieldAp = fieldCount * DESTROY_FIELD; - var sum = resoAp + linkAp + fieldAp; + var sum = resoAp + linkAp + fieldAp + 1750; function tt(text) { - var t = 'Destroy:\n'; + var t = 'Destroy & Capture:\n'; t += resoCount + '×\tResonators\t= ' + digits(resoAp) + '\n'; t += linkCount + '×\tLinks\t= ' + digits(linkAp) + '\n'; t += fieldCount + '×\tFields\t= ' + digits(fieldAp) + '\n'; + t += '1×\tCapture\t= 500\n'; + t += '8×\tDeploy\t= 1000\n'; + t += '1×\tBonus\t= 250\n'; t += 'Sum: ' + digits(sum) + ' AP'; return '' + digits(text) + ''; } From 5876d0cab6ea01a012da64ab4280abc523b645d7 Mon Sep 17 00:00:00 2001 From: Peter Sorger Date: Wed, 13 Feb 2013 16:10:24 +0100 Subject: [PATCH 2/5] use constants --- code/portal_detail_display_tools.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index 6486db42..026d9502 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -153,16 +153,16 @@ window.getDestroyAP = function(d) { var resoAp = resoCount * DESTROY_RESONATOR; var linkAp = linkCount * DESTROY_LINK; var fieldAp = fieldCount * DESTROY_FIELD; - var sum = resoAp + linkAp + fieldAp + 1750; + var sum = resoAp + linkAp + fieldAp + CAPTURE_PORTAL + 8*DEPLOY_RESONATOR + COMPLETITION_BONUS; function tt(text) { var t = 'Destroy & Capture:\n'; t += resoCount + '×\tResonators\t= ' + digits(resoAp) + '\n'; t += linkCount + '×\tLinks\t= ' + digits(linkAp) + '\n'; t += fieldCount + '×\tFields\t= ' + digits(fieldAp) + '\n'; - t += '1×\tCapture\t= 500\n'; - t += '8×\tDeploy\t= 1000\n'; - t += '1×\tBonus\t= 250\n'; + t += '1×\tCapture\t= ' + CAPTURE_PORTAL + '\n'; + t += '8×\tDeploy\t= ' + DEPLOY_RESONATOR + '\n'; + t += '1×\tBonus\t= ' + COMPLETITION_BONUS + '\n'; t += 'Sum: ' + digits(sum) + ' AP'; return '' + digits(text) + ''; } From 82029efa2b632a7d37ebe2066f2be7d3e16adf63 Mon Sep 17 00:00:00 2001 From: Peter Sorger Date: Wed, 13 Feb 2013 16:11:24 +0100 Subject: [PATCH 3/5] added constants --- main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.js b/main.js index 320d0c9a..d417f55b 100644 --- a/main.js +++ b/main.js @@ -157,6 +157,9 @@ var OCTANTS = ['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE']; var DESTROY_RESONATOR = 75; //AP for destroying portal var DESTROY_LINK = 187; //AP for destroying link var DESTROY_FIELD = 750; //AP for destroying field +var CAPTURE_PORTAL = 500; //AP for capturing a portal +var DEPLOY_RESONATOR = 125; //AP for deploying a resonator +var COMPLETITION_BONUS = 250; //AP for deploying all resonators on portal // OTHER MORE-OR-LESS CONSTANTS ////////////////////////////////////// var TEAM_NONE = 0, TEAM_RES = 1, TEAM_ENL = 2; From 4ff027a22ed4e6c2196b568a0f3dcb003b34a63e Mon Sep 17 00:00:00 2001 From: Peter Sorger Date: Wed, 13 Feb 2013 16:16:58 +0100 Subject: [PATCH 4/5] typo --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index d417f55b..5400cfc1 100644 --- a/main.js +++ b/main.js @@ -159,7 +159,7 @@ var DESTROY_LINK = 187; //AP for destroying link var DESTROY_FIELD = 750; //AP for destroying field var CAPTURE_PORTAL = 500; //AP for capturing a portal var DEPLOY_RESONATOR = 125; //AP for deploying a resonator -var COMPLETITION_BONUS = 250; //AP for deploying all resonators on portal +var COMPLETION_BONUS = 250; //AP for deploying all resonators on portal // OTHER MORE-OR-LESS CONSTANTS ////////////////////////////////////// var TEAM_NONE = 0, TEAM_RES = 1, TEAM_ENL = 2; From d9463de1e4086cc8e65836a03c4d52e62a6bba2c Mon Sep 17 00:00:00 2001 From: Peter Sorger Date: Wed, 13 Feb 2013 16:17:31 +0100 Subject: [PATCH 5/5] typo --- code/portal_detail_display_tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index 026d9502..67c66362 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -153,7 +153,7 @@ window.getDestroyAP = function(d) { var resoAp = resoCount * DESTROY_RESONATOR; var linkAp = linkCount * DESTROY_LINK; var fieldAp = fieldCount * DESTROY_FIELD; - var sum = resoAp + linkAp + fieldAp + CAPTURE_PORTAL + 8*DEPLOY_RESONATOR + COMPLETITION_BONUS; + var sum = resoAp + linkAp + fieldAp + CAPTURE_PORTAL + 8*DEPLOY_RESONATOR + COMPLETION_BONUS; function tt(text) { var t = 'Destroy & Capture:\n';