From 0afc26af4ab673bee831c05434ef5c84bcb55d34 Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Mon, 4 Mar 2013 14:38:08 +0100 Subject: [PATCH 1/8] new redeem dialog content --- code/redeeming.js | 60 +++++++++++++++++++++++++++++++++++------------ style.css | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 15 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index 12bc5e32..2b426e12 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -16,31 +16,61 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { } alert('' + data.error + "\n" + error); } else if (data.result) { - var xmp_level = 0, xmp_count = 0; - var res_level = 0, res_count = 0; - var shield_rarity = '', shield_count = 0; - - // This assumes that each passcode gives only one type of resonator/XMP/shield. - // This may break at some point, depending on changes to passcode functionality. + var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('').append($('').append($('').append($('').append($('').append($('
', {colspan: 2}).append("Passcode redeemed!"))); + + if (data.result.apAward) + tblResult.append($('
')).append($('').append('AP (' + data.result.apAward + ')'))); + if (data.result.xmAward) + tblResult.append($('
')).append($('').append('XM (' + data.result.xmAward + ')'))); + + var resonators = {}; + var bursts = {}; + var shields = {}; + for (var i in data.result.inventoryAward) { var acquired = data.result.inventoryAward[i][2]; if (acquired.modResource) { if (acquired.modResource.resourceType === 'RES_SHIELD') { - shield_rarity = acquired.modResource.rarity.split('_').map(function (i) {return i[0]}).join(''); - shield_count++; + var rarity = acquired.modResource.rarity.split('_').map(function (i) {return i[0]}).join(''); + if (!shields[rarity]) + shields[rarity] = 0; + shields[rarity] += 1; } } else if (acquired.resourceWithLevels) { - if (acquired.resourceWithLevels.resourceType === 'EMP_BURSTER') { - xmp_level = acquired.resourceWithLevels.level; - xmp_count++; - } else if (acquired.resourceWithLevels.resourceType === 'EMITTER_A') { - res_level = acquired.resourceWithLevels.level; - res_count++; + if (acquired.resourceWithLevels.resourceType === 'EMITTER_A') { + var level = acquired.resourceWithLevels.level + if (!resonators[level]) + resonators[level] = 0; + resonators[level] += 1; + } else if (acquired.resourceWithLevels.resourceType === 'EMP_BURSTER') { + var level = acquired.resourceWithLevels.level + if (!bursts[level]) + bursts[level] = 0; + bursts[level] += 1; } } } + + for (var lvl in resonators) { + var text = 'Resonator'; + if (resonators[lvl] > 1) + text += ' ('+resonators[lvl]+')'; + tblResult.append($('
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); + } + for (var lvl in bursts) { + var text = 'Xmp Burster'; + if (bursts[lvl] > 1) + text += ' ('+bursts[lvl]+')'; + tblResult.append($('
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); + } + for (var lvl in shields) { + var text = 'Portal Shield'; + if (shields[lvl] > 1) + text += ' ('+shields[lvl]+')'; + tblResult.append($('
').append(lvl)).append($('').append(text))); + } - alert("Passcode accepted!\n" + [data.result.apAward + 'AP', data.result.xmAward + 'XM', xmp_count + 'xL' + xmp_level + ' XMP', res_count + 'xL' + res_level + ' RES', shield_count + 'x' + shield_rarity + ' SH'].join('/')); + alert(tblResult, true); } } diff --git a/style.css b/style.css index 7b79982e..fb6c5dc4 100644 --- a/style.css +++ b/style.css @@ -747,3 +747,49 @@ td { td + td { padding-left: 4px; } + +/* level colors *******************************************************/ + +.level-1 { + color: #FECE5A; +} + +.level-2 { + color: #FFA630; +} + +.level-3 { + color: #FF7315; +} + +.level-4 { + color: #E40000; +} + +.level-5 { + color: #FD2992; +} + +.level-6 { + color: #EB26CD; +} + +.level-7 { + color: #C124E0; +} + +.level-8 { + color: #9627F4; +} + +/* redeem results *****************************************************/ +.redeem-result { + font-size: 14px; + font-family: "coda",arial,helvetica,sans-serif; + table-layout: fixed; +} + +.redeem-result tr > td:first-child { + width: 50px; + text-align: right; +} From ba730111c438d24ed22d0c93aeb5820d25c3130d Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Tue, 5 Mar 2013 08:35:13 +0100 Subject: [PATCH 2/8] Changed AP / XM Message to "+ 100 XM" --- code/redeeming.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index 2b426e12..7d14d387 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -19,9 +19,9 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('').append($('').append($('').append($('').append($('
', {colspan: 2}).append("Passcode redeemed!"))); if (data.result.apAward) - tblResult.append($('
')).append($('').append('AP (' + data.result.apAward + ')'))); + tblResult.append($('
').append('+')).append($('').append(data.result.apAward + ' AP'))); if (data.result.xmAward) - tblResult.append($('
')).append($('').append('XM (' + data.result.xmAward + ')'))); + tblResult.append($('
').append('+')).append($('').append(data.result.xmAward + ' XM'))); var resonators = {}; var bursts = {}; From f167cd83eaf55584cd54c048ba12f6723abcfa9a Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Tue, 5 Mar 2013 08:55:15 +0100 Subject: [PATCH 3/8] changed "redeemed" to "accepted" --- code/redeeming.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/redeeming.js b/code/redeeming.js index 7d14d387..beb16c8b 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -16,7 +16,7 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { } alert('' + data.error + "\n" + error); } else if (data.result) { - var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('
', {colspan: 2}).append("Passcode redeemed!"))); + var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('').append($('
', {colspan: 2}).append("Passcode accepted!"))); if (data.result.apAward) tblResult.append($('
').append('+')).append($('').append(data.result.apAward + ' AP'))); From 90ca8486901152e4472ca18200716fc4695c7b6f Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Tue, 5 Mar 2013 08:56:46 +0100 Subject: [PATCH 4/8] fixed indention --- code/redeeming.js | 82 +++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index beb16c8b..0288bdee 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -16,61 +16,61 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { } alert('' + data.error + "\n" + error); } else if (data.result) { - var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('
', {colspan: 2}).append("Passcode accepted!"))); + var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('').append($('').append($('').append($('').append($('').append($('').append($('').append($('').append($('').append($('').append($('
', {colspan: 2}).append("Passcode accepted!"))); - if (data.result.apAward) - tblResult.append($('
').append('+')).append($('').append(data.result.apAward + ' AP'))); - if (data.result.xmAward) - tblResult.append($('
').append('+')).append($('').append(data.result.xmAward + ' XM'))); + if (data.result.apAward) + tblResult.append($('
').append('+')).append($('').append(data.result.apAward + ' AP'))); + if (data.result.xmAward) + tblResult.append($('
').append('+')).append($('').append(data.result.xmAward + ' XM'))); - var resonators = {}; - var bursts = {}; - var shields = {}; - + var resonators = {}; + var bursts = {}; + var shields = {}; + for (var i in data.result.inventoryAward) { var acquired = data.result.inventoryAward[i][2]; if (acquired.modResource) { if (acquired.modResource.resourceType === 'RES_SHIELD') { - var rarity = acquired.modResource.rarity.split('_').map(function (i) {return i[0]}).join(''); - if (!shields[rarity]) - shields[rarity] = 0; - shields[rarity] += 1; + var rarity = acquired.modResource.rarity.split('_').map(function (i) {return i[0]}).join(''); + if (!shields[rarity]) + shields[rarity] = 0; + shields[rarity] += 1; } } else if (acquired.resourceWithLevels) { if (acquired.resourceWithLevels.resourceType === 'EMITTER_A') { - var level = acquired.resourceWithLevels.level - if (!resonators[level]) - resonators[level] = 0; - resonators[level] += 1; + var level = acquired.resourceWithLevels.level + if (!resonators[level]) + resonators[level] = 0; + resonators[level] += 1; } else if (acquired.resourceWithLevels.resourceType === 'EMP_BURSTER') { - var level = acquired.resourceWithLevels.level - if (!bursts[level]) - bursts[level] = 0; - bursts[level] += 1; + var level = acquired.resourceWithLevels.level + if (!bursts[level]) + bursts[level] = 0; + bursts[level] += 1; } } } - - for (var lvl in resonators) { - var text = 'Resonator'; - if (resonators[lvl] > 1) - text += ' ('+resonators[lvl]+')'; - tblResult.append($('
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); - } - for (var lvl in bursts) { - var text = 'Xmp Burster'; - if (bursts[lvl] > 1) - text += ' ('+bursts[lvl]+')'; - tblResult.append($('
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); - } - for (var lvl in shields) { - var text = 'Portal Shield'; - if (shields[lvl] > 1) - text += ' ('+shields[lvl]+')'; - tblResult.append($('
').append(lvl)).append($('').append(text))); - } + + for (var lvl in resonators) { + var text = 'Resonator'; + if (resonators[lvl] > 1) + text += ' ('+resonators[lvl]+')'; + tblResult.append($('
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); + } + for (var lvl in bursts) { + var text = 'Xmp Burster'; + if (bursts[lvl] > 1) + text += ' ('+bursts[lvl]+')'; + tblResult.append($('
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); + } + for (var lvl in shields) { + var text = 'Portal Shield'; + if (shields[lvl] > 1) + text += ' ('+shields[lvl]+')'; + tblResult.append($('
').append(lvl)).append($('').append(text))); + } - alert(tblResult, true); + alert(tblResult, true); } } From 967578f7eaf323540910bbcfdc9290fc3c00fc81 Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Tue, 5 Mar 2013 13:35:09 +0100 Subject: [PATCH 5/8] fixed codingstyle and removed coda font --- code/redeeming.js | 13 +++++++------ style.css | 36 +----------------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index 0288bdee..7c7bd555 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -16,12 +16,13 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { } alert('' + data.error + "\n" + error); } else if (data.result) { - var tblResult = $('', {'class': 'redeem-result' }).append($('').append($('
', {colspan: 2}).append("Passcode accepted!"))); + var tblResult = $(''); + tblResult.append($('')); if (data.result.apAward) - tblResult.append($('').append($('')); if (data.result.xmAward) - tblResult.append($('').append($('')); var resonators = {}; var bursts = {}; @@ -55,19 +56,19 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { var text = 'Resonator'; if (resonators[lvl] > 1) text += ' ('+resonators[lvl]+')'; - tblResult.append($('').append($('')); } for (var lvl in bursts) { var text = 'Xmp Burster'; if (bursts[lvl] > 1) text += ' ('+bursts[lvl]+')'; - tblResult.append($('').append($('')); } for (var lvl in shields) { var text = 'Portal Shield'; if (shields[lvl] > 1) text += ' ('+shields[lvl]+')'; - tblResult.append($('').append($('')); } alert(tblResult, true); diff --git a/style.css b/style.css index fb6c5dc4..456abb49 100644 --- a/style.css +++ b/style.css @@ -748,44 +748,10 @@ td + td { padding-left: 4px; } -/* level colors *******************************************************/ - -.level-1 { - color: #FECE5A; -} - -.level-2 { - color: #FFA630; -} - -.level-3 { - color: #FF7315; -} - -.level-4 { - color: #E40000; -} - -.level-5 { - color: #FD2992; -} - -.level-6 { - color: #EB26CD; -} - -.level-7 { - color: #C124E0; -} - -.level-8 { - color: #9627F4; -} - /* redeem results *****************************************************/ .redeem-result { font-size: 14px; - font-family: "coda",arial,helvetica,sans-serif; + font-family: arial,helvetica,sans-serif; table-layout: fixed; } From 1623c3fa9a7d515e5d5ba9dd44cb46727413ca4e Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Thu, 7 Mar 2013 08:31:25 +0100 Subject: [PATCH 6/8] fixed indetion --- code/redeeming.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index 7c7bd555..f80a33bc 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -16,13 +16,13 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { } alert('' + data.error + "\n" + error); } else if (data.result) { - var tblResult = $('
Passcode accepted!
').append('+')).append($('').append(data.result.apAward + ' AP'))); + tblResult.append($('
+' + data.result.apAward + 'AP
').append('+')).append($('').append(data.result.xmAward + ' XM'))); + tblResult.append($('
+' + data.result.xmAward + 'XM
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); + tblResult.append($('
L' +lvl+ '' + text + '
', { 'class' : ('level-'+lvl)}).append('L' + lvl)).append($('').append(text))); + tblResult.append($('
L' +lvl+ '' + text + '
').append(lvl)).append($('').append(text))); + tblResult.append($('
'+lvl+''+text+'
'); - tblResult.append($('')); + var tblResult = $('
Passcode accepted!
'); + tblResult.append($('')); if (data.result.apAward) tblResult.append($('')); if (data.result.xmAward) - tblResult.append($('')); + tblResult.append($('')); var resonators = {}; var bursts = {}; @@ -68,7 +68,7 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { var text = 'Portal Shield'; if (shields[lvl] > 1) text += ' ('+shields[lvl]+')'; - tblResult.append($('')); + tblResult.append($('')); } alert(tblResult, true); From ca4ad51d93b4d7575baea1aa2f7d2b5e0877b623 Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Thu, 7 Mar 2013 13:32:03 +0100 Subject: [PATCH 7/8] fixed some more codingstyle issues --- code/redeeming.js | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index 00a9a64c..4cbeffe4 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -33,43 +33,37 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { if (acquired.modResource) { if (acquired.modResource.resourceType === 'RES_SHIELD') { var rarity = acquired.modResource.rarity.split('_').map(function (i) {return i[0]}).join(''); - if (!shields[rarity]) - shields[rarity] = 0; + if (!shields[rarity]) shields[rarity] = 0; shields[rarity] += 1; } } else if (acquired.resourceWithLevels) { if (acquired.resourceWithLevels.resourceType === 'EMITTER_A') { var level = acquired.resourceWithLevels.level - if (!resonators[level]) - resonators[level] = 0; + if (!resonators[level]) resonators[level] = 0; resonators[level] += 1; } else if (acquired.resourceWithLevels.resourceType === 'EMP_BURSTER') { var level = acquired.resourceWithLevels.level - if (!bursts[level]) - bursts[level] = 0; + if (!bursts[level]) bursts[level] = 0; bursts[level] += 1; } } } - for (var lvl in resonators) { + $.each(resonators, function(lvl, count) { var text = 'Resonator'; - if (resonators[lvl] > 1) - text += ' ('+resonators[lvl]+')'; + if (count >= 2) text += ' ('+count+')'; tblResult.append($('')); - } - for (var lvl in bursts) { + }); + $.each(bursts, function(lvl, count) { var text = 'Xmp Burster'; - if (bursts[lvl] > 1) - text += ' ('+bursts[lvl]+')'; + if (count >= 2) text += ' ('+count+')'; tblResult.append($('')); - } - for (var lvl in shields) { + }); + $.each(shields, function(lvl, count) { var text = 'Portal Shield'; - if (shields[lvl] > 1) - text += ' ('+shields[lvl]+')'; + if (count >= 2) text += ' ('+count+')'; tblResult.append($('')); - } + }); alert(tblResult, true); } From 3bb3a4b6b2d10ad285b897347d75a7c621142038 Mon Sep 17 00:00:00 2001 From: Florian Sundermann Date: Thu, 7 Mar 2013 15:04:50 +0100 Subject: [PATCH 8/8] fixed coding style (no spaces after for and if) --- code/redeeming.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/code/redeeming.js b/code/redeeming.js index 4cbeffe4..0b9f4fbb 100644 --- a/code/redeeming.js +++ b/code/redeeming.js @@ -3,47 +3,47 @@ // REDEEMING ///////////////////////////////////////////////////////// window.handleRedeemResponse = function(data, textStatus, jqXHR) { - if (data.error) { + if(data.error) { var error = ''; - if (data.error === 'ALREADY_REDEEMED') { + if(data.error === 'ALREADY_REDEEMED') { error = 'The passcode has already been redeemed.'; - } else if (data.error === 'ALREADY_REDEEMED_BY_PLAYER') { + } else if(data.error === 'ALREADY_REDEEMED_BY_PLAYER') { error = 'You have already redeemed this passcode.'; - } else if (data.error === 'INVALID_PASSCODE') { + } else if(data.error === 'INVALID_PASSCODE') { error = 'This passcode is invalid.'; } else { error = 'There was a problem redeeming the passcode. Try again?'; } alert('' + data.error + '\n' + error); - } else if (data.result) { + } else if(data.result) { var tblResult = $('
Passcode accepted!
+' + data.result.apAward + 'AP
+' + data.result.xmAward + 'XM
+' + data.result.xmAward + 'XM
'+lvl+''+text+'
'+lvl+''+text+'
L' +lvl+ '' + text + '
L' +lvl+ '' + text + '
'+lvl+''+text+'
'); tblResult.append($('')); - if (data.result.apAward) + if(data.result.apAward) tblResult.append($('')); - if (data.result.xmAward) + if(data.result.xmAward) tblResult.append($('')); var resonators = {}; var bursts = {}; var shields = {}; - for (var i in data.result.inventoryAward) { + for(var i in data.result.inventoryAward) { var acquired = data.result.inventoryAward[i][2]; - if (acquired.modResource) { - if (acquired.modResource.resourceType === 'RES_SHIELD') { + if(acquired.modResource) { + if(acquired.modResource.resourceType === 'RES_SHIELD') { var rarity = acquired.modResource.rarity.split('_').map(function (i) {return i[0]}).join(''); - if (!shields[rarity]) shields[rarity] = 0; + if(!shields[rarity]) shields[rarity] = 0; shields[rarity] += 1; } - } else if (acquired.resourceWithLevels) { - if (acquired.resourceWithLevels.resourceType === 'EMITTER_A') { + } else if(acquired.resourceWithLevels) { + if(acquired.resourceWithLevels.resourceType === 'EMITTER_A') { var level = acquired.resourceWithLevels.level - if (!resonators[level]) resonators[level] = 0; + if(!resonators[level]) resonators[level] = 0; resonators[level] += 1; - } else if (acquired.resourceWithLevels.resourceType === 'EMP_BURSTER') { + } else if(acquired.resourceWithLevels.resourceType === 'EMP_BURSTER') { var level = acquired.resourceWithLevels.level - if (!bursts[level]) bursts[level] = 0; + if(!bursts[level]) bursts[level] = 0; bursts[level] += 1; } } @@ -51,17 +51,17 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) { $.each(resonators, function(lvl, count) { var text = 'Resonator'; - if (count >= 2) text += ' ('+count+')'; + if(count >= 2) text += ' ('+count+')'; tblResult.append($('')); }); $.each(bursts, function(lvl, count) { var text = 'Xmp Burster'; - if (count >= 2) text += ' ('+count+')'; + if(count >= 2) text += ' ('+count+')'; tblResult.append($('')); }); $.each(shields, function(lvl, count) { var text = 'Portal Shield'; - if (count >= 2) text += ' ('+count+')'; + if(count >= 2) text += ' ('+count+')'; tblResult.append($('')); }); @@ -76,8 +76,8 @@ window.setupRedeem = function() { window.postAjax('redeemReward', data, window.handleRedeemResponse, function(response) { var extra = ''; - if (response && response.status) { - if (response.status === 429) { + if(response && response.status) { + if(response.status === 429) { extra = 'You have been rate-limited by the server. Wait a bit and try again.'; } else { extra = 'The server indicated an error.';
Passcode accepted!
+' + data.result.apAward + 'AP
+' + data.result.xmAward + 'XM
L' +lvl+ '' + text + '
L' +lvl+ '' + text + '
'+lvl+''+text+'