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

* New passcode redemption plaintext format using Unicode chars

Browse Source 
* Don't use digit format for plaintext redemption
* Remove unneecessary 'return true' statements
* Passcode guessing doesn't dirty up the results window as much
* Add asterisks to names for all types of guess
This commit is contained in:
Morgan Jones 2013-04-27 22:37:21 -05:00
parent 992c0edacb
commit 909c760061
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
code/redeeming.js
View File

@ -55,7 +55,7 @@ window.REDEEM_HANDLERS = {
var suffix = '</span>'; var suffix = '</span>';
return { return {
table: '<td>' + prefix + 'L' + level + suffix + '</td><td>' + acquired.name.long + ' [' + acquired.count + ']</td>', table: '<td>' + prefix + 'L' + level + suffix + '</td><td>' + acquired.name.long + ' [' + acquired.count + ']</td>',
html: acquired.count + '@' + acquired.name.short + prefix + level + suffix, html: acquired.count + '&#215;' + acquired.name.short + prefix + level + suffix,
plain: acquired.count + '@' + acquired.name.short + level plain: acquired.count + '@' + acquired.name.short + level
}; };
} }
@ -68,7 +68,7 @@ window.REDEEM_HANDLERS = {
var abbreviation = rarity.split('_').map(function (i) {return i[0];}).join(''); var abbreviation = rarity.split('_').map(function (i) {return i[0];}).join('');
return { return {
table: '<td>' + prefix + abbreviation + suffix + '</td><td>' + acquired.name.long + ' [' + acquired.count + ']</td>', table: '<td>' + prefix + abbreviation + suffix + '</td><td>' + acquired.name.long + ' [' + acquired.count + ']</td>',
html: acquired.count + '@' + prefix + abbreviation + suffix, html: acquired.count + '&#215;' + prefix + abbreviation + suffix,
plain: acquired.count + '@' + abbreviation plain: acquired.count + '@' + abbreviation
}; };
} }
@ -78,7 +78,7 @@ window.REDEEM_HANDLERS = {
format: function(acquired, group) { format: function(acquired, group) {
return { return {
table: '<td>+</td><td>' + acquired.name.long + ' [' + acquired.count + ']</td>', table: '<td>+</td><td>' + acquired.name.long + ' [' + acquired.count + ']</td>',
html: acquired.count + '@' + acquired.name.short, html: acquired.count + '&#215;' + acquired.name.short,
plain: acquired.count + '@' + acquired.name.short plain: acquired.count + '@' + acquired.name.short
}; };
} }
@ -134,7 +134,6 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) {
}; };
return false; return false;
} }
return true;
}); });
// Fall back to the default handler if necessary // Fall back to the default handler if necessary
@ -148,15 +147,16 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) {
// Collect the data that we know // Collect the data that we know
type = resource.resourceType; type = resource.resourceType;
key = handler.functions.decode(type, resource); key = handler.functions.decode(type, resource);
name = window.REDEEM_RESOURCES[type] || {long: type + '*', short: type[0] + '*'}; name = window.REDEEM_RESOURCES[type] || {long: type, short: type[0]};
// Decide if we inferred this resource // Decide if we inferred this resource
if(!(type in window.REDEEM_RESOURCES) || handler.taxonomy !== handler.processed_as) { if(!(type in window.REDEEM_RESOURCES) || handler.taxonomy !== handler.processed_as) {
name.long += '*';
name.short += '*';
inferred.push({type: type, key: key, handler: handler}); inferred.push({type: type, key: key, handler: handler});
} }
return false; return false;
} }
return true;
}); });
// Update frequencies // Update frequencies
@ -169,15 +169,13 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) {
payload[type][key].count += 1; payload[type][key].count += 1;
}); });
// Get AP, XM, and other static quantities // Get AP and XM.
$.each([{label: 'AP', award: parseInt(data.result.apAward)}, {label: 'XM', award: parseInt(data.result.xmAward)}], function(idx, val) { $.each([{label: 'AP', award: parseInt(data.result.apAward)}, {label: 'XM', award: parseInt(data.result.xmAward)}], function(idx, val) {
if(val.award > 0) { if(val.award > 0) {
var formatted = digits(val.award) + ' ' + val.label; results.table.push('<td>+</td><td>' + digits(val.award) + ' ' + val.label + '</td>');
results.table.push('<td>+</td><td>' + formatted + '</td>'); results.html.push(val.award + ' ' + val.label);
results.html.push(formatted); results.plain.push(val.award + ' ' + val.label);
results.plain.push(formatted);
} }
return true;
}); });
// Build the formatted results alphabetically // Build the formatted results alphabetically
@ -186,32 +184,28 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) {
var acquired = payload[type][key]; var acquired = payload[type][key];
$.each(acquired.handler.functions.format(acquired, key), function(format, string) { $.each(acquired.handler.functions.format(acquired, key), function(format, string) {
results[format].push(string); results[format].push(string);
return true;
}); });
return true;
}); });
return true;
}); });
// Let the user know if we had to guess
if (inferred.length > 0) { if (inferred.length > 0) {
results.table.push('<td style="font-family: monospace;">**<td style="font-family: monospace;"><strong>IITC had to guess!</strong></td>'); results.table.push('<td style="font-family: monospace;">*</td><td style="font-family: monospace;">Guessed (check console)</td>');
results.table.push('<td style="font-family: monospace;">**<td style="font-family: monospace;"><strong>Submit a log including:</strong></td>');
$.each(inferred, function (idx, val) { $.each(inferred, function (idx, val) {
var type = val.type + ':' + val.key, taxonomy = val.handler.taxonomy + (val.handler.taxonomy === val.handler.processed_as ? '' : ' =~ ' + val.handler.processed_as); console.log(passcode +
results.table.push('<td style="font-family: monospace;">!</td><td style="font-family: monospace;"><em>' + type + '</em></td>'); ' => [INFERRED] ' + val.type + ':' + val.key + ' :: ' +
results.table.push('<td style="font-family: monospace;">!</td><td style="font-family: monospace;">' + taxonomy + '</td>'); val.handler.taxonomy + ' =~ ' + val.handler.processed_as);
console.log(passcode + ' => [INFERRED] ' + type + ' :: ' + taxonomy);
}); });
} }
// Add table footers // Add table footers
results.table.push('<td style="font-family: monospace;">&gt;&gt;</td><td><a href="javascript:alert(\'' + results.table.push('<td style="font-family: monospace;">&gt;</td><td><a href="javascript:alert(\'' +
escape('<span style="font-family: monospace;"><strong>' + encouragement + '</strong><br />' + results.html.join('/') + '</span>') + escape('<span style="font-family: monospace;"><strong>' + encouragement + '</strong><br />' + results.html.join('/') + '</span>') +
'\', true);" style="font-family: monospace;">[plaintext]</a>'); '\', true);" style="font-family: monospace;">[plaintext]</a>');
// Display formatted versions in a table, plaintext, and the console log // Display formatted versions in a table, plaintext, and the console log
to_alert = '<table class="redeem-result">' + results.table.map(function(a) {return '<tr>' + a + '</tr>';}).join("\n") + '</table>'; to_alert = '<table class="redeem-result">' + results.table.map(function(a) {return '<tr>' + a + '</tr>';}).join("\n") + '</table>';
to_log = results.plain.join('/'); to_log = '[SUCCESS] ' + results.plain.join('/');
} }
alert(to_alert, true); alert(to_alert, true);