diff --git a/commands/jeux/pierre-feuille-ciseau.js b/commands/jeux/pierre-feuille-ciseau.js index 5b7634a..27f0d05 100644 --- a/commands/jeux/pierre-feuille-ciseau.js +++ b/commands/jeux/pierre-feuille-ciseau.js @@ -11,73 +11,74 @@ module.exports = { async execute(message, args, client) { if (args.length !== 2) { - const embed = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setDescription(`Vous devez spécifier une mise et un coup. Exemple : \`&pierre-feuille-ciseau 100 pierre\`.`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + return message.reply({ embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(`Vous devez spécifier une mise et un coup. Exemple : \`&pierre-feuille-ciseau 100 pierre\`.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ], allowedMentions: { repliedUser: false } }) - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }) } else if (isNaN(args[0])) { - const embed = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setDescription(`La mise doit être un nombre.`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + return message.reply({ embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(`La mise doit être un nombre.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ], allowedMentions: { repliedUser: false } }) - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }) } else if (args[0] < 25) { - const embed = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setDescription(`La mise doit être supérieure ou égale à \`25\`.`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + return message.reply({ embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(`La mise doit être supérieure ou égale à \`25\`.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ], allowedMentions: { repliedUser: false } }) - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }) } else if (args[1] !== 'pierre' && args[1] !== 'p' && args[1] !== 'feuille' && args[1] !== 'f' && args[1] !== 'ciseau' && args[1] !== 'c') { - const embed = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setDescription(`La coup doit être \`pierre\`, \`feuille\` ou \`ciseau\`.`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }) + return message.reply({ embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(`La coup doit être \`pierre\`, \`feuille\` ou \`ciseau\`.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ], allowedMentions: { repliedUser: false } }) } const pocket = await new Promise((resolve, reject) => { - db.get(`SELECT pocket FROM users WHERE userId = ? AND guildId = ?`, [message.author.id, message.guild.id], (err, row) => { + db.get(`SELECT pocket FROM users WHERE userId = ? AND guildId = ?`, [message.author.id, message.guild.id], async (err, row) => { if (err) { reject(err); } else { - if (pocket < args[0]) { - const embed = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setDescription(`Vous n'avez pas assez d'argent sur vous pour miser cette somme.`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }) - } else { - resolve(row.pocket); - } + resolve(row.pocket); } }); }); - const embed = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setImage('') - .setDescription(`Vous avez misé(e) \`${args[0]}\`coins sur \`${args[1]}\`...\nRésultat dans 5 secondes...`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + if (pocket < args[0]) return message.reply({ + embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(`Vous n'avez pas assez d'argent sur vous pour miser cette somme.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ], allowedMentions: { repliedUser: false } }) - message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }) + const sendMessage = await message.reply({ embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(`Vous avez misé(e) \`${args[0]}\` coins sur \`${args[1]}\`...\nRésultat dans 5 secondes...`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ], allowedMentions: { repliedUser: false } }) await new Promise(resolve => setTimeout(resolve, 5000)); @@ -112,17 +113,13 @@ module.exports = { if (args[1] === coupBot || args[1] === coupBotA) { gain = 0 description = 'A refaire, le bot a jouer `' + coupBot + '`, comme toi...'; - } - else if (coupUser == 'p' && coupBotA == 'c') { + } else if (coupUser == 'p' && coupBotA == 'c') { win = true - } - else if (coupUser == 'f' && coupBotA == 'p') { + } else if (coupUser == 'f' && coupBotA == 'p') { win = true - } - else if (coupUser == 'c' && coupBotA == 'f') { + } else if (coupUser == 'c' && coupBotA == 'f') { win = true - } - else { + } else { gain = 0 - args[0]; description = 'Tu as perdu... le bot a jouer `' + coupBot + '` !'; } @@ -132,15 +129,14 @@ module.exports = { description = 'Bravo, tu as gagné(e) `' + gain + '`coins car le bot a jouer `' + coupBot + '` !' } - const embedResultat = new EmbedBuilder() - .setTitle('🪨 Pierre Feuille Ciseau') - .setImage('') - .setDescription(`Vous avez misé \`${args[0]}\` sur \`${args[1]}\`...\nRésultat dans 5 secondes...`) - .setColor(embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) - - message.reply({ embeds: [embedResultat], allowedMentions: { repliedUser: false } }) + sendMessage.edit({ embeds: [ + new EmbedBuilder() + .setTitle('🪨 Pierre Feuille Ciseau') + .setDescription(description) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `Demandé par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }) + ] }) await new Promise((resolve, reject) => { db.run(`UPDATE users SET pocket = pocket + ? WHERE userId = ? AND guildId = ?`, [gain, message.author.id, message.guild.id], (err) => { diff --git a/package-lock.json b/package-lock.json index 371a85a..acead10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "packages": { "": { "dependencies": { + "colors": "^1.4.0", "discord.js": "^14.14.1", "dotenv": "^16.4.5", "sqlite3": "^5.1.7" @@ -426,6 +427,14 @@ "color-support": "bin.js" } }, + "node_modules/colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", diff --git a/package.json b/package.json index 490762c..be41e93 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "colors": "^1.4.0", "discord.js": "^14.14.1", "dotenv": "^16.4.5", "sqlite3": "^5.1.7"