diff --git a/commands/inventory.js b/commands/inventory.js index 3e7784f..ecb1781 100644 --- a/commands/inventory.js +++ b/commands/inventory.js @@ -147,11 +147,14 @@ module.exports = { // Display wallet let item = inventory.items[0]; - let walletData = `**Cash:** $${item.cash.toFixed(2)}\n**ID:** ${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` + let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` let walletEmbed = new MessageEmbed() .setTitle(`Your Wallet`) - .setDescription(walletData); + .setColor(client.config.EmbedColor) + .addFields( + { name: '**Cash**', value: `$${item.cash.toFixed(2)}`, inline: true }, + { name: '**ID**', value: ID, inline: true }); return interaction.send({ embeds: [walletEmbed] }); @@ -171,10 +174,12 @@ module.exports = { if (item.type == 'wallet') { // Display wallet - let walletData = `**Cash:** $${item.cash}\n**ID:** ${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` + let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` itemEmbed.setTitle(`Your Wallet`); - itemEmbed.setDescription(walletData); + itemEmbed.addFields( + { name: '**Cash**', value: `$${item.cash.toFixed(2)}`, inline: true }, + { name: '**ID**', value: ID, inline: true }); } else if (item.type == 'firearm') { // Display firearm diff --git a/commands/search.js b/commands/search.js index d8ccc91..37e320f 100644 --- a/commands/search.js +++ b/commands/search.js @@ -93,10 +93,12 @@ module.exports = { if (item.type == 'wallet') { // Display wallet - let walletData = `**Cash:** $${item.cash}\n**ID:** ${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` - + let ID = `${client.exists(item.ID.firstname) ? item.ID.firstname : '...'} ${client.exists(item.ID.lastname) ? item.ID.lastname : '...'} | ${client.exists(item.ID.dob) ? item.ID.dob : 'N/A'}` + itemEmbed.setTitle(`${User.tag.split('#')[0]}'s Wallet`); - itemEmbed.setDescription(walletData); + itemEmbed.addFields( + { name: '**Cash**', value: `$${item.cash.toFixed(2)}`, inline: true }, + { name: '**ID**', value: ID, inline: true }); } else if (item.type == 'firearm') { // Display firearm